all repos — nixfiles @ 47919612a7dd30afce680e91384c791379023685

System and user configuration, managed by nix and home-manager

Simplify emacs configuation to make stable/unstable use easier
Alan Pearce alan@alanpearce.eu
Thu, 12 Jul 2018 15:47:27 +0200
commit

47919612a7dd30afce680e91384c791379023685

parent

cf7f46b1b1d99ebb67c0a183e266937bdc39596d

2 files changed, 9 insertions(+), 12 deletions(-)

jump to
M modules/user-interface.nix → modules/user-interface.nix
@@ -2,13 +2,7 @@ { config, pkgs, lib, ... }: 
 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;
M packages/emacs.nix → 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