public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Cleanup. 

svn path=/nixos/trunk/; revision=9593
This commit is contained in:
Eelco Dolstra 2007-11-06 00:00:29 +00:00
parent 5459a5c007
commit e6b8dd5b25
1 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
upstart-jobs/xserver.nix
View File

@ -73,13 +73,13 @@ let
configFile = stdenv.mkDerivation { configFile = stdenv.mkDerivation {
name = "xserver.conf"; name = "xserver.conf";
src = ./xserver.conf; src = ./xserver.conf;
inherit fontDirectories videoDriver resolutions isClone synaptics; inherit fontDirectories videoDriver resolutions isClone;
synapticsInputDevice = (if getCfg "isSynaptics" then " synapticsInputDevice = (if getCfg "isSynaptics" then "
Section \"InputDevice\" Section \"InputDevice\"
Identifier \"Touchpad[0]\" Identifier \"Touchpad[0]\"
Driver \"synaptics\" Driver \"synaptics\"
Option \"Device\" \""+(getCfg "devSynaptics")+"\" Option \"Device\" \"${getCfg "devSynaptics"}\"
Option \"Protocol\" \"PS/2\" Option \"Protocol\" \"PS/2\"
Option \"LeftEdge\" \"1700\" Option \"LeftEdge\" \"1700\"
Option \"RightEdge\" \"5300\" Option \"RightEdge\" \"5300\"
@ -100,18 +100,19 @@ let
Option \"TapButton3\" \"3\" Option \"TapButton3\" \"3\"
EndSection " else ""); EndSection " else "");
xkbOptions = (if (getCfg "xkbOptions") == "" then "" else xkbOptions = if (getCfg "xkbOptions") == "" then "" else
" Option \"XkbOptions\" \""+(getCfg "xkbOptions")+"\""); " Option \"XkbOptions\" \"${getCfg "xkbOptions"}\"";
layout = getCfg "layout"; layout = getCfg "layout";
corePointer = (if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]"); corePointer = if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]";
internalAGPGART = (if (getCfg "useInternalAGPGART") == "yes" then internalAGPGART =
" Option \"UseInternalAGPGART\" \"yes\"" else if (getCfg "useInternalAGPGART") == "yes" then
if (getCfg "useInternalAGPGART") == "no" then " Option \"UseInternalAGPGART\" \"yes\""
" Option \"UseInternalAGPGART\" \"no\"" else else if (getCfg "useInternalAGPGART") == "no" then
" "); " Option \"UseInternalAGPGART\" \"no\""
else " ";
extraDeviceConfig = getCfg "extraDeviceConfig"; extraDeviceConfig = getCfg "extraDeviceConfig";
extraMonitorSettings = getCfg "extraMonitorSettings"; extraMonitorSettings = getCfg "extraMonitorSettings";