From 844a5545536615bd9a8a162ab92f7eeb2a93aa70 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Fri, 6 Sep 2024 14:52:16 +0000 Subject: [PATCH] nixosMod/router: rewrite code with lib.trivial.pipe --- nix/nixos-modules/router/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nix/nixos-modules/router/default.nix b/nix/nixos-modules/router/default.nix index 684e068..3a1f8bf 100644 --- a/nix/nixos-modules/router/default.nix +++ b/nix/nixos-modules/router/default.nix @@ -52,7 +52,10 @@ let assert builtins.isString sep; assert builtins.isAttrs attr; assert builtins.isFunction mapFun; - builtins.concatStringsSep sep (filterMapAttrsToList attr (x: x.enable) mapFun); + lib.trivial.pipe mapFun [ + (filterMapAttrsToList attr (x: x.enable)) + (builtins.concatStringsSep sep) + ]; mkDisableOption = arg: (lib.mkEnableOption arg) // { default = true; }; # TODO think about to make it just readOnly, requiring defaultText mkOutputOption = @@ -90,7 +93,10 @@ let ]; goodChars = map (x: "") badChars; in - mac: builtins.replaceStrings badChars goodChars mac; + mac: + lib.trivial.pipe mac [ + (builtins.replaceStrings badChars goodChars) + ]; protoList = [ "dccp" "sctp"