* Bring back the options to enable/disable the Intel firmwares.

svn path=/nixos/branches/modular-nixos/; revision=16574

modules/hardware/network/intel-2200bg.nix

@@ -1,11 +1,34 @@
 {pkgs, config, ...}:
 
 {
-  services = {
-    udev = {
-      # Warning: setting this option requires acceptance of the firmware
-      # license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
-      addFirmware = [ pkgs.ipw2200fw ];
+
+  ###### interface
+
+  options = {
+  
+    networking.enableIntel2200BGFirmware = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      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'/>.
+      '';
     };
+
   };
-}
+
+
+  ###### implementation
+  
+  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.
+    services.udev.addFirmware = [ pkgs.ipw2200fw ];
+
+  };
+  
+}

modules/hardware/network/intel-3945abg.nix

@@ -1,22 +1,29 @@
 {pkgs, config, ...}:
 
-let
-  inherit (config.boot) kernelPackages;
-in
-
-# !!! make this optional
-
 {
-  boot = {
-    extraModulePackages =
-      pkgs.lib.optional
-        (!kernelPackages.kernel.features ? iwlwifi)
-        kernelPackages.iwlwifi;
+
+  ###### interface
+
+  options = {
+  
+    networking.enableIntel3945ABGFirmware = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        This option enables automatic loading of the firmware for the Intel
+        PRO/Wireless 3945ABG.
+      '';
+    };
+
   };
 
-  services = {
-    udev = {
-      addFirmware = [ pkgs.iwlwifi3945ucode ];
-    };
+
+  ###### implementation
+  
+  config = pkgs.lib.mkIf config.networking.enableIntel3945ABGFirmware {
+  
+    services.udev.addFirmware = [ pkgs.iwlwifi3945ucode ];
+
   };
+  
 }