From 5a676e463e0dea1a4aef53d3f7e6a93cb7bdd7f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Aug 2013 18:45:45 +0200
Subject: [PATCH] Don't load nouveau and nvidiafb when using the proprietary
 nvidia driver

---
 modules/services/x11/xserver.nix | 37 +++++++++++++++++---------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index 8378e10cc46b..40da6a743891 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -406,24 +406,27 @@ in
       optional (elem "virtualbox" driverNames) kernelPackages.virtualboxGuestAdditions ++
       optional (elem "ati_unfree" driverNames) kernelPackages.ati_drivers_x11;
 
-    environment.etc =
-    (optionals cfg.exportConfiguration
-      [ { source = "${configFile}";
-          target = "X11/xorg.conf";
-        }
-        # -xkbdir command line option does not seems to be passed to xkbcomp.
-        { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-          target = "X11/xkb";
-        }
-      ])
-    ++ (optionals (elem "ati_unfree" driverNames) [
+    boot.blacklistedKernelModules =
+      optionals (elem "nvidia" driverNames) [ "nouveau" "nvidiafb" ];
 
-        # according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your
-        # life harder ;) Still it seems to be required
-        { source = "${kernelPackages.ati_drivers_x11}/etc/ati";
-          target = "ati";
-        }
-    ]);
+    environment.etc =
+      (optionals cfg.exportConfiguration
+        [ { source = "${configFile}";
+            target = "X11/xorg.conf";
+          }
+          # -xkbdir command line option does not seems to be passed to xkbcomp.
+          { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+            target = "X11/xkb";
+          }
+        ])
+      ++ (optionals (elem "ati_unfree" driverNames) [
+
+          # according toiive on #ati you don't need the pcs, it is like registry... keeps old stuff to make your
+          # life harder ;) Still it seems to be required
+          { source = "${kernelPackages.ati_drivers_x11}/etc/ati";
+            target = "ati";
+          }
+      ]);
 
     environment.x11Packages =
       [ xorg.xorgserver