From 73dd4b1f8f3e55063a523a28b347cc48a60e748b Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Sun, 16 Jun 2024 18:54:03 -0400
Subject: [PATCH] ci: enable accept-flake-config, use the same args everywhere

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 .gitea/workflows/ci.yml             | 16 +++++++++++++---
 .github/workflows/ci.yml            | 16 +++++++++++++---
 .github/workflows/documentation.yml |  4 +++-
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index d2175cd2..c501dd2c 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -68,7 +68,9 @@ jobs:
               uses: https://github.com/DeterminateSystems/nix-installer-action@main
               with:
                 diagnostic-endpoint: ""
-                extra-conf: "experimental-features = nix-command flakes"
+                extra-conf: |
+                  experimental-features = nix-command flakes
+                  accept-flake-config = true
 
             - name: Enable Cachix binary cache
               run: |
@@ -178,6 +180,11 @@ jobs:
 
             - name: Install Nix
               uses: https://github.com/DeterminateSystems/nix-installer-action@main
+              with:
+                diagnostic-endpoint: ""
+                extra-conf: |
+                  experimental-features = nix-command flakes
+                  accept-flake-config = true
 
             - name: Install and enable Cachix binary cache
               run: |
@@ -187,12 +194,15 @@ jobs:
 
             - name: Configure Magic Nix Cache
               uses: https://github.com/DeterminateSystems/magic-nix-cache-action@main
+              with:
+                diagnostic-endpoint: ""
+                upstream-cache: "https://attic.kennel.juneis.dog"
 
             - name: Apply Nix binary cache configuration
               run: |
                   sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
-                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit https://cache.lix.systems
-                  extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=
+                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit https://cache.lix.systems https://conduwuit.cachix.org
+                  extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg=
                   EOF
 
             - name: Use alternative Nix binary caches if specified
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0fe17593..3a7c10cb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,7 +68,9 @@ jobs:
               uses: DeterminateSystems/nix-installer-action@main
               with:
                 diagnostic-endpoint: ""
-                extra-conf: "experimental-features = nix-command flakes"
+                extra-conf: |
+                  experimental-features = nix-command flakes
+                  accept-flake-config = true
 
             - name: Enable Cachix binary cache
               run: |
@@ -178,6 +180,11 @@ jobs:
 
             - name: Install Nix
               uses: DeterminateSystems/nix-installer-action@main
+              with:
+                diagnostic-endpoint: ""
+                extra-conf: |
+                  experimental-features = nix-command flakes
+                  accept-flake-config = true
 
             - name: Install and enable Cachix binary cache
               run: |
@@ -187,12 +194,15 @@ jobs:
 
             - name: Configure Magic Nix Cache
               uses: DeterminateSystems/magic-nix-cache-action@main
+              with:
+                diagnostic-endpoint: ""
+                upstream-cache: "https://attic.kennel.juneis.dog"
 
             - name: Apply Nix binary cache configuration
               run: |
                   sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
-                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit https://cache.lix.systems
-                  extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=
+                  extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit https://cache.lix.systems https://conduwuit.cachix.org
+                  extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg=
                   EOF
 
             - name: Use alternative Nix binary caches if specified
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 8b922e97..4a48b37f 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -55,7 +55,9 @@ jobs:
         uses: DeterminateSystems/nix-installer-action@main
         with:
           diagnostic-endpoint: ""
-          extra-conf: "experimental-features = nix-command flakes"
+          extra-conf: |
+            experimental-features = nix-command flakes
+            accept-flake-config = true
 
       - name: Enable Cachix binary cache
         run: |