From 60d2bec966b55e25dad01540ac84f9214932fd63 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Sun, 20 Jul 2025 00:42:19 +0200 Subject: [PATCH] Modules/Polkit: Replace lib.pipe with pipe operator --- .../1_deprecated/containers/default.nix | 20 +++++++++---------- system/modules/polkit/default.nix | 16 +++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/system/modules/1_deprecated/containers/default.nix b/system/modules/1_deprecated/containers/default.nix index 99cb568b..7e32eb57 100644 --- a/system/modules/1_deprecated/containers/default.nix +++ b/system/modules/1_deprecated/containers/default.nix @@ -55,21 +55,21 @@ in { # Allow start/stop containers without root password modules.polkit.allowedSystemServices = let - container-services = lib.pipe virtualisation.oci-containers.containers [ - builtins.attrNames - (builtins.filter (c: cfg.${c}.enable)) - (builtins.map (c: "podman-${c}.service")) - ]; + container-services = + virtualisation.oci-containers.containers + |> builtins.attrNames + |> builtins.filter (c: cfg.${c}.enable) + |> builtins.map (c: "podman-${c}.service"); in container-services; # Generate list of containers for rofi menu environment.etc."rofi-containers".text = let - containers = lib.pipe virtualisation.oci-containers.containers [ - builtins.attrNames - (builtins.filter (c: cfg.${c}.enable)) - (builtins.concatStringsSep "\n") - ]; + containers = + virtualisation.oci-containers.containers + |> builtins.attrNames + |> builtins.filter (c: cfg.${c}.enable) + |> builtins.concatStringsSep "\n"; in containers; }; diff --git a/system/modules/polkit/default.nix b/system/modules/polkit/default.nix index 25f1b693..808fc8b0 100644 --- a/system/modules/polkit/default.nix +++ b/system/modules/polkit/default.nix @@ -23,19 +23,19 @@ in { always-services = []; mkServicePredicate = service: "action.lookup(\"unit\") == \"${service}\""; - servicePredicates = lib.pipe (cfg.allowedSystemServices ++ always-services) [ - (builtins.map mkServicePredicate) - (builtins.concatStringsSep " ||\n") - ]; + servicePredicates = + (cfg.allowedSystemServices ++ always-services) + |> builtins.map mkServicePredicate + |> builtins.concatStringsSep " ||\n"; # Actions that should always be allowed always-actions = []; mkActionPredicate = action: "action.id == \"${action}\""; - actionPredicates = lib.pipe (cfg.allowedActions ++ always-actions) [ - (builtins.map mkActionPredicate) - (builtins.concatStringsSep " ||\n") - ]; + actionPredicates = + (cfg.allowedActions ++ always-actions) + |> builtins.map mkActionPredicate + |> builtins.concatStringsSep " ||\n"; in lib.concatStrings [ ''