From d0b86858e9bb16ba469e64df88895b32b081428c Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Wed, 4 Dec 2024 15:30:47 +1000
Subject: [PATCH] tasko(hardware): forigi malrekomenditan opengl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Anstataŭigita per "graphics".

 Progresses #3
---
 hardware/lenovo_x201.nix          | 2 +-
 hardware/lenovo_yoga7i.nix        | 2 +-
 hosts/sanganto/default.nix        | 8 --------
 hosts/sercanto/default.nix        | 8 --------
 modules/roles/desktop/default.nix | 2 +-
 profiles/desktop_common.nix       | 2 +-
 6 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/hardware/lenovo_x201.nix b/hardware/lenovo_x201.nix
index 47dbb30..1aa22c4 100644
--- a/hardware/lenovo_x201.nix
+++ b/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 = {
diff --git a/hardware/lenovo_yoga7i.nix b/hardware/lenovo_yoga7i.nix
index 391b83a..1c81960 100644
--- a/hardware/lenovo_yoga7i.nix
+++ b/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;
 }
diff --git a/hosts/sanganto/default.nix b/hosts/sanganto/default.nix
index de88864..4687360 100644
--- a/hosts/sanganto/default.nix
+++ b/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
diff --git a/hosts/sercanto/default.nix b/hosts/sercanto/default.nix
index 449a99e..f88f082 100644
--- a/hosts/sercanto/default.nix
+++ b/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
diff --git a/modules/roles/desktop/default.nix b/modules/roles/desktop/default.nix
index d49744c..817f992 100644
--- a/modules/roles/desktop/default.nix
+++ b/modules/roles/desktop/default.nix
@@ -92,7 +92,7 @@ in {
           Policy = {AutoEnable = "true";};
         };
       };
-      opengl.enable = true;
+      graphics.enable = true;
     };
 
     # Configure libreWolf and Chromium
diff --git a/profiles/desktop_common.nix b/profiles/desktop_common.nix
index 697cfff..93f91be 100644
--- a/profiles/desktop_common.nix
+++ b/profiles/desktop_common.nix
@@ -103,7 +103,7 @@
         Policy = {AutoEnable = "true";};
       };
     };
-    opengl.enable = true;
+    graphics.enable = true;
   };
 
   # Configure libreWolf and Chromium