From dbfd5905623298a8f98503dac2a42b1b8975b156 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Mon, 14 Apr 2025 13:46:03 -0400
Subject: [PATCH] dogfood nixcp

---
 .github/workflows/build-machines-and-homes.yml | 16 ++++++++++------
 .github/workflows/build-packages.yml           | 12 +++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 290761f..8280aea 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -73,10 +73,12 @@ jobs:
         if: '!cancelled()'
         run: |
           package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
-          nix run git+https://git.cy7.sh/cy/nixcp.git -- \
-            --to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem&compression=zstd' \
+          nix run github:cything/nixcp/2025-04-12 -- \
+            push \
+            --bucket nixcache \
+            --signing-key /home/runner/cache-priv-key.pem \
+            --endpoint https://s3.cy7.sh \
             -u https://nix-community.cachix.org \
-            -u https://nixcache.web.cy7.sh \
             $package
 
   build-homes:
@@ -142,8 +144,10 @@ jobs:
         if: '!cancelled()'
         run: |
           package=".#homeConfigurations."${{ matrix.home }}".activationPackage"
-          nix run git+https://git.cy7.sh/cy/nixcp.git -- \
-            --to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem&compression=zstd' \
+          nix run github:cything/nixcp/2025-04-12 -- \
+            push \
+            --bucket nixcache \
+            --signing-key /home/runner/cache-priv-key.pem \
+            --endpoint https://s3.cy7.sh \
             -u https://nix-community.cachix.org \
-            -u https://nixcache.web.cy7.sh \
             $package
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 4f76a1d..367c49c 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -22,8 +22,8 @@ jobs:
         os:
           - ubuntu-latest
           - ubuntu-24.04-arm
-          # - macos-latest
-          # - macos-13
+          - macos-latest
+          - macos-13
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -61,10 +61,12 @@ jobs:
         # https://stackoverflow.com/a/58859404
         if: '!cancelled()'
         run: |
-          nix run git+https://git.cy7.sh/cy/nixcp.git -- \
-            --to 's3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem&compression=zstd' \
+          nix run github:cything/nixcp/2025-04-12 -- \
+            push \
+            --bucket nixcache \
+            --signing-key /home/runner/cache-priv-key.pem \
+            --endpoint https://s3.cy7.sh \
             -u https://nix-community.cachix.org \
-            -u https://nixcache.web.cy7.sh \
             "${{ matrix.package }}"
 
       - name: prepare tarball to upload