Some renaming as was mentioned on the mailinglist.

Also, removed the firmware-free option because that firmware is already in the kernel package and thus causing collisions otherwise.

svn path=/nixos/trunk/; revision=31527

1 files changed, 26 insertions, 0 deletions

diff --git a/modules/hardware/all-firmware.nix b/modules/hardware/all-firmware.nix
new file mode 100644
index 00000000000..9ef7b1523fc
--- /dev/null
+++ b/modules/hardware/all-firmware.nix
@@ -0,0 +1,26 @@
+{pkgs, config, ...}:
+
+{
+
+  ###### interface
+
+  options = {
+
+    hardware.enableAllFirmware = pkgs.lib.mkOption {
+      default = false;
+      type = pkgs.lib.types.bool;
+      description = ''
+        Turn on this option if you want to enable all the firmware shipped with Debian/Ubuntu.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = pkgs.lib.mkIf config.hardware.enableAllFirmware {
+    hardware.firmware = [ pkgs.firmwareLinuxNonfree ];
+  };
+
+}