From fb416ea81745611cd55d7e4bbb1df88f0fbf91bd Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 13:43:35 -0400
Subject: [PATCH 01/13] test workflow

---
 .../workflows/build-machines-and-homes.yml    | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 413b892..7d4e572 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -3,6 +3,9 @@ on:
   workflow_dispatch:
   push:
   pull_request:
+env:
+  ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
+
 jobs:
   build-machines:
     strategy:
@@ -58,7 +61,17 @@ jobs:
           purge-primary-key: never
           # always save the cache
           save-always: true
-      - run: nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel
+          
+      - name: setup attic
+        run: |
+          nix profile install nixpkgs#attic
+          attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
+          attic use main
+
+      - run: |
+          nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel
+          attic push main result
+
   build-homes:
     strategy:
       matrix:
@@ -109,4 +122,13 @@ jobs:
           purge-primary-key: never
           # always save the cache
           save-always: true
-      - run: nix build -L .#homeConfigurations."${{ matrix.home }}".activationPackage
+
+      - name: setup attic
+        run: |
+          nix profile install nixpkgs#attic
+          attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
+          attic use main
+
+      - run: |
+          nix build -L .#homeConfigurations."${{ matrix.home }}".activationPackage
+          attic push main result

From 7a971e519a623e03f577a83e48154d22e8e8da6e Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 13:56:36 -0400
Subject: [PATCH 02/13] fix attic install, use faster nix installer, rm cachix

---
 .../workflows/build-machines-and-homes.yml    | 43 ++++++++-----------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 7d4e572..eb40209 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -5,6 +5,14 @@ on:
   pull_request:
 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-machines:
@@ -29,21 +37,15 @@ jobs:
           remove-codeql: 'true'
           remove-docker-images: 'true'
           build-mount-path: /nix
+
       - name: Install Nix
-        uses: cachix/install-nix-action@v30
-        with:
-          install_url: https://releases.nixos.org/nix/nix-2.25.4/install
-          extra_nix_config: 'accept-flake-config = true'
+        uses: nixbuild/nix-quick-install-action@master
+
       - name: Sync repository
         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: Restore and cache Nix store
         uses: nix-community/cache-nix-action@v5.1.0
         with:
@@ -64,13 +66,11 @@ jobs:
           
       - name: setup attic
         run: |
-          nix profile install nixpkgs#attic
-          attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
-          attic use main
+          nix run github:zhaofengli/attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
 
       - run: |
           nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel
-          attic push main result
+          nix run github:zhaofengli/attic push main result
 
   build-homes:
     strategy:
@@ -94,17 +94,14 @@ jobs:
           remove-codeql: 'true'
           remove-docker-images: 'true'
           build-mount-path: /nix
+
       - uses: nixbuild/nix-quick-install-action@master
+
       - name: Sync repository
         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: Restore and cache Nix store
         uses: nix-community/cache-nix-action@v5.1.0
         with:
@@ -125,10 +122,8 @@ jobs:
 
       - name: setup attic
         run: |
-          nix profile install nixpkgs#attic
-          attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
-          attic use main
+          nix run github:zhaofengli/attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
 
       - run: |
           nix build -L .#homeConfigurations."${{ matrix.home }}".activationPackage
-          attic push main result
+          nix run github:zhaofengli/attic push main result

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 03/13] 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

From 39e1b2dcafe0ab9ab96e8240ad89b260117c79c3 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 14:41:49 -0400
Subject: [PATCH 04/13] workflow: upload result as artifact

---
 .github/workflows/build-machines-and-homes.yml | 14 ++++++++++++++
 .github/workflows/build-packages.yml           |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 547cc42..55a86db 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -75,6 +75,13 @@ jobs:
         run: |
           nix run github:zhaofengli/attic push main result
 
+      - name: upload result
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.machine }}-${{ matrix.os }}
+          path: result
+          if-no-files-found: error
+
   build-homes:
     strategy:
       matrix:
@@ -133,3 +140,10 @@ jobs:
       - name: cache result
         run: |
           nix run github:zhaofengli/attic push main result
+
+      - name: upload result
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.home }}-${{ matrix.os }}
+          path: result
+          if-no-files-found: error
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 4c55317..07b76df 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -48,4 +48,11 @@ jobs:
       
       - name: cache result
         run: |
-          nix run github:zhaofengli/attic push main result
\ No newline at end of file
+          nix run github:zhaofengli/attic push main result
+
+      - name: upload result
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.package }}-${{ matrix.os }}
+          path: result
+          if-no-files-found: error

From 1067cba34bfa9525923191b4bb541d2e98152489 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 14:59:35 -0400
Subject: [PATCH 05/13] workflow: make tarball before uploading

---
 .github/workflows/build-machines-and-homes.yml | 10 ++++++++--
 .github/workflows/build-packages.yml           |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 55a86db..2614cba 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -75,11 +75,14 @@ jobs:
         run: |
           nix run github:zhaofengli/attic push main result
 
+      - name: prepare tarball to upload
+        run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result
+
       - name: upload result
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.machine }}-${{ matrix.os }}
-          path: result
+          path: result.tar
           if-no-files-found: error
 
   build-homes:
@@ -141,9 +144,12 @@ jobs:
         run: |
           nix run github:zhaofengli/attic push main result
 
+      - name: prepare tarball to upload
+        run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result
+
       - name: upload result
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.home }}-${{ matrix.os }}
-          path: result
+          path: result.tar
           if-no-files-found: error
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 07b76df..dbcf6c6 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -50,9 +50,12 @@ jobs:
         run: |
           nix run github:zhaofengli/attic push main result
 
+      - name: prepare tarball to upload
+        run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result
+
       - name: upload result
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.package }}-${{ matrix.os }}
-          path: result
+          path: result.tar
           if-no-files-found: error

From 2f7ebbdcaf5825daa8d9ec662c79c67c60aff5fb Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 15:59:29 -0400
Subject: [PATCH 06/13] workflow: test new way to cache

---
 .github/workflows/build-machines-and-homes.yml | 8 ++++++--
 .github/workflows/build-packages.yml           | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 2614cba..b15bc22 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -73,7 +73,9 @@ jobs:
       
       - name: cache result
         run: |
-          nix run github:zhaofengli/attic push main result
+          derivation="$(nix path-info --derivation "${{ matrix.machine }}")"
+          cache="$(nix-store --query --requisites --include-outputs "$derivation")"
+          nix run github:zhaofengli/attic push main --stdin <<< "$cache"
 
       - name: prepare tarball to upload
         run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result
@@ -142,7 +144,9 @@ jobs:
 
       - name: cache result
         run: |
-          nix run github:zhaofengli/attic push main result
+          derivation="$(nix path-info --derivation "${{ matrix.home }}")"
+          cache="$(nix-store --query --requisites --include-outputs "$derivation")"
+          nix run github:zhaofengli/attic push main --stdin <<< "$cache"
 
       - name: prepare tarball to upload
         run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index dbcf6c6..7edb468 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -48,7 +48,9 @@ jobs:
       
       - name: cache result
         run: |
-          nix run github:zhaofengli/attic push main result
+          derivation="$(nix path-info --derivation "${{ matrix.package }}")"
+          cache="$(nix-store --query --requisites --include-outputs "$derivation")"
+          nix run github:zhaofengli/attic push main --stdin <<< "$cache"
 
       - name: prepare tarball to upload
         run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result

From ffcb42f833bd12bf447b1fb7c2389a76fc95637f Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 16:43:34 -0400
Subject: [PATCH 07/13] workflow: fix cache for nixos and home

---
 .github/workflows/build-machines-and-homes.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index b15bc22..e7b0492 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -140,11 +140,12 @@ jobs:
           nix run github:zhaofengli/attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
 
       - run: |
-          nix build -L .#homeConfigurations."${{ matrix.home }}".activationPackage
+          package=".#homeConfigurations."${{ matrix.home }}".activationPackage"
+          nix build -L "$package"
 
       - name: cache result
         run: |
-          derivation="$(nix path-info --derivation "${{ matrix.home }}")"
+          derivation="$(nix path-info --derivation "$package")"
           cache="$(nix-store --query --requisites --include-outputs "$derivation")"
           nix run github:zhaofengli/attic push main --stdin <<< "$cache"
 

From 2b5322cb7231124030d52ca81e0ba859dd7eac47 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 17:15:53 -0400
Subject: [PATCH 08/13] workflow: install attic instead of nix run

---
 .github/workflows/build-machines-and-homes.yml | 10 ++++++----
 .github/workflows/build-packages.yml           |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index e7b0492..9e3344a 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -66,7 +66,8 @@ jobs:
           
       - name: setup attic
         run: |
-          nix run github:zhaofengli/attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
+          nix profile install github:zhaofengli/attic
+          attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
 
       - run: |
           nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel
@@ -75,7 +76,7 @@ jobs:
         run: |
           derivation="$(nix path-info --derivation "${{ matrix.machine }}")"
           cache="$(nix-store --query --requisites --include-outputs "$derivation")"
-          nix run github:zhaofengli/attic push main --stdin <<< "$cache"
+          attic push main --stdin <<< "$cache"
 
       - name: prepare tarball to upload
         run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result
@@ -137,7 +138,8 @@ jobs:
 
       - name: setup attic
         run: |
-          nix run github:zhaofengli/attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
+          nix profile install github:zhaofengli/attic
+          attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
 
       - run: |
           package=".#homeConfigurations."${{ matrix.home }}".activationPackage"
@@ -147,7 +149,7 @@ jobs:
         run: |
           derivation="$(nix path-info --derivation "$package")"
           cache="$(nix-store --query --requisites --include-outputs "$derivation")"
-          nix run github:zhaofengli/attic push main --stdin <<< "$cache"
+          attic push main --stdin <<< "$cache"
 
       - name: prepare tarball to upload
         run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 7edb468..7a19a0a 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -42,7 +42,8 @@ jobs:
           
       - name: setup attic
         run: |
-          nix run github:zhaofengli/attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
+          nix profile install github:zhaofengli/attic
+          attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
 
       - run: nix build -L ${{ matrix.package }}
       
@@ -50,7 +51,7 @@ jobs:
         run: |
           derivation="$(nix path-info --derivation "${{ matrix.package }}")"
           cache="$(nix-store --query --requisites --include-outputs "$derivation")"
-          nix run github:zhaofengli/attic push main --stdin <<< "$cache"
+          attic push main --stdin <<< "$cache"
 
       - name: prepare tarball to upload
         run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result

From 8da2d56d6d76080624b68365aa84c62008423752 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 17:45:59 -0400
Subject: [PATCH 09/13] workflow: fix

---
 .github/workflows/build-machines-and-homes.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 9e3344a..9443181 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -69,8 +69,14 @@ jobs:
           nix profile install github:zhaofengli/attic
           attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
 
-      - run: |
-          nix build -L .#nixosConfigurations.${{ matrix.machine }}.config.system.build.toplevel
+      - name: build and cache
+        run: |
+          package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
+          nix build -L "$package"
+          derivation="$(nix path-info --derivation "$package")"
+          cache="$(nix-store --query --requisites --include-outputs "$derivation")"
+          attic push main --stdin <<< "$cache"
+
       
       - name: cache result
         run: |
@@ -141,12 +147,10 @@ jobs:
           nix profile install github:zhaofengli/attic
           attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
 
-      - run: |
+      - name: build and cache
+        run: |
           package=".#homeConfigurations."${{ matrix.home }}".activationPackage"
           nix build -L "$package"
-
-      - name: cache result
-        run: |
           derivation="$(nix path-info --derivation "$package")"
           cache="$(nix-store --query --requisites --include-outputs "$derivation")"
           attic push main --stdin <<< "$cache"

From fef8deac6680a75e199897a93cfdba4c71d028cb Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 18:15:45 -0400
Subject: [PATCH 10/13] workflow: fix artifact name

---
 .github/workflows/build-packages.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 7a19a0a..5bb8b29 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -59,6 +59,6 @@ jobs:
       - name: upload result
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.package }}-${{ matrix.os }}
+          name: ${{ matrix.os }}
           path: result.tar
           if-no-files-found: error

From bd97413dfa44d3be25438ccb2a3c2743127b863c Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Thu, 13 Mar 2025 21:09:04 -0400
Subject: [PATCH 11/13] overlay garage

---
 flake.lock | 33 +++++++++++++++++++++++++++++++++
 flake.nix  | 12 ++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/flake.lock b/flake.lock
index e40aeed..bd1a4e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -342,6 +342,38 @@
         "type": "github"
       }
     },
+    "garage": {
+      "inputs": {
+        "crane": [
+          "crane"
+        ],
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741360584,
+        "narHash": "sha256-5UkuvKllBRhU943imyc0jHDXQDVhIFx5WWUr3qrLEWQ=",
+        "owner": "deuxfleurs-org",
+        "repo": "garage",
+        "rev": "c96be1a9a8aa3b51075678888b80c2414ead2909",
+        "type": "github"
+      },
+      "original": {
+        "owner": "deuxfleurs-org",
+        "repo": "garage",
+        "type": "github"
+      }
+    },
     "git-hooks": {
       "inputs": {
         "flake-compat": [
@@ -1002,6 +1034,7 @@
         "flake-compat": "flake-compat_2",
         "flake-parts": "flake-parts_2",
         "flake-utils": "flake-utils",
+        "garage": "garage",
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "lix": "lix",
diff --git a/flake.nix b/flake.nix
index a07ce00..494ce4f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -88,6 +88,16 @@
         crane.follows = "crane";
       };
     };
+    garage = {
+      url = "github:deuxfleurs-org/garage";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        rust-overlay.follows = "rust-overlay";
+        crane.follows = "crane";
+        flake-compat.follows = "flake-compat";
+        flake-utils.follows = "flake-utils";
+      };
+    };
 
     nvim-github-theme = {
       url = "github:projekt0n/github-nvim-theme";
@@ -105,11 +115,13 @@
       "https://nix-community.cachix.org"
       "https://cache.garnix.io"
       "https://cything.cachix.org"
+      "https://cache.cy7.sh/main"
     ];
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
       "cything.cachix.org-1:xqW1W5NNL+wrM9wfSELb0MLj/harD2ZyB4HbdaMyvPI="
+      "main:Ku31HoEWcBtfggge2VGj+QTkVrQuIwRIMGyfV/5VQP0="
     ];
     builders-use-substitutes = true;
   };

From ccc27bb9cc3dfda2507916aee8a3b3067b830cdd Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Fri, 14 Mar 2025 00:36:36 -0400
Subject: [PATCH 12/13] fix leftover

---
 .github/workflows/build-machines-and-homes.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 9443181..429a454 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -77,13 +77,6 @@ jobs:
           cache="$(nix-store --query --requisites --include-outputs "$derivation")"
           attic push main --stdin <<< "$cache"
 
-      
-      - name: cache result
-        run: |
-          derivation="$(nix path-info --derivation "${{ matrix.machine }}")"
-          cache="$(nix-store --query --requisites --include-outputs "$derivation")"
-          attic push main --stdin <<< "$cache"
-
       - name: prepare tarball to upload
         run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result
 

From 5b5418e325472ea7c61ea0ebf2face5435083405 Mon Sep 17 00:00:00 2001
From: cy <cy@cy7.sh>
Date: Fri, 14 Mar 2025 00:48:18 -0400
Subject: [PATCH 13/13] fix garage mainProgram

---
 overlay/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/overlay/default.nix b/overlay/default.nix
index b3cdb56..1df98bd 100644
--- a/overlay/default.nix
+++ b/overlay/default.nix
@@ -19,7 +19,10 @@ in
       pixelflasher = nixpkgsFrom inputs.pixelflasher "pixelflasher";
       attic-server = pkgFrom inputs.attic "attic-server";
       attic = pkgFrom inputs.attic "attic";
+      garage = ((pkgFrom inputs.garage "default").overrideAttrs {
+          meta.mainProgram = "garage";
+      });
     }
   )
 ]
-++ importedOverlays
\ No newline at end of file
+++ importedOverlays