diff --git a/hosts/work/configuration.nix b/hosts/work/configuration.nix
index 6e0e344..2ae66ed 100644
--- a/hosts/work/configuration.nix
+++ b/hosts/work/configuration.nix
@@ -5,6 +5,7 @@
     pkgs,
     ...
 }: let
+    inherit (lib.attrsets) attrValues;
     inherit (lib.meta) getExe;
 
     inherit (config.poz.other.system) username;
@@ -55,17 +56,21 @@ in {
         graphics = {
             enable = true;
             enable32Bit = true;
-            extraPackages = with pkgs; [
-                mesa
-                libdrm
-                libva
-                vaapiVdpau
-                libvdpau-va-gl
-            ];
-            extraPackages32 = with pkgs; [
-                driversi686Linux.mesa
-                driversi686Linux.libvdpau-va-gl
-            ];
+            extraPackages = attrValues {
+                inherit (pkgs)
+                    mesa
+                    libdrm
+                    libva
+                    vaapiVdpau
+                    libvdpau-va-gl
+                ;
+            };
+            extraPackages32 = attrValues {
+                inherit (pkgs.driversi686Linux)
+                    mesa
+                    libvdpau-va-gl
+                ;
+            };
         };
     };
 
@@ -100,9 +105,7 @@ in {
     };
 
     services.udev = {
-        packages = with pkgs; [
-            yubikey-personalization
-        ];
+        packages = [ pkgs.yubikey-personalization ];
     };
 
     networking.proxy = {
@@ -111,7 +114,7 @@ in {
 
     services.xserver.videoDrivers = [ "displaylink" "modesetting" ];
     boot = {
-        extraModulePackages = with config.boot.kernelPackages; [ evdi ];
+        extraModulePackages = [ config.boot.kernelPackages.evdi ];
         kernelModules = [ "evdi" ];
     };