From b810d3e96979967002fbe70f42ba01850dfea03c Mon Sep 17 00:00:00 2001
From: Brenden Matthews <github@brenden.brndn.io>
Date: Mon, 26 Jun 2023 19:30:22 -0400
Subject: [PATCH] Try the magic cache, use -y with npx

---
 .github/workflows/nix.yaml | 11 ++++-------
 lefthook.yml               |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml
index 74139956..b540b1a5 100644
--- a/.github/workflows/nix.yaml
+++ b/.github/workflows/nix.yaml
@@ -23,12 +23,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v22
-        with:
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: cachix/cachix-action@v12
-        with:
-          name: conky
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v4
+      - name: Setup Nix Cache
+        uses: DeterminateSystems/magic-nix-cache-action@v1
       - run: nix build
       - run: nix flake check
diff --git a/lefthook.yml b/lefthook.yml
index da076d38..b85344d1 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -3,7 +3,7 @@ pre-commit:
   commands:
     web-linter:
       run: |
-        npx eslint --fix {staged_files} \
+        npx -y eslint --fix {staged_files} \
           && git add {staged_files}
       root: web/
       glob: '*.{ts,tsx,js,jsx}'
@@ -14,7 +14,7 @@ pre-commit:
       glob: '*.{c,cc,cxx,h,cpp}'
     misc-linter:
       run: |
-        npx prettier --write {staged_files} \
+        npx -y prettier --write {staged_files} \
           && git add {staged_files}
       glob: '*.{md,json,yml,yaml}'
     nix-linter: