diff --git a/home/lander/features/workstation/default.nix b/home/lander/features/workstation/default.nix index 7ff6abd..25a5534 100644 --- a/home/lander/features/workstation/default.nix +++ b/home/lander/features/workstation/default.nix @@ -7,6 +7,6 @@ ./hledger.nix ./irssi.nix ./k8s.nix - #./mail.nix + ./mail.nix ]; } diff --git a/home/lander/features/workstation/mail.nix b/home/lander/features/workstation/mail.nix index 849fa94..7221362 100644 --- a/home/lander/features/workstation/mail.nix +++ b/home/lander/features/workstation/mail.nix @@ -1,11 +1,11 @@ # adapted from github:Misterio77/nix-config { - pkgs, lib, config, ... -}: let - mbsync = "$(config.programs.mbsync.package}/bin/mbsync"; +}: +let + mbsync = "${config.programs.mbsync.package}/bin/mbsync"; common = rec { realName = "Lander Van den Bulcke"; @@ -22,44 +22,44 @@ ''; }; }; -in { +in +{ accounts.email = { maildirBasePath = "Mail"; accounts = { - inuits = - rec { - primary = true; - address = "landervdb@inuits.eu"; - passwordCommand = "cat ${config.sops.secrets.inuits-mail-pass.path}"; + "escapeangle.com" = { + primary = true; + address = "lander@escapeangle.com"; + passwordCommand = "cat ${config.sops.secrets.escapeangle-mail-pass.path}"; - imap.host = "zimbra88.inuits.eu"; - mbsync = { - enable = true; - create = "maildir"; - expunge = "both"; - }; - folders = { - inbox = "Inbox"; - drafts = "Drafts"; - sent = "Sent"; - trash = "Trash"; - }; - neomutt = { - enable = true; - extraMailboxes = [ - "Archive" - "Drafts" - "Junk" - "Sent" - "Trash" - ]; - }; + imap.host = "mail.escapeangle.com"; + mbsync = { + enable = true; + create = "maildir"; + expunge = "both"; + }; + folders = { + inbox = "Inbox"; + drafts = "Drafts"; + sent = "Sent"; + trash = "Trash"; + }; + neomutt = { + enable = true; + extraMailboxes = [ + "Archive" + "Drafts" + "Junk" + "Sent" + "Trash" + ]; + }; - msmtp.enable = true; - smtp.host = "zimbra88.inuits.eu"; - userName = "landervdb"; - } - // common; + msmtp.enable = true; + smtp.host = "mail.escapeangle.com"; + userName = "lander@escapeangle.com"; + } + // common; }; }; @@ -84,19 +84,20 @@ in { OnUnitActiveSec = "5m"; }; Install = { - WantedBy = ["timers.target"]; + WantedBy = [ "timers.target" ]; }; }; # run `createMaildir` after `linkGeneration` - home.activation = let - mbsyncAccounts = lib.filter (a: a.mbsync.enable) (lib.attrValues config.accounts.email.accounts); - in - lib.mkIf (mbsyncAccounts != []) { - createMaildir = lib.mkForce (lib.hm.dag.entryAfter ["linkGeneration"] '' - run mkdir -m700 -p $VERBOSE_ARG ${ - lib.concatMapStringsSep " " (a: a.maildir.absPath) mbsyncAccounts - } - ''); + home.activation = + let + mbsyncAccounts = lib.filter (a: a.mbsync.enable) (lib.attrValues config.accounts.email.accounts); + in + lib.mkIf (mbsyncAccounts != [ ]) { + createMaildir = lib.mkForce ( + lib.hm.dag.entryAfter [ "linkGeneration" ] '' + run mkdir -m700 -p $VERBOSE_ARG ${lib.concatMapStringsSep " " (a: a.maildir.absPath) mbsyncAccounts} + '' + ); }; } diff --git a/home/lander/global/secrets.nix b/home/lander/global/secrets.nix index d019522..7dd40d8 100644 --- a/home/lander/global/secrets.nix +++ b/home/lander/global/secrets.nix @@ -1,7 +1,7 @@ { ... }: { - sops.secrets.inuits-mail-pass = { + sops.secrets.escapeangle-mail-pass = { sopsFile = ./secrets.yaml; }; } diff --git a/home/lander/global/secrets.yaml b/home/lander/global/secrets.yaml index 4fb0a0a..f1ba184 100644 --- a/home/lander/global/secrets.yaml +++ b/home/lander/global/secrets.yaml @@ -1,4 +1,4 @@ -inuits-mail-pass: ENC[AES256_GCM,data:0MqpjT2mmKs9UiY=,iv:yFo08gU4jfocr8yOQKQPBl49lOeE1QZrdsdjjOxp0dE=,tag:o2mOPnNJM0EXvkRep5w92w==,type:str] +escapeangle-mail-pass: ENC[AES256_GCM,data:Uc/CiZCjSjIkph8=,iv:A0miPxk/3JeE6QbDHobKC+ZmuhnFatG9kua/+8yirtw=,tag:lOlpriBtNUKd09m2EdTc6w==,type:str] sops: age: - recipient: age15m0pdv8mkt4aue8wjay9k4endyymtka5je3gc2t63dgamfzh9vts7774hh @@ -19,8 +19,8 @@ sops: SVJPeW1XM0RPWWI5L0wzSmFmNWRnZ3MKKbpkILPQB7dpzZQcU45g/4SfCdo8+UJK 7hrCYeiae9zHu2CfrZqVMkCnAOpda8lL0INLNnrS9hDRNdk3LBLapQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-05T06:11:39Z" - mac: ENC[AES256_GCM,data:SVdNtwrN7MEtXMdWKLQXR9BRlRaYvOBRDLmoDZMkX3t3dlUMR5m5m/btpal1+nPkYjUk58q0hSGA94BREdDTpMYHmvr0V+tWnKsmE8j7r51plN1Dp/4sfgtZBgaqHD2IRDGLI4pW9GCg2fXIxB+BGC6GNU/ZAVbhB4bmzNfFqOY=,iv:ElCt+fJFSjsykoiIS9XO9ViaBJ02Oi169YnUeHiATPk=,tag:vR/KXyuRMnWtW9uXIHNwUw==,type:str] + lastmodified: "2025-11-03T14:53:29Z" + mac: ENC[AES256_GCM,data:DXCtjC8hOyMR01xAxJLkhkTCdcMOeV0dFGmlZUaliNVIGtKDXaFvDanpb8IM1vRPcoNjRDDDgbC+KP6TPyKMEDpIigqQVNsjyD6jqEn0T0iHBiomWrsNXofY8NzIfeKT2075tt2s4BIbocaJlXLueiqAZoLHyh2FM9kEsU/jiuw=,iv:wpXl6yMJzNB28+d8MBb7I3Qx40sdTzykn4lzVtCW7Vo=,tag:Yq5wHEPbFnPM9bYXbDrL7Q==,type:str] pgp: - created_at: "2025-09-18T08:29:55Z" enc: |- @@ -34,4 +34,4 @@ sops: -----END PGP MESSAGE----- fp: 4BE1257015580BAB9F4B9D5FCA5B1C34E649BF92 unencrypted_suffix: _unencrypted - version: 3.8.1 + version: 3.11.0