From 80798e3345bd4f872c8d852e74bc3dc591bcd3b2 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 31 Aug 2023 14:53:08 +0200
Subject: Switch to a more stable emacs setup, rollback mu4e update

---
 gui/conf/email.el |  1 -
 gui/emacs.nix     | 12 +++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'gui')

diff --git a/gui/conf/email.el b/gui/conf/email.el
index 7010c9c..f0fd448 100644
--- a/gui/conf/email.el
+++ b/gui/conf/email.el
@@ -31,7 +31,6 @@
   (add-hook 'mu4e-compose-mode-hook #'(lambda () (auto-save-mode -1))))
 
 (use-package mu4e-alert
-  :ensure t
   :config
   (mu4e-alert-set-default-style 'libnotify)
   (add-hook 'after-init-hook #'mu4e-alert-enable-notifications))
diff --git a/gui/emacs.nix b/gui/emacs.nix
index d36d7bd..71690fc 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, pkgs-unstable, ... }:
+{ config, pkgs, pkgs-oldstable, pkgs-unstable, ... }:
 
 {
   programs.emacs = let
@@ -46,12 +46,10 @@
   in {
     enable = true;
 
-    package = pkgs-unstable.emacsWithPackagesFromUsePackage {
+    package = pkgs.emacsWithPackagesFromUsePackage {
       config = ./conf/init.el;
       alwaysEnsure = false;
 
-      package = pkgs-unstable.emacs-git.override { withNativeCompilation = true; };
-
       extraEmacsPackages = epkgs: (with epkgs.melpaPackages; [
         pdf-tools
         mu4e-alert
@@ -62,7 +60,7 @@
       ])++ [
         akr-color-theme
         custom-runtime-env
-        pkgs.mu
+        pkgs-oldstable.mu
       ];
     };
   };
@@ -86,10 +84,10 @@
     };
 
   in with pkgs; [
-    pkgs-unstable.symbola
+    symbola
     (iosevka-bin.override { variant = "aile"; })
     (iosevka-bin.override { variant = "etoile"; })
-    mu
+    pkgs-oldstable.mu
     org-protocol-shortcut
   ];
 
-- 
cgit v1.2.3