remove driSupport, opengl → graphics

lenovo/thinkpad/p1/3th-gen/nvidia.nix

@@ -1,13 +1,18 @@
 { lib, ... }:
 {
-  hardware.nvidia.modesetting.enable = true;
-  hardware.opengl.driSupport32Bit = true;
-  hardware.opengl.enable = true;
-
-  hardware.nvidia.prime = {
-    # Bus ID of the Intel GPU.
-    intelBusId = lib.mkDefault "PCI:0:2:0";
-    # Bus ID of the NVIDIA GPU.
-    nvidiaBusId = lib.mkDefault "PCI:1:0:0";
+  hardware = {
+    graphics = {
+      enable = lib.mkDefault true;
+      enable32Bit = lib.mkDefault true;
+    };
+    nvidia = {
+      modesetting.enable = lib.mkDefault true;
+      prime = {
+        # Bus ID of the Intel GPU.
+        intelBusId = lib.mkDefault "PCI:0:2:0";
+        # Bus ID of the NVIDIA GPU.
+        nvidiaBusId = lib.mkDefault "PCI:1:0:0";
+      };
+    };
   };
 }

lenovo/thinkpad/p50/default.nix

@@ -13,12 +13,6 @@
         nvidiaBusId = lib.mkDefault "PCI:1:0:0";
       };
     };
-
-    # is this too much?  It's convenient for Steam.
-    opengl = {
-      driSupport = lib.mkDefault true;
-      driSupport32Bit = lib.mkDefault true;
-    };
   };
 
   # required to make wireless work

lenovo/thinkpad/p51/default.nix

@@ -8,18 +8,17 @@
   ];
 
   hardware = {
+    graphics = {
+      enable = lib.mkDefault true;
+      enable32Bit = lib.mkDefault true;
+    };
+
     nvidia = {
       prime = {
         intelBusId = lib.mkDefault "PCI:0:2:0";
         nvidiaBusId = lib.mkDefault "PCI:1:0:0";
       };
     };
-
-    # is this too much?  It's convenient for Steam.
-    opengl = {
-      driSupport = lib.mkDefault true;
-      driSupport32Bit = lib.mkDefault true;
-    };
   };
 
   # required to make wireless work

lenovo/thinkpad/p52/default.nix

@@ -7,18 +7,18 @@
   ];
 
   hardware = {
+    # is this too much?  It's convenient for Steam.
+    graphics = {
+      enable = lib.mkDefault true;
+      enable32Bit = lib.mkDefault true;
+    };
+
     nvidia = {
       prime = {
         intelBusId = lib.mkDefault "PCI:0:2:0";
         nvidiaBusId = lib.mkDefault "PCI:1:0:0";
       };
     };
-
-    # is this too much?  It's convenient for Steam.
-    opengl = {
-      driSupport = lib.mkDefault true;
-      driSupport32Bit = lib.mkDefault true;
-    };
   };
 
   # required to make wireless work

lenovo/yoga/6/13ALC6/default.nix

@@ -7,7 +7,7 @@
   ];
 
   boot.initrd.kernelModules = [ "ideapad_laptop" ];
-  hardware.opengl.extraPackages = with pkgs; [
+  hardware.graphics.extraPackages = with pkgs; [
     vaapiVdpau
     libvdpau-va-gl
   ];

lenovo/yoga/7/14ARH7/amdgpu/default.nix

@@ -15,7 +15,7 @@ in {
 
   hardware = {
     amdgpu.loadInInitrd = true;
-    opengl.extraPackages = with pkgs; [
+    graphics.extraPackages = with pkgs; [
       vaapiVdpau
       libvdpau-va-gl
     ];

lenovo/yoga/7/14ARH7/nvidia/default.nix

@@ -19,7 +19,7 @@ in {
   hardware = {
     ## Enable the Nvidia card, as well as Prime and Offload:
     amdgpu.loadInInitrd = true;
-    opengl.extraPackages = with pkgs; [
+    graphics.extraPackages = with pkgs; [
       vaapiVdpau
       libvdpau-va-gl
     ];