From a2c1282ebc8a72ce096e98727ebc11f8fa86fa3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 7 Jan 2008 23:12:02 +0000
Subject: [PATCH] * Get rid of some unnecessary xorg.conf statements.

svn path=/nixos/trunk/; revision=10096
---
 upstart-jobs/xserver.conf |  4 ----
 upstart-jobs/xserver.nix  | 25 ++++++++-----------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/upstart-jobs/xserver.conf b/upstart-jobs/xserver.conf
index e35199e8d5d..2535f194a5d 100644
--- a/upstart-jobs/xserver.conf
+++ b/upstart-jobs/xserver.conf
@@ -14,11 +14,7 @@ EndSection
 
 Section "Module"
   Load "bitmap"
-  Load "dbe"
-  Load "extmod"
-  Load "freetype"
   Load "int10"
-  Load "type1"
   Load "vbe"
   @moduleSection@
   @extraModules@
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 8a3547f2a9f..f62f02ece6d 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -130,18 +130,18 @@ let
         fi
       done
 
+      export moduleSection=""
+      export screen=""
+      export device=""
+      export extensions=""
+
+
       #if only my gf were this dirty
       if test "${toString videoDriver}" == "nvidia"; then
-        export moduleSection='
-          Load "glx"
-          SubSection "extmod"
-            Option "omit xfree86-dga"
-          EndSubSection
-        '
-
         export screen='
           Option "AddARGBGLXVisuals" "true"
           Option "DisableGLXRootClipping" "true"
+	  Option "RandRRotation" "on"
         '
         
         export device='
@@ -153,15 +153,6 @@ let
         export extensions='
           Option "Composite" "Enable"
         '
-
-      else
-        export moduleSection='
-          Load "glx"
-          Load "dri"
-        '
-        export screen=
-        export device=
-        export extensions=
       fi
 	
       if [ "${toString videoDriver}" = i810 ]; then
@@ -230,7 +221,7 @@ let
 
       # Start Compiz and the GTK-style window decorator.
       env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
-      ${pkgs.compiz}/bin/compiz gconf ${renderingFlag}&
+      ${pkgs.compiz}/bin/compiz gconf ${renderingFlag} &
       ${pkgs.compiz}/bin/gtk-window-decorator --sync &
     ''