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