diff options
-rw-r--r-- | modules/hardware/all-firmware.nix (renamed from modules/hardware/firmware-nonfree.nix) | 6 | ||||
-rw-r--r-- | modules/hardware/firmware-free.nix | 26 | ||||
-rw-r--r-- | modules/module-list.nix | 3 |
3 files changed, 4 insertions, 31 deletions
diff --git a/modules/hardware/firmware-nonfree.nix b/modules/hardware/all-firmware.nix index 14cfaf0405b..9ef7b1523fc 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 ea21a5ae38d..00000000000 --- 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 6781e1b7a9e..398a902b638 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 |