From 47919612a7dd30afce680e91384c791379023685 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 12 Jul 2018 15:47:27 +0200
Subject: Simplify emacs configuation to make stable/unstable use easier

---
 modules/user-interface.nix |  8 +-------
 packages/emacs.nix         | 13 ++++++++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/modules/user-interface.nix b/modules/user-interface.nix
index 5b52e7f4..ca9d5956 100644
--- a/modules/user-interface.nix
+++ b/modules/user-interface.nix
@@ -2,13 +2,7 @@
 
 let
   emacsPackage = import ../packages/emacs.nix {
-    inherit (pkgs) stdenv;
-    inherit pkgs;
-    emacs = pkgs.lib.overrideDerivation (pkgs.emacs) (attrs: {
-        postInstall = attrs.postInstall + ''
-          rm $out/share/applications/emacs.desktop
-        '';
-      });
+    pkgs = pkgs.unstable;
   };
 in
 { programs.browserpass.enable = true;
diff --git a/packages/emacs.nix b/packages/emacs.nix
index 92a20ddf..f685c01b 100644
--- a/packages/emacs.nix
+++ b/packages/emacs.nix
@@ -1,14 +1,17 @@
 {
-  pkgs,
-  emacs ? pkgs.emacs,
-  stdenv
+  pkgs ? import <nixpkgs>
 }:
 
 let
-  myEmacs = emacs;
+  myEmacs = pkgs.lib.overrideDerivation (pkgs.emacs) (attrs: {
+    postInstall = attrs.postInstall + ''
+      rm $out/share/applications/emacs.desktop
+    '';
+  });
+
   emacsWithPackages = (pkgs.emacsPackagesNgGen myEmacs).emacsWithPackages;
 in
-  emacsWithPackages (epkgs: (with epkgs.melpaPackages; [
+  emacsWithPackages (epkgs: (with epkgs; [
     ace-link
     add-node-modules-path
     ag
-- 
cgit 1.4.1