diff options
author | Peter Simons <simons@cryp.to> | 2011-09-14 18:20:50 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2011-09-14 18:20:50 +0000 |
commit | eb6e1310b8774f3aed4c5675d09708f0df6199d3 (patch) | |
tree | 3297542b3cda78d38731abb65837f4553cd377a9 /modules/services/x11/xserver.nix | |
parent | f5e8d35f8e76755febf97ca8f62b0700a8b6d20a (diff) | |
download | nixlib-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar nixlib-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.gz nixlib-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.bz2 nixlib-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.lz nixlib-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.xz nixlib-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.zst nixlib-eb6e1310b8774f3aed4c5675d09708f0df6199d3.zip |
strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
Diffstat (limited to 'modules/services/x11/xserver.nix')
-rw-r--r-- | modules/services/x11/xserver.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix index 15240d65cee1..f1e8044fc6b0 100644 --- a/modules/services/x11/xserver.nix +++ b/modules/services/x11/xserver.nix @@ -71,7 +71,7 @@ let done fi done - + for i in $(find ${toString cfg.modules} -type d); do if test $(echo $i/*.so* | wc -w) -ne 0; then echo " ModulePath \"$i\"" >> $out @@ -79,7 +79,7 @@ let done echo 'EndSection' >> $out - + echo "$config" >> $out ''; # */ }; @@ -96,9 +96,9 @@ in ###### interface - + options = { - + services.xserver = { enable = mkOption { @@ -311,7 +311,7 @@ in Virtual screen size for Xrandr. ''; }; - + }; environment.x11Packages = mkOption { @@ -322,7 +322,7 @@ in activated (<option>services.xserver.enable</option>). ''; }; - + }; @@ -337,7 +337,7 @@ in { boot.extraModulePackages = - optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ + optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++ optional (elem "nvidiaLegacy96" driverNames) kernelPackages.nvidia_x11_legacy96 ++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++ optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++ @@ -352,7 +352,7 @@ in target = "X11/xkb"; } ]; - + environment.x11Packages = [ xorg.xorgserver xorg.xrandr @@ -370,7 +370,7 @@ in ++ optional (elem "nvidiaLegacy173" driverNames) kernelPackages.nvidia_x11_legacy173 ++ optional (elem "virtualbox" driverNames) xorg.xrefresh ++ optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11; - + environment.systemPackages = config.environment.x11Packages; environment.pathsToLink = @@ -378,7 +378,7 @@ in jobs.xserver = { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else ""; - + environment = { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. @@ -440,7 +440,7 @@ in [ xorg.xorgserver xorg.xf86inputevdev ]; - + services.xserver.config = '' Section "ServerFlags" @@ -478,7 +478,7 @@ in # For each supported driver, add a "Device" and "Screen" # section. ${flip concatMapStrings drivers (driver: '' - + Section "Device" Identifier "Device-${driver.name}[0]" Driver "${driver.driverName}" @@ -521,7 +521,7 @@ in ''; in concatMapStrings f [8 16 24] )} - + EndSection '')} ''; |