From 5a6928fbd3b838518496ae8ee7fb0caee65e1903 Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Sat, 5 Aug 2023 22:57:55 +0100
Subject: [PATCH] test: deploying

---
 flake.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 09d7945..ae5d286 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,7 +71,7 @@
         service_name = script: lib.strings.sanitizeDerivationName("${cfg.prefix}${cfg.user}@${script}");
         
         # oneshot scripts to run
-        serviceGenerator = builtins.mapAttrs (script: time: nameValuePair (service_name script) {
+        serviceGenerator = mapAttrs' (script: time: nameValuePair (service_name script) {
           description = "Service for ${desc} ${script}";
           wantedBy    = [ ];
           after       = [ "network-online.target" ];
@@ -83,10 +83,10 @@
             ExecStart       = "${self.defaultPackage."${system}"}/bin/${script}";
             EnvironmentFile = "${cfg.envFile}";
           };
-        }) scripts;
+        });
         
         # each timer will run the above service
-        timerGenerator = builtins.mapAttrs (script: time: nameValuePair (service_name script) {
+        timerGenerator = mapAttrs' (script: time: nameValuePair (service_name script) {
           description = "Timer for ${desc} ${script}";
           
           wantedBy    = [ "timers.target" ];
@@ -96,7 +96,7 @@
             Unit        = "${service_name script}.service";
             Persistent  = true;
           };
-        }) scripts;
+        });
         
         # modify these
         scripts = {
@@ -221,10 +221,10 @@
                 EnvironmentFile = "${cfg.envFile}";
               };
             };
-          } // serviceGenerator;
+          } // serviceGenerator scripts;
           
           # timers to run the above services
-          systemd.timers = timerGenerator;
+          systemd.timers = timerGenerator scripts;
           
         };