machines/dev/fedi203/woodpecker.nix

@@ -17,28 +17,12 @@
         inherit group;
         mode = "440";
       })
-      (
       {
         woodpecker-gitea-client = "woodpecker-server";
         woodpecker-gitea-secret = "woodpecker-server";
-        }
-        // (
-          if config.services.woodpecker-agents.agents.exec.enable then
-            {
         woodpecker-agent-exec = "woodpecker-agent-exec";
-            }
-          else
-            { }
-        )
-        // (
-          if config.services.woodpecker-agents.agents.docker.enable then
-            {
         woodpecker-agent-container = "woodpecker-agent-docker";
-            }
+      };
-          else
-            { }
-        )
-      );
 
   # needs `sudo generate-vars`
   vars.settings.on-machine.enable = true;
@@ -64,13 +48,12 @@
 
   vars.generators.woodpecker =
     let
-      fileNames =
+      fileNames = [
-        [
         "woodpecker-gitea-client"
         "woodpecker-gitea-secret"
-        ]
+        "woodpecker-agent-exec"
-        ++ (lib.lists.optional config.services.woodpecker-agents.agents.exec.enable "woodpecker-agent-exec")
+        "woodpecker-agent-container"
-        ++ (lib.lists.optional config.services.woodpecker-agents.agents.docker.enable "woodpecker-agent-container");
+      ];
     in
     {
       runtimeInputs = [
@@ -138,7 +121,6 @@
           WOODPECKER_GRPC_SECURE=false
         '';
       in
-      (lib.mkMerge [
       {
         # https://woodpecker-ci.org/docs/administration/configuration/server
         "woodpecker-server.conf" = {
@@ -161,8 +143,7 @@
             WOODPECKER_GRPC_ADDR=:9000
           '';
         };
-        }
+
-        (lib.mkIf config.services.woodpecker-agents.agents.exec.enable {
         # https://woodpecker-ci.org/docs/administration/configuration/backends/local#environment-variables
         "woodpecker-agent-exec.conf" = {
           secret = true;
@@ -177,8 +158,7 @@
             ]
           );
         };
-        })
+
-        (lib.mkIf config.services.woodpecker-agents.agents.docker.enable {
         # https://woodpecker-ci.org/docs/administration/configuration/backends/docker#environment-variables
         "woodpecker-agent-podman.conf" = {
           secret = true;
@@ -194,8 +174,7 @@
             ]
           );
         };
-        })
+      };
-      ]);
   };
 
   # enable git-lfs
@@ -228,7 +207,7 @@
     # https://woodpecker-ci.org/docs/administration/configuration/agent
     woodpecker-agents.agents = {
       exec = {
-        # enable = true;
+        enable = true;
         path = with pkgs; [
           git
           git-lfs
@@ -274,13 +253,9 @@
     };
   };
 
-  systemd.services = {
+  systemd.services.woodpecker-agent-docker = {
-    woodpecker-agent-docker = lib.mkIf config.services.woodpecker-agents.agents.docker.enable {
     wants = [ "podman.socket" ];
     after = [ "podman.socket" ];
-      serviceConfig = {
+    serviceConfig.SupplementaryGroups = [ "podman" ];
-        SupplementaryGroups = [ "podman" ];
-      };
-    };
   };
 }