diff --git a/system/options.nix b/system/options.nix index 5971f10d20e..4e45f34d08c 100644 --- a/system/options.nix +++ b/system/options.nix @@ -720,6 +720,23 @@ "; } + { + name = ["services" "xserver" "layout"]; + default = "us"; + description =" + Keyboard layout. + "; + } + + { + name = ["services" "xserver" "useInternalAGPGART"]; + default = ""; + example = "no"; + description =" + Just the wrapper for an xorg.conf option. + "; + } + { name = ["services" "httpd" "enable"]; diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf index 0a801217888..52b04f38f0f 100644 --- a/upstart-jobs/xserver.conf +++ b/upstart-jobs/xserver.conf @@ -79,6 +79,7 @@ Section "Device" #Option "MonitorLayout" "CRT,LFP" Option "MonitorLayout" "LVDS,CRT" @device@ + @internalAGPGART@ EndSection diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix index d77d5c04f70..c55f19cc5dc 100644 --- a/upstart-jobs/xserver.nix +++ b/upstart-jobs/xserver.nix @@ -105,6 +105,12 @@ let corePointer = (if getCfg "isSynaptics" then "Touchpad[0]" else "Mouse[0]"); + internalAGPGART = (if (getCfg "useInternalAGPGART") == "yes" then + " Option \"UseInternalAGPGART\" \"yes\"" else + if (getCfg "useInternalAGPGART") == "no" then + " Option \"UseInternalAGPGART\" \"no\"" else + " "); + buildCommand = " buildCommand= # urgh, don't substitute this