From 76da1da2cb5edac84852d0746f5fb76ef12ae47b Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" <collin@rekahsoft.ca>
Date: Mon, 25 Dec 2023 00:03:02 -0500
Subject: [PATCH] home: Remove unused package and config for
 emacs-mu4e-maildirs-extension

* .guix/rekahsoft/guix-config/home.scm: Remove the emacs-mu4e-maildirs-extension package
* user-config/emacs/.emacs.d/config.org: Remove the now unnecessary configuration for
mu4e-maildirs-extension (fwiw, this functionality is now included by default upstream).
---
 .guix/rekahsoft/guix-config/home.scm  |  1 -
 user-config/emacs/.emacs.d/config.org | 28 ---------------------------
 2 files changed, 29 deletions(-)

diff --git a/.guix/rekahsoft/guix-config/home.scm b/.guix/rekahsoft/guix-config/home.scm
index aaa810f..f226db4 100644
--- a/.guix/rekahsoft/guix-config/home.scm
+++ b/.guix/rekahsoft/guix-config/home.scm
@@ -92,7 +92,6 @@ single certifcate used for local development with caddy.")
       emacs-ix
       emacs-lsp-haskell
       emacs-mu4e-dashboard
-      emacs-mu4e-maildirs-extension
       emacs-org-html-theme-darksun
       emacs-org-html-themes
       emacs-org-projectile
diff --git a/user-config/emacs/.emacs.d/config.org b/user-config/emacs/.emacs.d/config.org
index 1b80039..e91e556 100644
--- a/user-config/emacs/.emacs.d/config.org
+++ b/user-config/emacs/.emacs.d/config.org
@@ -1238,34 +1238,6 @@ Leverage [[https://github.com/seagle0128/all-the-icons-ibuffer][all-the-icons-ib
     :after mu4e
     :config (mu4e-icalendar-setup))
 
-  ;; TODO: this functionality has moved upstream. See: https://github.com/djcb/mu/pull/1586.
-  ;;       Also, this appears to be broken when using guix powered emacs
-  (use-package mu4e-maildirs-extension
-    :after mu4e
-    :config (progn
-              (mu4e-maildirs-extension)
-
-              ;; Override mu4e-maildirs-extension-get-relevant-maildirs to allow filtering of
-              ;; displayed maildirs depending on the current mu4e context
-              (defun mu4e-maildirs-extension-get-relevant-maildirs ()
-                (seq-filter (lambda (maildir)
-                              (string-match-p
-                               (alist-get 'user-mail-address (mu4e-context-vars (mu4e-context-current)))
-                               maildir))
-                            (mu4e-get-maildirs)))
-
-              (defun mu4e-maildirs-after-enter-context ()
-                (interactive)
-                (let ((current-prefix-arg '(16)))
-                  (mu4e-maildirs-extension-with-buffer
-                    (call-interactively 'mu4e-maildirs-extension-force-update))))
-
-              (defadvice mu4e-context-switch
-                  (after mu4e-context-after-enter-func activate)
-                (mu4e-maildirs-after-enter-context))
-
-              (ad-activate 'mu4e-context-switch)))
-
   (use-package mu4e-alert
     :after mu4e
     :commands mu4e-alert-set-default-style