summary refs log tree commit diff
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-12-21 01:44:06 +0000
committerGitHub <noreply@github.com>2017-12-21 01:44:06 +0000
commit30b7624a08b7a211a098bc77075c3cf25712f536 (patch)
treed9fe0082eed7fdac982e04e61eddb4f552e18e52
parentc8a4e906de69862277e85f0ef05aca53f5fd3f7b (diff)
parent71a8dbb956f5735030cd3982263d72f1bffdae23 (diff)
downloadnixlib-30b7624a08b7a211a098bc77075c3cf25712f536.tar
nixlib-30b7624a08b7a211a098bc77075c3cf25712f536.tar.gz
nixlib-30b7624a08b7a211a098bc77075c3cf25712f536.tar.bz2
nixlib-30b7624a08b7a211a098bc77075c3cf25712f536.tar.lz
nixlib-30b7624a08b7a211a098bc77075c3cf25712f536.tar.xz
nixlib-30b7624a08b7a211a098bc77075c3cf25712f536.tar.zst
nixlib-30b7624a08b7a211a098bc77075c3cf25712f536.zip
Merge pull request #32791 from yegortimoshenko/feh/go-away
nixos/desktop-managers: do not leak feh to PATH (second attempt)
-rw-r--r--nixos/modules/services/x11/desktop-managers/default.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 39b27d4ceb61..4622c7b760f0 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -109,9 +109,5 @@ in
 
   };
 
-  config = {
-    services.xserver.displayManager.session = cfg.session.list;
-    environment.systemPackages =
-      mkIf cfg.session.needBGPackages [ pkgs.feh ]; # xsetroot via xserver.enable
-  };
+  config.services.xserver.displayManager.session = cfg.session.list;
 }