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

@@ -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
@@ -473,7 +472,9 @@ single certifcate used for local development with caddy.")
       `((".mbsyncrc" ,(local-file "../../../user-config/mbsync/.mbsyncrc" "mbsyncrc"))
         (".racketrc" ,(local-file "../../../user-config/racket/.racketrc" "racketrc"))
         (".guile" ,(local-file "../../../user-config/guile/.guile" "guilerc"))
-        (".ghci" ,(local-file "../../../user-config/haskell/.ghci" "ghci"))))
+        (".ghci" ,(local-file "../../../user-config/haskell/.ghci" "ghci"))
+        (".xinitrc" ,(local-file "../../../user-config/xorg/.xinitrc" "xinitrc"))
+        (".Xresources" ,(local-file "../../../user-config/xorg/.Xresources" "xresources"))))
 
      (simple-service
       'custom-guix-channels-service

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

user-config/xorg/.xinitrc

@@ -37,6 +37,12 @@ init_full_session() {
     # Allow clipboard to be shared via spice
     spice-vdagent &
 
+    # Start dbus session here so emacs daemon connects to the users dbus session and not the
+    # system one
+    if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+        eval "$(dbus-launch --sh-syntax)"
+    fi
+
     # Determine how to start (or not start) emacs
     if [ "$SESSION_WM" = "exwm" ]; then
         case "$SESSION_TYPE" in
@@ -129,20 +135,20 @@ init_session() {
 run_session() {
     case "$SESSION_WM" in
         xmonad|stumpwm)
-	    exec dbus-launch --exit-with-session "$SESSION_WM"
+	    exec "$SESSION_WM"
 	    ;;
         exwm)
             if [ "$SESSION_TYPE" = "min" ]; then
-                exec dbus-launch --exit-with-session emacs -f start-as-window-manager
+                exec emacs -f start-as-window-manager
             else
                 exec emacsclient -c
             fi
             ;;
         *)
             if [ "$SESSION_TYPE" = "new" ]; then
-                exec dbus-launch --exit-with-session "$SESSION_WM"
+                exec "$SESSION_WM"
             else
-	        exec dbus-launch --exit-with-session "$DEFAULT_WM"
+	        exec "$DEFAULT_WM"
             fi
 	    ;;
     esac