aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorAdrian Kummerlaender2023-08-31 14:53:08 +0200
committerAdrian Kummerlaender2023-08-31 14:53:08 +0200
commit80798e3345bd4f872c8d852e74bc3dc591bcd3b2 (patch)
treef6b2ee080d393cab026e4c3a4c1dd33728c9c625 /gui
parent546c3043089957b80088b6b26ee9a85930648aaa (diff)
downloadnixos_home-80798e3345bd4f872c8d852e74bc3dc591bcd3b2.tar
nixos_home-80798e3345bd4f872c8d852e74bc3dc591bcd3b2.tar.gz
nixos_home-80798e3345bd4f872c8d852e74bc3dc591bcd3b2.tar.bz2
nixos_home-80798e3345bd4f872c8d852e74bc3dc591bcd3b2.tar.lz
nixos_home-80798e3345bd4f872c8d852e74bc3dc591bcd3b2.tar.xz
nixos_home-80798e3345bd4f872c8d852e74bc3dc591bcd3b2.tar.zst
nixos_home-80798e3345bd4f872c8d852e74bc3dc591bcd3b2.zip
Switch to a more stable emacs setup, rollback mu4e update
Diffstat (limited to 'gui')
-rw-r--r--gui/conf/email.el1
-rw-r--r--gui/emacs.nix12
2 files changed, 5 insertions, 8 deletions
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
];