plumjam/nixos - Change CEOUX7SJMJXGN4SC6UZ3DN72RBPLEZVCHOL3TI6LZSEC5J2P57BAC

hosts: Move git-runners to modules with options for sharing.

Created by PlumJam on January 7, 2026

CEOUX7SJMJXGN4SC6UZ3DN72RBPLEZVCHOL3TI6LZSEC5J2P57BAC

Dependencies

In channels

main

Change contents

File move: default.nix → ci-runners.nix
BF:BFD[6.1162] → [6.3556:3591]
BF:BF[6.3591] → [6.2000:2000]
[7.2]
[6.2000]
Replacement in modules/ci-runners.nix at line 1 [6.2000]
B:BD[6.2000] → [8.2207:2253]
∅:D[9.195] → [6.2033:2058]
∅:D[8.2253] → [6.2033:2058]
B:BD[6.2033] → [6.2033:2058]
```
{ self, pkgs, lib, config, inputs, ... }: let
  inherit (lib) enabled;
```
[6.2000]
[6.2058]
```
{ self, config, lib, pkgs, inputs, ... }: let
  inherit (lib) enabled mkIf mkOption types;
```

Replacement in modules/ci-runners.nix at line 4 [6.2000]

B:BD[6.2063] → [10.1939:2031]

  age.secrets.forgejoRunnerToken.rekeyFile = self + /secrets/plum-forgejo-runner-token.age;

[6.2063]

[8.2254]

  options.ci-runner = {
    enable = lib.mkEnableOption "forgejo CI runner";
    tokenFile = mkOption {
      type = types.path;
      description = "Path to the runner token file";
    };

Replacement in modules/ci-runners.nix at line 12 [6.2000]

B:BD[8.2255] → [8.2255:2283]

B:BD[8.2283] → [10.2032:2078]

  age.secrets.z-ai-key2 = {
    rekeyFile = self + /secrets/z-ai-key.age;

[8.2255]

[8.2336]

    url = mkOption {
      type = types.str;
      default = "https://git.plumj.am/";
      description = "Forgejo instance URL";
    };
    labels = mkOption {
      type = types.listOf types.str;
      default = [ "self-hosted:host" ];
      description = "Runner labels";
    };
    extraHostPackages = mkOption {
      type = types.listOf types.package;
      default = [ ];
      description = "Extra packages to add to the runner";
    };
    withDocker = mkOption {
      type = types.bool;
      default = false;
      description = "Include docker and docker-compose";
    };

Replacement in modules/ci-runners.nix at line 37 [6.2000]

∅:D[8.2342] → [11.874:1161]

B:BD[6.2538] → [11.874:1161]

B:BD[11.1161] → [12.153:196]

B:BD[12.196] → [13.1040:1068]

∅:D[13.1068] → [12.196:232]

B:BD[12.196] → [12.196:232]

  services.gitea-actions-runner = {
    package = pkgs.forgejo-runner;
    instances.${config.networking.hostName} = enabled {
      name         = config.networking.hostName;
      tokenFile    = config.age.secrets.forgejoRunnerToken.path;
      url          = "https://git.plumj.am/";
      labels       = [
        "plum:host"
        "docpad-infra:host"
        "self-hosted:host"
      ];

[8.2342]

[14.155]

  config = mkIf config.ci-runner.enable {
    users.groups.gitea-runner = {};

Replacement in modules/ci-runners.nix at line 40 [6.2000]

B:BD[14.156] → [12.233:271]

      settings.cache.enabled = false;

[14.156]

[14.193]

    users.users.gitea-runner = {
      description  = "gitea-runner";
      isSystemUser = true;
      group        = "gitea-runner";
    };

Replacement in modules/ci-runners.nix at line 46 [6.2000]

∅:D[14.194] → [11.1206:1229]

B:BD[11.1206] → [11.1206:1229]

B:BD[11.1229] → [3.816:919]

∅:D[3.919] → [9.279:351]

B:BD[9.279] → [9.279:351]

B:BD[9.351] → [2.161:187]

∅:D[2.187] → [9.351:424]

B:BD[9.351] → [9.351:424]

      hostPackages = [
        (inputs.fenix.packages.${pkgs.stdenv.hostPlatform.system}.complete.withComponents [ # Nightly.
          "cargo"
          "clippy"
          "miri"
          "rustc"
          "rust-analyzer"
          "rustfmt"
          "rust-std"
          "rust-src"
        ])

[14.194]

[8.2343]

    services.gitea-actions-runner = {
      package = pkgs.forgejo-runner;
      instances.${config.networking.hostName} = enabled {
        name         = config.networking.hostName;
        tokenFile    = config.ci-runner.tokenFile;
        url          = config.ci-runner.url;
        labels       = config.ci-runner.labels;

Replacement in modules/ci-runners.nix at line 54 [6.2000]

B:BD[8.2344] → [8.2344:2423]

        inputs.claude-code.packages.${pkgs.stdenv.hostPlatform.system}.default

[8.2344]

[8.2423]

        settings.cache.enabled = false;

Replacement in modules/ci-runners.nix at line 56 [6.2000]

∅:D[9.424] → [11.1229:1265]

∅:D[8.2424] → [11.1229:1265]

B:BD[11.1229] → [11.1229:1265]

B:BD[11.1265] → [12.272:320]

B:BD[12.320] → [13.1069:1094]

∅:D[12.320] → [9.425:478]

∅:D[13.1094] → [9.425:478]

B:BD[11.1265] → [9.425:478]

∅:D[9.478] → [11.1265:1282]

B:BD[11.1265] → [11.1265:1282]

B:BD[11.1282] → [9.479:566]

B:BD[9.566] → [4.160:176]

∅:D[4.176] → [11.1282:1319]

∅:D[9.566] → [11.1282:1319]

B:BD[11.1282] → [11.1282:1319]

B:BD[11.1319] → [13.1095:1138]

∅:D[13.1138] → [9.567:612]

B:BD[11.1319] → [9.567:612]

B:BD[9.612] → [13.1139:1160]

∅:D[13.1160] → [9.632:654]

B:BD[9.632] → [9.632:654]

B:BD[9.654] → [13.1161:1180]

∅:D[9.654] → [11.1319:1344]

∅:D[13.1180] → [11.1319:1344]

B:BD[11.1319] → [11.1319:1344]

        pkgs.bash
        pkgs.curl
        pkgs.docker
        pkgs.docker-compose
        pkgs.forgejo-cli
        pkgs.gcc # Fixes cc linker not found errors.
        pkgs.git
        pkgs.gnutar # For cache processes.
        pkgs.gzip   # ...
        pkgs.just
        pkgs.jq
        pkgs.nix
        pkgs.nodejs
        pkgs.nushell
        pkgs.opencode
        pkgs.openssl
        pkgs.pkg-config
        pkgs.ripgrep
        pkgs.sqlx-cli
        pkgs.which
        pkgs.xz
      ];

[8.2424]

[6.3541]

        hostPackages = [
          (inputs.fenix.packages.${pkgs.stdenv.hostPlatform.system}.complete.withComponents [
            "cargo"
            "clippy"
            "miri"
            "rustc"
            "rust-analyzer"
            "rustfmt"
            "rust-std"
            "rust-src"
          ])
          inputs.claude-code.packages.${pkgs.stdenv.hostPlatform.system}.default
          pkgs.bash
          pkgs.curl
          pkgs.forgejo-cli
          pkgs.gcc
          pkgs.git
          pkgs.gnutar
          pkgs.gzip
          pkgs.just
          pkgs.jq
          pkgs.nix
          pkgs.nodejs
          pkgs.nushell
          pkgs.opencode
          pkgs.openssl
          pkgs.pkg-config
          pkgs.ripgrep
          pkgs.sqlx-cli
          pkgs.which
          pkgs.xz
        ] ++ lib.optionals config.ci-runner.withDocker [
          pkgs.docker
          pkgs.docker-compose
        ] ++ config.ci-runner.extraHostPackages;
      };

File deletion: git-runners
BF:BFD[15.7] → [6.1163:1185]
BF:BFD[6.1185] → [6.1162:1162]
Deletion in hosts/plum/default.nix at line 22 [18.987]
B:BD[16.401] → [17.275:299]
```
          ./git-runners
```
Insertion in hosts/plum/default.nix at line 27 [18.987]
[5.1477]
[19.3615]
```
          (self + /modules/ci-runners.nix)
```

Deletion in hosts/plum/default.nix at line 88 [18.987]

B:BD[8.2443] → [8.2443:2590]

∅:D[8.2590] → [6.3812:3825]

B:BD[6.3812] → [6.3812:3825]


          gitea-runner = {
            description  = "gitea-runner";
            isSystemUser = true;
            group        = "gitea-runner";
          };

Deletion in hosts/plum/default.nix at line 89 [18.987]
B:BD[20.197] → [8.2591:2632]
```
        users.groups.gitea-runner = {};
```

Insertion in hosts/plum/default.nix at line 107 [18.987]

[10.2371]

[21.13161]


        age.secrets.z-ai-key2 = {
          rekeyFile = self + /secrets/z-ai-key.age;
        };

Insertion in hosts/plum/default.nix at line 121 [18.987]

[5.1778]

[22.1427]

        age.secrets.forgejoRunnerToken.rekeyFile = self + /secrets/plum-forgejo-runner-token.age;
        ci-runner = enabled {
          tokenFile  = config.age.secrets.forgejoRunnerToken.path;
          url        = "https://git.plumj.am/";
          labels     = [
            "plum:host"
            "docpad-infra:host"
            "self-hosted:host"
          ];
          withDocker = true;
        };

File deletion: git-runners
BF:BFD[23.2123] → [6.4753:4775]
BF:BFD[6.4775] → [6.4752:4752]
File deletion: default.nix
BF:BFD[6.4752] → [6.7117:7152]
BF:BFD[6.7152] → [6.5552:5552]
∅:D[11.2271] → [6.5619:5624]
B:BD[6.5619] → [6.5619:5624]
∅:D[11.2742] → [6.7102:7116]
B:BD[6.7102] → [6.7102:7116]
∅:D[10.3153] → [8.3892:3893]
B:BD[6.6099] → [8.3892:3893]
∅:D[8.3893] → [11.2272:2559]
B:BD[6.6099] → [11.2272:2559]
∅:D[14.268] → [11.2604:2627]
B:BD[11.2604] → [11.2604:2627]
∅:D[3.1064] → [9.813:885]
B:BD[9.813] → [9.813:885]
∅:D[2.284] → [9.885:958]
B:BD[9.885] → [9.885:958]
B:BD[9.958] → [8.3894:3975]
B:BD[9.885] → [2.258:284]
∅:D[9.958] → [11.2627:2663]
∅:D[8.3975] → [11.2627:2663]
B:BD[11.2627] → [11.2627:2663]
∅:D[9.1012] → [11.2663:2680]
B:BD[11.2663] → [11.2663:2680]
∅:D[4.234] → [11.2680:2717]
∅:D[9.1100] → [11.2680:2717]
B:BD[11.2680] → [11.2680:2717]
∅:D[9.1188] → [11.2717:2742]
∅:D[13.2065] → [11.2717:2742]
B:BD[11.2717] → [11.2717:2742]
B:BD[11.2717] → [13.1980:2023]
∅:D[13.2023] → [9.1101:1146]
B:BD[11.2717] → [9.1101:1146]
∅:D[13.2045] → [9.1166:1188]
B:BD[9.1166] → [9.1166:1188]
B:BD[9.1188] → [13.2046:2065]
B:BD[9.1146] → [13.2024:2045]
B:BD[11.2680] → [9.1013:1100]
B:BD[9.1100] → [4.218:234]
B:BD[11.2663] → [13.1954:1979]
∅:D[13.1979] → [9.959:1012]
B:BD[11.2663] → [9.959:1012]
B:BD[11.2627] → [3.961:1064]
∅:D[12.436] → [14.229:230]
B:BD[11.2604] → [14.229:230]
∅:D[12.475] → [14.267:268]
B:BD[14.267] → [14.267:268]
B:BD[14.230] → [12.437:475]
B:BD[11.2559] → [12.357:400]
∅:D[2.257] → [12.400:436]
B:BD[12.400] → [12.400:436]
B:BD[12.400] → [2.229:257]
B:BD[6.5624] → [10.3061:3153]
∅:D[9.729] → [11.2246:2271]
∅:D[10.3060] → [11.2246:2271]
B:BD[6.5585] → [11.2246:2271]
B:BD[6.5552] → [10.3014:3060]
```
in {
    };
  };
}
  services.gitea-actions-runner = {
    package = pkgs.forgejo-runner;
    instances.${config.networking.hostName} = enabled {
      name         = config.networking.hostName;
      tokenFile    = config.age.secrets.forgejoRunnerToken.path;
      url          = "https://git.plumj.am/";
      hostPackages = [
          "cargo"
          "clippy"
          "miri"
          "rustc"
          "rustfmt"
          "rust-std"
          "rust-src"
        ])
        inputs.claude-code.packages.${pkgs.stdenv.hostPlatform.system}.default
          "rust-analyzer"
        pkgs.bash
        pkgs.curl
        pkgs.git
        pkgs.nix
        pkgs.nodejs
        pkgs.xz
      ];
        pkgs.nushell
        pkgs.opencode
        pkgs.openssl
        pkgs.pkg-config
        pkgs.sqlx-cli
        pkgs.which
        pkgs.ripgrep
        pkgs.gnutar # For cache processes.
        pkgs.gzip   # ...
        pkgs.just
        pkgs.jq
        pkgs.forgejo-cli
        pkgs.gcc # Fixes cc linker not found errors.
        (inputs.fenix.packages.${pkgs.stdenv.hostPlatform.system}.complete.withComponents [ # Nightly.
      settings.cache.enabled = false;
      labels       = [
        "kiwi:host"
        "self-hosted:host"
      ];
        "docpad-infra:host"
  age.secrets.forgejoRunnerToken.rekeyFile = self + /secrets/plum-forgejo-runner-token.age;
  inherit (lib) enabled;
{ self, pkgs, lib, config, inputs, ... }: let
```
Deletion in hosts/kiwi/default.nix at line 21 [18.1791]
B:BD[24.256] → [25.254:278]
```
          ./git-runners
```
Insertion in hosts/kiwi/default.nix at line 22 [18.1791]
[5.1843]
[19.11356]
```
          (self + /modules/ci-runners.nix)
```

Deletion in hosts/kiwi/default.nix at line 76 [18.1791]

B:BD[22.6664] → [22.6664:6677]

∅:D[22.6677] → [26.2118:2119]

B:BD[26.2118] → [26.2118:2119]

B:BD[8.3993] → [8.3993:4139]

          };
          gitea-runner = {
            description  = "gitea-runner";
            isSystemUser = true;
            group        = "gitea-runner";

Deletion in hosts/kiwi/default.nix at line 77 [18.1791]
∅:D[22.7028] → [27.227:239]
B:BD[27.227] → [27.227:239]
B:BD[27.239] → [8.4140:4165]
B:BD[8.4196] → [8.4196:4227]
```
        };
        users.groups = {
          gitea-runner   = {};
```

Insertion in hosts/kiwi/default.nix at line 112 [18.1791]

[5.2125]

[22.7072]

        age.secrets.forgejoRunnerToken.rekeyFile = self + /secrets/plum-forgejo-runner-token.age;
        ci-runner = enabled {
          tokenFile  = config.age.secrets.forgejoRunnerToken.path;
          url        = "https://git.plumj.am/";
          labels     = [
            "kiwi:host"
            "docpad-infra:host"
            "self-hosted:host"
          ];
        };

hosts: Move git-runners to modules with options for sharing.

Dependencies

In channels

Change contents

File move: default.nix → ci-runners.nix

Replacement in modules/ci-runners.nix at line 1 [6.2000]

Replacement in modules/ci-runners.nix at line 4 [6.2000]

Replacement in modules/ci-runners.nix at line 12 [6.2000]

Replacement in modules/ci-runners.nix at line 37 [6.2000]

Replacement in modules/ci-runners.nix at line 40 [6.2000]

Replacement in modules/ci-runners.nix at line 46 [6.2000]

Replacement in modules/ci-runners.nix at line 54 [6.2000]

Replacement in modules/ci-runners.nix at line 56 [6.2000]

File deletion: git-runners

Deletion in hosts/plum/default.nix at line 22 [18.987]

Insertion in hosts/plum/default.nix at line 27 [18.987]

Deletion in hosts/plum/default.nix at line 88 [18.987]

Deletion in hosts/plum/default.nix at line 89 [18.987]

Insertion in hosts/plum/default.nix at line 107 [18.987]

Insertion in hosts/plum/default.nix at line 121 [18.987]

File deletion: git-runners

File deletion: default.nix

Deletion in hosts/kiwi/default.nix at line 21 [18.1791]

Insertion in hosts/kiwi/default.nix at line 22 [18.1791]

Deletion in hosts/kiwi/default.nix at line 76 [18.1791]

Deletion in hosts/kiwi/default.nix at line 77 [18.1791]

Insertion in hosts/kiwi/default.nix at line 112 [18.1791]