diff options
author | Atemu <atemu.main@gmail.com> | 2023-11-07 15:59:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-07 15:59:03 +0100 |
commit | 8a8a2a107162e708fbc3e626231950ad17b1ff4f (patch) | |
tree | 9497a72846e825f2ac5f398b8ad9c0b40c2a1dea /nixos/modules | |
parent | a1200fa1a1c2b50a8cdfcee4a67c68985c42cade (diff) | |
parent | 5a137cf6070a132be840562b68cdda8734ad2841 (diff) | |
download | nixlib-8a8a2a107162e708fbc3e626231950ad17b1ff4f.tar nixlib-8a8a2a107162e708fbc3e626231950ad17b1ff4f.tar.gz nixlib-8a8a2a107162e708fbc3e626231950ad17b1ff4f.tar.bz2 nixlib-8a8a2a107162e708fbc3e626231950ad17b1ff4f.tar.lz nixlib-8a8a2a107162e708fbc3e626231950ad17b1ff4f.tar.xz nixlib-8a8a2a107162e708fbc3e626231950ad17b1ff4f.tar.zst nixlib-8a8a2a107162e708fbc3e626231950ad17b1ff4f.zip |
Merge pull request #262565 from Atemu/nixos/firmware-mkEnableOption
nixos/hardware: use mkEnableOption
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/hardware/all-firmware.nix | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 08141bb0e87b..6f58e848b38a 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -18,29 +18,16 @@ in { options = { - hardware.enableAllFirmware = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Turn on this option if you want to enable all the firmware. - ''; - }; + hardware.enableAllFirmware = mkEnableOption "all firmware regardless of license"; - hardware.enableRedistributableFirmware = mkOption { + hardware.enableRedistributableFirmware = mkEnableOption "firmware with a license allowing redistribution" // { default = config.hardware.enableAllFirmware; defaultText = lib.literalExpression "config.hardware.enableAllFirmware"; - type = types.bool; - description = lib.mdDoc '' - Turn on this option if you want to enable all the firmware with a license allowing redistribution. - ''; }; - hardware.wirelessRegulatoryDatabase = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - Load the wireless regulatory database at boot. - ''; + hardware.wirelessRegulatoryDatabase = mkEnableOption "loading the wireless regulatory database at boot" // { + default = cfg.enableRedistributableFirmware || cfg.enableAllFirmware; + defaultText = literalMD "Enabled if proprietary firmware is allowed via {option}`enableRedistributableFirmware` or {option}`enableAllFirmware`."; }; }; @@ -65,7 +52,6 @@ in { ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware ]; - hardware.wirelessRegulatoryDatabase = true; }) (mkIf cfg.enableAllFirmware { assertions = [{ |