From 2fa1f699e9165e86d65054283decc44696868ed0 Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 2 May 2026 20:37:11 +0100 Subject: [PATCH] treewide: specific lib --- home/default.nix | 2 +- home/isabel/cli/fzf.nix | 2 +- home/isabel/cli/git.nix | 2 +- home/isabel/cli/shell/fish.nix | 2 +- home/isabel/cli/shell/zsh.nix | 2 +- home/isabel/cli/starship.nix | 2 +- home/isabel/gui/chromium.nix | 9 +++------ home/isabel/gui/hyprland.nix | 14 +++++--------- home/isabel/gui/media/listening.nix | 2 +- home/isabel/gui/media/watching.nix | 2 +- home/isabel/packages.nix | 2 +- home/isabel/services/rnnoise.nix | 2 +- home/isabel/services/tray.nix | 2 +- home/isabel/themes/gtk.nix | 2 +- home/isabel/themes/qt.nix | 2 +- modules/base/nix/nix.nix | 8 ++------ modules/base/nix/substituters.nix | 2 +- modules/base/system/revision.nix | 2 +- modules/base/system/tools.nix | 3 ++- modules/base/system/vars.nix | 2 +- modules/base/users/isabel.nix | 3 ++- modules/base/users/mkuser.nix | 8 ++------ modules/base/users/options.nix | 3 ++- modules/darwin/documentation.nix | 2 +- modules/flake/lib/mkhost.nix | 9 ++------- modules/flake/lib/validators.nix | 9 +++------ modules/flake/packages/docs/options.nix | 8 +++----- modules/generic/packages.nix | 3 ++- modules/generic/profiles.nix | 2 +- modules/home/environment/xdg.nix | 2 +- modules/home/home.nix | 2 +- modules/home/profiles.nix | 2 +- modules/home/programs/defaults.nix | 3 ++- modules/home/programs/discord.nix | 8 ++------ modules/home/programs/pentesting.nix | 3 ++- modules/home/themes/fonts.nix | 3 ++- modules/iso/boot.nix | 2 +- modules/iso/image.nix | 3 ++- modules/iso/networking.nix | 2 +- modules/iso/space.nix | 2 +- modules/nixos/boot/loader.nix | 6 ++---- modules/nixos/boot/tmpfs.nix | 3 ++- modules/nixos/emulation.nix | 18 +++++++----------- modules/nixos/environment/documentation.nix | 2 +- modules/nixos/environment/wayland.nix | 2 +- modules/nixos/environment/zswap.nix | 2 +- .../nixos/hardware/cloud/hetzner/garden.nix | 3 ++- .../hardware/cloud/hetzner/networking.nix | 3 ++- modules/nixos/hardware/cloud/oracle.nix | 3 ++- modules/nixos/hardware/cloud/overrides.nix | 2 +- modules/nixos/hardware/cloud/upcloud.nix | 3 ++- modules/nixos/hardware/cpu/amd.nix | 2 +- modules/nixos/hardware/cpu/default.nix | 3 ++- modules/nixos/hardware/cpu/intel.nix | 2 +- modules/nixos/hardware/gpu/default.nix | 3 ++- modules/nixos/hardware/gpu/intel.nix | 3 ++- modules/nixos/hardware/gpu/nvidia.nix | 2 +- modules/nixos/hardware/media/sound.nix | 2 +- modules/nixos/hardware/options.nix | 3 ++- modules/nixos/hardware/power/acpid.nix | 2 +- modules/nixos/hardware/power/upower.nix | 2 +- modules/nixos/hardware/touchpad.nix | 2 +- modules/nixos/hardware/yubikey.nix | 3 ++- modules/nixos/headless.nix | 3 ++- modules/nixos/kernel/blacklisted-modules.nix | 3 ++- modules/nixos/kernel/params.nix | 3 ++- modules/nixos/networking/blocker.nix | 2 +- modules/nixos/networking/default.nix | 2 +- modules/nixos/networking/fail2ban.nix | 2 +- modules/nixos/networking/firewall.nix | 2 +- modules/nixos/networking/networkmanager.nix | 2 +- modules/nixos/networking/openssh.nix | 2 +- modules/nixos/networking/optimise.nix | 3 ++- modules/nixos/networking/systemd.nix | 3 ++- modules/nixos/networking/tailscale.nix | 10 +++------- modules/nixos/programs/graphical.nix | 2 +- modules/nixos/programs/hyprland.nix | 2 +- modules/nixos/security/pam.nix | 3 ++- modules/nixos/security/sudo.nix | 2 +- modules/nixos/services/arr.nix | 9 +++------ modules/nixos/services/attic.nix | 2 +- modules/nixos/services/blahaj.nix | 2 +- modules/nixos/services/borgbackup.nix | 11 ++++------- modules/nixos/services/buildbot.nix | 2 +- modules/nixos/services/cloudflared.nix | 2 +- modules/nixos/services/forgejo.nix | 2 +- modules/nixos/services/immich.nix | 2 +- modules/nixos/services/jellyfin.nix | 2 +- modules/nixos/services/kanidm.nix | 2 +- modules/nixos/services/lego.nix | 2 +- modules/nixos/services/mailserver.nix | 2 +- modules/nixos/services/nginx.nix | 10 +++------- modules/nixos/services/nixpkgs-prs-bot.nix | 3 ++- modules/nixos/services/pds/default.nix | 3 ++- modules/nixos/services/piper.nix | 2 +- modules/nixos/services/postgresql.nix | 2 +- modules/nixos/services/prowlarr.nix | 2 +- modules/nixos/services/qbittorent.nix | 2 +- modules/nixos/services/radarr.nix | 2 +- modules/nixos/services/sonarr.nix | 2 +- modules/nixos/services/tranquil.nix | 2 +- modules/nixos/services/vaultwarden.nix | 2 +- modules/nixos/services/website.nix | 2 +- modules/nixos/system/earlyoom.nix | 3 ++- modules/nixos/system/flatpak.nix | 2 +- modules/nixos/system/gnome.nix | 2 +- modules/nixos/system/location.nix | 2 +- modules/nixos/system/loginManager.nix | 3 ++- modules/nixos/system/logind.nix | 2 +- modules/nixos/system/logs.nix | 2 +- modules/nixos/system/misc.nix | 2 +- modules/nixos/system/monitoring.nix | 2 +- modules/nixos/system/oomd.nix | 2 +- modules/nixos/system/printing.nix | 9 +++------ modules/nixos/system/runners.nix | 3 ++- modules/nixos/system/size.nix | 2 +- modules/nixos/system/systemd.nix | 3 ++- modules/nixos/system/xdg-portals.nix | 3 ++- modules/nixos/system/xserver.nix | 2 +- modules/nixos/users/isabel.nix | 3 ++- 120 files changed, 184 insertions(+), 204 deletions(-) diff --git a/home/default.nix b/home/default.nix index 9cabae02..f1dccc60 100644 --- a/home/default.nix +++ b/home/default.nix @@ -8,7 +8,7 @@ ... }: let - inherit (lib) genAttrs; + inherit (lib.attrsets) genAttrs; in { home-manager = { diff --git a/home/isabel/cli/fzf.nix b/home/isabel/cli/fzf.nix index 5778025c..d6552eed 100644 --- a/home/isabel/cli/fzf.nix +++ b/home/isabel/cli/fzf.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) getExe; + inherit (lib.meta) getExe; in { programs.fzf = { diff --git a/home/isabel/cli/git.nix b/home/isabel/cli/git.nix index d3de1e7e..4b59f0d6 100644 --- a/home/isabel/cli/git.nix +++ b/home/isabel/cli/git.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) mkIf map mkMerge; + inherit (lib.modules) mkIf mkMerge; inherit (lib.hm.dag) entryBefore; inherit (self.lib) giturl; in diff --git a/home/isabel/cli/shell/fish.nix b/home/isabel/cli/shell/fish.nix index 7e72c9ed..59486ff6 100644 --- a/home/isabel/cli/shell/fish.nix +++ b/home/isabel/cli/shell/fish.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) optionalString; + inherit (lib.strings) optionalString; in { sops = { diff --git a/home/isabel/cli/shell/zsh.nix b/home/isabel/cli/shell/zsh.nix index 55ad1f6a..7bdf275c 100644 --- a/home/isabel/cli/shell/zsh.nix +++ b/home/isabel/cli/shell/zsh.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) mkOrder; + inherit (lib.modules) mkOrder; in { programs.zsh = { diff --git a/home/isabel/cli/starship.nix b/home/isabel/cli/starship.nix index 940f7680..ab48a878 100644 --- a/home/isabel/cli/starship.nix +++ b/home/isabel/cli/starship.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) concatStrings; + inherit (lib.strings) concatStrings; fmt = symbol: { inherit symbol; diff --git a/home/isabel/gui/chromium.nix b/home/isabel/gui/chromium.nix index a95ed358..d22a457a 100644 --- a/home/isabel/gui/chromium.nix +++ b/home/isabel/gui/chromium.nix @@ -5,12 +5,9 @@ ... }: let - inherit (lib) - mkIf - concatLists - concatMapStrings - enableFeature - ; + inherit (lib.lists) concatLists; + inherit (lib.modules) mkIf; + inherit (lib.strings) concatMapStrings enableFeature; in { programs.chromium = { diff --git a/home/isabel/gui/hyprland.nix b/home/isabel/gui/hyprland.nix index 72ffa410..35205957 100644 --- a/home/isabel/gui/hyprland.nix +++ b/home/isabel/gui/hyprland.nix @@ -6,21 +6,17 @@ ... }: let - inherit (lib) - length - optionalString + inherit (lib.attrsets) attrNames attrValues; + inherit (lib.lists) elemAt genList concatLists imap0 - concatLines - mod - attrNames - attrValues foldl' - min - id + length ; + inherit (lib.strings) optionalString concatLines; + inherit (lib.trivial) mod min id; inherit (config.garden.programs) defaults; inherit (osConfig.garden.device) monitors keyboard; diff --git a/home/isabel/gui/media/listening.nix b/home/isabel/gui/media/listening.nix index aafae016..06ac9ffa 100644 --- a/home/isabel/gui/media/listening.nix +++ b/home/isabel/gui/media/listening.nix @@ -7,7 +7,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; spicePkgs = inputs'.spicetify.legacyPackages; in diff --git a/home/isabel/gui/media/watching.nix b/home/isabel/gui/media/watching.nix index 20fc3684..79bb3f79 100644 --- a/home/isabel/gui/media/watching.nix +++ b/home/isabel/gui/media/watching.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf mkMerge; + inherit (lib.modules) mkIf mkMerge; inherit (pkgs.stdenv.hostPlatform) isLinux; in { diff --git a/home/isabel/packages.nix b/home/isabel/packages.nix index 313143ba..2a1f3c20 100644 --- a/home/isabel/packages.nix +++ b/home/isabel/packages.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) optionalAttrs mergeAttrsList; + inherit (lib.attrsets) optionalAttrs mergeAttrsList; inherit (pkgs.stdenv.hostPlatform) isLinux; cfg = config.garden.profiles; diff --git a/home/isabel/services/rnnoise.nix b/home/isabel/services/rnnoise.nix index f7ec49fb..0ac08a0a 100644 --- a/home/isabel/services/rnnoise.nix +++ b/home/isabel/services/rnnoise.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf (config.garden.profiles.graphical.enable && pkgs.stdenv.hostPlatform.isLinux) { diff --git a/home/isabel/services/tray.nix b/home/isabel/services/tray.nix index 77d4ab7c..61844878 100644 --- a/home/isabel/services/tray.nix +++ b/home/isabel/services/tray.nix @@ -4,7 +4,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.graphical.enable { diff --git a/home/isabel/themes/gtk.nix b/home/isabel/themes/gtk.nix index 90276d4a..a213e37e 100644 --- a/home/isabel/themes/gtk.nix +++ b/home/isabel/themes/gtk.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; cfg = config.garden.style; ctp = config.catppuccin; diff --git a/home/isabel/themes/qt.nix b/home/isabel/themes/qt.nix index 2a0edc08..87e379e3 100644 --- a/home/isabel/themes/qt.nix +++ b/home/isabel/themes/qt.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf (config.garden.profiles.graphical.enable && pkgs.stdenv.hostPlatform.isLinux) { diff --git a/modules/base/nix/nix.nix b/modules/base/nix/nix.nix index 441ac39b..0a1a9346 100644 --- a/modules/base/nix/nix.nix +++ b/modules/base/nix/nix.nix @@ -7,12 +7,8 @@ ... }: let - inherit (lib) - filterAttrs - attrValues - mapAttrs - mkForce - ; + inherit (lib.attrsets) filterAttrs attrValues mapAttrs; + inherit (lib.modules) mkForce; inherit (lib.types) isType; flakeInputs = filterAttrs (name: value: (isType "flake" value) && (name != "self")) inputs; diff --git a/modules/base/nix/substituters.nix b/modules/base/nix/substituters.nix index e68bee55..b11db529 100644 --- a/modules/base/nix/substituters.nix +++ b/modules/base/nix/substituters.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) optionals; + inherit (lib.lists) optionals; # well well well hasCtp = if _class == "darwin" then true else (options ? catppuccin && config.catppuccin.enable); diff --git a/modules/base/system/revision.nix b/modules/base/system/revision.nix index ede8a8b9..d9ef9597 100644 --- a/modules/base/system/revision.nix +++ b/modules/base/system/revision.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) mkOption; + inherit (lib.options) mkOption; cfg = config.garden.system; in diff --git a/modules/base/system/tools.nix b/modules/base/system/tools.nix index 8bb23580..7e8cb6f9 100644 --- a/modules/base/system/tools.nix +++ b/modules/base/system/tools.nix @@ -5,7 +5,8 @@ ... }: let - inherit (lib) mkEnableOption mergeAttrsList optionalAttrs; + inherit (lib.attrsets) mergeAttrsList optionalAttrs; + inherit (lib.options) mkEnableOption; cfg = config.garden.system.tools; in diff --git a/modules/base/system/vars.nix b/modules/base/system/vars.nix index 74ea1e0c..f38b4b65 100644 --- a/modules/base/system/vars.nix +++ b/modules/base/system/vars.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkOption; + inherit (lib.options) mkOption; inherit (lib.types) str; sys = config.garden.system; diff --git a/modules/base/users/isabel.nix b/modules/base/users/isabel.nix index 18bae6d4..a8afa6fd 100644 --- a/modules/base/users/isabel.nix +++ b/modules/base/users/isabel.nix @@ -4,7 +4,8 @@ ... }: let - inherit (lib) elem mkIf; + inherit (lib.lists) elem; + inherit (lib.modules) mkIf; in { config = mkIf (elem "isabel" config.garden.system.users) { diff --git a/modules/base/users/mkuser.nix b/modules/base/users/mkuser.nix index da42462a..b945518b 100644 --- a/modules/base/users/mkuser.nix +++ b/modules/base/users/mkuser.nix @@ -6,12 +6,8 @@ ... }: let - inherit (lib) - mkDefault - mergeAttrsList - optionalAttrs - genAttrs - ; + inherit (lib.attrsets) mergeAttrsList optionalAttrs genAttrs; + inherit (lib.modules) mkDefault; inherit (self.lib) ifTheyExist; in { diff --git a/modules/base/users/options.nix b/modules/base/users/options.nix index 6db7c0d5..d82ffeb5 100644 --- a/modules/base/users/options.nix +++ b/modules/base/users/options.nix @@ -1,6 +1,7 @@ { lib, config, ... }: let - inherit (lib) mkOption optional; + inherit (lib.lists) optional; + inherit (lib.options) mkOption; inherit (lib.types) enum listOf str; in { diff --git a/modules/darwin/documentation.nix b/modules/darwin/documentation.nix index bd468537..321b6b26 100644 --- a/modules/darwin/documentation.nix +++ b/modules/darwin/documentation.nix @@ -1,6 +1,6 @@ { lib, ... }: let - inherit (lib) mkForce; + inherit (lib.modules) mkForce; in { documentation = { diff --git a/modules/flake/lib/mkhost.nix b/modules/flake/lib/mkhost.nix index b96807e5..c98d36a5 100644 --- a/modules/flake/lib/mkhost.nix +++ b/modules/flake/lib/mkhost.nix @@ -5,13 +5,8 @@ let inherit (inputs) self; - inherit (lib) - optionals - singleton - concatLists - recursiveUpdate - mapAttrs - ; + inherit (lib.attrsets) recursiveUpdate mapAttrs; + inherit (lib.lists) optionals singleton concatLists; in /** mkHost is a function that uses withSystem to give us inputs' and self' diff --git a/modules/flake/lib/validators.nix b/modules/flake/lib/validators.nix index 10b9aac2..5cde9cd1 100644 --- a/modules/flake/lib/validators.nix +++ b/modules/flake/lib/validators.nix @@ -1,11 +1,8 @@ { lib, ... }: let - inherit (lib) - getAttrFromPath - filter - hasAttr - any - ; + inherit (lib.attrsets) getAttrFromPath; + inherit (lib.lists) any; + inherit (lib) filter hasAttr; /** a function that will append a list of groups if they exist in config.users.groups diff --git a/modules/flake/packages/docs/options.nix b/modules/flake/packages/docs/options.nix index e9c77330..590ed974 100644 --- a/modules/flake/packages/docs/options.nix +++ b/modules/flake/packages/docs/options.nix @@ -10,11 +10,9 @@ linkFarm, }: let - inherit (lib) - evalModules - filterAttrs - removePrefix - ; + inherit (lib.attrsets) filterAttrs; + inherit (lib.modules) evalModules; + inherit (lib.strings) removePrefix; gitHubDeclaration = user: repo: subpath: { url = "https://github.com/${user}/${repo}/blob/main/${subpath}"; diff --git a/modules/generic/packages.nix b/modules/generic/packages.nix index cea37bb4..2103f755 100644 --- a/modules/generic/packages.nix +++ b/modules/generic/packages.nix @@ -5,7 +5,8 @@ ... }: let - inherit (lib) mkOption mergeAttrsList optionalAttrs; + inherit (lib.attrsets) mergeAttrsList optionalAttrs; + inherit (lib.options) mkOption; inherit (lib.types) lazyAttrsOf package; in { diff --git a/modules/generic/profiles.nix b/modules/generic/profiles.nix index ef8321a3..f5e87aaf 100644 --- a/modules/generic/profiles.nix +++ b/modules/generic/profiles.nix @@ -1,6 +1,6 @@ { lib, ... }: let - inherit (lib) mkEnableOption; + inherit (lib.options) mkEnableOption; in { options.garden.profiles = { diff --git a/modules/home/environment/xdg.nix b/modules/home/environment/xdg.nix index 79c45614..088721c5 100644 --- a/modules/home/environment/xdg.nix +++ b/modules/home/environment/xdg.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) mkIf mkForce; + inherit (lib.modules) mkIf mkForce; inherit (pkgs.stdenv.hostPlatform) isLinux; template = self.lib.template.xdg; diff --git a/modules/home/home.nix b/modules/home/home.nix index 2ec84b09..674c2c6e 100644 --- a/modules/home/home.nix +++ b/modules/home/home.nix @@ -1,6 +1,6 @@ { lib, osConfig, ... }: let - inherit (lib) mkDefault; + inherit (lib.modules) mkDefault; in { home.stateVersion = osConfig.garden.system.stateVersion; diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix index 8bb8e06b..7492b7b8 100644 --- a/modules/home/profiles.nix +++ b/modules/home/profiles.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) mkEnableOption; + inherit (lib.options) mkEnableOption; in { options.garden.profiles.media = { diff --git a/modules/home/programs/defaults.nix b/modules/home/programs/defaults.nix index 52d39b20..8554438b 100644 --- a/modules/home/programs/defaults.nix +++ b/modules/home/programs/defaults.nix @@ -4,7 +4,8 @@ ... }: let - inherit (lib) mkOption mapAttrs; + inherit (lib.attrsets) mapAttrs; + inherit (lib.options) mkOption; inherit (lib.types) enum nullOr str; mkDefault = name: args: mkOption ({ description = "default ${name} for the system"; } // args); diff --git a/modules/home/programs/discord.nix b/modules/home/programs/discord.nix index c738fd4f..4e4c4e88 100644 --- a/modules/home/programs/discord.nix +++ b/modules/home/programs/discord.nix @@ -5,12 +5,8 @@ ... }: let - inherit (lib) - mkIf - mkMerge - mkEnableOption - mkOption - ; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.options) mkEnableOption mkOption; inherit (pkgs.stdenv.hostPlatform) isLinux isDarwin; cfg = config.programs.discord; diff --git a/modules/home/programs/pentesting.nix b/modules/home/programs/pentesting.nix index e2729562..f9a1401c 100644 --- a/modules/home/programs/pentesting.nix +++ b/modules/home/programs/pentesting.nix @@ -9,7 +9,8 @@ ... }: let - inherit (lib) mkIf mkEnableOption; + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; cfg = config.garden.profiles.pentesting; in diff --git a/modules/home/themes/fonts.nix b/modules/home/themes/fonts.nix index 380c5d38..5d6b2b86 100644 --- a/modules/home/themes/fonts.nix +++ b/modules/home/themes/fonts.nix @@ -5,7 +5,8 @@ ... }: let - inherit (lib) mkIf mkOption mkEnableOption; + inherit (lib.modules) mkIf; + inherit (lib.options) mkOption mkEnableOption; inherit (lib.types) str int diff --git a/modules/iso/boot.nix b/modules/iso/boot.nix index eb590fa7..0669877d 100644 --- a/modules/iso/boot.nix +++ b/modules/iso/boot.nix @@ -1,6 +1,6 @@ { lib, ... }: let - inherit (lib) mkForce mkAfter; + inherit (lib.modules) mkForce mkAfter; in { boot = { diff --git a/modules/iso/image.nix b/modules/iso/image.nix index e09ed2cc..dc75a9d6 100644 --- a/modules/iso/image.nix +++ b/modules/iso/image.nix @@ -6,7 +6,8 @@ ... }: let - inherit (lib) mkImageMediaOverride cleanSource; + inherit (lib.sources) cleanSource; + inherit (lib) mkImageMediaOverride; # Get the hostname from our networking name provided in the mkNixosIso builder # If none is set then default to "nixos" diff --git a/modules/iso/networking.nix b/modules/iso/networking.nix index e5029584..46529400 100644 --- a/modules/iso/networking.nix +++ b/modules/iso/networking.nix @@ -1,6 +1,6 @@ { lib, ... }: let - inherit (lib) mkForce; + inherit (lib.modules) mkForce; in { # allow ssh into the system for headless installs diff --git a/modules/iso/space.nix b/modules/iso/space.nix index 27aa8c0d..40fe9bfb 100644 --- a/modules/iso/space.nix +++ b/modules/iso/space.nix @@ -1,6 +1,6 @@ { lib, ... }: let - inherit (lib) mkForce; + inherit (lib.modules) mkForce; in { # disable documentation diff --git a/modules/nixos/boot/loader.nix b/modules/nixos/boot/loader.nix index 2c5807ad..ee6f24e7 100644 --- a/modules/nixos/boot/loader.nix +++ b/modules/nixos/boot/loader.nix @@ -5,15 +5,13 @@ ... }: let - inherit (lib) + inherit (lib.modules) mkForce - mkOption mkDefault mkMerge mkIf - mkEnableOption - mkPackageOption ; + inherit (lib.options) mkOption mkEnableOption mkPackageOption; inherit (lib.types) enum nullOr str; cfg = config.garden.system.boot; diff --git a/modules/nixos/boot/tmpfs.nix b/modules/nixos/boot/tmpfs.nix index acc9684b..aa448427 100644 --- a/modules/nixos/boot/tmpfs.nix +++ b/modules/nixos/boot/tmpfs.nix @@ -1,6 +1,7 @@ { lib, config, ... }: let - inherit (lib) mkEnableOption mkDefault; + inherit (lib.modules) mkDefault; + inherit (lib.options) mkEnableOption; cfg = config.garden.system.boot; in diff --git a/modules/nixos/emulation.nix b/modules/nixos/emulation.nix index f154b864..09cf20c0 100644 --- a/modules/nixos/emulation.nix +++ b/modules/nixos/emulation.nix @@ -5,17 +5,13 @@ ... }: let - inherit (lib) - mkIf - splitString - genAttrs - flip - pipe - elemAt - filter - mkOption - mkEnableOption - ; + inherit (lib.attrsets) genAttrs; + inherit (lib.lists) elemAt; + inherit (lib.modules) mkIf; + inherit (lib.options) mkOption mkEnableOption; + inherit (lib.strings) splitString; + inherit (lib.trivial) flip pipe; + inherit (lib) filter; inherit (lib.types) listOf str diff --git a/modules/nixos/environment/documentation.nix b/modules/nixos/environment/documentation.nix index d18fe65b..e986ad8e 100644 --- a/modules/nixos/environment/documentation.nix +++ b/modules/nixos/environment/documentation.nix @@ -1,6 +1,6 @@ { lib, ... }: let - inherit (lib) mkForce; + inherit (lib.modules) mkForce; in { documentation = { diff --git a/modules/nixos/environment/wayland.nix b/modules/nixos/environment/wayland.nix index 749c55f7..c42f49ae 100644 --- a/modules/nixos/environment/wayland.nix +++ b/modules/nixos/environment/wayland.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.graphical.enable { diff --git a/modules/nixos/environment/zswap.nix b/modules/nixos/environment/zswap.nix index e20cec6b..5c15ca58 100644 --- a/modules/nixos/environment/zswap.nix +++ b/modules/nixos/environment/zswap.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { # compress half of the ram to use as swap basically, get more memory per memory diff --git a/modules/nixos/hardware/cloud/hetzner/garden.nix b/modules/nixos/hardware/cloud/hetzner/garden.nix index e9714ee5..e010206f 100644 --- a/modules/nixos/hardware/cloud/hetzner/garden.nix +++ b/modules/nixos/hardware/cloud/hetzner/garden.nix @@ -1,6 +1,7 @@ { lib, config, ... }: let - inherit (lib) mkIf mkEnableOption; + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; cfg = config.garden.profiles.hetzner; in diff --git a/modules/nixos/hardware/cloud/hetzner/networking.nix b/modules/nixos/hardware/cloud/hetzner/networking.nix index c9cb3684..9735fd51 100644 --- a/modules/nixos/hardware/cloud/hetzner/networking.nix +++ b/modules/nixos/hardware/cloud/hetzner/networking.nix @@ -1,6 +1,7 @@ { lib, config, ... }: let - inherit (lib) mkIf mkForce mkOption; + inherit (lib.modules) mkIf mkForce; + inherit (lib.options) mkOption; cfg = config.garden.profiles.hetzner; in diff --git a/modules/nixos/hardware/cloud/oracle.nix b/modules/nixos/hardware/cloud/oracle.nix index ff0287cf..4cfd8724 100644 --- a/modules/nixos/hardware/cloud/oracle.nix +++ b/modules/nixos/hardware/cloud/oracle.nix @@ -1,6 +1,7 @@ { lib, config, ... }: let - inherit (lib) mkForce mkEnableOption; + inherit (lib.modules) mkForce; + inherit (lib.options) mkEnableOption; in { options.garden.profiles.oracle = { diff --git a/modules/nixos/hardware/cloud/overrides.nix b/modules/nixos/hardware/cloud/overrides.nix index 034c6c4a..01ad0ef5 100644 --- a/modules/nixos/hardware/cloud/overrides.nix +++ b/modules/nixos/hardware/cloud/overrides.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf mkForce; + inherit (lib.modules) mkIf mkForce; enable = config.garden.profiles.hetzner.enable || config.garden.profiles.upcloud.enable diff --git a/modules/nixos/hardware/cloud/upcloud.nix b/modules/nixos/hardware/cloud/upcloud.nix index c8533ea7..41b2255f 100644 --- a/modules/nixos/hardware/cloud/upcloud.nix +++ b/modules/nixos/hardware/cloud/upcloud.nix @@ -1,6 +1,7 @@ { lib, config, ... }: let - inherit (lib) mkIf mkEnableOption; + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; in { options.garden.profiles.upcloud = { diff --git a/modules/nixos/hardware/cpu/amd.nix b/modules/nixos/hardware/cpu/amd.nix index 2cec052d..4d5dde87 100644 --- a/modules/nixos/hardware/cpu/amd.nix +++ b/modules/nixos/hardware/cpu/amd.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (config.garden) device; in { diff --git a/modules/nixos/hardware/cpu/default.nix b/modules/nixos/hardware/cpu/default.nix index ebad0de8..e7edd6ad 100644 --- a/modules/nixos/hardware/cpu/default.nix +++ b/modules/nixos/hardware/cpu/default.nix @@ -1,6 +1,7 @@ { lib, ... }: let - inherit (lib) mkOption types; + inherit (lib.options) mkOption; + inherit (lib) types; in { imports = [ diff --git a/modules/nixos/hardware/cpu/intel.nix b/modules/nixos/hardware/cpu/intel.nix index 55965abe..9701c7c3 100644 --- a/modules/nixos/hardware/cpu/intel.nix +++ b/modules/nixos/hardware/cpu/intel.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (config.garden) device; in { diff --git a/modules/nixos/hardware/gpu/default.nix b/modules/nixos/hardware/gpu/default.nix index 1f5089bd..d0203048 100644 --- a/modules/nixos/hardware/gpu/default.nix +++ b/modules/nixos/hardware/gpu/default.nix @@ -1,6 +1,7 @@ { lib, ... }: let - inherit (lib) mkOption types; + inherit (lib.options) mkOption; + inherit (lib) types; in { imports = [ diff --git a/modules/nixos/hardware/gpu/intel.nix b/modules/nixos/hardware/gpu/intel.nix index 44c4b62d..82efb362 100644 --- a/modules/nixos/hardware/gpu/intel.nix +++ b/modules/nixos/hardware/gpu/intel.nix @@ -5,7 +5,8 @@ ... }: let - inherit (lib) mkIf attrValues; + inherit (lib.attrsets) attrValues; + inherit (lib.modules) mkIf; inherit (config.garden) device; in { diff --git a/modules/nixos/hardware/gpu/nvidia.nix b/modules/nixos/hardware/gpu/nvidia.nix index 7534fa99..c683327b 100644 --- a/modules/nixos/hardware/gpu/nvidia.nix +++ b/modules/nixos/hardware/gpu/nvidia.nix @@ -8,7 +8,7 @@ }: let inherit (config.garden) device; - inherit (lib) mkIf mkDefault; + inherit (lib.modules) mkIf mkDefault; in { config = mkIf (device.gpu == "nvidia") { diff --git a/modules/nixos/hardware/media/sound.nix b/modules/nixos/hardware/media/sound.nix index 7198759c..b9919f44 100644 --- a/modules/nixos/hardware/media/sound.nix +++ b/modules/nixos/hardware/media/sound.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) isx86Linux; in { diff --git a/modules/nixos/hardware/options.nix b/modules/nixos/hardware/options.nix index 8bb9e6e5..d9753159 100644 --- a/modules/nixos/hardware/options.nix +++ b/modules/nixos/hardware/options.nix @@ -1,6 +1,7 @@ { lib, ... }: let - inherit (lib) mkOption types; + inherit (lib.options) mkOption; + inherit (lib) types; in { options.garden.device = { diff --git a/modules/nixos/hardware/power/acpid.nix b/modules/nixos/hardware/power/acpid.nix index eb38b1c0..e143f8fc 100644 --- a/modules/nixos/hardware/power/acpid.nix +++ b/modules/nixos/hardware/power/acpid.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.laptop.enable { diff --git a/modules/nixos/hardware/power/upower.nix b/modules/nixos/hardware/power/upower.nix index 0e16894e..7134f728 100644 --- a/modules/nixos/hardware/power/upower.nix +++ b/modules/nixos/hardware/power/upower.nix @@ -4,7 +4,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.laptop.enable { diff --git a/modules/nixos/hardware/touchpad.nix b/modules/nixos/hardware/touchpad.nix index 87f8f922..ef26ac48 100644 --- a/modules/nixos/hardware/touchpad.nix +++ b/modules/nixos/hardware/touchpad.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.laptop.enable { diff --git a/modules/nixos/hardware/yubikey.nix b/modules/nixos/hardware/yubikey.nix index 36001109..3a48d7a5 100644 --- a/modules/nixos/hardware/yubikey.nix +++ b/modules/nixos/hardware/yubikey.nix @@ -5,7 +5,8 @@ ... }: let - inherit (lib) mkIf mkEnableOption; + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; in { options.garden.device.capabilities.yubikey = mkEnableOption "yubikey support"; diff --git a/modules/nixos/headless.nix b/modules/nixos/headless.nix index 1f82ab53..3670fec9 100644 --- a/modules/nixos/headless.nix +++ b/modules/nixos/headless.nix @@ -1,6 +1,7 @@ { lib, config, ... }: let - inherit (lib) mkIf mapAttrs mkForce; + inherit (lib.attrsets) mapAttrs; + inherit (lib.modules) mkIf mkForce; in { config = mkIf config.garden.profiles.headless.enable { diff --git a/modules/nixos/kernel/blacklisted-modules.nix b/modules/nixos/kernel/blacklisted-modules.nix index 1a1244ee..bb99f66a 100644 --- a/modules/nixos/kernel/blacklisted-modules.nix +++ b/modules/nixos/kernel/blacklisted-modules.nix @@ -1,6 +1,7 @@ { config, lib, ... }: let - inherit (lib) optionals concatLists mkEnableOption; + inherit (lib.lists) optionals concatLists; + inherit (lib.options) mkEnableOption; sys = config.garden.system; in diff --git a/modules/nixos/kernel/params.nix b/modules/nixos/kernel/params.nix index e6e6888e..94d66512 100644 --- a/modules/nixos/kernel/params.nix +++ b/modules/nixos/kernel/params.nix @@ -2,7 +2,8 @@ # { lib, config, ... }: let - inherit (lib) mkEnableOption optionals; + inherit (lib.lists) optionals; + inherit (lib.options) mkEnableOption; cfg = config.garden.system; in { diff --git a/modules/nixos/networking/blocker.nix b/modules/nixos/networking/blocker.nix index 9b80bb51..157f57cf 100644 --- a/modules/nixos/networking/blocker.nix +++ b/modules/nixos/networking/blocker.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { # remove stupid sites that i just don't want to see diff --git a/modules/nixos/networking/default.nix b/modules/nixos/networking/default.nix index 479c2c71..91e9241a 100644 --- a/modules/nixos/networking/default.nix +++ b/modules/nixos/networking/default.nix @@ -4,7 +4,7 @@ ... }: let - inherit (lib) mkIf mkDefault mkForce; + inherit (lib.modules) mkIf mkDefault mkForce; in { imports = [ diff --git a/modules/nixos/networking/fail2ban.nix b/modules/nixos/networking/fail2ban.nix index 34187e73..5c58b110 100644 --- a/modules/nixos/networking/fail2ban.nix +++ b/modules/nixos/networking/fail2ban.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) mkIf mkMerge; + inherit (lib.modules) mkIf mkMerge; cfg = config.garden.services; in diff --git a/modules/nixos/networking/firewall.nix b/modules/nixos/networking/firewall.nix index 92392420..674a6591 100644 --- a/modules/nixos/networking/firewall.nix +++ b/modules/nixos/networking/firewall.nix @@ -4,7 +4,7 @@ ... }: let - inherit (lib) mkForce; + inherit (lib.modules) mkForce; in { config = { diff --git a/modules/nixos/networking/networkmanager.nix b/modules/nixos/networking/networkmanager.nix index 742a3cd5..208bbd1d 100644 --- a/modules/nixos/networking/networkmanager.nix +++ b/modules/nixos/networking/networkmanager.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) optionalAttrs; + inherit (lib.attrsets) optionalAttrs; in { garden.packages = optionalAttrs config.garden.profiles.graphical.enable { diff --git a/modules/nixos/networking/openssh.nix b/modules/nixos/networking/openssh.nix index ab481548..655c7150 100644 --- a/modules/nixos/networking/openssh.nix +++ b/modules/nixos/networking/openssh.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) concatMapAttrs; + inherit (lib.attrsets) concatMapAttrs; inherit (self.lib) mkPubs; in { diff --git a/modules/nixos/networking/optimise.nix b/modules/nixos/networking/optimise.nix index 832273e4..0237421e 100644 --- a/modules/nixos/networking/optimise.nix +++ b/modules/nixos/networking/optimise.nix @@ -1,6 +1,7 @@ { lib, config, ... }: let - inherit (lib) mkIf mkEnableOption; + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; cfg = config.garden.system.networking; in diff --git a/modules/nixos/networking/systemd.nix b/modules/nixos/networking/systemd.nix index ef89ab5c..4ecdd5cc 100644 --- a/modules/nixos/networking/systemd.nix +++ b/modules/nixos/networking/systemd.nix @@ -1,6 +1,7 @@ { lib, ... }: let - inherit (lib) mkForce concatMapAttrs genAttrs; + inherit (lib.attrsets) concatMapAttrs genAttrs; + inherit (lib.modules) mkForce; ethernetDevices = [ "enp0s31f6" # ethernet interface on the motherboard diff --git a/modules/nixos/networking/tailscale.nix b/modules/nixos/networking/tailscale.nix index b10385b2..b21f3b74 100644 --- a/modules/nixos/networking/tailscale.nix +++ b/modules/nixos/networking/tailscale.nix @@ -1,12 +1,8 @@ { lib, config, ... }: let - inherit (lib) - mkIf - mkDefault - mkOption - mkEnableOption - optionals - ; + inherit (lib.lists) optionals; + inherit (lib.modules) mkIf mkDefault; + inherit (lib.options) mkOption mkEnableOption; inherit (lib.types) bool listOf str; inherit (config.services) tailscale; diff --git a/modules/nixos/programs/graphical.nix b/modules/nixos/programs/graphical.nix index ba171138..b06c2cd0 100644 --- a/modules/nixos/programs/graphical.nix +++ b/modules/nixos/programs/graphical.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.graphical.enable { diff --git a/modules/nixos/programs/hyprland.nix b/modules/nixos/programs/hyprland.nix index 262bbc65..2957545d 100644 --- a/modules/nixos/programs/hyprland.nix +++ b/modules/nixos/programs/hyprland.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) anyHome; cond = anyHome config (conf: conf.wayland.windowManager.hyprland.enable); diff --git a/modules/nixos/security/pam.nix b/modules/nixos/security/pam.nix index a012def0..c506373f 100644 --- a/modules/nixos/security/pam.nix +++ b/modules/nixos/security/pam.nix @@ -1,6 +1,7 @@ { lib, config, ... }: let - inherit (lib) mkIf mkMerge genAttrs; + inherit (lib.attrsets) genAttrs; + inherit (lib.modules) mkIf mkMerge; services = [ "login" diff --git a/modules/nixos/security/sudo.nix b/modules/nixos/security/sudo.nix index ee5ee591..5b75a43a 100644 --- a/modules/nixos/security/sudo.nix +++ b/modules/nixos/security/sudo.nix @@ -1,6 +1,6 @@ { lib, ... }: let - inherit (lib) mkDefault; + inherit (lib.modules) mkDefault; in { # lets swap out our sudo for sudo-rs just like ubuntu does diff --git a/modules/nixos/services/arr.nix b/modules/nixos/services/arr.nix index 795d7c2f..e57b70be 100644 --- a/modules/nixos/services/arr.nix +++ b/modules/nixos/services/arr.nix @@ -1,11 +1,8 @@ { lib, config, ... }: let - inherit (lib) - mkEnableOption - mkOption - types - genAttrs - ; + inherit (lib.attrsets) genAttrs; + inherit (lib.options) mkEnableOption mkOption; + inherit (lib) types; cfg = config.garden.services.arr; in diff --git a/modules/nixos/services/attic.nix b/modules/nixos/services/attic.nix index f5b5a0b1..c8af6c0f 100644 --- a/modules/nixos/services/attic.nix +++ b/modules/nixos/services/attic.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption mkSecret; rdomain = config.networking.domain; diff --git a/modules/nixos/services/blahaj.nix b/modules/nixos/services/blahaj.nix index fb9f12fc..b963179d 100644 --- a/modules/nixos/services/blahaj.nix +++ b/modules/nixos/services/blahaj.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption mkSecret; in { diff --git a/modules/nixos/services/borgbackup.nix b/modules/nixos/services/borgbackup.nix index 750659ed..af686cdd 100644 --- a/modules/nixos/services/borgbackup.nix +++ b/modules/nixos/services/borgbackup.nix @@ -5,13 +5,10 @@ ... }: let - inherit (lib) - mkIf - mkOption - types - mapAttrs - mkEnableOption - ; + inherit (lib.attrsets) mapAttrs; + inherit (lib.modules) mkIf; + inherit (lib.options) mkOption mkEnableOption; + inherit (lib) types; inherit (self.lib) mkServiceOption mkSecret mkPubs; cfg = config.garden.services.borgbackup; diff --git a/modules/nixos/services/buildbot.nix b/modules/nixos/services/buildbot.nix index eb563029..aa3cfc2f 100644 --- a/modules/nixos/services/buildbot.nix +++ b/modules/nixos/services/buildbot.nix @@ -7,7 +7,7 @@ ... }: let - inherit (lib) mkIf mkMerge; + inherit (lib.modules) mkIf mkMerge; inherit (self.lib) mkServiceOption mkSecret; inherit (config.sops) secrets; diff --git a/modules/nixos/services/cloudflared.nix b/modules/nixos/services/cloudflared.nix index af874e96..024f7986 100644 --- a/modules/nixos/services/cloudflared.nix +++ b/modules/nixos/services/cloudflared.nix @@ -7,7 +7,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption mkSecret; cfg = config.garden.services.cloudflared; diff --git a/modules/nixos/services/forgejo.nix b/modules/nixos/services/forgejo.nix index 88bff3a4..e0a572bb 100644 --- a/modules/nixos/services/forgejo.nix +++ b/modules/nixos/services/forgejo.nix @@ -9,7 +9,7 @@ let cfg = config.garden.services.forgejo; rdomain = config.networking.domain; - inherit (lib) mkIf mkForce; + inherit (lib.modules) mkIf mkForce; inherit (self.lib) mkServiceOption mkSecret; in { diff --git a/modules/nixos/services/immich.nix b/modules/nixos/services/immich.nix index ffa39836..4fc5521c 100644 --- a/modules/nixos/services/immich.nix +++ b/modules/nixos/services/immich.nix @@ -8,7 +8,7 @@ let cfg = config.garden.services.immich; rdomain = config.networking.domain; - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption mkSecret; in { diff --git a/modules/nixos/services/jellyfin.nix b/modules/nixos/services/jellyfin.nix index 2b3b6e81..94a080bb 100644 --- a/modules/nixos/services/jellyfin.nix +++ b/modules/nixos/services/jellyfin.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption; cfg = config.garden.services.jellyfin; diff --git a/modules/nixos/services/kanidm.nix b/modules/nixos/services/kanidm.nix index c67d066f..af560994 100644 --- a/modules/nixos/services/kanidm.nix +++ b/modules/nixos/services/kanidm.nix @@ -9,7 +9,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption mkSecret; rdomain = config.networking.domain; diff --git a/modules/nixos/services/lego.nix b/modules/nixos/services/lego.nix index 3a94b591..5993641c 100644 --- a/modules/nixos/services/lego.nix +++ b/modules/nixos/services/lego.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkSecret; in { diff --git a/modules/nixos/services/mailserver.nix b/modules/nixos/services/mailserver.nix index 1f8b18c6..0f1259b0 100644 --- a/modules/nixos/services/mailserver.nix +++ b/modules/nixos/services/mailserver.nix @@ -7,7 +7,7 @@ ... }: let - inherit (lib) mkIf mkForce; + inherit (lib.modules) mkIf mkForce; inherit (self.lib) mkServiceOption mkSecret; rdomain = config.networking.domain; diff --git a/modules/nixos/services/nginx.nix b/modules/nixos/services/nginx.nix index 3bf7e7af..1213ad7e 100644 --- a/modules/nixos/services/nginx.nix +++ b/modules/nixos/services/nginx.nix @@ -5,13 +5,9 @@ ... }: let - inherit (lib) - types - mkIf - mkOption - mkDefault - mkMerge - ; + inherit (lib.modules) mkIf mkDefault mkMerge; + inherit (lib.options) mkOption; + inherit (lib) types; inherit (self.lib) mkServiceOption; cfg = config.garden.services.nginx; diff --git a/modules/nixos/services/nixpkgs-prs-bot.nix b/modules/nixos/services/nixpkgs-prs-bot.nix index b08273e3..49cab957 100644 --- a/modules/nixos/services/nixpkgs-prs-bot.nix +++ b/modules/nixos/services/nixpkgs-prs-bot.nix @@ -5,7 +5,8 @@ ... }: let - inherit (lib) mkIf mkMerge mkEnableOption; + inherit (lib.modules) mkIf mkMerge; + inherit (lib.options) mkEnableOption; inherit (self.lib) mkServiceOption mkSecret; cfg = config.garden.services.nixpkgs-prs-bot; diff --git a/modules/nixos/services/pds/default.nix b/modules/nixos/services/pds/default.nix index e458fc51..1536c03b 100644 --- a/modules/nixos/services/pds/default.nix +++ b/modules/nixos/services/pds/default.nix @@ -9,7 +9,8 @@ let cfg = config.garden.services.pds; gkCfg = config.garden.services.pds-gatekeeper; - inherit (lib) mkIf concatStringsSep; + inherit (lib.modules) mkIf; + inherit (lib.strings) concatStringsSep; inherit (self.lib) mkServiceOption mkSecret; in { diff --git a/modules/nixos/services/piper.nix b/modules/nixos/services/piper.nix index f02fc0a9..504919ec 100644 --- a/modules/nixos/services/piper.nix +++ b/modules/nixos/services/piper.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption mkSecret; cfg = config.garden.services.piper; diff --git a/modules/nixos/services/postgresql.nix b/modules/nixos/services/postgresql.nix index d4ca27c9..da749dd6 100644 --- a/modules/nixos/services/postgresql.nix +++ b/modules/nixos/services/postgresql.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkSecret mkServiceOption; cfg = config.garden.services; diff --git a/modules/nixos/services/prowlarr.nix b/modules/nixos/services/prowlarr.nix index 9bff11cb..445e8eaf 100644 --- a/modules/nixos/services/prowlarr.nix +++ b/modules/nixos/services/prowlarr.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption; cfg = config.garden.services.prowlarr; diff --git a/modules/nixos/services/qbittorent.nix b/modules/nixos/services/qbittorent.nix index f8abf026..7d497a0f 100644 --- a/modules/nixos/services/qbittorent.nix +++ b/modules/nixos/services/qbittorent.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption mkSecret; cfg = config.garden.services.qbittorrent; diff --git a/modules/nixos/services/radarr.nix b/modules/nixos/services/radarr.nix index 000ff0f7..ac7976a6 100644 --- a/modules/nixos/services/radarr.nix +++ b/modules/nixos/services/radarr.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption; cfg = config.garden.services.radarr; diff --git a/modules/nixos/services/sonarr.nix b/modules/nixos/services/sonarr.nix index 595e456b..03152e98 100644 --- a/modules/nixos/services/sonarr.nix +++ b/modules/nixos/services/sonarr.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption; cfg = config.garden.services.sonarr; diff --git a/modules/nixos/services/tranquil.nix b/modules/nixos/services/tranquil.nix index a504e860..6a623e1a 100644 --- a/modules/nixos/services/tranquil.nix +++ b/modules/nixos/services/tranquil.nix @@ -8,7 +8,7 @@ let cfg = config.garden.services.tranquil; - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption mkSecret; in { diff --git a/modules/nixos/services/vaultwarden.nix b/modules/nixos/services/vaultwarden.nix index a31cc607..1ad4c711 100644 --- a/modules/nixos/services/vaultwarden.nix +++ b/modules/nixos/services/vaultwarden.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption mkSecret; rdomain = config.networking.domain; diff --git a/modules/nixos/services/website.nix b/modules/nixos/services/website.nix index d1f2b1f5..23eb2eac 100644 --- a/modules/nixos/services/website.nix +++ b/modules/nixos/services/website.nix @@ -6,7 +6,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; inherit (self.lib) mkServiceOption; inherit (config.networking) domain; diff --git a/modules/nixos/system/earlyoom.nix b/modules/nixos/system/earlyoom.nix index a0825244..7744feb5 100644 --- a/modules/nixos/system/earlyoom.nix +++ b/modules/nixos/system/earlyoom.nix @@ -5,7 +5,8 @@ ... }: let - inherit (lib) mkIf mkForce concatStringsSep; + inherit (lib.modules) mkIf mkForce; + inherit (lib.strings) concatStringsSep; avoid = concatStringsSep "|" [ "(h|H)yprland" diff --git a/modules/nixos/system/flatpak.nix b/modules/nixos/system/flatpak.nix index ff65669d..0a324cd4 100644 --- a/modules/nixos/system/flatpak.nix +++ b/modules/nixos/system/flatpak.nix @@ -4,7 +4,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.graphical.enable { diff --git a/modules/nixos/system/gnome.nix b/modules/nixos/system/gnome.nix index d38e5670..3ecc04a9 100644 --- a/modules/nixos/system/gnome.nix +++ b/modules/nixos/system/gnome.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf mkForce; + inherit (lib.modules) mkIf mkForce; in { config = mkIf config.garden.profiles.graphical.enable { diff --git a/modules/nixos/system/location.nix b/modules/nixos/system/location.nix index fb5343eb..6d6b4dc4 100644 --- a/modules/nixos/system/location.nix +++ b/modules/nixos/system/location.nix @@ -4,7 +4,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.graphical.enable { diff --git a/modules/nixos/system/loginManager.nix b/modules/nixos/system/loginManager.nix index c7be49c4..f338a7c1 100644 --- a/modules/nixos/system/loginManager.nix +++ b/modules/nixos/system/loginManager.nix @@ -5,7 +5,8 @@ ... }: let - inherit (lib) getExe concatStringsSep; + inherit (lib.meta) getExe; + inherit (lib.strings) concatStringsSep; sessionData = config.services.displayManager.sessionData.desktops; in diff --git a/modules/nixos/system/logind.nix b/modules/nixos/system/logind.nix index e354e126..47389641 100644 --- a/modules/nixos/system/logind.nix +++ b/modules/nixos/system/logind.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; prof = config.garden.profiles; in { diff --git a/modules/nixos/system/logs.nix b/modules/nixos/system/logs.nix index feaddba8..b82bc841 100644 --- a/modules/nixos/system/logs.nix +++ b/modules/nixos/system/logs.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf (!config.garden.profiles.server.enable) { diff --git a/modules/nixos/system/misc.nix b/modules/nixos/system/misc.nix index 28339d68..11f3f1c0 100644 --- a/modules/nixos/system/misc.nix +++ b/modules/nixos/system/misc.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.graphical.enable { diff --git a/modules/nixos/system/monitoring.nix b/modules/nixos/system/monitoring.nix index 3f1091f3..04ade180 100644 --- a/modules/nixos/system/monitoring.nix +++ b/modules/nixos/system/monitoring.nix @@ -1,6 +1,6 @@ { lib, ... }: let - inherit (lib) mkDefault; + inherit (lib.modules) mkDefault; in { services = { diff --git a/modules/nixos/system/oomd.nix b/modules/nixos/system/oomd.nix index 947638ff..5c9ae375 100644 --- a/modules/nixos/system/oomd.nix +++ b/modules/nixos/system/oomd.nix @@ -1,6 +1,6 @@ { lib, ... }: let - inherit (lib) mkDefault; + inherit (lib.modules) mkDefault; in { systemd = { diff --git a/modules/nixos/system/printing.nix b/modules/nixos/system/printing.nix index ce0211e8..820b9390 100644 --- a/modules/nixos/system/printing.nix +++ b/modules/nixos/system/printing.nix @@ -5,12 +5,9 @@ ... }: let - inherit (lib) - mkIf - mkOption - mkEnableOption - attrValues - ; + inherit (lib.attrsets) attrValues; + inherit (lib.modules) mkIf; + inherit (lib.options) mkOption mkEnableOption; inherit (lib.types) attrsOf path; cfg = config.garden.system.printing; diff --git a/modules/nixos/system/runners.nix b/modules/nixos/system/runners.nix index 8184433b..2f133925 100644 --- a/modules/nixos/system/runners.nix +++ b/modules/nixos/system/runners.nix @@ -5,7 +5,8 @@ ... }: let - inherit (lib) mkIf genAttrs; + inherit (lib.attrsets) genAttrs; + inherit (lib.modules) mkIf; cfg = config.garden.system.security.binaries; in diff --git a/modules/nixos/system/size.nix b/modules/nixos/system/size.nix index 272b69a8..7d30fe6c 100644 --- a/modules/nixos/system/size.nix +++ b/modules/nixos/system/size.nix @@ -1,6 +1,6 @@ { lib, ... }: let - inherit (lib) mkForce; + inherit (lib.modules) mkForce; in { environment = { diff --git a/modules/nixos/system/systemd.nix b/modules/nixos/system/systemd.nix index 62974bb1..9d53c592 100644 --- a/modules/nixos/system/systemd.nix +++ b/modules/nixos/system/systemd.nix @@ -4,7 +4,8 @@ ... }: let - inherit (lib) mkIf genAttrs; + inherit (lib.attrsets) genAttrs; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.graphical.enable { diff --git a/modules/nixos/system/xdg-portals.nix b/modules/nixos/system/xdg-portals.nix index 31e7718a..4233ddad 100644 --- a/modules/nixos/system/xdg-portals.nix +++ b/modules/nixos/system/xdg-portals.nix @@ -5,7 +5,8 @@ ... }: let - inherit (lib) getExe mkDefault; + inherit (lib.meta) getExe; + inherit (lib.modules) mkDefault; in { xdg.portal = { diff --git a/modules/nixos/system/xserver.nix b/modules/nixos/system/xserver.nix index e6ea20ea..e8edde30 100644 --- a/modules/nixos/system/xserver.nix +++ b/modules/nixos/system/xserver.nix @@ -5,7 +5,7 @@ ... }: let - inherit (lib) mkIf; + inherit (lib.modules) mkIf; in { config = mkIf config.garden.profiles.graphical.enable { diff --git a/modules/nixos/users/isabel.nix b/modules/nixos/users/isabel.nix index 759ad0f9..8dd8242c 100644 --- a/modules/nixos/users/isabel.nix +++ b/modules/nixos/users/isabel.nix @@ -4,7 +4,8 @@ ... }: let - inherit (lib) elem mkIf; + inherit (lib.lists) elem; + inherit (lib.modules) mkIf; in { config = mkIf (elem "isabel" config.garden.system.users) { -- 2.51.2