From faedc3b7ef237c73a400ca7ac9fcef35ffca18b8 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 17 Sep 2019 15:11:48 +0200
Subject: Use a single version of emacs

---
 modules/user-interface.nix | 5 ++++-
 satoshipad.nix             | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/user-interface.nix b/modules/user-interface.nix
index cba0a27..e8596be 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 15fc126..86123e1 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)";
     };
   };
 
-- 
cgit 1.4.1