diff --git a/systems/fuji-wsl/default.nix b/systems/fuji-wsl/default.nix
index 107d8f8..867efad 100644
--- a/systems/fuji-wsl/default.nix
+++ b/systems/fuji-wsl/default.nix
@@ -20,10 +20,6 @@
 
   hardware.opengl = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-    setLdLibraryPath = true;
-
     extraPackages = with pkgs; [
       mesa.drivers
     ];
diff --git a/systems/fuji/nvidia.nix b/systems/fuji/nvidia.nix
index 2dcfe2f..f61ee1c 100644
--- a/systems/fuji/nvidia.nix
+++ b/systems/fuji/nvidia.nix
@@ -16,18 +16,15 @@
     MOZ_DISABLE_RDD_SANDBOX = "1";
   };
 
-  hardware.opengl = {
-    driSupport = true;
-    driSupport32Bit = true;
-    extraPackages = [pkgs.vaapiVdpau];
-  };
-
-  hardware.nvidia = {
-    # package = config.boot.kernelPackages.nvidiaPackages.beta;
-    modesetting.enable = true;
-    powerManagement = {
-      enable = true;
-      finegrained = false;
+  hardware = {
+    opengl.extraPackages = [pkgs.vaapiVdpau];
+    nvidia = {
+      # package = config.boot.kernelPackages.nvidiaPackages.beta;
+      modesetting.enable = true;
+      powerManagement = {
+        enable = true;
+        finegrained = false;
+      };
     };
   };