From 6616fd47ea3acbabb04e97aa78e96cfd59c979dd Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Tue, 15 Oct 2024 00:51:32 -0500
Subject: [PATCH] Properly add Garnix support

This removes the `extra-` prefix from the specified Nix config. This appears to only be used within Nix flake configs. We probably should eventually provide this - oops!
---
 flake.lock                                     | 18 +++++++++---------
 .../spotlights-macbook-air/configuration.nix   |  4 ++--
 hosts/linux/cyclone/configuration.nix          |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 327e8ba..496ad7c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -55,11 +55,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728337164,
-        "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
+        "lastModified": 1728903686,
+        "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
+        "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f",
         "type": "github"
       },
       "original": {
@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728385805,
-        "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
+        "lastModified": 1728901530,
+        "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
+        "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728241625,
-        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
+        "lastModified": 1728492678,
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
         "type": "github"
       },
       "original": {
diff --git a/hosts/darwin/spotlights-macbook-air/configuration.nix b/hosts/darwin/spotlights-macbook-air/configuration.nix
index 56e7dd6..ca517dd 100644
--- a/hosts/darwin/spotlights-macbook-air/configuration.nix
+++ b/hosts/darwin/spotlights-macbook-air/configuration.nix
@@ -45,8 +45,8 @@
       experimental-features = "nix-command flakes";
   
       # Include Garnix
-      extra-substituters = [ "https://cache.garnix.io" ];
-      extra-trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ];
+      substituters = [ "https://cache.garnix.io" ];
+      trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ];
     };
   };
 
diff --git a/hosts/linux/cyclone/configuration.nix b/hosts/linux/cyclone/configuration.nix
index 22cc7d5..237aeae 100644
--- a/hosts/linux/cyclone/configuration.nix
+++ b/hosts/linux/cyclone/configuration.nix
@@ -29,8 +29,8 @@
     builders-use-substitutes = true;
 
     # Include Garnix
-    extra-substituters = [ "https://cache.garnix.io" ];
-    extra-trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ];
+    substituters = [ "https://cache.garnix.io" ];
+    trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ];
   };
 
   # Select internationalisation properties.