retry

.github/workflows/deploy.yml

@@ -1,6 +1,11 @@
-on: [push]
+on:
+  push:
+    branches:
+      - main
 jobs:
-  test:
+  build:
-    runs-on: docker
+    runs-on: nix
     steps:
-      - run: echo All good!
+      - uses: actions/checkout@v4
+      - run: nix develop
+      - run: colmena build -v --on @fili

.github/workflows/lint.yml

@@ -0,0 +1,7 @@
+on: [push]
+jobs:
+  lint:
+    runs-on: nix
+    steps:
+      - uses: actions/checkout@v4
+      - run: nix fmt -- --check .

fili/configuration.nix

@@ -16,7 +16,6 @@ _: {
     networkmanager.enable = true;
   };
 
-
   nix.settings = {
     # users that can interact with nix
     trusted-users = [

fili/lib/auth.nix

@@ -1,4 +1,5 @@
-{ baseUrl, clientId }: {
+{ baseUrl, clientId }:
+{
   inherit clientId;
 
   userAuthUrl = "${baseUrl}/ui/oauth2";

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,8 +28,7 @@ in {
       mkdir -p "${backupsDir}"
     '';
     serviceConfig = {
-      SupplementaryGroups =
+      SupplementaryGroups = [ config.security.acme.certs.${domain}.group ];
-        [ config.security.acme.certs.${domain}.group ];
     };
   };
 

fili/services/auth/oauth2-proxy.nix

@@ -1,12 +1,17 @@
-{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"; };
+      auth = import ../../lib/auth.nix {
-    in {
+        baseUrl = "https://auth.donsz.nl";
+        clientId = "homeserver";
+      };
+    in
+    {
       enable = true;
 
       provider = "oidc";

fili/services/forgejo.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 let
   cfg = config.services.forgejo;
   srv = cfg.settings.server;
@@ -74,19 +79,66 @@ 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;
+  };
+
+  nix = {
+    settings = {
+      trusted-users = [
+        "forgejo-runner"
+      ];
+      trusted-public-keys = [
+        "jana.cachix.org-1:LN0lzHx7QH1RBoDn3+psi4HOEAXW3EqRa/u0ncQ1XBE="
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      ];
+      substituters = [
+        "https://jana.cachix.org/"
+        "https://cache.nixos.org/"
+      ];
+      trusted-substituters = [
+        "https://jana.cachix.org/"
+        "https://cache.nixos.org/"
+      ];
+    };
+  };
+
   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"
+        "nix:host"
-        "nixos-latest:docker://nixos/nix"
+        "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
+      ];
     };
   };
 

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, ... }:
 let
-  totpal =
+  totpal = flakes.totpal.packages.${pkgs.system}.default;
-    flakes.totpal.packages.${pkgs.system}.default
-  ;
 in
 {
   services.nginx = {
@@ -17,8 +15,7 @@ in
     };
   };
 
-  systemd.services.totpal =
+  systemd.services.totpal = {
-    {
     description = "totpal";
     serviceConfig = {
       Type = "simple";

secrets/forgejo-runner.env

@@ -0,0 +1,7 @@
+TOKEN=ENC[AES256_GCM,data:5WnyyafhDtizIzL4VjXYsMFxLTKikS4Lg6rNGoeVbMqXbquutotfcQ==,iv:2QknXqH8eHft9NHy6K17uv2WvSfvDE8HJsaBDfzUlws=,tag:jw0ffCsfhBNBy++W7cyJsg==,type:str]
+sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHaTZNTmxkMVVuWER0dTZN\nL3N0cDF2bHdpZUNLQWdJMHVjVk5LbnY1OGlVClpya1VhcHdRUW0yUW5CL21mSUJN\nMDU5cFZ1QUppaHZ2dXkwUjgrVFloS3cKLS0tIGNzRWUxSFlXUnR5eFhEQkNOWmRY\nV0dNWWRXVnJCU0duU2dGcWZRWFhMUm8K9dsrIrABcLRZ4pfduYrIaSiEVF+e2OA0\nOGY2eYWAxbgtqBXEX+vLn0eNtoAptpQi2WgOWwVPr1M1+07w7jExBA==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_0__map_recipient=age1ygkcl4ss92z5ptzt3w5g4n98qx2c4kagyssm96m5z4c7t299c5wszjchxw
+sops_lastmodified=2025-08-20T10:03:18Z
+sops_mac=ENC[AES256_GCM,data:Su4KI/pxc1hqNzEYoA1iPU2a5Fp9o/SEf2DW+hx0T5sNL8UvUFDELqYUoGvNNuz1/59ZR8cEmNWhao9euBoF0eVoUAVuS6ADKkX8EjXXJY8qR3M7aseweYxRYXADcWLTlrXsK4xWU6z+NKwmdvYzir9N1XEeR+w3fJLBBNPBnZI=,iv:z3e0kJuJsCLrBGDXZZiYERA48bdvxTxCsPnSdUFgtT8=,tag:rW0zsoEKnKRTpJN8pkJ4/A==,type:str]
+sops_unencrypted_suffix=_unencrypted
+sops_version=3.10.2