diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-30 17:52:35 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-30 18:47:43 +0100 |
commit | 7d5152964cf85a698d48deea67a2e830f2e8ad24 (patch) | |
tree | 5f8a3f400f22ef936838bdde97e493d0693749cc /nixos | |
parent | 408b8b5725c3e6fff75aef772da248d3e95ff414 (diff) | |
download | nixlib-7d5152964cf85a698d48deea67a2e830f2e8ad24.tar nixlib-7d5152964cf85a698d48deea67a2e830f2e8ad24.tar.gz nixlib-7d5152964cf85a698d48deea67a2e830f2e8ad24.tar.bz2 nixlib-7d5152964cf85a698d48deea67a2e830f2e8ad24.tar.lz nixlib-7d5152964cf85a698d48deea67a2e830f2e8ad24.tar.xz nixlib-7d5152964cf85a698d48deea67a2e830f2e8ad24.tar.zst nixlib-7d5152964cf85a698d48deea67a2e830f2e8ad24.zip |
Drop environment.x11Packages
It doesn't do anything useful compared to environment.systemPackages.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/rename.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/default.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/x11/window-managers/awesome.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/x11/window-managers/i3.nix | 6 | ||||
-rw-r--r-- | nixos/modules/services/x11/window-managers/icewm.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/x11/window-managers/openbox.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/x11/window-managers/twm.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/x11/xserver.nix | 13 |
8 files changed, 10 insertions, 23 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 4f924b82a9df..ae3c9faeea68 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -69,9 +69,7 @@ let in zipModules ([] -# usage example: -# ++ alias [ "services" "xserver" "slim" "theme" ] [ "services" "xserver" "displayManager" "slim" "theme" ] -++ obsolete [ "environment" "extraPackages" ] [ "environment" "systemPackages" ] +++ obsolete [ "environment" "x11Packages" ] [ "environment" "systemPackages" ] ++ obsolete [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ] ++ obsolete [ "environment" "nix" ] [ "nix" "package" ] diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 4bf1e33a2950..ab3ced4c9e2c 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -70,7 +70,7 @@ in config = { services.xserver.displayManager.session = cfg.session.list; - environment.x11Packages = + environment.systemPackages = mkIf cfg.session.needBGPackages [ pkgs.feh ]; }; } diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index 880ebf1eca6a..1c61419a44c0 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -35,7 +35,7 @@ in ''; }; - environment.x11Packages = [ pkgs.awesome ]; + environment.systemPackages = [ pkgs.awesome ]; }; diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index 6777a95ddc8c..e53d86187ae6 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -30,14 +30,14 @@ in services.xserver.windowManager = { session = [{ name = "i3"; - start = " + start = '' ${pkgs.i3}/bin/i3 ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\"" } & waitPID=$! - "; + ''; }]; }; - environment.x11Packages = [ pkgs.i3 ]; + environment.systemPackages = [ pkgs.i3 ]; }; } diff --git a/nixos/modules/services/x11/window-managers/icewm.nix b/nixos/modules/services/x11/window-managers/icewm.nix index 9da4a415fad1..b7da4051c141 100644 --- a/nixos/modules/services/x11/window-managers/icewm.nix +++ b/nixos/modules/services/x11/window-managers/icewm.nix @@ -35,7 +35,7 @@ in ''; }; - environment.x11Packages = [ pkgs.icewm ]; + environment.systemPackages = [ pkgs.icewm ]; }; diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix index ae34a938c4a0..46b1945d33e8 100644 --- a/nixos/modules/services/x11/window-managers/openbox.nix +++ b/nixos/modules/services/x11/window-managers/openbox.nix @@ -25,6 +25,6 @@ in "; }]; }; - environment.x11Packages = [ pkgs.openbox ]; + environment.systemPackages = [ pkgs.openbox ]; }; } diff --git a/nixos/modules/services/x11/window-managers/twm.nix b/nixos/modules/services/x11/window-managers/twm.nix index c1a99b97566f..d80ffe4942fb 100644 --- a/nixos/modules/services/x11/window-managers/twm.nix +++ b/nixos/modules/services/x11/window-managers/twm.nix @@ -35,7 +35,7 @@ in ''; }; - environment.x11Packages = [ pkgs.xorg.twm ]; + environment.systemPackages = [ pkgs.xorg.twm ]; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 89b6d21ebefd..caa0839dbb75 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -419,15 +419,6 @@ in }; - environment.x11Packages = mkOption { - default = []; - type = types.listOf types.package; - description = '' - List of packages added to the system when the X server is - activated (<option>services.xserver.enable</option>). - ''; - }; - }; @@ -477,7 +468,7 @@ in } ]); - environment.x11Packages = + environment.systemPackages = [ xorg.xorgserver xorg.xrandr xorg.xrdb @@ -498,8 +489,6 @@ in ++ optional (elem "virtualbox" driverNames) xorg.xrefresh ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11; - environment.systemPackages = config.environment.x11Packages; - environment.pathsToLink = [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ]; |