diff --git a/modules/services/gitea-instance.nix b/modules/services/gitea-instance.nix index e6c54f9..00ea1b0 100644 --- a/modules/services/gitea-instance.nix +++ b/modules/services/gitea-instance.nix @@ -2,6 +2,7 @@ flake.nixosModules.gitea-instance = { config, lib, + pkgs, ... }: let cfg = config.hive.gitea-instance; @@ -84,28 +85,35 @@ }; # act_runner - services.gitea-actions-runner = lib.mkIf cfg.nativeRunner { - instances.nixos-host = { - enable = true; - name = "nixos-host-runner"; - url = "https://${cfg.instanceFQDN}"; - tokenFile = "/var/lib/gitea-registration/nixos-host"; + services.gitea-actions-runner.instances.nixoshost = { + enable = cfg.nativeRunner; + name = "nixos-host-runner"; + url = "https://${cfg.instanceFQDN}"; + tokenFile = "/var/lib/gitea-registration/nixos-host"; - labels = ["nixos:host"]; + hostPackages = with pkgs; [ + bash + coreutils + curl + gawk + gitMinimal + gnused + nix + nodejs + wget + ]; - settings = { - runner = { - capacity = 1; - }; + labels = ["nixos:host"]; + + settings = { + runner = { + capacity = 1; }; }; }; - systemd.services.gitea-runner-nixos-host = lib.mkIf cfg.nativeRunner { + systemd.services.gitea-runner-nixoshost = lib.mkIf cfg.nativeRunner { after = ["gitea-runner-gen-token.service"]; requires = ["gitea-runner-gen-token.service"]; - serviceConfig.Environment = '' - PATH=/run/current-system/sw/bin:/usr/bin:/bin - ''; }; systemd.services.gitea-runner-gen-token = lib.mkIf cfg.nativeRunner { wantedBy = ["multi-user.target"];