Fix and reorder nvidia settings

hosts/tardis/default.nix

@@ -4,7 +4,6 @@
   imports =
     [
       ./hardware-configuration.nix
-      ./nvidia.nix
     ];
 
   boot.blacklistedKernelModules = [
@@ -13,6 +12,23 @@
 
   boot.kernelParams = [ "video=efifb:1920x1080" ];
 
+  boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
+
+  hardware.graphics.enable = true;
+
+  hardware.nvidia = {
+    modesetting.enable = true;
+    open = true;
+    prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
+      };
+      intelBusId = "PCI:0@0:2:0";
+      nvidiaBusId = "PCI:1@0:0:0";
+    };
+  };
+
   environment.systemPackages = lib.mkAfter (with pkgs; [
     firefox
     xdg-utils
@@ -32,7 +48,7 @@
   services.xserver = {
     enable = true;
     displayManager.startx.enable = true;
-    videoDrivers = [ "modesetting" "nvidia" ];
+    videoDrivers = [ "nvidia" ];
     xkb = {
       layout = "us";
       variant = "";

hosts/tardis/nvidia.nix

@@ -1,22 +0,0 @@
-{ config, ... }:
-
-{
-  hardware.graphics.enable = true;
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = false;
-    powerManagement.finegrained = false;
-    open = true;
-    nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
-    prime = {
-      offload = {
-        enable = true;
-        enableOffloadCmd = true;
-      };
-      intelBusId = "PCI:0@0:2:0";
-      nvidiaBusId = "PCI:1@0:0:0";
-    };
-  };
-}