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

---
 flake.lock        | 38 +++++++++++++++++++-------------------
 gui/conf/email.el |  2 --
 gui/conf/init.el  |  5 +----
 gui/emacs.nix     |  2 +-
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index bd85851..5b18c50 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1719562820,
-        "narHash": "sha256-HZQ9UCGpcQSrAz335utn5CXkUr2OHyoqipDTQI6/3+k=",
+        "lastModified": 1722503466,
+        "narHash": "sha256-/uMz2fgoe15us1OufkY+cLxtPvwQ8pujIae1KpiTGCc=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "e3a4b715f2a60efafa9cbe6bfa6b8bb5b659a381",
+        "rev": "835be326735bff3737320bf61cb2ae1b54a26cbd",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718530513,
-        "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
+        "lastModified": 1720042825,
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
         "type": "github"
       },
       "original": {
@@ -97,11 +97,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719254875,
-        "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
+        "lastModified": 1722185531,
+        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
+        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
         "type": "github"
       },
       "original": {
@@ -113,16 +113,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1719234068,
-        "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=",
+        "lastModified": 1722221733,
+        "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "90bd1b26e23760742fdcb6152369919098f05417",
+        "rev": "12bf09802d77264e441f48e25459c10c93eada2e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -188,11 +188,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1719426051,
-        "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=",
+        "lastModified": 1722221733,
+        "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd",
+        "rev": "12bf09802d77264e441f48e25459c10c93eada2e",
         "type": "github"
       },
       "original": {
@@ -219,11 +219,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1719468428,
-        "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
+        "lastModified": 1722415718,
+        "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
+        "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce",
         "type": "github"
       },
       "original": {
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