From 472474ffda01f3ec4a96be601e118492b809df8d Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 13 Jun 2024 02:14:25 +0200 Subject: [PATCH] tree-wide: remove top-level "with lib;" --- hosts/bootstrap.nix | 4 +++- hosts/fae/paperless.nix | 2 +- modules/adb/default.nix | 2 +- modules/arduino/default.nix | 2 +- modules/audio/default.nix | 2 +- modules/core/boot.nix | 8 ++++---- modules/core/default.nix | 2 +- modules/core/hibernation.nix | 3 ++- modules/core/i18n.nix | 2 +- modules/core/packages.nix | 2 +- modules/crypto/default.nix | 2 +- modules/docker/default.nix | 2 +- modules/email/default.nix | 2 +- modules/gaming/default.nix | 2 +- modules/graphical/default.nix | 6 +++--- modules/graphical/sway/default.nix | 7 ++++--- modules/invoiceplane/default.nix | 19 +++++++++++++++++-- modules/nextcloud/default.nix | 2 +- modules/office/default.nix | 2 +- modules/printing/default.nix | 2 +- modules/terminal-life/default.nix | 6 +++--- modules/user/default.nix | 3 ++- modules/user/home.nix | 2 +- modules/virtualisation/default.nix | 2 +- modules/wireguard-client/default.nix | 3 ++- pkgs/cockroach.nix | 4 ++-- pkgs/prison-break.nix | 8 ++++---- users/teutat3s/concepts-and-training.nix | 2 +- users/teutat3s/home.nix | 2 +- users/teutat3s/mnx.nix | 2 +- 30 files changed, 65 insertions(+), 44 deletions(-) diff --git a/hosts/bootstrap.nix b/hosts/bootstrap.nix index c71f03cc..b1841c47 100644 --- a/hosts/bootstrap.nix +++ b/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 diff --git a/hosts/fae/paperless.nix b/hosts/fae/paperless.nix index c58b9455..33bde8fa 100644 --- a/hosts/fae/paperless.nix +++ b/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; diff --git a/modules/adb/default.nix b/modules/adb/default.nix index 7a0a83d0..c8d14b61 100644 --- a/modules/adb/default.nix +++ b/modules/adb/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: -with lib; let +let psCfg = config.pub-solar; in { programs.adb.enable = true; diff --git a/modules/arduino/default.nix b/modules/arduino/default.nix index 8b0e51d4..bf6f9566 100644 --- a/modules/arduino/default.nix +++ b/modules/arduino/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: -with lib; let +let psCfg = config.pub-solar; in { users.users."${psCfg.user.name}" = { diff --git a/modules/audio/default.nix b/modules/audio/default.nix index 555ac53d..564678ec 100644 --- a/modules/audio/default.nix +++ b/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 { diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 3cb8133f..67e4ee5b 100644 --- a/modules/core/boot.nix +++ b/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 { - type = types.bool; + options.pub-solar.core.disk-encryption-active = lib.mkOption { + 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; }; diff --git a/modules/core/default.nix b/modules/core/default.nix index 3e388c78..fa0a52ef 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -3,7 +3,7 @@ lib, ... }: -with lib; let +let cfg = config.pub-solar.core; psCfg = config.pub-solar; in { diff --git a/modules/core/hibernation.nix b/modules/core/hibernation.nix index 74befd77..12a38806 100644 --- a/modules/core/hibernation.nix +++ b/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 { diff --git a/modules/core/i18n.nix b/modules/core/i18n.nix index e83d20b2..7d4767b7 100644 --- a/modules/core/i18n.nix +++ b/modules/core/i18n.nix @@ -4,7 +4,7 @@ lib, ... }: -with lib; { +{ config = { # Set your time zone. time.timeZone = "Europe/Berlin"; diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 69bc4f67..b1428f35 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -4,7 +4,7 @@ lib, ... }: -with lib; let +let psCfg = config.pub-solar; cfg = config.pub-solar.core; in { diff --git a/modules/crypto/default.nix b/modules/crypto/default.nix index d6acd6c5..7e18a867 100644 --- a/modules/crypto/default.nix +++ b/modules/crypto/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: -with lib; let +let psCfg = config.pub-solar; in { services.udev.packages = [pkgs.yubikey-personalization]; diff --git a/modules/docker/default.nix b/modules/docker/default.nix index f5bf1f67..334637ca 100644 --- a/modules/docker/default.nix +++ b/modules/docker/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: -with lib; let +let psCfg = config.pub-solar; in { virtualisation.docker.enable = true; diff --git a/modules/email/default.nix b/modules/email/default.nix index d9530d82..73f7d8cd 100644 --- a/modules/email/default.nix +++ b/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; [ diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix index ba654d1e..20220706 100644 --- a/modules/gaming/default.nix +++ b/modules/gaming/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: -with lib; let +let psCfg = config.pub-solar; in { programs.steam.enable = true; diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix index 823b14d5..eb0095af 100644 --- a/modules/graphical/default.nix +++ b/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 { - type = types.bool; + wayland.software-renderer.enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Feature flag enabling wlroots software renderer, useful in VMs"; }; diff --git a/modules/graphical/sway/default.nix b/modules/graphical/sway/default.nix index e2f71718..119623cf 100644 --- a/modules/graphical/sway/default.nix +++ b/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 [ - linuxPackages.v4l2loopback + environment.systemPackages = mkIf psCfg.graphical.v4l2loopback.enable [ + pkgs.linuxPackages.v4l2loopback ]; programs.sway.enable = true; diff --git a/modules/invoiceplane/default.nix b/modules/invoiceplane/default.nix index a29a5ca8..52be0f23 100644 --- a/modules/invoiceplane/default.nix +++ b/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"; diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix index 09fb8401..f72ae94a 100644 --- a/modules/nextcloud/default.nix +++ b/modules/nextcloud/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: -with lib; let +let psCfg = config.pub-solar; in { home-manager.users."${psCfg.user.name}" = { diff --git a/modules/office/default.nix b/modules/office/default.nix index 483e33fc..dbaa9bc7 100644 --- a/modules/office/default.nix +++ b/modules/office/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: -with lib; let +let psCfg = config.pub-solar; in { programs.evince.enable = true; diff --git a/modules/printing/default.nix b/modules/printing/default.nix index 308fbe42..b7ec266b 100644 --- a/modules/printing/default.nix +++ b/modules/printing/default.nix @@ -5,7 +5,7 @@ lib, ... }: -with lib; let +let psCfg = config.pub-solar; in { services.avahi.enable = true; diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix index 9e3ba989..347bcfec 100644 --- a/modules/terminal-life/default.nix +++ b/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; }; }; diff --git a/modules/user/default.nix b/modules/user/default.nix index d61e98dd..4c18a33d 100644 --- a/modules/user/default.nix +++ b/modules/user/default.nix @@ -5,8 +5,9 @@ ... }: let psCfg = config.pub-solar; + inherit (lib) mkIf mkOption types; in -with lib; { +{ imports = [ ./home.nix ]; diff --git a/modules/user/home.nix b/modules/user/home.nix index ea1e07b2..e7e42baf 100644 --- a/modules/user/home.nix +++ b/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 { diff --git a/modules/virtualisation/default.nix b/modules/virtualisation/default.nix index 892667b4..fe2b1ce4 100644 --- a/modules/virtualisation/default.nix +++ b/modules/virtualisation/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: -with lib; let +let psCfg = config.pub-solar; in { boot.kernelParams = [ diff --git a/modules/wireguard-client/default.nix b/modules/wireguard-client/default.nix index b9198289..b7a2adbb 100644 --- a/modules/wireguard-client/default.nix +++ b/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 { diff --git a/pkgs/cockroach.nix b/pkgs/cockroach.nix index 0a5bc5d2..7894ffdf 100644 --- a/pkgs/cockroach.nix +++ b/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 ]; }; } diff --git a/pkgs/prison-break.nix b/pkgs/prison-break.nix index 7de96c1b..e605c899 100644 --- a/pkgs/prison-break.nix +++ b/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; - license = licenses.mit; - maintainers = [ maintainers.makefu ]; + homepage = "https://github.com/ironfroggy/straight.plugin"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.makefu ]; }; }; in diff --git a/users/teutat3s/concepts-and-training.nix b/users/teutat3s/concepts-and-training.nix index 73c16747..53dfc655 100644 --- a/users/teutat3s/concepts-and-training.nix +++ b/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 { diff --git a/users/teutat3s/home.nix b/users/teutat3s/home.nix index 84d6515d..716771cf 100644 --- a/users/teutat3s/home.nix +++ b/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; diff --git a/users/teutat3s/mnx.nix b/users/teutat3s/mnx.nix index 65f01f4a..384b6d38 100644 --- a/users/teutat3s/mnx.nix +++ b/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 {