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.

+7 -141
-3
nixos/modules/hardware/network/intel-2030.nix
··· 1 - { 2 - hardware.enableRedistributableFirmware = true; 3 - }
-30
nixos/modules/hardware/network/intel-2100bg.nix
··· 1 - { config, pkgs, lib, ... }: 2 - 3 - { 4 - 5 - ###### interface 6 - 7 - options = { 8 - 9 - networking.enableIntel2100BGFirmware = lib.mkOption { 10 - default = false; 11 - type = lib.types.bool; 12 - description = '' 13 - Turn on this option if you want firmware for the Intel 14 - PRO/Wireless 2100BG to be loaded automatically. This is 15 - required if you want to use this device. 16 - ''; 17 - }; 18 - 19 - }; 20 - 21 - 22 - ###### implementation 23 - 24 - config = lib.mkIf config.networking.enableIntel2100BGFirmware { 25 - 26 - hardware.enableRedistributableFirmware = true; 27 - 28 - }; 29 - 30 - }
-29
nixos/modules/hardware/network/intel-3945abg.nix
··· 1 - { config, pkgs, lib, ... }: 2 - 3 - { 4 - 5 - ###### interface 6 - 7 - options = { 8 - 9 - networking.enableIntel3945ABGFirmware = lib.mkOption { 10 - default = false; 11 - type = lib.types.bool; 12 - description = '' 13 - This option enables automatic loading of the firmware for the Intel 14 - PRO/Wireless 3945ABG. 15 - ''; 16 - }; 17 - 18 - }; 19 - 20 - 21 - ###### implementation 22 - 23 - config = lib.mkIf config.networking.enableIntel3945ABGFirmware { 24 - 25 - hardware.enableRedistributableFirmware = true; 26 - 27 - }; 28 - 29 - }
-3
nixos/modules/hardware/network/intel-4965agn.nix
··· 1 - { 2 - hardware.enableRedistributableFirmware = true; 3 - }
-3
nixos/modules/hardware/network/intel-5000.nix
··· 1 - { 2 - hardware.enableRedistributableFirmware = true; 3 - }
-3
nixos/modules/hardware/network/intel-5150.nix
··· 1 - { 2 - hardware.enableRedistributableFirmware = true; 3 - }
-3
nixos/modules/hardware/network/intel-6000.nix
··· 1 - { 2 - hardware.enableRedistributableFirmware = true; 3 - }
-3
nixos/modules/hardware/network/intel-6000g2a.nix
··· 1 - { 2 - hardware.enableRedistributableFirmware = true; 3 - }
-3
nixos/modules/hardware/network/intel-6000g2b.nix
··· 1 - { 2 - hardware.enableRedistributableFirmware = true; 3 - }
-26
nixos/modules/hardware/network/ralink.nix
··· 1 - {pkgs, config, lib, ...}: 2 - 3 - { 4 - 5 - ###### interface 6 - 7 - options = { 8 - 9 - networking.enableRalinkFirmware = lib.mkOption { 10 - default = false; 11 - type = lib.types.bool; 12 - description = '' 13 - Turn on this option if you want firmware for the RT73 NIC. 14 - ''; 15 - }; 16 - 17 - }; 18 - 19 - 20 - ###### implementation 21 - 22 - config = lib.mkIf config.networking.enableRalinkFirmware { 23 - hardware.enableRedistributableFirmware = true; 24 - }; 25 - 26 - }
-26
nixos/modules/hardware/network/rtl8192c.nix
··· 1 - {pkgs, config, lib, ...}: 2 - 3 - { 4 - 5 - ###### interface 6 - 7 - options = { 8 - 9 - networking.enableRTL8192cFirmware = lib.mkOption { 10 - default = false; 11 - type = lib.types.bool; 12 - description = '' 13 - Turn on this option if you want firmware for the RTL8192c (and related) NICs. 14 - ''; 15 - }; 16 - 17 - }; 18 - 19 - 20 - ###### implementation 21 - 22 - config = lib.mkIf config.networking.enableRTL8192cFirmware { 23 - hardware.enableRedistributableFirmware = true; 24 - }; 25 - 26 - }
+2 -3
nixos/modules/installer/scan/detected.nix
··· 6 6 7 7 { 8 8 config = mkDefault { 9 - # Wireless card firmware 10 - networking.enableIntel2200BGFirmware = true; 11 - networking.enableIntel3945ABGFirmware = true; 9 + # Common firmware, i.e. for wifi cards 10 + hardware.enableRedistributableFirmware = true; 12 11 }; 13 12 }
-5
nixos/modules/module-list.nix
··· 35 35 ./hardware/ksm.nix 36 36 ./hardware/mcelog.nix 37 37 ./hardware/network/b43.nix 38 - ./hardware/network/intel-2100bg.nix 39 - ./hardware/network/intel-2200bg.nix 40 - ./hardware/network/intel-3945abg.nix 41 - ./hardware/network/ralink.nix 42 - ./hardware/network/rtl8192c.nix 43 38 ./hardware/nitrokey.nix 44 39 ./hardware/opengl.nix 45 40 ./hardware/pcmcia.nix
+5 -1
nixos/modules/rename.nix
··· 11 11 (mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]) 12 12 13 13 (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]) 14 - (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]) 14 + (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ]) 15 + (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) 16 + (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) 17 + (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) 18 + (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) 15 19 16 20 (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) 17 21 (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]