Drop environment.x11Packages

It doesn't do anything useful compared to environment.systemPackages.
This commit is contained in:
Eelco Dolstra 2013-10-30 17:52:35 +01:00
parent 408b8b5725
commit 7d5152964c
8 changed files with 10 additions and 23 deletions

View file

@ -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" ]

View file

@ -70,7 +70,7 @@ in
config = {
services.xserver.displayManager.session = cfg.session.list;
environment.x11Packages =
environment.systemPackages =
mkIf cfg.session.needBGPackages [ pkgs.feh ];
};
}

View file

@ -35,7 +35,7 @@ in
'';
};
environment.x11Packages = [ pkgs.awesome ];
environment.systemPackages = [ pkgs.awesome ];
};

View file

@ -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 ];
};
}

View file

@ -35,7 +35,7 @@ in
'';
};
environment.x11Packages = [ pkgs.icewm ];
environment.systemPackages = [ pkgs.icewm ];
};

View file

@ -25,6 +25,6 @@ in
";
}];
};
environment.x11Packages = [ pkgs.openbox ];
environment.systemPackages = [ pkgs.openbox ];
};
}

View file

@ -35,7 +35,7 @@ in
'';
};
environment.x11Packages = [ pkgs.xorg.twm ];
environment.systemPackages = [ pkgs.xorg.twm ];
};

View file

@ -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" ];