diff --git a/modules/nixos/compositors/default.nix b/modules/nixos/compositors/default.nix
index 3d4f109..c323add 100644
--- a/modules/nixos/compositors/default.nix
+++ b/modules/nixos/compositors/default.nix
@@ -7,7 +7,7 @@
 
   config = {
     fonts.enableDefaultPackages = lib.mkDefault true;
-    hardware.opengl.enable = lib.mkDefault true;
+    hardware.graphics.enable = lib.mkDefault true;
 
     programs.hyprland.enable = config.chimera.compositors.hyprland.enable;
 
diff --git a/modules/nixos/games/steam/default.nix b/modules/nixos/games/steam/default.nix
index 06a9a9a..d0c0087 100644
--- a/modules/nixos/games/steam/default.nix
+++ b/modules/nixos/games/steam/default.nix
@@ -11,7 +11,7 @@
 
       package = pkgs.steam.override
         {
-          extraLibraries = pkgs: [ config.hardware.opengl.package ] ++ config.hardware.opengl.extraPackages;
+          extraLibraries = pkgs: [ config.hardware.graphics.package ] ++ config.hardware.graphics.extraPackages;
         };
     };
     hardware.steam-hardware.enable = true;
diff --git a/modules/nixos/graphics/default.nix b/modules/nixos/graphics/default.nix
index e394353..0ad706b 100644
--- a/modules/nixos/graphics/default.nix
+++ b/modules/nixos/graphics/default.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:
 {
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
     extraPackages = [ pkgs.vaapiVdpau ];
   };
 }
diff --git a/modules/nixos/yubikey/default.nix b/modules/nixos/yubikey/default.nix
index eb3cf06..c508b1e 100644
--- a/modules/nixos/yubikey/default.nix
+++ b/modules/nixos/yubikey/default.nix
@@ -6,7 +6,7 @@
 
   config = lib.mkIf config.chimera.yubikey.enable {
     services.pcscd.enable = true;
-    security.pam.u2f.cue = true;
+    security.pam.u2f.settings.cue = true;
     security.pam.services = lib.mkIf config.chimera.yubikey.pam.enable {
       login.u2fAuth = true;
       sudo.u2fAuth = true;