diff options
| author | lassulus <lass@aidsballs.de> | 2015-12-26 17:30:59 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-12-26 17:30:59 +0100 |
| commit | 70d0cae1d3831cd24b3e2ac68a927132f71d2801 (patch) | |
| tree | 1fa798e60c4abda2bf47c7e8a0f68ecd9a8dea08 | |
| parent | 7aacc397241cc62e88d23d253533fb7d83548b9d (diff) | |
l 2: move pkgs from xserver to baseX
| -rw-r--r-- | lass/2configs/baseX.nix | 9 | ||||
| -rw-r--r-- | lass/2configs/xserver/default.nix | 14 |
2 files changed, 7 insertions, 16 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 4e46c18d2..0596682df 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -31,10 +31,15 @@ in { environment.systemPackages = with pkgs; [ - powertop - sxiv + gitAndTools.qgit + mpv much + pavucontrol + powertop push + slock + sxiv + xsel zathura #window manager stuff diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index da337f6a7..04d14c7ce 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -7,7 +7,6 @@ let user = config.users.users.mainUser; out = { - services.xserver = { display = 11; tty = 11; @@ -41,16 +40,6 @@ let }; }; - environment.systemPackages = [ - pkgs.gitAndTools.qgit - pkgs.mpv - pkgs.pavucontrol - pkgs.slock - pkgs.sxiv - pkgs.xsel - pkgs.zathura - ]; - security.setuidPrograms = [ "slock" ]; @@ -106,9 +95,6 @@ let set -efu export PATH; PATH=${makeSearchPath "bin" ([ pkgs.rxvt_unicode - pkgs.i3lock - pkgs.haskellPackages.yeganesh - pkgs.dmenu ] ++ config.environment.systemPackages)}:/var/setuid-wrappers settle() {( # Use PATH for a clean journal |