retry

fili/services/auth/kanidm.nix

@@ -1,9 +1,11 @@
-{pkgs, config, ...}: let
+{ pkgs, config, ... }:
+let
   lib = pkgs.lib;
   domain = "auth.donsz.nl";
   port = 3013;
   backupsDir = "/var/lib/kanidm/backup";
-in {
+in
+{
   services.kanidm.enableServer = true;
   services.kanidm.package = pkgs.kanidm_1_6;
   services.kanidm.serverSettings = {
@@ -26,12 +28,11 @@ in {
       mkdir -p "${backupsDir}"
     '';
     serviceConfig = {
-      SupplementaryGroups =
-        [ config.security.acme.certs.${domain}.group ];
+      SupplementaryGroups = [ config.security.acme.certs.${domain}.group ];
     };
   };
 
-  environment.systemPackages = [pkgs.kanidm];
+  environment.systemPackages = [ pkgs.kanidm ];
 
   services.nginx.virtualHosts.${domain} = {
     forceSSL = true;

fili/services/auth/oauth2-proxy.nix

@@ -1,45 +1,50 @@
-{pkgs, config, ...}: {
+{ pkgs, config, ... }:
+{
   sops.secrets.oauth2-proxy = {
     sopsFile = ../../../secrets/oauth2-proxy.env;
   };
 
   services.oauth2-proxy =
     let
-      auth = import ../../lib/auth.nix { baseUrl = "https://auth.donsz.nl"; clientId = "homeserver"; };
-    in {
-    enable = true;
+      auth = import ../../lib/auth.nix {
+        baseUrl = "https://auth.donsz.nl";
+        clientId = "homeserver";
+      };
+    in
+    {
+      enable = true;
 
-    provider = "oidc";
-    clientID = "${auth.clientId}";
-    oidcIssuerUrl = auth.oidcIssuerUri;
+      provider = "oidc";
+      clientID = "${auth.clientId}";
+      oidcIssuerUrl = auth.oidcIssuerUri;
 
-    proxyPrefix = "/oauth2";
-    reverseProxy = true;
+      proxyPrefix = "/oauth2";
+      reverseProxy = true;
 
-    keyFile = config.sops.secrets.oauth2-proxy.path;
+      keyFile = config.sops.secrets.oauth2-proxy.path;
 
-    loginURL = auth.apiAuthUrl;
-    redeemURL = auth.tokenUrl;
-    validateURL = auth.rfc7662TokenIntrospectionUrl;
-    profileURL = auth.oidcUserInfo;
+      loginURL = auth.apiAuthUrl;
+      redeemURL = auth.tokenUrl;
+      validateURL = auth.rfc7662TokenIntrospectionUrl;
+      profileURL = auth.oidcUserInfo;
 
-    scope = "openid profile email";
+      scope = "openid profile email";
 
-    email.domains = [ "*" ];
+      email.domains = [ "*" ];
 
-    cookie = {
-      domain = "donsz.nl";
-      refresh = "1h";
-      secure = true;
+      cookie = {
+        domain = "donsz.nl";
+        refresh = "1h";
+        secure = true;
+      };
+
+      extraConfig = {
+        whitelist-domain = [ "*.donsz.nl" ];
+      };
+
+      nginx.domain = "oauth2.donsz.nl";
     };
 
-    extraConfig = {
-      whitelist-domain = ["*.donsz.nl"];
-    };
-
-    nginx.domain = "oauth2.donsz.nl";
-  };
-
   services.nginx.virtualHosts."oauth2.donsz.nl" = {
     forceSSL = true;
     http2 = true;

fili/services/forgejo.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 let
   cfg = config.services.forgejo;
   srv = cfg.settings.server;
@@ -6,7 +11,7 @@ in
 {
   sops.secrets.forgejo = {
     sopsFile = ../../secrets/forgejo.yaml;
-    key="email_password";
+    key = "email_password";
     format = "yaml";
   };
 
@@ -33,7 +38,7 @@ in
     lfs.enable = true;
     user = "forgejo";
     group = "forgejo";
-    repositoryRoot="/storage/storage/git";
+    repositoryRoot = "/storage/storage/git";
 
     database = {
       type = "postgres";
@@ -43,8 +48,8 @@ in
 
     settings = {
       DEFAULT = {
-        APP_NAME="jana's git server";
-        APP_SLOGAN="meow!";
+        APP_NAME = "jana's git server";
+        APP_SLOGAN = "meow!";
       };
       server = {
         DOMAIN = "git.donsz.nl";
@@ -62,7 +67,7 @@ in
         DEFAULT_ACTIONS_URL = "github";
       };
       repository = {
-        DEFAULT_PRIVATE="private";
+        DEFAULT_PRIVATE = "private";
       };
       mailer = {
         ENABLED = true;
@@ -74,19 +79,46 @@ in
     mailerPasswordFile = config.sops.secrets.forgejo.path;
   };
 
+  users.groups.forgejo-runner = { };
+  users.users.forgejo-runner = {
+    isSystemUser = true;
+    group = "forgejo-runner";
+  };
+
+  sops.secrets.forgejo-runner = {
+    sopsFile = ../../secrets/forgejo-runner.env;
+  };
+
   services.gitea-actions-runner = {
     package = pkgs.forgejo-runner;
 
     instances.fili = {
       enable = true;
       name = "forgejo-runner-01";
-      token = "SutcrCJ3ULoE5LBj9Tm8zkvTRDEJCpbvpe7FEJHC";
+      tokenFile = config.sops.secrets.forgejo-runner.path;
       url = "https://git.donsz.nl/";
       labels = [
-        "node-22:docker://node:22-bookworm"
-        "nixos-latest:docker://nixos/nix"
+        "nix:host"
+        "docker:docker://node:16-bullseye"
+        "ubuntu-latest:docker://node:16-bullseye"
+      ];
+      settings = { };
+
+      hostPackages = with pkgs; [
+        # default ones
+        bash
+        coreutils
+        curl
+        gawk
+        gitMinimal
+        gnused
+        nodejs
+        wget
+
+        # used in deployments
+        lix
+        openssh
       ];
-      settings = {};
     };
   };
 

fili/services/nginx.nix

@@ -1,4 +1,5 @@
-{pkgs, config, ...}: {
+{ pkgs, config, ... }:
+{
   services.nginx = {
     enable = true;
     statusPage = true;

fili/services/websites/homepage.nix

@@ -1,4 +1,5 @@
-{flakes, pkgs, ...}: {
+{ flakes, pkgs, ... }:
+{
   services.nginx = {
     virtualHosts."donsz.nl" = {
       forceSSL = true;

fili/services/websites/mapf.nix

@@ -1,4 +1,5 @@
-{flakes,...}: {
+{ flakes, ... }:
+{
   # imports = [
   #   flakes.mapf.nixosModules.default
   # ];

fili/services/websites/totpal.nix

@@ -1,8 +1,6 @@
-{ flakes, pkgs,... }:
+{ flakes, pkgs, ... }:
 let
-  totpal =
-    flakes.totpal.packages.${pkgs.system}.default
-  ;
+  totpal = flakes.totpal.packages.${pkgs.system}.default;
 in
 {
   services.nginx = {
@@ -17,12 +15,11 @@ in
     };
   };
 
-  systemd.services.totpal =
-    {
-      description = "totpal";
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${totpal}/bin/totpal";
-      };
+  systemd.services.totpal = {
+    description = "totpal";
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = "${totpal}/bin/totpal";
     };
+  };
 }