From 66f0d29a48d3f70e2251bae1b25488eda4f8b26c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 May 2007 15:27:50 +0000 Subject: [PATCH] * Use the new Intel driver. svn path=/nixos/trunk/; revision=8633 --- system/options.nix | 2 ++ upstart-jobs/xserver.conf | 6 +++--- upstart-jobs/xserver.nix | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/system/options.nix b/system/options.nix index 8416f1724f74..f1b3c645f2e7 100644 --- a/system/options.nix +++ b/system/options.nix @@ -357,12 +357,14 @@ { name = ["services" "ttyBackgrounds" "defaultSpecificThemes"]; default = [ + /* { tty = 6; theme = pkgs.fetchurl { # Yeah! url = http://www.bootsplash.de/files/themes/Theme-Pativo.tar.bz2; md5 = "9e13beaaadf88d43a5293e7ab757d569"; }; } + */ { tty = 10; theme = pkgs.fetchurl { url = http://www.bootsplash.de/files/themes/Theme-GNU.tar.bz2; diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf index 81289cfefd79..fdd5c23becd6 100644 --- a/upstart-jobs/xserver.conf +++ b/upstart-jobs/xserver.conf @@ -36,8 +36,8 @@ EndSection Section "Monitor" Identifier "Monitor[0]" Option "DPMS" - HorizSync 28-49 - VertRefresh 43-75 +# HorizSync 28-49 +# VertRefresh 43-75 EndSection @@ -65,7 +65,7 @@ Section "Device" Identifier "Device[0]" Driver "@videoDriver@" Option "Clone" "On" - Option "MonitorLayout" "CRT,LFP" + Option "MonitorLayout" "LVDS,CRT" EndSection diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix index a6c6f152b45f..6056edbf09c3 100644 --- a/upstart-jobs/xserver.nix +++ b/upstart-jobs/xserver.nix @@ -52,7 +52,8 @@ let xorg.xf86inputmouse ] ++ optional (videoDriver == "vesa") xorg.xf86videovesa - ++ optional (videoDriver == "i810") xorg.xf86videoi810; + ++ optional (videoDriver == "i810") xorg.xf86videoi810 + ++ optional (videoDriver == "intel") xorg.xf86videointel; configFile = stdenv.mkDerivation { @@ -245,7 +246,7 @@ rec { job = " - #start on network-interfaces + start on network-interfaces start script rm -f /var/state/opengl-driver