diff --git a/flake.lock b/flake.lock index aac0c5f8..b56b497e 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1736145356, - "narHash": "sha256-XCmys9ELmm1w3+vDhoO9CQOS3/qBY4D1VzFnDpC8uPQ=", + "lastModified": 1736318091, + "narHash": "sha256-RkRHXZaMgOMGgkW2YmEqxxDDYRiGFbfr1JuaI0VrCKo=", "owner": "nix-community", "repo": "fenix", - "rev": "bcbb8d5046d6ca9e35eb54f4d36f303ac9bd89e8", + "rev": "9e13860d50cbfd42e79101a516e1939c7723f093", "type": "github" }, "original": { @@ -429,11 +429,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736177481, - "narHash": "sha256-4NDt2s77I0Vklt9ixE+JFpbeyd7UOCf9e45xKfRclw4=", + "lastModified": 1736395712, + "narHash": "sha256-qUNzyQAMCRQkf3FTRQ18Pjd4Bffa/vHjVxrw9e4Ffgo=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "34612047410ecd329c8a06e95189d84e8e3514a6", + "rev": "1057fd23be68ba37155e6499e0ada56c2cfeeb8b", "type": "github" }, "original": { @@ -488,11 +488,11 @@ }, "hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736283893, + "narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6", "type": "github" }, "original": { @@ -526,11 +526,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1736177665, - "narHash": "sha256-eRtVzfZDU0iKh30hswiP9qWmE5tJA5SBkdnYJlLDbc8=", + "lastModified": 1736361400, + "narHash": "sha256-QR87WqLvYAUy288N0rvQCwLLw5f7JbB/kDk8PzEFgN0=", "owner": "helix-editor", "repo": "helix", - "rev": "03f35af9c153b1d0db1bd26eecd69bade55e23fd", + "rev": "a83c23bb037a2db26f3e2fe519de22425e95a7d8", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1736089250, - "narHash": "sha256-/LPWMiiJGPHGd7ZYEgmbE2da4zvBW0acmshUjYC3WG4=", + "lastModified": 1736366465, + "narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "172b91bfb2b7f5c4a8c6ceac29fd53a01ef07196", + "rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5", "type": "github" }, "original": { @@ -766,11 +766,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1736173769, - "narHash": "sha256-HZnZGTBfoh0uNxajXHd0lgn6xPNuseJpH5x3m6fI0dc=", + "lastModified": 1736370994, + "narHash": "sha256-0rt/+Ma9a3HMmvxziMMmUTb5dPu4gN+lSbW+K/zxG6o=", "owner": "hyprwm", "repo": "hyprland", - "rev": "780e3dd542c9706dd37b715f95eb1134b14e6624", + "rev": "c9822b08f914da2997e8ef47c8bef8016e5ff313", "type": "github" }, "original": { @@ -940,11 +940,11 @@ ] }, "locked": { - "lastModified": 1735493740, - "narHash": "sha256-QmfXYQxWmT2w5wx8y4CCADaMdMBiCPxK2M+8/iP1110=", + "lastModified": 1736181224, + "narHash": "sha256-mOV9EZia1EKjGtoqwASZNo9gWVJt0GNwBdC5/iqkXws=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "505e447b6c48e6b49f3aecf5da276f3cc5780054", + "rev": "251e8e2593cdd2ef0a015f4f6e211a7bab3a63ed", "type": "github" }, "original": { @@ -1207,11 +1207,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1736127863, - "narHash": "sha256-ojmsjlPRzxQp5tAvFRbCXxd94M95bgTgMN7iWIRjlBU=", + "lastModified": 1736275344, + "narHash": "sha256-96yQIFgep6DT5XuGEYl7O0GCbPOZv6NVctl7nw0m3Gg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "c94feb626623183da1121d9849f1af2de3dca66f", + "rev": "6f431d614aa0e50a01253b7167c8c97a0ec83872", "type": "github" }, "original": { @@ -1610,11 +1610,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1736161221, - "narHash": "sha256-MKhkpmhiiF18GCTFyNyzN4Wz5nHd8muXM/O1pfCYvV8=", + "lastModified": 1736361923, + "narHash": "sha256-mYfOx4UD+O/LF4BO8FE/OWsQ1XyQ+rMbrEKVs0jCv1g=", "owner": "notashelf", "repo": "nvf", - "rev": "a1bac1d356d9f0610c0a2757b6abe9d9835b8063", + "rev": "ab49ba443d1d17a31c67937b510d56ee8b60859f", "type": "github" }, "original": { @@ -3645,11 +3645,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1736009406, - "narHash": "sha256-5P+kK7S64/Mg8NrGQ3ScqoRW7vJAKzoeGJCFhEbldN0=", + "lastModified": 1736266405, + "narHash": "sha256-V2FDSb8YjuquZduBRNp5niWYlWurja2yGN6Xzh5GPYk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "6725e046df7493c1047e115ebc7180fb06416038", + "rev": "91fc0a239af4e56b84b1d3974ac0f34dcc99b895", "type": "github" }, "original": { @@ -3925,11 +3925,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1736144667, - "narHash": "sha256-P3QE1yjvBgfrGj0LzCYYyW7gsYvPX5qmCxZnWUO5vks=", + "lastModified": 1736271378, + "narHash": "sha256-j1TqXcffjqp/xmWvY9j4Johj1AdKiGXv94pNZHXEz6Y=", "ref": "refs/heads/main", - "rev": "5442348f18fbe15f8ca00621869d39fd35ced7ec", - "revCount": 876, + "rev": "f423d6683cac7037333fbf38db8d0cc94c984fda", + "revCount": 880, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/" diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix index b75a585d..a38bd9be 100644 --- a/hosts/cnix/modules.nix +++ b/hosts/cnix/modules.nix @@ -133,9 +133,9 @@ }; services = { agenix = { - enable = false; + enable = true; cnix = { - enable = false; + enable = true; }; }; blueman = { @@ -151,7 +151,7 @@ enable = true; }; gnome-keyring = { - enable = false; + enable = true; }; greetd = { enable = true; diff --git a/modules/home/programs/aerc/default.nix b/modules/home/programs/aerc/default.nix index eb7ae650..bb171ab6 100644 --- a/modules/home/programs/aerc/default.nix +++ b/modules/home/programs/aerc/default.nix @@ -1,6 +1,7 @@ { pkgs, config, + osConfig, lib, ... }: let @@ -183,11 +184,17 @@ in { accounts.email = { maildirBasePath = ".mail"; accounts.protonmail = { - realName = "notmuch"; - address = "notmuch@localhost"; + primary = true; + realName = "adde"; + address = "adam@cnst.dev"; aerc = { enable = true; - extraAccounts.source = "notmuch://~/.mail"; + extraAccounts = { + source = "imap://adam%40cnst.dev@127.0.0.1:1143"; + source-cred-cmd = "cat ${osConfig.age.secrets.mailpwd.path}"; + outgoing = "smtp://adam%40cnst.dev@127.0.0.1:1025"; + outgoing-cred-cmd = "cat ${osConfig.age.secrets.mailpwd.path}"; + }; extraBinds.messages."r" = '':reply -aqA {{index (.Filename | split ("/")) 4}}''; extraBinds.view."r" = '':reply -aqA {{index (.Filename | split ("/")) 4}}''; }; diff --git a/modules/nixos/programs/pkgs/default.nix b/modules/nixos/programs/pkgs/default.nix index 38287965..855ae888 100644 --- a/modules/nixos/programs/pkgs/default.nix +++ b/modules/nixos/programs/pkgs/default.nix @@ -45,6 +45,7 @@ in { wf-recorder inotify-tools git-crypt + protonmail-bridge-gui ] (mkIf cfg.desktop.enable [ diff --git a/modules/nixos/services/agenix/default.nix b/modules/nixos/services/agenix/default.nix index 4c97ea19..fc37090e 100644 --- a/modules/nixos/services/agenix/default.nix +++ b/modules/nixos/services/agenix/default.nix @@ -36,6 +36,9 @@ in { secrets = { cnstssh.file = "${self}/secrets/cnstssh.age"; cnixssh.file = "${self}/secrets/cnixssh.age"; + certpem.file = "${self}/secrets/certpem.age"; + keypem.file = "${self}/secrets/keypem.age"; + mailpwd.file = "${self}/secrets/mailpwd.age"; }; }) (mkIf cfg.toothpc.enable { diff --git a/secrets/certpem.age b/secrets/certpem.age new file mode 100644 index 00000000..6a0a68e2 Binary files /dev/null and b/secrets/certpem.age differ diff --git a/secrets/cnixssh.age b/secrets/cnixssh.age index 3a7fe6b3..2342607e 100644 Binary files a/secrets/cnixssh.age and b/secrets/cnixssh.age differ diff --git a/secrets/cnstssh.age b/secrets/cnstssh.age index 7e6b26c1..0361ea52 100644 Binary files a/secrets/cnstssh.age and b/secrets/cnstssh.age differ diff --git a/secrets/helix-gpt.age b/secrets/helix-gpt.age deleted file mode 100644 index c5f25658..00000000 --- a/secrets/helix-gpt.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 13OpUQ pp2AqYbrvBHQuDxP0vwYHqXGEfROAZyps5PJDRXxuFI -T6eZEJkyAhhjxCLOmNRQxi5810m714gLOjOhJmQbJKw --> ssh-ed25519 /lVW0g amS6bihZ4oqY1Pbih6i95c8xMCZzhb905YgmNNWJWzI -l/hJ7Smi1lXELNSAiFR/5cBpttwaLi6IJ0oHMvlXbOk ---- 5hrzVRt5StWSeQvk1hrMEi+ReC2HqWDJFOOFkqNwAkE - {.`D4e/X -$[ 74S{ -6O VV?-vI챒7:i@ոא" \ No newline at end of file diff --git a/secrets/keypem.age b/secrets/keypem.age new file mode 100644 index 00000000..c40e4883 Binary files /dev/null and b/secrets/keypem.age differ diff --git a/secrets/mailpwd.age b/secrets/mailpwd.age new file mode 100644 index 00000000..ed57749b --- /dev/null +++ b/secrets/mailpwd.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 t9iOEg GeRcF9wix3hC6je7cJsMnztPSoyZznUMIeWizjHzVmY +rxO06CpRFsVvcnwQDLOkW69rByMmTdF3EujzMWHR9pg +-> ssh-ed25519 KUYMFA JXWcBYjBEYcs6lRat6ctHyu8gp1POe4ihLBUDj6r3S0 +OQUMEW28gpEVZszG84Ljybs8yrINVHeHFcC9n3T9k04 +--- B32Zy8hV0iRFIrclwhQEBTx28qHpA83dwNpDPCGWsOI +${9;@D"YupensZ