From 8ba17ac1cebcaacf947b7a1b965c7c8444e380c4 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Fri, 16 Jan 2026 14:09:34 +0100 Subject: [PATCH] Replace `lib'` with `self.lib` --- flake-parts/hosts.nix | 10 ++++------ modules/system/meta/domains.nix | 3 +-- modules/system/meta/ports.nix | 4 ++-- modules/system/services/caddy.nix | 10 +++++----- modules/system/services/dns.nix | 3 +-- modules/system/services/syncthing.nix | 7 +++---- modules/system/services/wlan.nix | 4 ++-- modules/system/web-services/filebrowser.nix | 6 +++--- modules/system/web-services/freshrss.nix | 6 +++--- modules/system/web-services/gatus.nix | 3 +-- 10 files changed, 25 insertions(+), 31 deletions(-) diff --git a/flake-parts/hosts.nix b/flake-parts/hosts.nix index 675f99f..94abcd8 100644 --- a/flake-parts/hosts.nix +++ b/flake-parts/hosts.nix @@ -5,12 +5,10 @@ ... }: let - lib' = self.lib; - mkHost = hostName: inputs.nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs self lib'; }; + specialArgs = { inherit inputs self; }; modules = [ { networking = { inherit hostName; }; } "${self}/hosts/common.nix" @@ -31,13 +29,13 @@ let self.nixosConfigurations.${hostname}; }; - hostNames = "${self}/hosts" |> lib'.listDirectoryNames; + hostNames = "${self}/hosts" |> self.lib.listDirectoryNames; in { flake = { - nixosConfigurations = hostNames |> lib'.genAttrs mkHost; + nixosConfigurations = hostNames |> self.lib.genAttrs mkHost; - deploy.nodes = hostNames |> lib'.genAttrs mkDeployNode; + deploy.nodes = hostNames |> self.lib.genAttrs mkDeployNode; checks = inputs.deploy-rs.lib |> lib.mapAttrs (_: deployLib: deployLib.deployChecks self.deploy); }; diff --git a/modules/system/meta/domains.nix b/modules/system/meta/domains.nix index 9334842..0d786fc 100644 --- a/modules/system/meta/domains.nix +++ b/modules/system/meta/domains.nix @@ -2,7 +2,6 @@ config, self, lib, - lib', ... }: let @@ -38,7 +37,7 @@ in { file, value }: value |> lib.map (domain: { - file = lib'.relativePath file; + file = self.lib.relativePath file; inherit domain; }) ) diff --git a/modules/system/meta/ports.nix b/modules/system/meta/ports.nix index 430e53a..77ff548 100644 --- a/modules/system/meta/ports.nix +++ b/modules/system/meta/ports.nix @@ -1,8 +1,8 @@ { config, options, + self, lib, - lib', ... }: let @@ -31,7 +31,7 @@ in { file, value }: value |> lib.map (port: { - file = lib'.relativePath file; + file = self.lib.relativePath file; inherit port; }) ) diff --git a/modules/system/services/caddy.nix b/modules/system/services/caddy.nix index 99f0200..4e87dfb 100644 --- a/modules/system/services/caddy.nix +++ b/modules/system/services/caddy.nix @@ -1,7 +1,7 @@ { config, + self, lib, - lib', ... }: let @@ -10,8 +10,8 @@ let virtualHosts = cfg.virtualHosts |> lib.attrValues |> lib.filter (value: value.enable); - publicHostsExist = virtualHosts |> lib.any (value: (!lib'.isPrivateDomain value.domain)); - privateHostsExist = virtualHosts |> lib.any (value: lib'.isPrivateDomain value.domain); + publicHostsExist = virtualHosts |> lib.any (value: (!self.lib.isPrivateDomain value.domain)); + privateHostsExist = virtualHosts |> lib.any (value: self.lib.isPrivateDomain value.domain); webPorts = [ 80 @@ -29,7 +29,7 @@ let lib.nameValuePair domain { logFormat = "output file ${config.services.caddy.logDir}/${domain}.log { mode 640 }"; extraConfig = lib.concatLines [ - (lib.optionalString (lib'.isPrivateDomain domain) ( + (lib.optionalString (self.lib.isPrivateDomain domain) ( let certDir = config.security.acme.certs.${domain}.directory; in @@ -138,7 +138,7 @@ in certs = virtualHosts - |> lib.filter (host: lib'.isPrivateDomain host.domain) + |> lib.filter (host: self.lib.isPrivateDomain host.domain) |> lib.map (host: lib.nameValuePair host.domain { }) |> lib.listToAttrs; }; diff --git a/modules/system/services/dns.nix b/modules/system/services/dns.nix index 13e6c8f..f36873c 100644 --- a/modules/system/services/dns.nix +++ b/modules/system/services/dns.nix @@ -2,7 +2,6 @@ config, self, lib, - lib', ... }: let @@ -41,7 +40,7 @@ in |> lib.concatMap ( host: host.config.meta.domains.local - |> lib.filter (domain: lib'.isPrivateDomain domain) + |> lib.filter (domain: self.lib.isPrivateDomain domain) |> lib.map (domain: "\"${domain}. A ${host.config.custom.networking.overlay.address}\"") ); in diff --git a/modules/system/services/syncthing.nix b/modules/system/services/syncthing.nix index 819726f..ec62533 100644 --- a/modules/system/services/syncthing.nix +++ b/modules/system/services/syncthing.nix @@ -2,7 +2,6 @@ config, self, lib, - lib', ... }: let @@ -56,8 +55,8 @@ in message = "Running syncthing on a server requires `gui.domain` to be set"; } { - assertion = (cfg.gui.domain != null) -> (lib'.isPrivateDomain cfg.gui.domain); - message = lib'.mkUnprotectedMessage "Syncthing-GUI"; + assertion = (cfg.gui.domain != null) -> (self.lib.isPrivateDomain cfg.gui.domain); + message = self.lib.mkUnprotectedMessage "Syncthing-GUI"; } ]; @@ -113,7 +112,7 @@ in folders = cfg.folders - |> lib'.genAttrs (name: { + |> self.lib.genAttrs (name: { path = "${dataDir}/${name}"; devices = config.services.syncthing.settings.devices |> lib.attrNames; }); diff --git a/modules/system/services/wlan.nix b/modules/system/services/wlan.nix index 5d4373b..3f0698f 100644 --- a/modules/system/services/wlan.nix +++ b/modules/system/services/wlan.nix @@ -1,8 +1,8 @@ { config, + self, pkgs, lib, - lib', ... }: let @@ -31,7 +31,7 @@ in sops.secrets = cfg.networks |> lib.map (name: "iwd/${name}") - |> lib'.genAttrs (_: { + |> self.lib.genAttrs (_: { restartUnits = [ "iwd.service" ]; }); diff --git a/modules/system/web-services/filebrowser.nix b/modules/system/web-services/filebrowser.nix index 982a83d..7f239f8 100644 --- a/modules/system/web-services/filebrowser.nix +++ b/modules/system/web-services/filebrowser.nix @@ -1,7 +1,7 @@ { config, + self, lib, - lib', ... }: let @@ -25,8 +25,8 @@ in config = lib.mkIf cfg.enable { assertions = lib.singleton { - assertion = lib'.isPrivateDomain cfg.domain; - message = lib'.mkUnprotectedMessage "Filebrowser"; + assertion = self.lib.isPrivateDomain cfg.domain; + message = self.lib.mkUnprotectedMessage "Filebrowser"; }; meta = { diff --git a/modules/system/web-services/freshrss.nix b/modules/system/web-services/freshrss.nix index a9736d4..fe3ea6b 100644 --- a/modules/system/web-services/freshrss.nix +++ b/modules/system/web-services/freshrss.nix @@ -1,7 +1,7 @@ { config, + self, lib, - lib', ... }: let @@ -25,8 +25,8 @@ in config = lib.mkIf cfg.enable { assertions = lib.singleton { - assertion = lib'.isPrivateDomain cfg.domain; - message = lib'.mkUnprotectedMessage "FreshRSS"; + assertion = self.lib.isPrivateDomain cfg.domain; + message = self.lib.mkUnprotectedMessage "FreshRSS"; }; meta = { diff --git a/modules/system/web-services/gatus.nix b/modules/system/web-services/gatus.nix index aba56dd..d62fcdf 100644 --- a/modules/system/web-services/gatus.nix +++ b/modules/system/web-services/gatus.nix @@ -2,7 +2,6 @@ config, self, lib, - lib', ... }: let @@ -184,7 +183,7 @@ in |> lib.filter (domain: domain != cfg.domain) |> lib.map ( domain: - lib.nameValuePair (lib'.subdomainOf domain) { + lib.nameValuePair (self.lib.subdomainOf domain) { inherit domain; group = hostName; }