From 0b7b9c99560233297ea4450ca142e741f38f0ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= Date: Tue, 10 Mar 2026 17:01:44 -0700 Subject: [PATCH 1/2] fix: use Attic cache URL with cache name and remove Cachix Attic serves each cache at a subpath, so the substituter URL needs /main appended. Also removes Cachix substituter, public key, and devShell package since we've migrated to self-hosted Attic. Co-Authored-By: Claude Opus 4.6 --- flake.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index d90c6220..c324045d 100644 --- a/flake.nix +++ b/flake.nix @@ -119,12 +119,10 @@ nixConfig = { experimental-features = ["nix-command" "flakes"]; extra-substituters = [ - "https://cache.zx.dev" - "https://stackptr.cachix.org" + "https://cache.zx.dev/main" ]; extra-trusted-public-keys = [ "main:sbkS1Xz6P4g66iyttRGj/o8aPODE6bVG9oKT98/ULKI=" - "stackptr.cachix.org-1:5e2q7OxdRdAtvRmHTeogpgJKzQhbvFqNMmCMw71opZA=" ]; }; }; @@ -150,7 +148,6 @@ packages = [ inputs'.agenix.packages.default - pkgs.cachix pkgs.graphite-cli pkgs.just ] From 5bc3c539aae0238b77137e48b4215171567b5f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=BF=20corey=20=28they/them=29?= Date: Tue, 10 Mar 2026 17:19:52 -0700 Subject: [PATCH 2/2] fix: speed up Attic client install in CI Use --inputs-from to resolve attic from the flake lock (which follows our nixpkgs), so store paths are cacheable. Configure the substituter on the Nix daemon before installing so cached attic-client is fetched instead of built from source. Also push attic-client itself to cache. Co-Authored-By: Claude Opus 4.6 --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c9c188e..d4f48fbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,9 +29,12 @@ jobs: - uses: cachix/install-nix-action@v31 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} + extra_nix_config: | + extra-substituters = https://cache.zx.dev/main + extra-trusted-public-keys = main:sbkS1Xz6P4g66iyttRGj/o8aPODE6bVG9oKT98/ULKI= - name: Configure Attic cache run: | - nix profile install github:zhaofengli/attic#attic-client + nix profile install --inputs-from . attic#attic-client attic login rc https://cache.zx.dev ${{ secrets.ATTIC_TOKEN }} attic use rc:main - run: nix flake check @@ -44,4 +47,6 @@ jobs: fi - name: Push to Attic if: github.ref == 'refs/heads/main' - run: attic push rc:main ./result + run: | + attic push rc:main ./result + attic push rc:main $(which attic)