nixos/modules: clean up wireless firmware options

All available options were just enabling
hardware.enableRedistributableFirmware. There were nix files without
modules which weren't referenced anywhere.

-3
nixos/modules/hardware/network/intel-2030.nix
···
-
{
-
hardware.enableRedistributableFirmware = true;
-
}
-30
nixos/modules/hardware/network/intel-2100bg.nix
···
-
{ config, pkgs, lib, ... }:
-
-
{
-
-
###### interface
-
-
options = {
-
-
networking.enableIntel2100BGFirmware = lib.mkOption {
-
default = false;
-
type = lib.types.bool;
-
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.
-
'';
-
};
-
-
};
-
-
-
###### implementation
-
-
config = lib.mkIf config.networking.enableIntel2100BGFirmware {
-
-
hardware.enableRedistributableFirmware = true;
-
-
};
-
-
}
-29
nixos/modules/hardware/network/intel-3945abg.nix
···
-
{ config, pkgs, lib, ... }:
-
-
{
-
-
###### interface
-
-
options = {
-
-
networking.enableIntel3945ABGFirmware = lib.mkOption {
-
default = false;
-
type = lib.types.bool;
-
description = ''
-
This option enables automatic loading of the firmware for the Intel
-
PRO/Wireless 3945ABG.
-
'';
-
};
-
-
};
-
-
-
###### implementation
-
-
config = lib.mkIf config.networking.enableIntel3945ABGFirmware {
-
-
hardware.enableRedistributableFirmware = true;
-
-
};
-
-
}
-3
nixos/modules/hardware/network/intel-4965agn.nix
···
-
{
-
hardware.enableRedistributableFirmware = true;
-
}
-3
nixos/modules/hardware/network/intel-5000.nix
···
-
{
-
hardware.enableRedistributableFirmware = true;
-
}
-3
nixos/modules/hardware/network/intel-5150.nix
···
-
{
-
hardware.enableRedistributableFirmware = true;
-
}
-3
nixos/modules/hardware/network/intel-6000.nix
···
-
{
-
hardware.enableRedistributableFirmware = true;
-
}
-3
nixos/modules/hardware/network/intel-6000g2a.nix
···
-
{
-
hardware.enableRedistributableFirmware = true;
-
}
-3
nixos/modules/hardware/network/intel-6000g2b.nix
···
-
{
-
hardware.enableRedistributableFirmware = true;
-
}
-26
nixos/modules/hardware/network/ralink.nix
···
-
{pkgs, config, lib, ...}:
-
-
{
-
-
###### interface
-
-
options = {
-
-
networking.enableRalinkFirmware = lib.mkOption {
-
default = false;
-
type = lib.types.bool;
-
description = ''
-
Turn on this option if you want firmware for the RT73 NIC.
-
'';
-
};
-
-
};
-
-
-
###### implementation
-
-
config = lib.mkIf config.networking.enableRalinkFirmware {
-
hardware.enableRedistributableFirmware = true;
-
};
-
-
}
-26
nixos/modules/hardware/network/rtl8192c.nix
···
-
{pkgs, config, lib, ...}:
-
-
{
-
-
###### interface
-
-
options = {
-
-
networking.enableRTL8192cFirmware = lib.mkOption {
-
default = false;
-
type = lib.types.bool;
-
description = ''
-
Turn on this option if you want firmware for the RTL8192c (and related) NICs.
-
'';
-
};
-
-
};
-
-
-
###### implementation
-
-
config = lib.mkIf config.networking.enableRTL8192cFirmware {
-
hardware.enableRedistributableFirmware = true;
-
};
-
-
}
+2 -3
nixos/modules/installer/scan/detected.nix
···
{
config = mkDefault {
-
# Wireless card firmware
-
networking.enableIntel2200BGFirmware = true;
-
networking.enableIntel3945ABGFirmware = true;
+
# Common firmware, i.e. for wifi cards
+
hardware.enableRedistributableFirmware = true;
};
}
-5
nixos/modules/module-list.nix
···
./hardware/ksm.nix
./hardware/mcelog.nix
./hardware/network/b43.nix
-
./hardware/network/intel-2100bg.nix
-
./hardware/network/intel-2200bg.nix
-
./hardware/network/intel-3945abg.nix
-
./hardware/network/ralink.nix
-
./hardware/network/rtl8192c.nix
./hardware/nitrokey.nix
./hardware/opengl.nix
./hardware/pcmcia.nix
+5 -1
nixos/modules/rename.nix
···
(mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ])
(mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
-
(mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
+
(mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])
+
(mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+
(mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+
(mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+
(mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
(mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]