From 8c6ece43390a5219fee5fbb6da797b757d5ce350 Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 29 Jun 2024 10:29:23 -0400 Subject: [PATCH] chore(system): update video driver syntax to match upstream --- system/modules/system/gpu/amd.nix | 9 +++------ system/modules/system/gpu/intel.nix | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/system/modules/system/gpu/amd.nix b/system/modules/system/gpu/amd.nix index 543571b..b24c647 100644 --- a/system/modules/system/gpu/amd.nix +++ b/system/modules/system/gpu/amd.nix @@ -15,15 +15,12 @@ in config = lib.mkIf cfg.enable { boot.initrd.kernelModules = [ "amdgpu" ]; - services.xserver = { - enable = true; - videoDrivers = [ "amdgpu" ]; - }; + services.xserver.videoDrivers = [ "amdgpu" ]; - hardware.opengl = { + hardware.graphics = { extraPackages = [ pkgs.amdvlk ]; # 32-bit application compatibility - driSupport32Bit = true; + enable32Bit = true; extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; }; }; diff --git a/system/modules/system/gpu/intel.nix b/system/modules/system/gpu/intel.nix index 59c7737..2f94c7c 100644 --- a/system/modules/system/gpu/intel.nix +++ b/system/modules/system/gpu/intel.nix @@ -19,7 +19,7 @@ in environment.variables.VDPAU_DRIVER = "va_gl"; - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.extraPackages = with pkgs; [ ( if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel @@ -30,7 +30,7 @@ in intel-media-driver ]; - hardware.opengl.extraPackages32 = with pkgs.driversi686Linux; [ + hardware.graphics.extraPackages32 = with pkgs.driversi686Linux; [ ( if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel