desktop: hardware.opengl -> hardware.graphics

Shawn8901 · Jun 22, 2024 · 1bd1a12 · 1bd1a12
1 parent 6c0d242
commit 1bd1a12
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/modules/nixos/private/desktop.nix b/modules/nixos/private/desktop.nix
@@ -80,22 +80,25 @@ in
 
     systemd.defaultUnit = "graphical.target";
 
-    hardware = {
-      bluetooth = {
-        enable = true;
-        package = pkgs.bluez5-experimental;
-        settings.General.Experimental = true;
-        input.General.ClassicBondedOnly = false;
-      };
-      pulseaudio.enable = false;
-      opengl = {
-        enable = true;
-        driSupport = true;
-        driSupport32Bit = true;
-        extraPackages = [ pkgs.libva ];
-        extraPackages32 = [ pkgs.pkgsi686Linux.libva ];
-      };
-    };
+    hardware = lib.mkMerge [
+      {
+        bluetooth = {
+          enable = true;
+          package = pkgs.bluez5-experimental;
+          settings.General.Experimental = true;
+          input.General.ClassicBondedOnly = false;
+        };
+        pulseaudio.enable = false;
+      }
+      (lib.optionalAttrs (!versionOlder config.system.nixos.release "24.11") {
+        graphics = {
+          enable = true;
+          enable32Bit = true;
+          extraPackages = [ pkgs.libva ];
+          extraPackages32 = [ pkgs.pkgsi686Linux.libva ];
+        };
+      })
+    ];
     sound.enable = false;
     xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
     environment = {