From 930af3e5333cf8aaae290851b43527a2f734719e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 27 Aug 2024 20:42:51 +0200
Subject: [PATCH] nixos/hardware.enableAllFirmware: remove `with lib;`

---
 nixos/modules/hardware/all-firmware.nix | 33 +++++++++++--------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index abad6e08611f..6475cfc843d2 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -1,33 +1,30 @@
 { config, lib, pkgs, ... }:
-
-with lib;
-
 let
   cfg = config.hardware;
 in {
 
   imports = [
-    (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" ])
+    (lib.mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])
+    (lib.mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+    (lib.mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+    (lib.mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+    (lib.mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
   ];
 
   ###### interface
 
   options = {
 
-    hardware.enableAllFirmware = mkEnableOption "all firmware regardless of license";
+    hardware.enableAllFirmware = lib.mkEnableOption "all firmware regardless of license";
 
-    hardware.enableRedistributableFirmware = mkEnableOption "firmware with a license allowing redistribution" // {
+    hardware.enableRedistributableFirmware = lib.mkEnableOption "firmware with a license allowing redistribution" // {
       default = config.hardware.enableAllFirmware;
       defaultText = lib.literalExpression "config.hardware.enableAllFirmware";
     };
 
-    hardware.wirelessRegulatoryDatabase = mkEnableOption "loading the wireless regulatory database at boot" // {
+    hardware.wirelessRegulatoryDatabase = lib.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`.";
+      defaultText = lib.literalMD "Enabled if proprietary firmware is allowed via {option}`enableRedistributableFirmware` or {option}`enableAllFirmware`.";
     };
 
   };
@@ -35,8 +32,8 @@ in {
 
   ###### implementation
 
-  config = mkMerge [
-    (mkIf (cfg.enableAllFirmware || cfg.enableRedistributableFirmware) {
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.enableAllFirmware || cfg.enableRedistributableFirmware) {
       hardware.firmware = with pkgs; [
         linux-firmware
         intel2200BGFirmware
@@ -47,9 +44,9 @@ in {
         alsa-firmware
         sof-firmware
         libreelec-dvb-firmware
-      ] ++ optional pkgs.stdenv.hostPlatform.isAarch raspberrypiWirelessFirmware;
+      ] ++ lib.optional pkgs.stdenv.hostPlatform.isAarch raspberrypiWirelessFirmware;
     })
-    (mkIf cfg.enableAllFirmware {
+    (lib.mkIf cfg.enableAllFirmware {
       assertions = [{
         assertion = !cfg.enableAllFirmware || pkgs.config.allowUnfree;
         message = ''
@@ -63,12 +60,12 @@ in {
         b43Firmware_5_1_138
         b43Firmware_6_30_163_46
         xow_dongle-firmware
-      ] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
+      ] ++ lib.optionals pkgs.stdenv.hostPlatform.isx86 [
         facetimehd-calibration
         facetimehd-firmware
       ];
     })
-    (mkIf cfg.wirelessRegulatoryDatabase {
+    (lib.mkIf cfg.wirelessRegulatoryDatabase {
       hardware.firmware = [ pkgs.wireless-regdb ];
     })
   ];