fix: supply different imap/smtp passwords depending on machine

This commit is contained in:
wi11-holdsworth 2025-10-09 22:17:52 +11:00
parent 7bce9ba144
commit 89903b6137
7 changed files with 19 additions and 9 deletions

View file

@ -53,6 +53,7 @@
backupFileExtension = "backup"; backupFileExtension = "backup";
extraSpecialArgs = { extraSpecialArgs = {
inherit userName; inherit userName;
inherit hostName;
}; };
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;

View file

@ -14,6 +14,8 @@
# config # config
age.secrets."protonmail-desktop-password".file = ../../secrets/protonmail-desktop-password.age;
home = { home = {
username = "${userName}"; username = "${userName}";
homeDirectory = "/home/will"; homeDirectory = "/home/will";

View file

@ -14,6 +14,8 @@
# config # config
age.secrets."protonmail-laptop-password".file = ../../secrets/protonmail-laptop-password.age;
home = { home = {
username = "${userName}"; username = "${userName}";
homeDirectory = "/home/will"; homeDirectory = "/home/will";

View file

@ -1,6 +1,7 @@
{ {
config, config,
lib, lib,
hostName,
... ...
}: }:
let let
@ -41,7 +42,7 @@ in
inherit host; inherit host;
}; };
inherit address; inherit address;
passwordCommand = "cat ${config.age.secrets.protonmail-password.path}"; passwordCommand = "cat ${config.age.secrets."protonmail-${hostName}-password".path}";
primary = true; primary = true;
realName = "Will Holdsworth"; realName = "Will Holdsworth";
smtp = { smtp = {
@ -55,13 +56,7 @@ in
}; };
}; };
}; };
age.secrets."protonmail-cert".file = ../../../secrets/protonmail-cert.age;
age.secrets = {
# keep-sorted start
"protonmail-cert".file = ../../../secrets/protonmail-cert.age;
"protonmail-password".file = ../../../secrets/protonmail-password.age;
# keep-sorted end
};
}; };
imports = [ ]; imports = [ ];

View file

@ -0,0 +1,9 @@
age-encryption.org/v1
-> ssh-ed25519 qLT+DQ 5SwQDhD4kh5rf8gOIf5OAXsipUjguakuW8YiaWeniVU
ZbivA9gOXebUmHLnIjDe7mBGe6RSwLSxiZdsqwGe8Y0
-> ssh-ed25519 7+xRyQ EmyQt5Mo21YDxnAAdMW1ehlzSX8/KfWmvsyJ5F+4eVg
aanR02UNI2qHpFsBm18G71vfZusybejGc1xLBoQz/2c
-> ssh-ed25519 LtK9yQ 0No7c3518Q2JRALb5XTl/ZjNiEgWEiQz1k/hfSR0vyM
z/OHVmjTaVXcCsDSeWIsRCmwIbPnkj9K4/bEME3aEjE
--- DtxdciZ6fWb30GyGn0/mqtsXOmiyOQupeSoe8tOIx6g
øh¢ya´Yc…0§©>©hÅã<C385>ļÊY{ƒ;*—.†V6u@Ï4&Šù"·Èüê@

View file

@ -25,7 +25,8 @@ in
"paperless.age".publicKeys = users; "paperless.age".publicKeys = users;
"porkbun-api.age".publicKeys = users; "porkbun-api.age".publicKeys = users;
"protonmail-cert.age".publicKeys = users; "protonmail-cert.age".publicKeys = users;
"protonmail-password.age".publicKeys = users; "protonmail-desktop-password.age".publicKeys = users;
"protonmail-laptop-password.age".publicKeys = users;
"prowlarr.age".publicKeys = users; "prowlarr.age".publicKeys = users;
"radarr.age".publicKeys = users; "radarr.age".publicKeys = users;
"radicale.age".publicKeys = users; "radicale.age".publicKeys = users;