From a3163e6260e47b8e7b3b70dc5878b3594bc0ab17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Sun, 31 May 2020 18:25:22 +0200
Subject: [PATCH] feat(mutt): add archive wrapper

---
 configs/mail.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/configs/mail.nix b/configs/mail.nix
index c02aecb..7c30a4a 100644
--- a/configs/mail.nix
+++ b/configs/mail.nix
@@ -11,6 +11,12 @@ let
     neomutt.enable = true;
     notmuch.enable = false;
   };
+  addArchiveCommand = folder: lib.recursiveUpdate {
+    neomutt.extraConfig = ''
+      # named-mailboxes " └Archive" "=${folder}"
+      macro pager,index \' "<save-message>+${folder}<enter>" "Archive"
+    '';
+  };
 in
 {
   environment.systemPackages = [ pkgs.neomutt ];
@@ -18,7 +24,7 @@ in
   home-manager.users.me = let maildir = "${config.users.users.me.home}/mail"; in {
     accounts.email.maildirBasePath = maildir;
     accounts.email.accounts = {
-      cock = enableDefaults {
+      cock = addArchiveCommand "Archive" (enableDefaults {
         primary = false;
         smtp = {
           host = "mail.cock.li";
@@ -34,24 +40,21 @@ in
         address = "2210@cock.li";
         realName = "2210";
         passwordCommand = pass "mail/2210@cock.li";
-      };
-      kieran-gmail = enableDefaults {
+      });
+      kieran-gmail = addArchiveCommand "[Gmail]/Alle Nachrichten" (enableDefaults {
         primary = true;
         flavor = "gmail.com";
         address = "kieran.meinhardt@gmail.com";
         realName = config.niveum.user.name;
         userName = "kieran.meinhardt";
         passwordCommand = pass "mail/kieran.meinhardt@gmail.com";
-        neomutt.extraConfig = ''
-          macro pager,index \' "<save-message>+[Gmail]/Alle Nachrichten<enter>" "Archive"
-        '';
         folders = {
           drafts = "[Gmail]/Entw&APw-rfe";
           sent = "[Gmail]/Gesendet";
           trash = "[Gmail]/Papierkorb";
         };
-      };
-      hu-berlin = enableDefaults {
+      });
+      hu-berlin = addArchiveCommand "Archives" (enableDefaults {
         primary = false;
         address = "meinhark@hu-berlin.de";
         realName = config.niveum.user.name;
@@ -67,10 +70,7 @@ in
           port = 993;
           tls.enable = true;
         };
-        neomutt.extraConfig = ''
-          macro pager,index \' "<save-message>Archives<enter>" "Archive"
-        '';
-      };
+      });
     };
 
     programs.neomutt = {