From 0e9f6986cf9b5c51907cc7e57260ed11e84c3ae7 Mon Sep 17 00:00:00 2001
From: Julia Ryan <juliaryan3.14@gmail.com>
Date: Wed, 28 May 2025 22:32:12 +0200
Subject: [PATCH] nix: Add job names and garnix substitutor (#31625)

This should result in some additional cache hits as I personally use
garnix.

Also added `-v` cachix arg to try to figure out why CI jobs aren't
pushing any paths. Right now they just show ["Pushing is
disabled."](https://github.com/zed-industries/zed/actions/runs/15293723678/job/43018512167#step:13:3)
but I'm not sure if that's due to the `pushFilter` or misconfigured
secrets.

Release Notes:

- N/A
---
 .github/workflows/ci.yml              | 1 +
 .github/workflows/nix.yml             | 1 +
 .github/workflows/release_nightly.yml | 1 +
 flake.nix                             | 6 +++++-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27520a3de4..3f3402f768 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -714,6 +714,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   nix-build:
+    name: Build with Nix
     uses: ./.github/workflows/nix.yml
     if: github.repository_owner == 'zed-industries' && contains(github.event.pull_request.labels.*.name, 'run-nix')
     with:
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 5f90604df9..155fc484f5 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -56,6 +56,7 @@ jobs:
           name: zed
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
           pushFilter: "${{ inputs.cachix-filter }}"
+          cachixArgs: '-v'
 
       - run: nix build .#${{ inputs.flake-output }} -L --accept-flake-config
 
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index 09d669281a..d4f8309e78 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -168,6 +168,7 @@ jobs:
         run: script/upload-nightly linux-targz
 
   bundle-nix:
+    name: Build and cache Nix package
     needs: tests
     uses: ./.github/workflows/nix.yml
 
diff --git a/flake.nix b/flake.nix
index b75e9a3150..fe7a09701b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,9 +54,13 @@
     };
 
   nixConfig = {
-    extra-substituters = [ "https://zed.cachix.org" ];
+    extra-substituters = [
+      "https://zed.cachix.org"
+      "https://cache.garnix.io"
+    ];
     extra-trusted-public-keys = [
       "zed.cachix.org-1:/pHQ6dpMsAZk2DiP4WCL0p9YDNKWj2Q5FL20bNmw1cU="
+      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
     ];
   };
 }