tree-wide: remove top-level "with lib;"

hosts/bootstrap.nix

@@ -5,7 +5,9 @@
   profiles,
   ...
 }:
-with lib; let
+let
+  inherit (lib) mkForce;
+
   # Gets hostname of host to be bundled inside iso
   # Copied from https://github.com/divnix/digga/blob/30ffa0b02272dc56c94fd3c7d8a5a0f07ca197bf/modules/bootstrap-iso.nix#L3-L11
   getFqdn = config: let

hosts/fae/paperless.nix

@@ -5,7 +5,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
 

modules/adb/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
 in {
   programs.adb.enable = true;

modules/arduino/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
 in {
   users.users."${psCfg.user.name}" = {

modules/audio/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
 in {

modules/core/boot.nix

@@ -4,11 +4,11 @@
   lib,
   ...
 }:
-with lib; let
+let
   cfg = config.pub-solar.core;
 in {
-  options.pub-solar.core.disk-encryption-active = mkOption {
+  options.pub-solar.core.disk-encryption-active = lib.mkOption {
-    type = types.bool;
+    type = lib.types.bool;
     default = true;
     description = "Whether it should be assumed that there is a cryptroot device";
   };
@@ -17,7 +17,7 @@ in {
     boot = {
       # Mount / luks device in initrd
       # Allow fstrim to work on it.
-      initrd = mkIf cfg.disk-encryption-active {
+      initrd = lib.mkIf cfg.disk-encryption-active {
         luks.devices."cryptroot" = {
           allowDiscards = true;
         };

modules/core/default.nix

@@ -3,7 +3,7 @@
   lib,
   ...
 }:
-with lib; let
+let
   cfg = config.pub-solar.core;
   psCfg = config.pub-solar;
 in {

modules/core/hibernation.nix

@@ -4,8 +4,9 @@
   lib,
   ...
 }:
-with lib; let
+let
   cfg = config.pub-solar.core.hibernation;
+  inherit (lib) mkOption types mkIf;
 in {
   options.pub-solar.core.hibernation = {
     enable = mkOption {

modules/core/i18n.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }:
-with lib; {
+{
   config = {
     # Set your time zone.
     time.timeZone = "Europe/Berlin";

modules/core/packages.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.core;
 in {

modules/crypto/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
 in {
   services.udev.packages = [pkgs.yubikey-personalization];

modules/docker/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
 in {
   virtualisation.docker.enable = true;

modules/email/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
 in {
   users.users."${psCfg.user.name}".packages = with pkgs; [

modules/gaming/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
 in {
   programs.steam.enable = true;

modules/graphical/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
   tomlFormat = pkgs.formats.toml {};
   sessionVariables = {
@@ -22,8 +22,8 @@ in {
   ];
 
   options.pub-solar.graphical = {
-    wayland.software-renderer.enable = mkOption {
+    wayland.software-renderer.enable = lib.mkOption {
-      type = types.bool;
+      type = lib.types.bool;
       default = false;
       description = "Feature flag enabling wlroots software renderer, useful in VMs";
     };

modules/graphical/sway/default.nix

@@ -5,8 +5,9 @@
   flake,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
+  inherit (lib) mkIf mkOption types;
 in {
   options.pub-solar.graphical = {
     v4l2loopback.enable = mkOption {
@@ -25,8 +26,8 @@ in {
       '';
     };
 
-    environment.systemPackages = with pkgs; mkIf psCfg.graphical.v4l2loopback.enable [
+    environment.systemPackages = mkIf psCfg.graphical.v4l2loopback.enable [
-      linuxPackages.v4l2loopback
+      pkgs.linuxPackages.v4l2loopback
     ];
 
     programs.sway.enable = true;

modules/invoiceplane/default.nix

@@ -1,8 +1,23 @@
 { config, pkgs, lib, ... }:
 
-with lib;
-
 let
+  inherit (lib)
+    any
+    attrValues
+    concatMapStringsSep
+    concatStrings
+    flatten
+    literalExpression
+    mapAttrs'
+    mapAttrsToList
+    mkDefault
+    mkEnableOption
+    mkIf
+    mkMerge
+    mkOption
+    nameValuePair
+    types;
+
   cfg = config.services.invoiceplane;
   eachSite = cfg.sites;
   user = "invoiceplane";

modules/nextcloud/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
 in {
   home-manager.users."${psCfg.user.name}" = {

modules/office/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
 in {
   programs.evince.enable = true;

modules/printing/default.nix

@@ -5,7 +5,7 @@
   lib,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
 in {
   services.avahi.enable = true;

modules/terminal-life/default.nix

@@ -5,17 +5,17 @@
   flake,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.terminal-life;
 in {
   options.pub-solar.terminal-life = {
-    full = mkOption {
+    full = lib.mkOption {
       description = ''
         Enable a full version, which includes more nvim plugins and lsps.
       '';
       default = false;
-      type = types.bool;
+      type = lib.types.bool;
     };
   };
 

modules/user/default.nix

@@ -5,8 +5,9 @@
   ...
 }: let
   psCfg = config.pub-solar;
+  inherit (lib) mkIf mkOption types;
 in
-with lib; {
+{
   imports = [
     ./home.nix
   ];

modules/user/home.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
 in {

modules/virtualisation/default.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
 in {
   boot.kernelParams = [

modules/wireguard-client/default.nix

@@ -4,9 +4,10 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
   cfg = config.pub-solar.wireguard-client;
+  inherit (lib) mkOption types;
 in {
   options.pub-solar.wireguard-client = {
     ownIPs = mkOption {

pkgs/cockroach.nix

@@ -15,10 +15,10 @@ with self;
       install -D -m755 cockroach $out/bin/cockroach
       cp -r lib $out/lib
     '';
-    meta = with lib; {
+    meta = {
       homepage = "https://www.cockroachlabs.com";
       description = "A scalable, survivable, strongly-consistent SQL database";
       platforms = ["x86_64-linux"];
-      maintainers = with maintainers; [mic92];
+      maintainers = [ lib.maintainers.mic92 ];
     };
   }

pkgs/prison-break.nix

@@ -11,11 +11,11 @@ let
       sha256 = "818a7641068932ed6436d0af0a3bb77bbbde29df0a7142c8bd1a249e7c2f0d38";
     };
 
-    meta = with lib; {
+    meta = {
       description = "A simple namespaced plugin facility";
-      homepage = https://github.com/ironfroggy/straight.plugin;
+      homepage = "https://github.com/ironfroggy/straight.plugin";
-      license = licenses.mit;
+      license = lib.licenses.mit;
-      maintainers = [ maintainers.makefu ];
+      maintainers = [ lib.maintainers.makefu ];
     };
   };
 in

users/teutat3s/concepts-and-training.nix

@@ -5,7 +5,7 @@
   flake,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
 in {

users/teutat3s/home.nix

@@ -6,7 +6,7 @@
   pkgs,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
   tritonshell = flake.inputs.tritonshell;

users/teutat3s/mnx.nix

@@ -5,7 +5,7 @@
   flake,
   ...
 }:
-with lib; let
+let
   psCfg = config.pub-solar;
   xdg = config.home-manager.users."${psCfg.user.name}".xdg;
 in {