3 files changed, 61 insertions, 52 deletions
diff --git a/profiles/email/neomutt.nix b/profiles/email/neomutt.nix
index 4106f5b..da81207 100644
--- a/profiles/email/neomutt.nix
+++ b/profiles/email/neomutt.nix
@@ -188,10 +188,9 @@
       macros = [
         { map = ["index"]; key = "X"; action = "<save-message>=Spam<enter>y"; }
         { map = ["index"]; key = "A"; action = "<modify-labels-then-hide>+archive -unread -inbox<enter><mark-message>z<enter><change-folder>^<enter>'z"; }
-        { map = ["index"]; key = "h"; action = "<mark-message>z<enter><change-folder>^<enter>'z"; }
         { map = ["index"]; key = "D"; action = "<delete-message>"; }
-        { map = ["index" "pager"]; key =  "S"; action = "<sync-mailbox>!notmuch-hook &<enter>"; }
-        { map = ["index"]; key = "c"; action = "<change-vfolder>?"; }
+        { map = ["index" "pager"]; key =  "S"; action = "<sync-mailbox>!notmuch-hook<enter><mark-message>z<enter><change-folder>^<enter>'z"; }
+        { map = ["index"]; key = "h"; action = "<change-vfolder>?h"; }
         { map = ["index"]; key = "\\\\"; action = "<vfolder-from-query>"; }
         { map = ["browser"]; key = "h"; action = "<change-dir><kill-line>..<enter>"; }
       ];
diff --git a/profiles/email/server.nix b/profiles/email/server.nix
new file mode 100644
index 0000000..9a5e16c
--- /dev/null
+++ b/profiles/email/server.nix
@@ -0,0 +1,59 @@
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  ...
+}: with lib; {
+  hm = {
+    accounts.email = {
+      accounts = {
+        ${ivi.username} = {
+          realName = "${ivi.realName}";
+          userName = "${ivi.email}";
+          address = "${ivi.email}";
+          passwordCommand = ["${pkgs.pass}/bin/pass" "personal/mailserver"];
+          imap = { host = "${ivi.domain}"; port = 993; tls = { enable = true; }; };
+          smtp = { host = "${ivi.domain}"; port = 587; tls = { enable = true; useStartTls = true; }; };
+          msmtp = {
+            enable = true;
+          };
+          neomutt = {
+            enable = true;
+            sendMailCommand = "msmtp -a ${ivi.username}";
+            mailboxName = "=== ${ivi.username} ===";
+            extraConfig = ''
+            set spoolfile='Inbox'
+            unvirtual-mailboxes *
+          '';
+          };
+          mbsync = {
+            enable = true;
+            create = "both"; remove = "both"; expunge = "both";
+            groups = {
+              ${ivi.username} = {
+                channels = {
+                  All = { patterns = ["*"]; extraConfig = { Create = "Both"; Expunge = "Both"; Remove = "Both"; }; };
+                };
+              };
+            };
+          };
+          notmuch = {
+            enable = true;
+            neomutt = {
+              enable = true;
+              virtualMailboxes = [
+                { name = "Inbox"; query = "folder:/${ivi.username}/ tag:inbox"; }
+                { name = "Sent"; query = "folder:/${ivi.username}/ tag:sent"; }
+                { name = "Archive"; query = "folder:/${ivi.username}/ tag:archive"; }
+                { name = "Drafts"; query = "folder:/${ivi.username}/ tag:drafts"; }
+                { name = "Junk"; query = "folder:/${ivi.username}/ tag:spam"; }
+                { name = "Trash"; query = "folder:/${ivi.username}/ tag:trash"; }
+              ];
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/profiles/email/vinkland.nix b/profiles/email/vinkland.nix
deleted file mode 100644
index 6e93d8b..0000000
--- a/profiles/email/vinkland.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}: {
-  hm = {
-    accounts.email = {
-      accounts = {
-        ivi = {
-          realName = "Mike Vink";
-          userName = "ivi@vinkland.xyz";
-          address = "ivi@vinkland.xyz";
-          passwordCommand = ["${pkgs.pass}/bin/pass" "personal/mailserver"];
-          imap = { host = "vinkland.xyz"; port = 993; tls = { enable = true; }; };
-          smtp = { host = "vinkland.xyz"; port = 587; tls = { enable = true; useStartTls = true; }; };
-          msmtp = {
-            enable = true;
-          };
-          neomutt = {
-            enable = true;
-            sendMailCommand = "msmtp -a ivi";
-            mailboxName = "=== ivi ===";
-            extraConfig = ''
-            set spoolfile='Inbox'
-            unvirtual-mailboxes *
-          '';
-          };
-          mbsync = {
-            enable = true;
-            create = "both"; remove = "both"; expunge = "both";
-          };
-          notmuch = {
-            enable = true;
-            neomutt = {
-              enable = true;
-              virtualMailboxes = [
-                { name = "Drafts"; query = "folder:/ivi/ tag:trash"; }
-                { name = "Inbox"; query = "folder:/ivi/ tag:inbox"; }
-                { name = "Sent"; query = "folder:/ivi/ tag:sent"; }
-                { name = "Junk"; query = "folder:/ivi/ tag:trash"; }
-              ];
-            };
-          };
-        };
-      };
-    };
-  };
-}