chore(treewide): Move away from git-crypt

4 files changed, 100 insertions, 52 deletions

diff --git a/hm/soispha/conf/mail/accounts/benedikt.nix b/hm/soispha/conf/mail/accounts/benedikt.nix
new file mode 100644
index 00000000..87ede61b
--- /dev/null
+++ b/hm/soispha/conf/mail/accounts/benedikt.nix
@@ -0,0 +1,48 @@
+{pkgs}: {
+  address = "benedikt.peetz@b-peetz.de";
+  userName = "benedikt.peetz@b-peetz.de";
+  realName = "Benedikt Peetz";
+  primary = true;
+  passwordCommand = "${pkgs.libsecret}/bin/secret-tool lookup account benedikt.peetz@b-peetz.de";
+  aliases = [
+    "@b-peetz.de"
+  ];
+  folders = {};
+  gpg = {
+    encryptByDefault = true;
+    key = "9A254A935C25B0419EAE495014D2BC012F572AD7";
+    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 = "bpeetz";
+  };
+}
diff --git a/hm/soispha/conf/mail/accounts/soispha.nix b/hm/soispha/conf/mail/accounts/soispha.nix
new file mode 100644
index 00000000..012e84d6
--- /dev/null
+++ b/hm/soispha/conf/mail/accounts/soispha.nix
@@ -0,0 +1,49 @@
+{pkgs}: {
+  address = "soispha@vhack.eu";
+  userName = "soispha@vhack.eu";
+  realName = "Soispha";
+  primary = false;
+  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";
+  };
+}
diff --git a/hm/soispha/conf/mail/default.nix b/hm/soispha/conf/mail/default.nix
index 7ca65e1a..0ecbe40a 100644
--- a/hm/soispha/conf/mail/default.nix
+++ b/hm/soispha/conf/mail/default.nix
@@ -1,61 +1,12 @@
 {
   config,
   pkgs,
-  lib,
   ...
 }: let
-  non_public_accounts = import ./non_public_accounts.nix {inherit pkgs;};
-  accounts = lib.recursiveUpdate {inherit soispha;} non_public_accounts;
+  benedikt = import ./accounts/benedikt.nix {inherit pkgs;};
+  soispha = import ./accounts/soispha.nix {inherit pkgs;};
 
-  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";
-    };
-  };
+  accounts = {inherit soispha benedikt;};
 in {
   accounts.email = {
     maildirBasePath = "${config.xdg.dataHome}/maildir";
diff --git a/hm/soispha/conf/mail/non_public_accounts.nix b/hm/soispha/conf/mail/non_public_accounts.nix
deleted file mode 100644
index 7ab1bbc6..00000000
--- a/hm/soispha/conf/mail/non_public_accounts.nix
+++ /dev/null
Binary files differ