From 2d7a5127feb460f0ad78c730b3468d29829ecf76 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 1 Aug 2024 13:46:18 +0200
Subject: emacs: Fix post-update mu4e setup issue

---
 gui/conf/email.el | 2 --
 gui/conf/init.el  | 5 +----
 gui/emacs.nix     | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'gui')

diff --git a/gui/conf/email.el b/gui/conf/email.el
index f0fd448..ce62a1d 100644
--- a/gui/conf/email.el
+++ b/gui/conf/email.el
@@ -26,8 +26,6 @@
   (doom-modeline-gnus nil)
 
   :config
-  (require 'org-mu4e)
-  (evil-collection-init 'mu4e)
   (add-hook 'mu4e-compose-mode-hook #'(lambda () (auto-save-mode -1))))
 
 (use-package mu4e-alert
diff --git a/gui/conf/init.el b/gui/conf/init.el
index c94b4f0..a3a6929 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -1,9 +1,6 @@
 (setq inhibit-startup-message t)
 (setq initial-scratch-message nil)
 
-(setq load-path (seq-filter (lambda (x) (not (string-match-p "org-202109" x)))
-                            load-path))
-
 (require 'package)
 (package-initialize)
 
@@ -120,7 +117,7 @@
   :after evil
   :ensure t
   :config
-  (setq evil-collection-mode-list '(dired eshell eww pdf magit ediff pdf))
+  (setq evil-collection-mode-list '(dired eshell eww pdf magit ediff pdf mu4e))
   (evil-collection-init))
 
 (use-package which-key
diff --git a/gui/emacs.nix b/gui/emacs.nix
index eb3bc8b..d29a6b3 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -51,7 +51,7 @@
         org = prev.org.overrideAttrs(old: { patches = []; } );
       };
 
-      package = pkgs.emacs29;
+      package = pkgs.emacs;
 
       config = ./conf/init.el;
       alwaysEnsure = false;
-- 
cgit v1.2.3