some changes

1 files changed, 13 insertions, 23 deletions

diff --git a/modules/hardware/gpu.nix b/modules/hardware/gpu.nix
index bb8b831..8d2f004 100644
--- a/modules/hardware/gpu.nix
+++ b/modules/hardware/gpu.nix
@@ -36,31 +36,21 @@ in {
             environment.variables.VDPAU_DRIVER = "va_gl";
         })
         (lib.mkIf (device.gpu == "nvidia") {
-          boot = {
-            extraModulePackages = [
-              config.boot.kernelPackages.nvidia_x11_beta
-            ];
-            initrd.kernelModules = [ 
-                "nvidia"
-                "nvidia_modeset"
-                "nvidia_uvm"
-                "nvidia_drm"
-              ];
-              blacklistedKernelModules = [ "nouveau" ];
-            };
+          services.xserver.videoDrivers = ["nvidia"];
+          boot.initrd.kernelModules = [ "nvidia" ];
 
-            environment.systemPackages = with pkgs; [
-              pkgs.nvidia-vaapi-driver
-            ];
+          hardware.nvidia = {
+            modesetting.enable = true;
+            powerManagement.enable = false;
+            powerManagement.finegrained = false;
+            open = false;
+            nvidiaSettings = true;
+            package = config.boot.kernelPackages.nvidiaPackages.latest;
+          };
 
-            services.xserver.videoDrivers = ["nvidia"];
-            hardware.nvidia = {
-                modesetting.enable = true;
-                powerManagement.enable = true;
-                open = false;
-                nvidiaSettings = true;
-                package = config.boot.kernelPackages.nvidiaPackages.beta;
-            };
+          environment.systemPackages = with pkgs; [
+            nvtopPackages.nvidia
+          ];
         })
     ]);
 }