From f8c7193bd6f4fb200b79268ca0d93cdc8eb36684 Mon Sep 17 00:00:00 2001 From: oddlama Date: Tue, 30 Jan 2024 21:33:17 +0100 Subject: [PATCH] feat: add more mail accounts to thunderbird --- users/myuser/default.nix | 6 ----- users/myuser/graphical/thunderbird.nix | 34 ++++++++----------------- users/myuser/secrets/user.nix.age | Bin 3146 -> 4769 bytes 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/users/myuser/default.nix b/users/myuser/default.nix index 4fddf4d..1409256 100644 --- a/users/myuser/default.nix +++ b/users/myuser/default.nix @@ -28,12 +28,6 @@ in mode = "640"; }; - age.secrets.mailpw-206fd3b8 = { - rekeyFile = ./secrets/mailpw-206fd3b8.age; - group = myuser; - mode = "640"; - }; - home-manager.users.${myuser} = { imports = [ ../modules diff --git a/users/myuser/graphical/thunderbird.nix b/users/myuser/graphical/thunderbird.nix index 82f7302..5faf4d1 100644 --- a/users/myuser/graphical/thunderbird.nix +++ b/users/myuser/graphical/thunderbird.nix @@ -1,31 +1,17 @@ { config, lib, - nixosConfig, - pkgs, ... -}: let - rageWrapper = pkgs.writeShellScript "rage-decrypt-yubikey" '' - export PATH="${pkgs.age-plugin-yubikey}:$PATH" - exec ${pkgs.rage}/bin/rage - ''; -in { - accounts.email.accounts = - lib.flip lib.mapAttrs' config.userSecrets.accounts.email - (_n: v: - lib.nameValuePair v.address ({ - # TODO genericize - passwordCommand = - [rageWrapper.out "-d"] - ++ lib.concatMap (x: ["-i" x]) nixosConfig.age.rekey.masterIdentities - ++ [nixosConfig.age.secrets.mailpw-206fd3b8.path]; - - thunderbird = { - enable = true; - profiles = ["personal"]; - }; - } - // v)); +}: { + accounts.email.accounts = lib.flip lib.mapAttrs' config.userSecrets.accounts.email (_n: v: + lib.nameValuePair v.address ( + lib.recursiveUpdate v { + thunderbird = { + enable = true; + profiles = ["personal"]; + }; + } + )); programs.thunderbird = { enable = true; diff --git a/users/myuser/secrets/user.nix.age b/users/myuser/secrets/user.nix.age index 025279d218a6db21d038848db2d3bce5353fbbc9..cac5e81863c649efb3b87f6f996a3fbc8f0e7b72 100644 GIT binary patch literal 4769 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
peM06l9V{fx*PwMb;PL zvvTN$do(-AH#fvlut|zDLp~&uLK-5t@Yc6YZ-wyr9p+rvw<<(-0sF=1Bb=%l+a6Xk zb}yxd_;50DZFtjXXtHvy{f>u+_yyBE8*XY@j4e0dpiH8q?YV?8f=^<}Ca0w6?3DAC z4(=lXmKtnuN_^9&QeU(fZ~##4_ar#NczTCE-C>*)qnGOcNxnG|w-ou#IG92!dbZT? zjrMFxeRUD^*WLE5_Yjva{@f`+Qis6t!&G8BTZ@hO4a>s!#Gp_iwyKfDy?`WA;1kg} viy}VO=blqRwARy&J$S|Ts)HH46?L+#=N!-M@_d=lRTiM|kPA@+=W7!dtWFH7 delta 3145 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