Unverified Commit 8a8a2a10 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #262565 from Atemu/nixos/firmware-mkEnableOption 

nixos/hardware: use mkEnableOption
parents a1200fa1 5a137cf6

nixos/modules/hardware/all-firmware.nix

+5 −19
Original line number Diff line number Diff line
@@ -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 = [{