update email

modules/home-manager/emacs/emacs/init.el

@@ -116,11 +116,15 @@
   :custom
   (org-return-follows-link t)
   (org-hide-emphasis-markers t)
-  (org-capturen-templates
+  (org-log-into-drawer t)
+  (org-log-done 'time)
+  (org-todo-keywords
+   '((sequence "TODO(t)" "NEXT(n)" "HOLD(h@)" "|" "DONE(d)" "CANCELLED(c@/!)")))
+  (org-capture-templates
         `(("i" "Inbox" entry  (file "inbox.org")
            ,(concat "* TODO %?\n"
                     "/Entered on/ %U"))
-          ("@" "Inbox [mu4e]" entry (file "inbox.org")
+          ("@" "Inbox [email]" entry (file "inbox.org")
            ,(concat "* TODO Process \"%a\" %?\n"
                     "/Entered on/ %U"))))
   (org-refile-use-outline-path 'file)
@@ -663,6 +667,39 @@
 					(mu4e-sent-folder . "/personal/Sent")
 					(mu4e-trash-folder . "/personal/Trash"))))))
 
+(use-package notmuch
+  :ensure t
+  :straight t
+  :bind (("C-c m" . notmuch-hello))
+  :custom
+  (notmuch-saved-searches
+   '((:name "inbox (personal)" :query "tag:inbox AND tag:personal")
+	 (:name "unread (personal)" :query "tag:unread AND tag:personal")
+	 (:name "sent (personal)" :query "tag:sent AND tag:personal")
+	 (:name "all mail (personal)" :query "tag:personal")
+	 (:name "inbox (work)" :query "tag:inbox AND tag:work")
+	 (:name "unread (work)" :query "tag:unread AND tag:work")
+	 (:name "sent (work)" :query "tag:sent AND tag:work")
+	 (:name "all mail (work)" :query "tag:work")
+	 (:name "drafts" :query "tag:draft")))
+  :init
+  (add-hook 'message-send-hook (lambda ()
+                                 (let ((from (message-fetch-field "From")))
+                                   (if (string-match-p (regexp-quote "michael@michaelthomson.dev") from)
+                                       (progn
+                                         (setq sendmail-program "msmtp")
+                                         (setq message-sendmail-extra-arguments nil))
+                                     (progn
+                                       (setq sendmail-program "gmi")
+                                       (setq message-sendmail-extra-arguments '("send" "--quiet" "-t" "-C" "~/Maildir/work")))))))
+  :config
+  (setq notmuch-fcc-dirs nil))
+
+(use-package ol-notmuch
+  :ensure t
+  :straight t
+  :bind
+  ("C-c l" . org-store-link))
 
 ;; epubs
 (use-package nov

modules/home-manager/email.nix

@@ -67,6 +67,22 @@
     };
     notmuch = {
       enable = true;
+      new.tags = [ "new" ];
+      hooks = {
+        postNew = ''
+        notmuch tag +personal "path:personal/**"
+        notmuch tag +work "path:work/**"
+
+        notmuch tag +sent -new tag:new from:michael@michaelthomson.dev
+        notmuch tag +sent -new tag:new from:mthomson@konradgroup.com
+
+        notmuch tag +inbox +unread -new "tag:new"
+        '';
+        preNew = ''
+        mbsync -a
+        (cd ~/Maildir/work/ && gmi sync)
+        '';
+      };
     };
     lieer = {
       enable = true;
@@ -125,6 +141,25 @@
           enable = true;
         };
       };
+      accounts.work = {
+        primary = false;
+        flavor = "gmail.com";
+        address = "mthomson@konradgroup.com";
+        realName = "Michael Thomson";
+        aerc = {
+          enable = true;
+        };
+        notmuch = {
+          enable = true;
+        };
+        lieer = {
+          enable = true;
+          settings = {
+            replace_slash_with_dot = true;
+            ignore_tags = [ "new" "personal" "work" ];
+          };
+        };
+      };
     };
     calendar = {
       basePath = ".calendar";

modules/home-manager/stylix.nix

@@ -6,7 +6,7 @@ lib,
 ...
 }: {
   imports = [
-    inputs.stylix.homeManagerModules.stylix
+    inputs.stylix.homeModules.stylix
   ];
 
   stylix = {