diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix
index 57f2ca27..221fb193 100644
--- a/hosts/common/programs/assorted.nix
+++ b/hosts/common/programs/assorted.nix
@@ -1177,13 +1177,12 @@ in
     ];
   };
 
-  hardware.opengl = lib.mkIf config.sane.programs.guiApps.enabled ({
+  hardware.graphics = lib.mkIf config.sane.programs.guiApps.enabled ({
     enable = true;
-    driSupport = lib.mkDefault true;
   } // (lib.optionalAttrs pkgs.stdenv.isx86_64 {
     # for 32 bit applications
-    # upstream nixpkgs forbids setting driSupport32Bit unless specifically x86_64 (so aarch64 isn't allowed)
-    driSupport32Bit = lib.mkDefault true;
+    # upstream nixpkgs forbids setting enable32Bit unless specifically x86_64 (so aarch64 isn't allowed)
+    enable32Bit = lib.mkDefault true;
   }));
 
   system.activationScripts.notifyActive = lib.mkIf config.sane.programs.guiApps.enabled {
diff --git a/hosts/common/programs/sanebox.nix b/hosts/common/programs/sanebox.nix
index f73814b9..d8a22763 100644
--- a/hosts/common/programs/sanebox.nix
+++ b/hosts/common/programs/sanebox.nix
@@ -44,19 +44,19 @@ in
           # XXX: /run/current-system symlink can't be cached without forcing regular mass rebuilds:
           # mount it as if it were a directory instead.
           "/run/current-system" = "";
-        } // lib.optionalAttrs config.hardware.opengl.enable {
+        } // lib.optionalAttrs config.hardware.graphics.enable {
           "/run/opengl-driver" = let
-            gl = config.hardware.opengl;
-            # from: <repo:nixos/nixpkgs:nixos/modules/hardware/opengl.nix>
+            gl = config.hardware.graphics;
+            # from: <repo:nixos/nixpkgs:nixos/modules/hardware/graphics.nix>
             package = pkgs.buildEnv {
               name = "opengl-drivers";
               paths = [ gl.package ] ++ gl.extraPackages;
             };
           in "${package}";
-        } // lib.optionalAttrs (config.hardware.opengl.enable && config.hardware.opengl.driSupport32Bit) {
+        } // lib.optionalAttrs (config.hardware.graphics.enable && config.hardware.graphics.enable32Bit) {
           "/run/opengl-driver-32" = let
-            gl = config.hardware.opengl;
-            # from: <repo:nixos/nixpkgs:nixos/modules/hardware/opengl.nix>
+            gl = config.hardware.graphics;
+            # from: <repo:nixos/nixpkgs:nixos/modules/hardware/graphics.nix>
             package = pkgs.buildEnv {
               name = "opengl-drivers-32bit";
               paths = [ gl.package32 ] ++ gl.extraPackages32;
diff --git a/pkgs/additional/nixpkgs/default.nix b/pkgs/additional/nixpkgs/default.nix
index 88f84f8c..b4146426 100644
--- a/pkgs/additional/nixpkgs/default.nix
+++ b/pkgs/additional/nixpkgs/default.nix
@@ -27,12 +27,12 @@
 }:
 let
   lock = {
-    master.rev = "8b50e555cc02c9c7f3b4d4202fad518554610a01";
-    master.sha256 = "sha256-o5rR0HYVhci4l5otMfAtE2CmL5APRrcRVSBBSRkROWk=";
-    staging.rev = "8b50e555cc02c9c7f3b4d4202fad518554610a01";
-    staging.sha256 = "sha256-o5rR0HYVhci4l5otMfAtE2CmL5APRrcRVSBBSRkROWk=";
-    staging-next.rev = "8b50e555cc02c9c7f3b4d4202fad518554610a01";
-    staging-next.sha256 = "sha256-o5rR0HYVhci4l5otMfAtE2CmL5APRrcRVSBBSRkROWk=";
+    master.rev = "3ed0e6824c1a677493e86904a9f7472fcef5b46a";
+    master.sha256 = "sha256-PZWvWO/s0IPqT+OFwOUsm28Nznr7YceWcdlJHYW1WU0=";
+    staging.rev = "3ed0e6824c1a677493e86904a9f7472fcef5b46a";
+    staging.sha256 = "sha256-PZWvWO/s0IPqT+OFwOUsm28Nznr7YceWcdlJHYW1WU0=";
+    staging-next.rev = "3ed0e6824c1a677493e86904a9f7472fcef5b46a";
+    staging-next.sha256 = "sha256-PZWvWO/s0IPqT+OFwOUsm28Nznr7YceWcdlJHYW1WU0=";
   };
   lock' = lock."${variant}";
   unpatchedSrc = fetchzip {
@@ -81,7 +81,7 @@ in
     src.overrideAttrs (base: {
       # attributes needed for update scripts
       pname = "nixpkgs";
-      version = "24.05-unstable-2024-06-19";
+      version = "24.05-unstable-2024-06-21";
       passthru = (base.passthru or {}) // nixpkgs // {
         src = unpatchedSrc // {
           inherit (lock') rev;