2 files changed, 55 insertions, 52 deletions
diff --git a/home-manager/config/mail/default.nix b/home-manager/config/mail/default.nix
index 95c8a7d0..267652a6 100644
--- a/home-manager/config/mail/default.nix
+++ b/home-manager/config/mail/default.nix
@@ -2,59 +2,62 @@
   config,
   pkgs,
   ...
-}: {
-  accounts.email = {
-    maildirBasePath = "${config.xdg.dataHome}/maildir";
-    accounts = {
-      soispha = {
-        address = "soispha@vhack.eu";
-        userName = "soispha@vhack.eu";
-        realName = "Soispha";
-        primary = true;
-        passwordCommand = "${pkgs.libsecret}/bin/secret-tool lookup account soispha@vhack.eu";
-        aliases = [
-          "admin@vhack.eu"
-        ];
-        folders = {
-        };
-        gpg = {
-          encryptByDefault = true;
-          key = "9606FC749FCE16360723D4ADA5E94010C3A642AD";
-          signByDefault = true;
-        };
-        signature = {
-          # TODO
-        };
-        neomutt = {
-          enable = true;
-        };
-        mbsync = {
-          enable = true;
-          create = "both";
-        };
-        himalaya = {
-          enable = true;
-          backend = "imap";
-          sender = "smtp";
-          settings = {
-            # TODO
-          };
-        };
-        smtp = {
-          host = "server1.vhack.eu";
-          port = 465;
-        };
-        imap = {
-          host = "server1.vhack.eu";
-          port = 993;
-        };
-        jmap = {
-          # TODO
-        };
-        maildir = {
-          path = "soispha";
-        };
+}: let
+  non_public_accounts = import ./non_public_accounts.nix {};
+  accounts = {inherit non_public_accounts soispha;};
+
+  soispha = {
+    address = "soispha@vhack.eu";
+    userName = "soispha@vhack.eu";
+    realName = "Soispha";
+    primary = true;
+    passwordCommand = "${pkgs.libsecret}/bin/secret-tool lookup account soispha@vhack.eu";
+    aliases = [
+      "admin@vhack.eu"
+    ];
+    folders = {
+    };
+    gpg = {
+      encryptByDefault = true;
+      key = "9606FC749FCE16360723D4ADA5E94010C3A642AD";
+      signByDefault = true;
+    };
+    signature = {
+      # TODO
+    };
+    neomutt = {
+      enable = true;
+    };
+    mbsync = {
+      enable = true;
+      create = "both";
+    };
+    himalaya = {
+      enable = true;
+      backend = "imap";
+      sender = "smtp";
+      settings = {
+        # TODO
       };
     };
+    smtp = {
+      host = "server1.vhack.eu";
+      port = 465;
+    };
+    imap = {
+      host = "server1.vhack.eu";
+      port = 993;
+    };
+    jmap = {
+      # TODO
+    };
+    maildir = {
+      path = "soispha";
+    };
+  };
+in {
+  accounts.email = {
+    maildirBasePath = "${config.xdg.dataHome}/maildir";
+    inherit accounts;
   };
 }
diff --git a/home-manager/config/mail/non_public_accounts.nix b/home-manager/config/mail/non_public_accounts.nix
new file mode 100644
index 00000000..edd2f6ba
--- /dev/null
+++ b/home-manager/config/mail/non_public_accounts.nix
Binary files differ