diff --git a/modules/nixos/hardware/gpu/amd.nix b/modules/nixos/hardware/gpu/amd.nix
index 055dcb29..fa1dbe55 100644
--- a/modules/nixos/hardware/gpu/amd.nix
+++ b/modules/nixos/hardware/gpu/amd.nix
@@ -14,10 +14,7 @@ in
     services.xserver.videoDrivers = [ "amdgpu" ];
 
     # enable amdgpu kernel module
-    boot = {
-      kernelModules = [ "amdgpu" ];
-      initrd.kernelModules = [ "amdgpu" ];
-    };
+    boot.kernelModules = [ "amdgpu" ];
 
     # enables AMDVLK & OpenCL support
     hardware.graphics.extraPackages = [
diff --git a/modules/nixos/hardware/gpu/nvidia.nix b/modules/nixos/hardware/gpu/nvidia.nix
index 2cda6490..c08c2c60 100644
--- a/modules/nixos/hardware/gpu/nvidia.nix
+++ b/modules/nixos/hardware/gpu/nvidia.nix
@@ -10,19 +10,11 @@ let
 in
 {
   config = mkIf (device.gpu == "nvidia") {
-    # nvidia drivers kinda are unfree software
-    nixpkgs.config.allowUnfree = true;
-
     services.xserver.videoDrivers = [ "nvidia" ];
 
-    boot = {
-      # blacklist nouveau module as otherwise it conflicts with nvidia drm
-      blacklistedKernelModules = [ "nouveau" ];
-
-      # Enables the Nvidia's experimental framebuffer device
-      # fix for the imaginary monitor that does not exist
-      kernelParams = [ "nvidia_drm.fbdev=1" ];
-    };
+    # Enables the Nvidia's experimental framebuffer device
+    # fix for the imaginary monitor that does not exist
+    boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
 
     environment.sessionVariables = {
       LIBVA_DRIVER_NAME = "nvidia";
@@ -35,9 +27,6 @@ in
       inherit (pkgs.nvtopPackages) nvidia;
 
       inherit (pkgs)
-        # mesa
-        mesa
-
         # vulkan
         vulkan-tools
         vulkan-loader
@@ -52,22 +41,21 @@ in
 
     hardware = {
       nvidia = {
-        package = mkDefault config.boot.kernelPackages.nvidiaPackages.beta;
-
-        prime.offload = {
-          enable = false;
-          enableOffloadCmd = false;
-        };
+        # use the latest and greatest nvidia drivers
+        package = config.boot.kernelPackages.nvidiaPackages.beta;
 
         powerManagement = {
-          enable = mkDefault true;
-          finegrained = mkDefault false;
+          enable = true;
+          finegrained = false;
         };
 
-        open = false; # dont use the open drivers by default
-        nvidiaSettings = false; # adds nvidia-settings to pkgs, so useless on nixos
+        # dont use the open drivers by default
+        open = false;
+
+        # adds nvidia-settings to pkgs, so useless on nixos
+        nvidiaSettings = false;
+
         nvidiaPersistenced = true;
-        # forceFullCompositionPipeline = true;
       };
 
       graphics = {