Revert "Remove mu and wanderlust for notmuch"

This reverts commit d1483e5989.

home/accounts/email.nix

@@ -12,6 +12,7 @@
     };
     notmuch.enable = true;
     msmtp.enable = true;
+    mu.enable = true;
   };
   accounts.email = {
     maildirBasePath = ".mail";
@@ -52,6 +53,7 @@
             auth = "login";
           };
         };
+        mu.enable = true;
         notmuch.enable = true;
       };
       icloud = rec {
@@ -71,6 +73,7 @@
           subFolders = "Verbatim";
         };
         msmtp.enable = true;
+        mu.enable = true;
         notmuch.enable = true;
       };
     };

home/emacs/doom/config.el

@@ -39,19 +39,46 @@
   (add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1))))
 
 ;; mail settings
-(setq sendmail-program (executable-find "msmtp")
-      send-mail-function #'smtpmail-send-it
-      mail-specify-envelope-from t
-      mail-envelope-from 'header
-      message-sendmail-envelope-from 'header
-      message-sendmail-f-is-evil t
-      message-sendmail-extra-arguments '("--read-envelope-from")
-      message-send-mail-function #'message-send-mail-with-sendmail)
-
 (after! notmuch
   (setq +notmuch-sync-backend 'mbsync)
   (set-popup-rule! "^\\*notmuch-hello" :ignore t))
 
+(after! mu4e
+  (setq mu4e-get-mail-command "true"
+        mu4e-update-interval 60
+        mu4e-sent-messages-behavior 'delete
+        mu4e-attachment-dir "~/Downloads"
+        mu4e-change-filenames-when-moving t
+        sendmail-program (executable-find "msmtp")
+        send-mail-function #'smtpmail-send-it
+        message-sendmail-f-is-evil t
+        message-sendmail-extra-arguments '("--read-envelope-from")
+        message-send-mail-function #'message-send-mail-with-sendmail)
+
+  ;; Add accounts with contexts
+  (set-email-account! "proton.me"
+                      '((user-mail-address . "e.litherlandsmith@proton.me")
+                        (mu4e-sent-folder . "/Proton/Sent")
+                        (mu4e-drafts-folder . "/Proton/Drafts")
+                        (mu4e-trash-folder . "/Proton/Trash")
+                        (mu4e-refile-folder . "/Proton/Archive"))
+                      t)
+  (set-email-account! "icloud.com"
+                      '((user-mail-address . "e.litherlandsmith@icloud.com")
+                        (mu4e-sent-folder . "/iCloud/Sent")
+                        (mu4e-drafts-folder . "/iCloud/Drafts")
+                        (mu4e-trash-folder . "/iCloud/Trash")
+                        (mu4e-refile-folder . "/iCloud/Archive"))
+                      nil)
+  (set-email-account! "ukaea.uk"
+                      '((user-mail-address . "evie.litherland-smith@ukaea.uk")
+                        (mu4e-sent-folder . "/UKAEA/Sent")
+                        (mu4e-drafts-folder . "/UKAEA/Drafts")
+                        (mu4e-trash-folder . "/UKAEA/Trash")
+                        (mu4e-refile-folder . "/UKAEA/Archive"))
+                      nil)
+  )
+
 ;; Calendar settings
 (defun open-calendar-all ()
   (interactive)

home/emacs/doom/init.el

@@ -176,9 +176,9 @@
        ;; zig  ; C, but simpler
 
        :email
-       ;; (mu4e +org +gmail)
+       (mu4e +org +gmail)
        (notmuch +afew +org)
-       ;; (wanderlust +gmail)
+       (wanderlust +gmail)
 
        :app
        calendar

hosts/Ronin/home.nix

@@ -59,6 +59,7 @@
             auth = "login";
           };
         };
+        mu.enable = true;
         notmuch.enable = true;
       };
     };