From 624cb7db3b98b5cd87586a169afde7b92d668f9e Mon Sep 17 00:00:00 2001
From: Benson Chu <dev@mail.pestctrl.io>
Date: Sun, 24 May 2026 15:56:05 -0500
Subject: [PATCH] Mail stuff

---
 lisp/mail/mu4e-configuration.el | 33 +++++++++++++++++++++++----------
 lisp/mail/mu4e-generic.el       | 10 +++++++++-
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/lisp/mail/mu4e-configuration.el b/lisp/mail/mu4e-configuration.el
index a2770d0..8b9edff 100644
--- a/lisp/mail/mu4e-configuration.el
+++ b/lisp/mail/mu4e-configuration.el
@@ -43,12 +43,34 @@
         ("/fastmail/important.Development" . ?d)
         ("/fastmail/important.Puppet" . ?p)
         ("/fastmail/important.VIPs" . ?v)
-        ("/fastmail/Archive" . ?a)))
+        ("/fastmail/important.unsorted" . ?u)
+        ("/fastmail/important.tracking" . ?t)
+        ("/fastmail/important.tracking.receipts" . ?r)
+        ("/fastmail/corpo" . ?c)
+        ("/fastmail/Archive" . ?a)
+        ("/fastmail/Unnecessary.mailing_lists.emacs.emacs-devel" . ?e)
+        ("/fastmail/Unnecessary.mailing_lists.emacs.emacs-devel.kept" . ?k)
+        ("/fastmail/Unnecessary.mailing_lists.emacs.emacs-orgmode" . ?O)
+        ("/fastmail/Unnecessary.mailing_lists.emacs.bug-gnu-emacs" . ?b)
+        ("/fastmail/Unnecessary.mailing_lists.emacs.help-gnu-emacs" . ?h)
+        ("/fastmail/Unnecessary.mailing_lists.notmuch" . ?n)))
 
 (setq mu4e-bookmarks
       '(( :name  "Inbox"
           :query "maildir:/fastmail/INBOX AND NOT flag:trashed"
           :key ?i)
+        ( :name  "Unsorted"
+          :query "(maildir:/fastmail/important.unsorted OR maildir:/fastmail/corpo)"
+          :key ?u)
+        ( :name  "New emacs-devel"
+          :query "maildir:/fastmail/Unnecessary.mailing_lists.emacs.emacs-devel AND flag:unread AND date:2026/03/01.."
+          :key ?e)
+        ( :name  "All emacs-devel"
+          :query "maildir:/fastmail/Unnecessary.mailing_lists.emacs.emacs-devel AND flag:unread"
+          :key ?E)
+        ( :name  "Kept emacs-devel"
+          :query "maildir:/fastmail/Unnecessary.mailing_lists.emacs.emacs-devel.kept"
+          :key ?k)
         ( :name "Today's messages"
           :query "date:today..now"
           :key ?t)
@@ -57,15 +79,6 @@
           :hide-unread t
           :key ?w)))
 
-(setq mu4e-bookmarks
-      (mapcar (lambda (x)
-                (let ((str (plist-get x :query)))
-                  (when (not (string-match-p "Unnecessary/mailing_lists" str))
-                    (setf (plist-get x :query)
-                          (concat str " AND NOT maildir:/Unnecessary/mailing_lists*"))))
-                x)
-              mu4e-bookmarks))
-
 (defvar my/email-accounts
   '("bensonchu457@fastmail.com"
     "bensonchu@fastmail.com"
diff --git a/lisp/mail/mu4e-generic.el b/lisp/mail/mu4e-generic.el
index 6a29b9d..60a73b5 100644
--- a/lisp/mail/mu4e-generic.el
+++ b/lisp/mail/mu4e-generic.el
@@ -26,7 +26,15 @@
 (require 'mu4e)
 (require 'mu4e-contrib)
 
-(define-key mu4e-headers-mode-map (kbd "M") #'mu4e-headers-mark-all)
+(defun my/mu4e-headers-mark-all ()
+  "Mark all headers for some action.
+Ask user what action to execute."
+  (interactive)
+  (mu4e-headers-mark-for-each-if
+   (cons 'something nil)
+   (lambda (_msg _param) t)))
+
+(define-key mu4e-headers-mode-map (kbd "M") #'my/mu4e-headers-mark-all)
 
 (defun mu4e-print-path ()
   (interactive)