From 4d26262878fc03336a85f2e1523efc345baa3c5f Mon Sep 17 00:00:00 2001
From: Arie Middelkoop <amiddelk@gmail.com>
Date: Sat, 14 Jan 2012 09:30:24 +0000
Subject: [PATCH] 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
---
 ...{firmware-nonfree.nix => all-firmware.nix} |  6 ++---
 modules/hardware/firmware-free.nix            | 26 -------------------
 modules/module-list.nix                       |  3 +--
 3 files changed, 4 insertions(+), 31 deletions(-)
 rename modules/hardware/{firmware-nonfree.nix => all-firmware.nix} (53%)
 delete mode 100644 modules/hardware/firmware-free.nix

diff --git a/modules/hardware/firmware-nonfree.nix b/modules/hardware/all-firmware.nix
similarity index 53%
rename from modules/hardware/firmware-nonfree.nix
rename to modules/hardware/all-firmware.nix
index 14cfaf0405b8..9ef7b1523fcd 100644
--- a/modules/hardware/firmware-nonfree.nix
+++ b/modules/hardware/all-firmware.nix
@@ -6,11 +6,11 @@
 
   options = {
 
-    hardware.enableFirmwareLinuxNonfree = pkgs.lib.mkOption {
+    hardware.enableAllFirmware = pkgs.lib.mkOption {
       default = false;
       type = pkgs.lib.types.bool;
       description = ''
-        Turn on this option if you want the set of firmware of the non-free package.
+        Turn on this option if you want to enable all the firmware shipped with Debian/Ubuntu.
       '';
     };
 
@@ -19,7 +19,7 @@
 
   ###### implementation
 
-  config = pkgs.lib.mkIf config.hardware.enableFirmwareLinuxNonfree {
+  config = pkgs.lib.mkIf config.hardware.enableAllFirmware {
     hardware.firmware = [ pkgs.firmwareLinuxNonfree ];
   };
 
diff --git a/modules/hardware/firmware-free.nix b/modules/hardware/firmware-free.nix
deleted file mode 100644
index ea21a5ae38d2..000000000000
--- a/modules/hardware/firmware-free.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{pkgs, config, ...}:
-
-{
-
-  ###### interface
-
-  options = {
-
-    hardware.enableFirmwareLinuxFree = pkgs.lib.mkOption {
-      default = false;
-      type = pkgs.lib.types.bool;
-      description = ''
-        Turn on this option if you want the set of firmware of the linux-firmware-free package.
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = pkgs.lib.mkIf config.hardware.enableFirmwareLinuxFree {
-    hardware.firmware = [ pkgs.firmwareLinuxFree ];
-  };
-
-}
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 6781e1b7a9e0..398a902b638e 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -20,8 +20,7 @@
   ./hardware/network/rt73.nix
   ./hardware/network/rtl8192c.nix
   ./hardware/pcmcia.nix
-  ./hardware/firmware-nonfree.nix
-  ./hardware/firmware-free.nix
+  ./hardware/all-firmware.nix
   ./installer/generations-dir/generations-dir.nix
   ./installer/grub/grub.nix
   ./installer/init-script/init-script.nix