* Use the new Intel driver.

svn path=/nixos/trunk/; revision=8633

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;

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
 
 

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