summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2019-09-17 15:11:48 +0200
committerAlan Pearce2019-09-17 15:11:48 +0200
commitfaedc3b7ef237c73a400ca7ac9fcef35ffca18b8 (patch)
treea345985dd5d86a326dec785ade833cd0d633413a
parenta0fe1ef8872003557a4f527395fc9e09379e5ade (diff)
downloadnixfiles-faedc3b7ef237c73a400ca7ac9fcef35ffca18b8.tar.lz
nixfiles-faedc3b7ef237c73a400ca7ac9fcef35ffca18b8.tar.zst
nixfiles-faedc3b7ef237c73a400ca7ac9fcef35ffca18b8.zip
Use a single version of emacs
-rw-r--r--modules/user-interface.nix5
-rw-r--r--satoshipad.nix2
2 files changed, 5 insertions, 2 deletions
diff --git a/modules/user-interface.nix b/modules/user-interface.nix
index cba0a271..e8596bef 100644
--- a/modules/user-interface.nix
+++ b/modules/user-interface.nix
@@ -35,6 +35,9 @@ in
   documentation.info.enable = true;
   nixpkgs.config.firefox.enableOfficialBranding = true;
 
+  nixpkgs.config.packageOverrides = pkgs: {
+    myEmacs = emacsPackage;
+  };
   environment.systemPackages = with pkgs; [
     aria2
     firefox
@@ -44,7 +47,7 @@ in
     geeqie
 
     fish # for emacs-fish-completion
-    emacsPackage
+    myEmacs
     editorScript
 
     xst # st, but with support for XResources
diff --git a/satoshipad.nix b/satoshipad.nix
index 15fc1263..86123e1e 100644
--- a/satoshipad.nix
+++ b/satoshipad.nix
@@ -54,7 +54,7 @@
     serviceConfig = {
       Type = "oneshot";
       ExecStart = "${pkgs.isync}/bin/mbsync -Va";
-      ExecStartPost = "${pkgs.unstable.emacs}/bin/emacsclient -e (mu4e-update-index)";
+      ExecStartPost = "${pkgs.myEmacs}/bin/emacsclient -e (mu4e-update-index)";
     };
   };