Turns out there was a real function for this

Wish wgrep worked though...

config-emacs.org

@@ -66,6 +66,15 @@
                                        (dedicated . t)))
                  (window-width . 100)))
 
+  (add-to-list 'display-buffer-alist
+               `((major-mode . grep-mode)
+                 display-buffer-in-side-window
+                 (side . right)
+                 (slot . 3)
+                 (window-parameters . ((no-delete-other-windows . t)
+                                       (dedicated . t)))
+                 (window-width . 100)))
+
   (add-to-list 'display-buffer-alist
                `(my/is-compilation-buffer
                  display-buffer-in-side-window
@@ -153,10 +162,7 @@
 * colorful compilation buffer
 #+begin_src emacs-lisp
   (require 'ansi-color)
-  (defun colorize-compilation-buffer ()
-    (let ((buffer-read-only nil))
-      (ansi-color-apply-on-region (point-min) (point-max))))
-  (add-hook 'compilation-filter-hook 'colorize-compilation-buffer)
+  (add-hook 'compilation-filter-hook 'ansi-color-compilation-filter)
 #+end_src
 * World time
 #+begin_src emacs-lisp

lisp/mail/mu4e-configuration.el

@@ -23,25 +23,15 @@
 ;;; Commentary:
 
 ;;; Code:
-(require 'mbsync)
-
-(unless (eq system-type 'windows-nt)
-  (add-to-list 'load-path
-               "/usr/share/emacs/site-lisp/mu4e/")
 (require 'mu4e)
-
-  (add-hook 'mbsync-postsync-hooks
-            '(lambda (&rest _ignore)
-               (mu4e-update-mail-and-index t)))
-
-  ;; For mbsync, this must be set
-  (setq mu4e-change-filenames-when-moving t)
+(require 'mu4e-generic)
 
 (add-to-list 'mu4e-view-actions
              '("ViewInBrowser" . mu4e-action-view-in-browser) t)
 
   ;; (global-set-key (kbd "<f8>") 'mu4e)
 
+
 (setq mu4e-maildir "~/.mail"
       mu4e-sent-folder   "/fastmail/Sent"
       mu4e-drafts-folder "/fastmail/Drafts"
@@ -50,24 +40,22 @@
 
 (setq mu4e-maildir-shortcuts
       '(("/fastmail/INBOX" . ?i)
-          ("/fastmail/INBOX/tracking" . ?t)
-          ("/fastmail/INBOX/unsorted" . ?u)
+        ("/fastmail/important.Development" . ?d)
+        ("/fastmail/important.Puppet" . ?p)
+        ("/fastmail/important.VIPs" . ?v)
         ("/fastmail/Archive" . ?a)))
 
 (setq mu4e-bookmarks
-        '(( :name  "Unread messages"
-            :query "flag:unread AND NOT flag:trashed"
-            :key ?u)
+      '(( :name  "Inbox"
+          :query "maildir:/fastmail/INBOX AND NOT flag:trashed"
+          :key ?i)
         ( :name "Today's messages"
           :query "date:today..now"
           :key ?t)
         ( :name "Last 7 days"
           :query "date:7d..now"
           :hide-unread t
-            :key ?w)
-          ( :name "Messages with images"
-            :query "mime:image/*"
-            :key ?p)))
+          :key ?w)))
 
 (setq mu4e-bookmarks
       (mapcar (lambda (x)
@@ -84,7 +72,9 @@
     "bensonchu457@gmail.com"
     "me@mail.pestctrl.io"
     "dev@mail.pestctrl.io"
-      "accounts@mail.pestctrl.io"))
+    "accounts@mail.pestctrl.io"
+    "chuan.chu01@fastmail.com"
+    "julie.chu01@fastmail.com"))
 
 (defun my/mu-init ()
   (interactive)
@@ -113,6 +103,7 @@
   ;; (setcar mu4e-headers-thread-first-child-prefix "├┬►")
   ;; (setcar mu4e-headers-thread-connection-prefix "│")
 
+
 (defun my/mu4e~headers-thread-prefix (thread)
   "Calculate the thread prefix based on thread info THREAD."
   (when thread
@@ -167,16 +158,5 @@
             :override
             #'my/mu4e~headers-thread-prefix)
 
-  (defun mu4e-print-path ()
-    (interactive)
-    (-->
-     (mu4e-message-at-point)
-     (mu4e-message-field it :path)
-     (progn
-       (kill-new it)
-       (message "Path Copied: %s" it))))
-
-  (define-key mu4e-search-minor-mode-map (kbd "l") #'mu4e-print-path))
-
 (provide 'mu4e-configuration)
 ;;; mu4e-config.el ends here

lisp/mail/mu4e-generic.el

@@ -0,0 +1,152 @@
+;;; mu4e-generic.el ---  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2026 Benson Chu
+
+;; Author: Benson Chu <bensonchu457@gmail.com>
+;; Created: [2026-04-19 20:10]
+
+;; This file is not part of GNU Emacs
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+(require 'mu4e)
+(require 'mu4e-contrib)
+
+(define-key mu4e-headers-mode-map (kbd "M") #'mu4e-headers-mark-all)
+
+(defun mu4e-print-path ()
+  (interactive)
+  (-->
+   (mu4e-message-at-point)
+   (mu4e-message-field it :path)
+   (progn
+     (kill-new it)
+     (message "Path Copied: %s" it))))
+
+(define-key mu4e-search-minor-mode-map (kbd "l") #'mu4e-print-path)
+
+(add-hook 'mu4e-headers-found-hook #'mu4e-thread-fold-all)
+
+(define-key mu4e-headers-mode-map (kbd "C-M-a") #'mu4e-view-thread-goto-root)
+(define-key mu4e-thread-mode-map (kbd "<tab>") #'mu4e-thread-fold-toggle)
+
+;; Prevent automatic baseline resets to keep (+x) indicators persistent
+(defvar my/mu4e-allow-baseline-reset nil
+  "When non-nil, allow baseline resets. Otherwise, preserve the baseline.")
+
+(defun my/mu4e--query-items-refresh-no-auto-reset (orig-fun &optional reset-baseline)
+  "Advice for `mu4e--query-items-refresh' to prevent automatic baseline resets.
+Only reset the baseline if `my/mu4e-allow-baseline-reset' is non-nil."
+  (funcall orig-fun (and reset-baseline my/mu4e-allow-baseline-reset)))
+
+(advice-add 'mu4e--query-items-refresh :around
+            #'my/mu4e--query-items-refresh-no-auto-reset)
+
+(defun my/mu4e-reset-baseline ()
+  "Manually reset the mu4e baseline to clear all (+x) indicators."
+  (interactive)
+  (let ((my/mu4e-allow-baseline-reset t))
+    (mu4e--query-items-refresh 'reset-baseline))
+  (message "mu4e baseline reset - (+x) indicators cleared"))
+
+(defun my/goto-mail ()
+  (interactive)
+  (switch-or-create-tab "mail")
+  (delete-other-windows)
+  (mu4e))
+
+(global-set-key (kbd "C-x m") #'my/goto-mail)
+
+(with-eval-after-load 'mu4e-view
+  (add-hook 'mu4e-view-mode-hook
+            #'olivetti-mode))
+
+(add-to-list 'mu4e-view-actions
+             '("ViewInBrowser" . mu4e-action-view-in-browser) t)
+
+(defun my/mu4e~headers-thread-prefix (thread)
+  "Calculate the thread prefix based on thread info THREAD."
+  (when thread
+    (let* ((prefix       "")
+           (level        (plist-get thread :level))
+           (has-child    (plist-get thread :has-child))
+           (last-child   (plist-get thread :last-child))
+           (duplicate    (plist-get thread :duplicate)))
+      ;; Do not prefix root messages.
+      (when (= level 0)
+        (setq mu4e~headers-thread-state '())
+        (when has-child
+          (setq prefix "┬►")))
+      (if (> level 0)
+          (let* ((length (length mu4e~headers-thread-state))
+                 (padding (make-list (max 0 (- level length)) nil)))
+            ;; Trim and pad the state to ensure a message will
+            ;; always be shown with the correct indentation, even if
+            ;; a broken thread is returned. It's trimmed to level-1
+            ;; because the current level has always an connection
+            ;; and it used a special formatting.
+            (setq mu4e~headers-thread-state
+                  (cl-subseq (append mu4e~headers-thread-state padding)
+                             0 (- level 1)))
+            ;; Prepare the thread prefix.
+            (setq prefix
+                  (concat
+                   ;; Current mu4e~headers-thread-state, composed by
+                   ;; connections or blanks.
+                   (mapconcat
+                    (lambda (s)
+                      (if s "│" " "))
+                    mu4e~headers-thread-state "")
+                   (if last-child "╰" "├")
+                   (if has-child "┬" "─")
+                   "►"))))
+      ;; If a new sub-thread will follow (has-child) and the current
+      ;; one is still not done (not last-child), then a new
+      ;; connection needs to be added to the tree-state.  It's not
+      ;; necessary to a blank (nil), because padding will handle
+      ;; that.
+      (if (and has-child (not last-child))
+          (setq mu4e~headers-thread-state
+                (append mu4e~headers-thread-state '(t))))
+      ;; Return the thread prefix.
+      (format "%s%s"
+              prefix
+              (if duplicate
+                  (mu4e~headers-thread-prefix-map 'duplicate) "")))))
+
+(advice-add #'mu4e~headers-thread-prefix
+            :override
+            #'my/mu4e~headers-thread-prefix)
+
+(defun my/mu4e-compose-edit-ignore-draft()
+  "Edit an existing draft message."
+  (interactive)
+  (let* ((msg (mu4e-message-at-point)))
+    (mu4e--draft
+     'edit
+     (lambda ()
+       (with-current-buffer
+           (find-file-noselect (mu4e-message-readable-path msg))
+         (mu4e--delimit-headers)
+         (current-buffer))))))
+
+(advice-add #'mu4e-compose-edit
+            :override
+            #'my/mu4e-compose-edit-ignore-draft)
+
+(provide 'mu4e-generic)
+;;; mu4e-generic.el ends here

lisp/multi-vterm-tabs.el

@@ -25,7 +25,8 @@
 ;;; Code:
 (require 'cl-lib)
 (require 'dash)
-(require 'vterm)
+(require 'use-package)
+(use-package vterm)
 (require 'tab-bar)
 
 (defclass multi-vterm-tab-info ()

lisp/ripgrep.el

@@ -0,0 +1,188 @@
+;;; ripgrep.el ---  -*- lexical-binding: t -*-
+
+;; https://www.dyerdwelling.family/emacs/20260109094340-emacs--a-single-function-ripgrep-alternative-to-rgrep/
+
+;;; Commentary:
+
+;;; Code:
+
+(defconst ripgrep-error-regexp
+  `((,(concat "^\\(?:"
+              ;; Parse using NUL characters when `--null' is used.
+              ;; Note that we must still assume no newlines in
+              ;; filenames due to "foo: Is a directory." type
+              ;; messages.
+              "\\(?1:[^\0\n]+\\)\\(?3:\0\\)\\(?2:[0-9]+\\):"
+              "\\|"
+              ;; Fallback if `--null' is not used, use a tight regexp
+              ;; to handle weird file names (with colons in them) as
+              ;; well as possible.  E.g., use [1-9][0-9]* rather than
+              ;; [0-9]+ so as to accept ":034:" in file names.
+              "\\(?1:"
+              "\\(?:[a-zA-Z]:\\)?"      ; Allow "C:..." for w32.
+              "[^\n:]+?[^\n/:]\\):[\t ]*\\(?2:[1-9][0-9]*\\)[\t ]*:\\(?:[1-9][0-9]*\\)[\t ]*:"
+              "\\)")
+     1 2
+     ;; Calculate column positions (col . end-col) of first grep match on a line
+     (,(lambda ()
+         (when grep-highlight-matches
+           (let* ((beg (match-end 0))
+                  (end (save-excursion (goto-char beg) (line-end-position)))
+                  (mbeg
+                   (text-property-any beg end 'font-lock-face grep-match-face)))
+             (when mbeg
+               (- mbeg beg)))))
+      .
+      ,(lambda ()
+         (when grep-highlight-matches
+           (let* ((beg (match-end 0))
+                  (end (save-excursion (goto-char beg) (line-end-position)))
+                  (mbeg
+                   (text-property-any beg end 'font-lock-face grep-match-face))
+                  (mend
+                   (and mbeg (next-single-property-change
+                              mbeg 'font-lock-face nil end))))
+             (when mend
+               (- mend beg 1))))))
+     nil nil
+     (3 '(face nil display ":")))
+    ("^Binary file \\(.+\\) matches" 1 nil nil 0 1)))
+
+(defun ripgrep (search-term &optional directory glob)
+  "Run ripgrep (rg) with SEARCH-TERM and optionally DIRECTORY and GLOB.
+If ripgrep is unavailable, fall back to Emacs's rgrep command. Highlights SEARCH-TERM in results.
+By default, only the SEARCH-TERM needs to be provided. If called with a
+universal argument, DIRECTORY and GLOB are prompted for as well."
+  (interactive
+   (let* ((univ-arg current-prefix-arg)
+          (default-search-term
+           (cond
+            ((use-region-p)
+             (buffer-substring-no-properties (region-beginning) (region-end)))
+            ((thing-at-point 'symbol t))
+            ((thing-at-point 'word t))
+            (t ""))))
+     (list
+      (read-string (if (string-empty-p default-search-term)
+                       "Search for: "
+                     (format "Search for (default `%s`): " default-search-term))
+                   nil nil default-search-term)
+      (when univ-arg (read-directory-name "Directory: "))
+      (when univ-arg (read-string "File pattern (glob, default: ): " nil nil "")))))
+  (let* ((directory (expand-file-name (or directory default-directory)))
+         (glob (or glob ""))
+         (buffer-name "*grep*"))
+    (if (executable-find "rg")
+        (let ((buffer (get-buffer-create buffer-name)))
+          (with-current-buffer buffer
+            (setq default-directory directory)
+            (let ((inhibit-read-only t))
+              (erase-buffer)
+              (insert (format "-*- mode: grep; default-directory: \"%s\" -*-\n\n" directory))
+              (if (not (string= "" glob))
+                  (insert (format "[o] Glob: %s\n\n" glob)))
+              (insert "Searching...\n\n"))
+            (grep-mode)
+            (setq-local compilation-error-regexp-alist ripgrep-error-regexp)
+            (setq-local my/grep-search-term search-term)
+            (setq-local my/grep-directory directory)
+            (setq-local my/grep-glob glob))
+
+          (pop-to-buffer buffer)
+          (goto-char (point-min))
+
+          (make-process
+           :name "ripgrep"
+           :buffer buffer
+           :command `("rg" "--color=never" "--max-columns=500"
+                      "--column" "--line-number" "--no-heading"
+                      "--smart-case" "-e" ,search-term
+                      "--glob" ,glob ,directory)
+           :filter `(lambda (proc string)
+                      (when (buffer-live-p (process-buffer proc))
+                        (with-current-buffer (process-buffer proc)
+                          (let ((inhibit-read-only t)
+                                (moving (= (point) (process-mark proc))))
+                            (setq string (replace-regexp-in-string "[\r\0\x01-\x08\x0B-\x0C\x0E-\x1F]" "" string))
+                            ;; Replace full directory path with ./ in the incoming output
+                            (setq string (replace-regexp-in-string
+                                          (concat "^" (regexp-quote ,directory))
+                                          "./"
+                                          string))
+                            (save-excursion
+                              (goto-char (process-mark proc))
+                              (insert string)
+                              (set-marker (process-mark proc) (point)))
+                            (if moving (goto-char (process-mark proc)))))))
+           :sentinel
+           `(lambda (proc _event)
+              (when (memq (process-status proc) '(exit signal))
+                (with-current-buffer (process-buffer proc)
+                  (let ((inhibit-read-only t))
+                    ;; Remove "Searching..." line
+                    (goto-char (point-min))
+                    (while (re-search-forward "Searching\\.\\.\\.\n\n" nil t)
+                      (replace-match "" nil t))
+
+                    ;; Clean up the output - replace full paths with ./
+                    (goto-char (point-min))
+                    (forward-line 3)
+                    (let ((start-pos (point)))
+                      (while (re-search-forward (concat "^" (regexp-quote ,directory)) nil t)
+                        (replace-match "./" t t))
+
+                      ;; Check if any results were found
+                      (goto-char start-pos)
+                      (when (= (point) (point-max))
+                        (insert "No results found.\n")))
+
+                    (goto-char (point-max))
+                    (insert "\nRipgrep finished\n")
+
+                    ;; Highlight search terms using grep's match face
+                    (goto-char (point-min))
+                    (forward-line 3)
+                    (save-excursion
+                      (while (re-search-forward (regexp-quote ,search-term) nil t)
+                        (put-text-property (match-beginning 0) (match-end 0)
+                                           'face 'match)
+                        (put-text-property (match-beginning 0) (match-end 0)
+                                           'font-lock-face 'match))))
+
+                  ;; Set up keybindings
+                  (local-set-key (kbd "D")
+                                 (lambda ()
+                                   (interactive)
+                                   (ripgrep my/grep-search-term
+                                            (read-directory-name "New search directory: ")
+                                            my/grep-glob)))
+                  (local-set-key (kbd "S")
+                                 (lambda ()
+                                   (interactive)
+                                   (ripgrep (read-string "New search term: "
+                                                         nil nil my/grep-search-term)
+                                            my/grep-directory
+                                            my/grep-glob)))
+                  (local-set-key (kbd "o")
+                                 (lambda ()
+                                   (interactive)
+                                   (ripgrep my/grep-search-term
+                                            my/grep-directory
+                                            (read-string "New glob: "))))
+                  (local-set-key (kbd "g")
+                                 (lambda ()
+                                   (interactive)
+                                   (ripgrep my/grep-search-term my/grep-directory my/grep-glob)))
+
+                  (goto-char (point-min))
+                  (message "ripgrep finished."))))
+           )
+          (message "ripgrep started..."))
+      ;; Fallback to rgrep
+      (progn
+        (setq default-directory directory)
+        (message (format "%s : %s : %s" search-term glob directory))
+        (rgrep search-term (if (string= "" glob) "*" glob) directory)))))
+
+(provide 'ripgrep)
+;;; ripgrep.el ends here

lisp/themes/dark-default-theme.el

@@ -45,6 +45,8 @@
    '(mode-line     ((t :foreground "gray60" :background "black" :inverse-video nil)))
    '(eldoc-highlight-function-argument ((t :foreground "dodger blue")))
 
+   '(highlight ((t :background "gray20")))
+
    '(sml/charging ((t (:inherit sml/global :foreground "forest green"))))
 
    ;; TODO: Rework according to prot:

lisp/ti-config/work-mail.el

@@ -25,6 +25,7 @@
 ;;; Code:
 
 (require 'mu4e)
+(require 'mu4e-generic)
 
 (require 'ti-mail-identity)
 (require 'gnus-article-hack)
@@ -33,28 +34,9 @@
 
 (setq mu4e-update-interval (* 60 5))
 
-(defun my/goto-mail ()
-  (interactive)
-  (switch-or-create-tab "mail")
-  (delete-other-windows)
-  (mu4e))
-
-(global-set-key (kbd "C-x m") #'my/goto-mail)
-
-(with-eval-after-load 'mu4e-view
-  (add-hook 'mu4e-view-mode-hook
-            #'olivetti-mode))
-
-(add-hook 'mbsync-postsync-hooks
-          '(lambda (&rest _ignore)
-             (mu4e-update-mail-and-index t)))
-
 ;; For mbsync, this must be set
 (setq mu4e-change-filenames-when-moving t)
 
-(add-to-list 'mu4e-view-actions
-             '("ViewInBrowser" . mu4e-action-view-in-browser) t)
-
 ;; (global-set-key (kbd "<f8>") 'mu4e)
 
 (setq mu4e-maildir "~/.mail"
@@ -68,12 +50,12 @@
         (:key ?a :maildir "/work/Done")))
 
 (setq mu4e-bookmarks
-      '(( :name  "Unread messages"
-          :query "flag:unread AND NOT maildir:/work/Other* AND NOT flag:trashed"
-          :key ?u)
-        ( :name  "Inbox"
+      '(( :name  "Inbox"
           :query "maildir:/work/INBOX AND NOT flag:trashed"
           :key ?i)
+        ( :name  "Unread messages"
+          :query "flag:unread AND NOT maildir:/work/Other* AND NOT flag:trashed"
+          :key ?u)
         ( :name  "mailing_lists"
           :query "maildir:/work/INBOX/mailing_lists* AND NOT flag:trashed"
           :key ?m)
@@ -118,104 +100,7 @@
 ;; (setcar mu4e-headers-thread-first-child-prefix "├┬►")
 ;; (setcar mu4e-headers-thread-connection-prefix "│")
 
-(defun my/mu4e~headers-thread-prefix (thread)
-  "Calculate the thread prefix based on thread info THREAD."
-  (when thread
-    (let* ((prefix       "")
-           (level        (plist-get thread :level))
-           (has-child    (plist-get thread :has-child))
-           (last-child   (plist-get thread :last-child))
-           (duplicate    (plist-get thread :duplicate)))
-      ;; Do not prefix root messages.
-      (when (= level 0)
-        (setq mu4e~headers-thread-state '())
-        (when has-child
-          (setq prefix "┬►")))
-      (if (> level 0)
-          (let* ((length (length mu4e~headers-thread-state))
-                 (padding (make-list (max 0 (- level length)) nil)))
-            ;; Trim and pad the state to ensure a message will
-            ;; always be shown with the correct indentation, even if
-            ;; a broken thread is returned. It's trimmed to level-1
-            ;; because the current level has always an connection
-            ;; and it used a special formatting.
-            (setq mu4e~headers-thread-state
-                  (cl-subseq (append mu4e~headers-thread-state padding)
-                             0 (- level 1)))
-            ;; Prepare the thread prefix.
-            (setq prefix
-                  (concat
-                   ;; Current mu4e~headers-thread-state, composed by
-                   ;; connections or blanks.
-                   (mapconcat
-                    (lambda (s)
-                      (if s "│" " "))
-                    mu4e~headers-thread-state "")
-                   (if last-child "╰" "├")
-                   (if has-child "┬" "─")
-                   "►"))))
-      ;; If a new sub-thread will follow (has-child) and the current
-      ;; one is still not done (not last-child), then a new
-      ;; connection needs to be added to the tree-state.  It's not
-      ;; necessary to a blank (nil), because padding will handle
-      ;; that.
-      (if (and has-child (not last-child))
-          (setq mu4e~headers-thread-state
-                (append mu4e~headers-thread-state '(t))))
-      ;; Return the thread prefix.
-      (format "%s%s"
-              prefix
-              (if duplicate
-                  (mu4e~headers-thread-prefix-map 'duplicate) "")))))
-
-(advice-add #'mu4e~headers-thread-prefix
-            :override
-            #'my/mu4e~headers-thread-prefix)
-
-(defun my/mu4e-compose-edit-ignore-draft()
-  "Edit an existing draft message."
-  (interactive)
-  (let* ((msg (mu4e-message-at-point)))
-    (mu4e--draft
-     'edit
-     (lambda ()
-       (with-current-buffer
-           (find-file-noselect (mu4e-message-readable-path msg))
-         (mu4e--delimit-headers)
-         (current-buffer))))))
-
-(advice-add #'mu4e-compose-edit
-            :override
-            #'my/mu4e-compose-edit-ignore-draft)
-
-(add-hook 'mu4e-headers-found-hook #'mu4e-thread-fold-all)
-
-(define-key mu4e-headers-mode-map (kbd "C-M-a") #'mu4e-view-thread-goto-root)
-(define-key mu4e-thread-mode-map (kbd "<tab>") #'mu4e-thread-fold-toggle)
-
 (setq mu4e-attachment-dir "/scratch/benson/mail_attachments")
 
-(require 'mu4e-contrib)
-(define-key mu4e-headers-mode-map (kbd "M") #'mu4e-headers-mark-all)
-
-;; Prevent automatic baseline resets to keep (+x) indicators persistent
-(defvar my/mu4e-allow-baseline-reset nil
-  "When non-nil, allow baseline resets. Otherwise, preserve the baseline.")
-
-(defun my/mu4e--query-items-refresh-no-auto-reset (orig-fun &optional reset-baseline)
-  "Advice for `mu4e--query-items-refresh' to prevent automatic baseline resets.
-Only reset the baseline if `my/mu4e-allow-baseline-reset' is non-nil."
-  (funcall orig-fun (and reset-baseline my/mu4e-allow-baseline-reset)))
-
-(advice-add 'mu4e--query-items-refresh :around
-            #'my/mu4e--query-items-refresh-no-auto-reset)
-
-(defun my/mu4e-reset-baseline ()
-  "Manually reset the mu4e baseline to clear all (+x) indicators."
-  (interactive)
-  (let ((my/mu4e-allow-baseline-reset t))
-    (mu4e--query-items-refresh 'reset-baseline))
-  (message "mu4e baseline reset - (+x) indicators cleared"))
-
 (provide 'work-mail)
 ;;; work-mail.el ends here