diff --git a/hosts/Vanguard/configuration.nix b/hosts/Vanguard/configuration.nix
index 6619c7ca..04437a75 100644
--- a/hosts/Vanguard/configuration.nix
+++ b/hosts/Vanguard/configuration.nix
@@ -1,6 +1,9 @@
-{ config, ... }: {
+{ config, pkgs, ... }: {
   boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
   boot.extraModprobeConfig = ''
     options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
   '';
+  hardware.opengl.driSupport32Bit = true;
+  hardware.opengl.extraPackages = with pkgs; [ amdvlk rocmPackages.clr.icd ];
+  hardware.opengl.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
 }
diff --git a/system/desktop.nix b/system/desktop.nix
index f0f47284..37fc8653 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -2,7 +2,6 @@
   imports = [ ./default.nix ];
   environment.systemPackages = with pkgs; [
     dex
-    mesa
     libnotify
     glib
     gsettings-desktop-schemas
diff --git a/system/steam.nix b/system/steam.nix
index 2e76248d..62499a70 100644
--- a/system/steam.nix
+++ b/system/steam.nix
@@ -1,9 +1,5 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [ mesa ];
-  hardware = {
-    opengl.driSupport32Bit = true;
-    steam-hardware.enable = true;
-  };
+{ ... }: {
+  hardware.steam-hardware.enable = true;
   programs = {
     xwayland.enable = true;
     gamescope = {