diff options
| -rw-r--r-- | marvin.nix | 1 | ||||
| -rw-r--r-- | modules/user-interface.nix | 8 | ||||
| -rw-r--r-- | packages/emacs.nix | 13 |
3 files changed, 10 insertions, 12 deletions
diff --git a/marvin.nix b/marvin.nix index f047d88b..bafad5bc 100644 --- a/marvin.nix +++ b/marvin.nix @@ -26,6 +26,7 @@ ./modules/programs/infrastructure.nix ./modules/programs/passwords.nix ./modules/programs/shell.nix + ./modules/programs/steam.nix ./modules/services/syncthing.nix ]; 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 |