From 8209ff70ff1b69ddcb20c4b0eccf3f5f00582a08 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 14:30:02 -0400
Subject: [PATCH] workflow: use attic cache for packages too

---
 .../workflows/build-machines-and-homes.yml    |  6 +++++
 .github/workflows/build-packages.yml          | 27 ++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index eb40209..547cc42 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -70,6 +70,9 @@ jobs:
 
       - run: |
           nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel
+      
+      - name: cache result
+        run: |
           nix run github:zhaofengli/attic push main result
 
   build-homes:
@@ -126,4 +129,7 @@ jobs:
 
       - run: |
           nix build -L .#homeConfigurations."${{ matrix.home }}".activationPackage
+
+      - name: cache result
+        run: |
           nix run github:zhaofengli/attic push main result
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 72fc72c..4c55317 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -6,6 +6,17 @@ on:
         description: "package to build"
         required: false
         type: string
+env:
+  ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
+  NIX_CONFIG: |
+    show-trace = true
+    extra-substituters = https://cache.cy7.sh/main
+    extra-trusted-public-keys = main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0=
+    experimental-features = nix-command flakes
+    extra-experimental-features = nix-command flakes
+    accept-flake-config = true
+  TERM: ansi
+
 jobs:
   build-packages:
     strategy:
@@ -18,6 +29,7 @@ jobs:
           - ubuntu-24.04-arm
           - macos-latest
           - macos-13
+
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install Nix
@@ -27,12 +39,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           persist-credentials: false
-
-      - uses: cachix/cachix-action@v14
-        with:
-          name: cything
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-          useDaemon: false
-          installCommand: nix profile install nixpkgs#cachix
+          
+      - name: setup attic
+        run: |
+          nix run github:zhaofengli/attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
 
       - run: nix build -L ${{ matrix.package }}
+      
+      - name: cache result
+        run: |
+          nix run github:zhaofengli/attic push main result
\ No newline at end of file