From 14b0e0ac1de558b42b9d0ad36839c5fc2224ba30 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Sun, 10 Aug 2025 00:21:05 +0200 Subject: [PATCH] Make more use of pipes --- hosts/shared.nix | 6 +++--- modules/system/services/caddy.nix | 6 ++++-- modules/system/services/gatus.nix | 2 +- modules/system/services/syncthing.nix | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hosts/shared.nix b/hosts/shared.nix index a80ccbf..2df6cf8 100644 --- a/hosts/shared.nix +++ b/hosts/shared.nix @@ -11,12 +11,12 @@ nix = let - flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; + flakeInputs = inputs |> lib.filterAttrs (_: lib.isType "flake"); in { channel.enable = false; - registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs; - nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; + registry = flakeInputs |> lib.mapAttrs (_: flake: { inherit flake; }); + nixPath = flakeInputs |> lib.mapAttrsToList (name: _: "${name}=flake:${name}"); settings = { flake-registry = ""; diff --git a/modules/system/services/caddy.nix b/modules/system/services/caddy.nix index 36640a8..a8e8477 100644 --- a/modules/system/services/caddy.nix +++ b/modules/system/services/caddy.nix @@ -15,8 +15,10 @@ let isTailscaleDomain = domain: domain |> lib.hasSuffix config.custom.services.tailscale.domain; - tailscaleHostsExist = lib.any (v: isTailscaleDomain v.domain) (lib.attrValues virtualHosts); - nonTailscaleHostsExist = lib.any (v: !isTailscaleDomain v.domain) (lib.attrValues virtualHosts); + tailscaleHostsExist = + virtualHosts |> lib.attrValues |> lib.any (value: isTailscaleDomain value.domain); + nonTailscaleHostsExist = + virtualHosts |> lib.attrValues |> lib.any (value: !isTailscaleDomain value.domain); getSubdomain = domain: domain |> lib.splitString "." |> lib.head; diff --git a/modules/system/services/gatus.nix b/modules/system/services/gatus.nix index f10043b..942c1f4 100644 --- a/modules/system/services/gatus.nix +++ b/modules/system/services/gatus.nix @@ -158,7 +158,7 @@ in mkEndpoint = value: let - isPrivate = lib.hasInfix config.custom.services.tailscale.domain value.url; + isPrivate = value.url |> lib.hasInfix config.custom.services.tailscale.domain; deducedGroup = if isPrivate then "Private" else "Public"; in { diff --git a/modules/system/services/syncthing.nix b/modules/system/services/syncthing.nix index 402a36e..cd5e98f 100644 --- a/modules/system/services/syncthing.nix +++ b/modules/system/services/syncthing.nix @@ -92,7 +92,7 @@ in lib.genAttrs folders (name: { path = "${config.services.syncthing.dataDir}/${name}"; ignorePerms = false; - devices = lib.attrNames config.services.syncthing.settings.devices; + devices = config.services.syncthing.settings.devices |> lib.attrNames; }); in genFolders [