From b863568077d9fa3df7368a48a536545b17e0898f Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Thu, 21 Nov 2024 22:23:09 -0600 Subject: [PATCH] more pipe rewriting --- modules/scripts/base.nix | 77 +++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/modules/scripts/base.nix b/modules/scripts/base.nix index 2ca1de0..01eb942 100644 --- a/modules/scripts/base.nix +++ b/modules/scripts/base.nix @@ -37,44 +37,47 @@ }; config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) { - users.users.jawz.packages = lib.flatten ( - lib.mapAttrsToList ( - _name: script: lib.optional (script.enable && script.install) script.package - ) config.my.scripts - ); + users.users.jawz.packages = + config.my.scripts + |> lib.mapAttrsToList (_name: script: lib.optional (script.enable && script.install) script.package) + |> lib.flatten; - systemd.user.services = lib.mapAttrs' ( - name: script: - lib.nameValuePair "${script.name}" ( - lib.mkIf (script.enable && script.service) { - restartIfChanged = true; - inherit (script) description; - wantedBy = [ "default.target" ]; - path = [ - pkgs.nix - script.package - ]; - serviceConfig = { - Restart = "on-failure"; - RestartSec = 30; - ExecStart = "${script.package}/bin/${script.name}"; - }; - } - ) - ) config.my.scripts; + systemd.user.services = + config.my.scripts + |> lib.mapAttrs' ( + name: script: + lib.nameValuePair "${script.name}" ( + lib.mkIf (script.enable && script.service) { + restartIfChanged = true; + inherit (script) description; + wantedBy = [ "default.target" ]; + path = [ + pkgs.nix + script.package + ]; + serviceConfig = { + Restart = "on-failure"; + RestartSec = 30; + ExecStart = "${script.package}/bin/${script.name}"; + }; + } + ) + ); - systemd.user.timers = lib.mapAttrs' ( - name: script: - lib.nameValuePair "${script.name}" ( - lib.mkIf (script.enable && script.service) { - enable = true; - inherit (script) description; - wantedBy = [ "timers.target" ]; - timerConfig = { - OnCalendar = script.timer; - }; - } - ) - ) config.my.scripts; + systemd.user.timers = + config.my.scripts + |> lib.mapAttrs' ( + name: script: + lib.nameValuePair "${script.name}" ( + lib.mkIf (script.enable && script.service) { + enable = true; + inherit (script) description; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = script.timer; + }; + } + ) + ); }; }