From b29deecda5f4c65f3e5f386b4172e5b9137784f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Sun, 11 Feb 2024 20:14:02 +0100
Subject: [PATCH] treewide: change cache url

---
 .github/actions/attic-push/action.yaml  | 20 ++++++++++++++++++++
 .github/actions/install-nix/action.yaml |  4 ++--
 .github/workflows/build.yaml            | 12 +++---------
 modules/system/settei/sane-defaults.nix |  4 ++--
 4 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 .github/actions/attic-push/action.yaml

diff --git a/.github/actions/attic-push/action.yaml b/.github/actions/attic-push/action.yaml
new file mode 100644
index 0000000..cd0ecd0
--- /dev/null
+++ b/.github/actions/attic-push/action.yaml
@@ -0,0 +1,20 @@
+name: "Attic push"
+inputs:
+  from:
+    default: "."
+  server-url:
+    default: "https://attic.nrab.lol/"
+  server-name:
+    default: "nrab-attic"
+  cache:
+    default: "public"
+  paths:
+    default: "result"
+  token:
+    default: ${{ secrets.ATTIC_TOKEN }}
+runs:
+  using: "composite"
+  steps:
+    - run: |
+        nix run "${{ inputs.from }}"#attic -- login "${{ inputs.server-name }}" '${{ inputs.server-url }}' '${{ inputs.token }}'
+        nix run "${{ inputs.from }}"#attic -- push "${{ inputs.server-name }}":"${{ inputs.cache }}" ${{ inputs.paths }}
diff --git a/.github/actions/install-nix/action.yaml b/.github/actions/install-nix/action.yaml
index 744703d..26e6c4b 100644
--- a/.github/actions/install-nix/action.yaml
+++ b/.github/actions/install-nix/action.yaml
@@ -16,12 +16,12 @@ runs:
           extra-substituters = https://nix-community.cachix.org
           extra-substituters = https://hercules-ci.cachix.org
           extra-substituters = https://nrabulinski.cachix.org
-          extra-substituters = https://cache.nrab.lol/public
+          extra-substituters = https://cache.nrab.lol
           extra-trusted-public-keys = hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=
           extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=
           extra-trusted-public-keys = nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
           extra-trusted-public-keys = hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0=
           extra-trusted-public-keys = nrabulinski.cachix.org-1:Q5FD7+1c68uH74CQK66UWNzxhanZW8xcg1LFXxGK8ic=
-          extra-trusted-public-keys = public:wIIyvCTlsk39uwKlBFOuVY+BXrPY3lUNAEpDN4H+O0Q=
+          extra-trusted-public-keys = cache.nrab.lol-1:wIIyvCTlsk39uwKlBFOuVY+BXrPY3lUNAEpDN4H+O0Q=
           ${{ inputs.extra-conf }}
     - uses: DeterminateSystems/magic-nix-cache-action@main
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 814258d..23831c2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -37,9 +37,7 @@ jobs:
       - name: Build output
         run: nix build .#${{ matrix.output }} -L
       - name: Push output
-        run: |
-          nix run .#attic -- login nrab-attic 'https://cache.nrab.lol/' ${{ secrets.ATTIC_TOKEN }}
-          nix run .#attic -- push nrab-attic:public result
+        uses: ./.github/actions/attic-push
 
   build-aarch64-darwin:
     runs-on: macos-14
@@ -55,9 +53,7 @@ jobs:
       - name: Build output
         run: nix build .#${{ matrix.output }} -L
       - name: Push output
-        run: |
-          nix run .#attic -- login nrab-attic 'https://cache.nrab.lol/' ${{ secrets.ATTIC_TOKEN }}
-          nix run .#attic -- push nrab-attic:public result
+        uses: ./.github/actions/attic-push
 
   build-aarch64-linux:
     runs-on: [Linux, ARM64, nix]
@@ -72,9 +68,7 @@ jobs:
       - name: Build output
         run: nix build .#${{ matrix.output }} -L
       - name: Push output
-        run: |
-          nix run .#attic -- login nrab-attic 'https://cache.nrab.lol/' ${{ secrets.ATTIC_TOKEN }}
-          nix run .#attic -- push nrab-attic:public result
+        uses: ./.github/actions/attic-push
 
   all-built:
     runs-on: ubuntu-latest
diff --git a/modules/system/settei/sane-defaults.nix b/modules/system/settei/sane-defaults.nix
index 4bdadb5..30a1467 100644
--- a/modules/system/settei/sane-defaults.nix
+++ b/modules/system/settei/sane-defaults.nix
@@ -58,7 +58,7 @@
           "https://nix-community.cachix.org"
           "https://hercules-ci.cachix.org"
           "https://nrabulinski.cachix.org"
-          "https://cache.nrab.lol/public"
+          "https://cache.nrab.lol"
         ];
         extra-trusted-public-keys = [
           "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
@@ -66,7 +66,7 @@
           "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
           "hercules-ci.cachix.org-1:ZZeDl9Va+xe9j+KqdzoBZMFJHVQ42Uu/c/1/KMC5Lw0="
           "nrabulinski.cachix.org-1:Q5FD7+1c68uH74CQK66UWNzxhanZW8xcg1LFXxGK8ic="
-          "public:wIIyvCTlsk39uwKlBFOuVY+BXrPY3lUNAEpDN4H+O0Q="
+          "cache.nrab.lol-1:CJl1TouOyuJ1Xh4tZSXLwm3Upt06HzUNZmeyuEB9EZg="
         ];
       };
     };