flake: start transitioning away from with

modules/system/hardware/bluetooth.nix

@@ -12,10 +12,13 @@ in {
       enable = true;
       powerOnBoot = mkIf cfg.powerOnBoot true;
     };
-    environment.systemPackages = with pkgs; [
-      bluetuith
-      bluez
-      blueman
-    ];
+    environment.systemPackages = builtins.attrValues {
+      inherit
+        (pkgs)
+        bluetuith
+        bluez
+        blueman
+        ;
+    };
   };
 }

modules/system/hardware/cpu/intel.nix

@@ -9,9 +9,12 @@
 in {
   hardware = {
     cpu.intel.updateMicrocode = mkDefault config.hardware.enableRedistributableFirmware;
-    graphics.extraPackages = with pkgs; [
-      intel-vaapi-driver
-      intel-media-driver
-    ];
+    graphics.extraPackages = builtins.attrValues {
+      inherit
+        (pkgs)
+        intel-vaapi-driver
+        intel-media-driver
+        ;
+    };
   };
 }

modules/system/hardware/graphics.nix

@@ -11,12 +11,14 @@ in {
     hardware = {
       graphics = {
         enable = true;
-        extraPackages = with pkgs;
-          mkIf cfg.amd.enable [
+        extraPackages = mkIf cfg.amd.enable (builtins.attrValues {
+          inherit
+            (pkgs)
             mesa
             libva
             vaapiVdpa
-          ];
+            ;
+        });
       };
       nvidia = mkIf cfg.nvidia.enable {
         modesetting.enable = true;