summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2018-07-12 15:47:27 +0200
committerAlan Pearce2018-07-12 15:47:27 +0200
commit47919612a7dd30afce680e91384c791379023685 (patch)
treef037a57c8f2bc2c4fb9992e4fc865f4b771218aa
parentcf7f46b1b1d99ebb67c0a183e266937bdc39596d (diff)
downloadnixfiles-47919612a7dd30afce680e91384c791379023685.tar.lz
nixfiles-47919612a7dd30afce680e91384c791379023685.tar.zst
nixfiles-47919612a7dd30afce680e91384c791379023685.zip
Simplify emacs configuation to make stable/unstable use easier
-rw-r--r--modules/user-interface.nix8
-rw-r--r--packages/emacs.nix13
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