From 60485ec9fab67b38e94f131f197be0a5c3479c00 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Sun, 12 Oct 2025 07:10:59 -0700 Subject: [PATCH] ops: attempt --- .github/workflows/nodes.yml | 24 ++++++++++++------------ ci/nodes.nix | 7 +++++-- nixos/servers/forgejo.nix | 1 + 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/nodes.yml b/.github/workflows/nodes.yml index 892279cc..40a9f51e 100644 --- a/.github/workflows/nodes.yml +++ b/.github/workflows/nodes.yml @@ -53,8 +53,8 @@ jobs: NF_UPDATE_CACHIX_PUSH: '1' id: home-base name: build home closure for home-base - run: nix run .#nf-build-system -- homeConfigurations.home-base.activationPackage - home-base Home + run: /nix/store/23a2fc0ha64j2ygaq8b9gaqc5sb0whf7-lix-2.93.3/bin/nix run .#nf-build-system + -- homeConfigurations.home-base.activationPackage home-base Home - id: ci-dirty name: nix test dirty uses: arcnmx/ci/actions/nix/run@v0.7 @@ -115,8 +115,8 @@ jobs: NF_UPDATE_CACHIX_PUSH: '1' id: home-graphical name: build home closure for home-graphical - run: nix run .#nf-build-system -- homeConfigurations.home-graphical.activationPackage - home-graphical Home + run: /nix/store/23a2fc0ha64j2ygaq8b9gaqc5sb0whf7-lix-2.93.3/bin/nix run .#nf-build-system + -- homeConfigurations.home-graphical.activationPackage home-graphical Home - id: ci-dirty name: nix test dirty uses: arcnmx/ci/actions/nix/run@v0.7 @@ -177,8 +177,8 @@ jobs: NF_UPDATE_CACHIX_PUSH: '1' id: home-neovim name: build home closure for home-neovim - run: nix run .#nf-build-system -- homeConfigurations.home-neovim.activationPackage - home-neovim Home + run: /nix/store/23a2fc0ha64j2ygaq8b9gaqc5sb0whf7-lix-2.93.3/bin/nix run .#nf-build-system + -- homeConfigurations.home-neovim.activationPackage home-neovim Home - id: ci-dirty name: nix test dirty uses: arcnmx/ci/actions/nix/run@v0.7 @@ -239,8 +239,8 @@ jobs: NF_UPDATE_CACHIX_PUSH: '1' id: home-shell name: build home closure for home-shell - run: nix run .#nf-build-system -- homeConfigurations.home-shell.activationPackage - home-shell Home + run: /nix/store/23a2fc0ha64j2ygaq8b9gaqc5sb0whf7-lix-2.93.3/bin/nix run .#nf-build-system + -- homeConfigurations.home-shell.activationPackage home-shell Home - id: ci-dirty name: nix test dirty uses: arcnmx/ci/actions/nix/run@v0.7 @@ -301,8 +301,8 @@ jobs: NF_UPDATE_CACHIX_PUSH: '1' id: mai name: build system closure for mai - run: nix run .#nf-build-system -- nixosConfigurations.mai.config.system.build.toplevel - mai NixOS + run: /nix/store/23a2fc0ha64j2ygaq8b9gaqc5sb0whf7-lix-2.93.3/bin/nix run .#nf-build-system + -- nixosConfigurations.mai.config.system.build.toplevel mai NixOS - id: ci-dirty name: nix test dirty uses: arcnmx/ci/actions/nix/run@v0.7 @@ -363,8 +363,8 @@ jobs: NF_UPDATE_CACHIX_PUSH: '1' id: mei name: build system closure for mei - run: nix run .#nf-build-system -- nixosConfigurations.mei.config.system.build.toplevel - mei NixOS + run: /nix/store/23a2fc0ha64j2ygaq8b9gaqc5sb0whf7-lix-2.93.3/bin/nix run .#nf-build-system + -- nixosConfigurations.mei.config.system.build.toplevel mei NixOS - id: ci-dirty name: nix test dirty uses: arcnmx/ci/actions/nix/run@v0.7 diff --git a/ci/nodes.nix b/ci/nodes.nix index 1eb8a7be..d842fdcf 100644 --- a/ci/nodes.nix +++ b/ci/nodes.nix @@ -34,12 +34,15 @@ in { workflow_dispatch = {}; }; jobs = let + lix' = channels.nixpkgs.lixPackageSets.stable.lix; + inherit (lib.meta) getExe; + lix = getExe lix'; genericNixosBuildJob = name: _system: nameValuePair "nixos-${name}" { step.${name} = { name = "build system closure for ${name}"; order = 500; - run = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS"; + run = "${lix} run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS"; env = { CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; @@ -54,7 +57,7 @@ in { step.${name} = { name = "build home closure for ${name}"; order = 500; - run = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home"; + run = "${lix} run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home"; env = { CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; diff --git a/nixos/servers/forgejo.nix b/nixos/servers/forgejo.nix index 18444abf..8fae7be4 100644 --- a/nixos/servers/forgejo.nix +++ b/nixos/servers/forgejo.nix @@ -2,6 +2,7 @@ _: { services.forgejo = { enable = true; settings = { + DOMAIN = "git.kittywit.ch"; }; }; }