diff --git a/flake.lock b/flake.lock index 90fa6c7..65d54a9 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1712850504, - "narHash": "sha256-s1cUVFgoukNsAfU7bpLP3G0qL0Q2un/AimUxnQ+u6ig=", + "lastModified": 1713240951, + "narHash": "sha256-Nvbn1baUNN7AQOA1hHunUHuFziF0dErqaTlfxr9NNwo=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "18e4b1d6a35acbcea2cef05a4a8eece83f1da5ae", + "rev": "954eda50aca5ef986c557f3b515c4321fd3c7fd8", "type": "github" }, "original": { @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1712434681, - "narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=", + "lastModified": 1713214463, + "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3", + "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1712797985, - "narHash": "sha256-2WS5zErQC7DuGUoVIiWUqQPXsIpdYBqFJip5XSpCVrU=", + "lastModified": 1713283263, + "narHash": "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ac0f3411c18497a39498b756b711e092512de9e0", + "rev": "fe7b748eb668136dd0558b7c8279bfcd7ab4d759", "type": "github" }, "original": { @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1712420644, - "narHash": "sha256-h2X8qhN5RKYQXzT1kxKgUz1u1QthqOrP9xk800mTM6E=", + "lastModified": 1713283897, + "narHash": "sha256-/0OPK/bDr8/Lf7r8kzDD/yP1kySbJ8gPmV3CdUbVTFM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "5ec0140d4aeca42b8a33e7f335f979e376d1b549", + "rev": "00d147d7f6ad2ecfbf75efe4a8402723c72edd98", "type": "github" }, "original": { @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1711671891, - "narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "c1402612146ba06606ebf64963a02bc1efe11e74", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -204,11 +204,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712588820, - "narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=", + "lastModified": 1713145326, + "narHash": "sha256-m7+IWM6mkWOg22EC5kRUFCycXsXLSU7hWmHdmBfmC3s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167", + "rev": "53a2c32bc66f5ae41a28d7a9a49d321172af621e", "type": "github" }, "original": { @@ -276,20 +276,18 @@ "wlroots": { "flake": false, "locked": { - "host": "gitlab.freedesktop.org", - "lastModified": 1709983277, - "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "lastModified": 1713124002, + "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "type": "github" }, "original": { - "host": "gitlab.freedesktop.org", - "owner": "wlroots", - "repo": "wlroots", - "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b", - "type": "gitlab" + "owner": "hyprwm", + "repo": "wlroots-hyprland", + "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "type": "github" } }, "xdph": { @@ -312,11 +310,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1713214484, + "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", "type": "github" }, "original": { diff --git a/home-modules/bitwarden.nix b/home-modules/bitwarden.nix new file mode 100644 index 0000000..51a64df --- /dev/null +++ b/home-modules/bitwarden.nix @@ -0,0 +1,32 @@ +{ config, pkgs, secrets, ... }: +{ + home.packages = with pkgs; [ + bitwarden + bitwarden-cli + ]; + + home.file.".config/Bitwarden CLI/data.json".text = '' + { + "stateVersion": 9, + "global": { + "theme": "system", + "window": {}, + "environmentUrls": { + "base": "https://pw.nx2.site", + "api": null, + "identity": null, + "webVault": null, + "icons": null, + "notifications": null, + "events": null, + "keyConnector": null + }, + "region": "Self-hosted", + "installedVersion": "2023.12.0" + } + } + ''; + + home.sessionVariables.BW_SESSION = secrets.bitwarden.env.bw-session; + +} \ No newline at end of file diff --git a/home-modules/email.nix b/home-modules/email.nix index a4a6880..bc61f25 100644 --- a/home-modules/email.nix +++ b/home-modules/email.nix @@ -4,7 +4,22 @@ thunderbird ]; - + + programs.thunderbird = { + enable = true; + profiles = { + default = { + isDefault = true; + settings = { + "calendar.alarms.showmissed" = false; + "calendar.alarms.playsound" = false; + "calendar.alarms.show" = false; + }; + }; + }; + }; + + accounts.email.accounts = { "gamil-online" = { address = secrets.email.gmail-online.mail; @@ -45,33 +60,33 @@ }; }; - "hsmw" = { - address = secrets.email.hsmw.mail; - realName = "Lennart J. Kurzweg"; - imap = { - port = 993; - host = "mail.hs-mittweida.de"; - }; - smtp = { - port = 465; - host = "mail.hs-mittweida.de"; - }; - signature = { - text = '' - -- - MatNr: ${secrets.email.hsmw.mnr} - SemGr: ${secrets.email.hsmw.semgr} - About Me: https://nx2.site/about-me - Contact: https://nx2.site/contact - GPG: https://nx2.site/gpg - ''; - showSignature = "append"; - }; - thunderbird = { - enable = true; - profiles = [ "default" ]; - }; - }; + # "hsmw" = { + # address = secrets.email.hsmw.mail; + # realName = "Lennart J. Kurzweg"; + # imap = { + # port = 993; + # host = "mail.hs-mittweida.de"; + # }; + # smtp = { + # port = 465; + # host = "mail.hs-mittweida.de"; + # }; + # signature = { + # text = '' + # -- + # MatNr: ${secrets.email.hsmw.mnr} + # SemGr: ${secrets.email.hsmw.semgr} + # About Me: https://nx2.site/about-me + # Contact: https://nx2.site/contact + # GPG: https://nx2.site/gpg + # ''; + # showSignature = "append"; + # }; + # thunderbird = { + # enable = true; + # profiles = [ "default" ]; + # }; + # }; }; } diff --git a/home-modules/git.nix b/home-modules/git.nix index 424e727..491e9d5 100644 --- a/home-modules/git.nix +++ b/home-modules/git.nix @@ -36,6 +36,5 @@ whitespace-error-style = "22 reverse"; }; }; - iniContent."sendemail.hsmw".smtpUser = secrets.email.hsmw.mail; }; } \ No newline at end of file diff --git a/home-modules/hyprland/hyprland.nix b/home-modules/hyprland/hyprland.nix index 9449c28..dd7463e 100644 --- a/home-modules/hyprland/hyprland.nix +++ b/home-modules/hyprland/hyprland.nix @@ -239,7 +239,6 @@ in workspace_swipe_direction_lock = false; workspace_swipe_direction_lock_threshold = "10"; workspace_swipe_forever = true; - workspace_swipe_numbered = false; workspace_swipe_use_r = false; }; diff --git a/home.nix b/home.nix index 2274a1a..af1e6ff 100644 --- a/home.nix +++ b/home.nix @@ -6,6 +6,7 @@ ./home-modules/chatterino.nix # ./home-modules/meli/meli.nix ./home-modules/email.nix + ./home-modules/bitwarden.nix # ./home-modules/mutt/neomutt.nix ./home-modules/gestures.nix @@ -50,7 +51,7 @@ obsidian spotify spicetify-cli - obs-studio bitwarden + obs-studio waybar swww rofi diff --git a/secrets/passwords-and-certificates.nix b/secrets/passwords-and-certificates.nix index b8a8091..80b568a 100644 Binary files a/secrets/passwords-and-certificates.nix and b/secrets/passwords-and-certificates.nix differ