config/guix/system/default: Factor %ambrevar/firmware.

.config/guix/system/default.scm

@@ -81,6 +81,10 @@ StrictNodes 1")
                                        (list ;; %nitrokey-udev-rule
                                         %ambrevar/cdemu-vhba-udev-rule))))))))
 
+(define %ambrevar/firmware
+  (append (list vhba-module)
+          %base-firmware))
+
 (define-public default-operating-system
   (operating-system
     (host-name "ambrevar-system")
@@ -100,11 +104,8 @@ StrictNodes 1")
     (kernel linux)
     ;; (kernel-arguments
     ;;  '("modprobe.blacklist=pcspkr"
-    ;;    "modprobe.blacklist=nouveau"
-    ;;    "pcie_port_pm=off"))
-    (firmware (append (list iwlwifi-firmware
-                            vhba-module)
-                      %base-firmware))
+    ;;    "modprobe.blacklist=nouveau"))
+    (firmware %ambrevar/firmware)
     ;; TODO: Remove all virtio modules.
     (initrd-modules (delete "virtio-rng" %base-initrd-modules))