diff --git a/modules/hardware/network/intel-2030.nix b/modules/hardware/network/intel-2030.nix
index 303363eaab2c..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-2030.nix
+++ b/modules/hardware/network/intel-2030.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi2030ucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-2100bg.nix b/modules/hardware/network/intel-2100bg.nix
index b2eea6c7b905..1e0033eb414a 100644
--- a/modules/hardware/network/intel-2100bg.nix
+++ b/modules/hardware/network/intel-2100bg.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 {
 
@@ -12,9 +12,7 @@
       description = ''
         Turn on this option if you want firmware for the Intel
         PRO/Wireless 2100BG to be loaded automatically.  This is
-        required if you want to use this device.  Intel requires you to
-        accept the license for this firmware, see
-        <link xlink:href='http://ipw2100.sourceforge.net/firmware.php?fid=2'/>.
+        required if you want to use this device.
       '';
     };
 
@@ -25,9 +23,7 @@
 
   config = pkgs.lib.mkIf config.networking.enableIntel2100BGFirmware {
 
-    # Warning: setting this option requires acceptance of the firmware
-    # license, see http://ipw2100.sourceforge.net/firmware.php?fid=2.
-    hardware.firmware = [ pkgs.ipw2100fw ];
+    hardware.enableAllFirmware = true;
 
   };
 
diff --git a/modules/hardware/network/intel-2200bg.nix b/modules/hardware/network/intel-2200bg.nix
index 5804eabded5b..ae5b69b7981d 100644
--- a/modules/hardware/network/intel-2200bg.nix
+++ b/modules/hardware/network/intel-2200bg.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 {
 
@@ -12,9 +12,7 @@
       description = ''
         Turn on this option if you want firmware for the Intel
         PRO/Wireless 2200BG to be loaded automatically.  This is
-        required if you want to use this device.  Intel requires you to
-        accept the license for this firmware, see
-        <link xlink:href='http://ipw2200.sourceforge.net/firmware.php?fid=7'/>.
+        required if you want to use this device.
       '';
     };
 
@@ -25,9 +23,7 @@
 
   config = pkgs.lib.mkIf config.networking.enableIntel2200BGFirmware {
 
-    # Warning: setting this option requires acceptance of the firmware
-    # license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
-    hardware.firmware = [ pkgs.ipw2200fw ];
+    hardware.enableAllFirmware = true;
 
   };
 
diff --git a/modules/hardware/network/intel-3945abg.nix b/modules/hardware/network/intel-3945abg.nix
index 3500fc2ff682..80baf260ab9a 100644
--- a/modules/hardware/network/intel-3945abg.nix
+++ b/modules/hardware/network/intel-3945abg.nix
@@ -1,4 +1,4 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 {
 
@@ -22,7 +22,7 @@
 
   config = pkgs.lib.mkIf config.networking.enableIntel3945ABGFirmware {
 
-    hardware.firmware = [ pkgs.iwlwifi3945ucode ];
+    hardware.enableAllFirmware = true;
 
   };
 
diff --git a/modules/hardware/network/intel-4965agn.nix b/modules/hardware/network/intel-4965agn.nix
index d22eea296971..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-4965agn.nix
+++ b/modules/hardware/network/intel-4965agn.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ config.boot.kernelPackages.iwlwifi4965ucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-5000.nix b/modules/hardware/network/intel-5000.nix
index 19e6499fa992..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-5000.nix
+++ b/modules/hardware/network/intel-5000.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi5000ucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-5150.nix b/modules/hardware/network/intel-5150.nix
index e32b72d5fa47..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-5150.nix
+++ b/modules/hardware/network/intel-5150.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi5150ucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-6000.nix b/modules/hardware/network/intel-6000.nix
index 89dd5ba4b882..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-6000.nix
+++ b/modules/hardware/network/intel-6000.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi6000ucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-6000g2a.nix b/modules/hardware/network/intel-6000g2a.nix
index 37886eac5ae2..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-6000g2a.nix
+++ b/modules/hardware/network/intel-6000g2a.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi6000g2aucode ];
+  hardware.enableAllFirmware = true;
 }
diff --git a/modules/hardware/network/intel-6000g2b.nix b/modules/hardware/network/intel-6000g2b.nix
index f3fcaee7aa79..8fecdae36bf2 100644
--- a/modules/hardware/network/intel-6000g2b.nix
+++ b/modules/hardware/network/intel-6000g2b.nix
@@ -1,5 +1,3 @@
-{pkgs, config, ...}:
-
 {
-  hardware.firmware = [ pkgs.iwlwifi6000g2bucode ];
+  hardware.enableAllFirmware = true;
 }