hardware/lenovo_x201.nix

@@ -19,7 +19,7 @@
 
   swapDevices = [{device = "/dev/disk/by-label/swap";}];
 
-  hardware.opengl.extraPackages = with pkgs; [vaapiIntel];
+  hardware.graphics.extraPackages = with pkgs; [vaapiIntel];
   nix.settings.max-jobs = lib.mkDefault 4;
 
   services.thinkfan = {

hardware/lenovo_yoga7i.nix

@@ -38,6 +38,6 @@
     {device = "/dev/disk/by-label/swap";}
   ];
 
-  hardware.opengl.extraPackages = with pkgs; [vaapiIntel];
+  hardware.graphics.extraPackages = with pkgs; [vaapiIntel];
   nix.settings.max-jobs = lib.mkDefault 4;
 }

hosts/sanganto/default.nix

@@ -94,14 +94,6 @@
     };
   };
 
-  hardware = {
-    bluetooth = {
-      enable = true;
-      settings = {Policy = {AutoEnable = "true";};};
-    };
-    opengl.enable = true;
-  };
-
   # The below pair are set to overcome flakey connections / busy servers that
   # fail to respond to ssh keep alive requests, sometimes triggering:
   # client_loop: send disconnect: Broken pipe

hosts/sercanto/default.nix

@@ -90,14 +90,6 @@
     };
   };
 
-  hardware = {
-    bluetooth = {
-      enable = true;
-      settings = {Policy = {AutoEnable = "true";};};
-    };
-    opengl.enable = true;
-  };
-
   # The below pair are set to overcome flakey connections / busy servers that
   # fail to respond to ssh keep alive requests, sometimes triggering:
   # client_loop: send disconnect: Broken pipe

modules/roles/desktop/default.nix

@@ -92,7 +92,7 @@ in {
           Policy = {AutoEnable = "true";};
         };
       };
-      opengl.enable = true;
+      graphics.enable = true;
     };
 
     # Configure libreWolf and Chromium

profiles/desktop_common.nix

@@ -103,7 +103,7 @@
         Policy = {AutoEnable = "true";};
       };
     };
-    opengl.enable = true;
+    graphics.enable = true;
   };
 
   # Configure libreWolf and Chromium