From 9295934c848369f8048fd7a4126f1a7fb27471f5 Mon Sep 17 00:00:00 2001
From: Luke Channings <461449+LukeChannings@users.noreply.github.com>
Date: Sat, 9 Nov 2024 14:32:25 +0000
Subject: [PATCH] Add devenv cache substitutor

---
 flake.lock                        | 12 ++++++------
 flake.nix                         |  6 +++++-
 templates/darwin-system/flake.nix |  8 ++++++--
 templates/devenv/flake.nix        |  6 +++++-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 375b203..de75ba8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -24,11 +24,11 @@
     "brew-api": {
       "flake": false,
       "locked": {
-        "lastModified": 1731161329,
-        "narHash": "sha256-m5vnnyFGAAP8WkwmozrRFhlIrwYc/PikwLjHbMOY+cA=",
+        "lastModified": 1731162419,
+        "narHash": "sha256-mRLpAwpiZDCW/sBqIr+Cecpqzu8nYFGu2UzCFyL5ctk=",
         "owner": "BatteredBunny",
         "repo": "brew-api",
-        "rev": "a8d7e752e41125006d819d26adad00370485c3cf",
+        "rev": "cc5341e0e6404f83467e0f26560ac08f5c2d8b83",
         "type": "github"
       },
       "original": {
@@ -1449,11 +1449,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1730891215,
-        "narHash": "sha256-i85DPrhDuvzgvIWCpJlbfM2UFtNYbapo20MtQXsvay4=",
+        "lastModified": 1730958623,
+        "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c128e44a249d6180740d0a979b6480d5b795c013",
+        "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a746f64..b8c8ac2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -100,8 +100,12 @@
     };
 
   nixConfig = {
-    extra-substituters = [ "https://luke-channings.cachix.org" ];
+    extra-substituters = [
+      "https://devenv.cachix.org"
+      "https://luke-channings.cachix.org"
+    ];
     extra-trusted-public-keys = [
+      "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
       "luke-channings.cachix.org-1:ETsZ3R5ue9QOwO4spg8aGJMwMU6k5tQIaHWnTakGHjo="
     ];
   };
diff --git a/templates/darwin-system/flake.nix b/templates/darwin-system/flake.nix
index 3a2864b..612d5b1 100644
--- a/templates/darwin-system/flake.nix
+++ b/templates/darwin-system/flake.nix
@@ -1,5 +1,5 @@
 {
-  description = "Configuration for Luke's CAIS MacBook Pro";
+  description = "Configuration for Luke's Work MacBook Pro";
 
   inputs = {
     devenv-root = {
@@ -56,8 +56,12 @@
     };
 
   nixConfig = {
-    extra-substituters = [ "https://luke-channings.cachix.org" ];
+    extra-substituters = [
+      "https://devenv.cachix.org"
+      "https://luke-channings.cachix.org"
+    ];
     extra-trusted-public-keys = [
+      "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
       "luke-channings.cachix.org-1:ETsZ3R5ue9QOwO4spg8aGJMwMU6k5tQIaHWnTakGHjo="
     ];
   };
diff --git a/templates/devenv/flake.nix b/templates/devenv/flake.nix
index a1093fc..47baa19 100644
--- a/templates/devenv/flake.nix
+++ b/templates/devenv/flake.nix
@@ -41,8 +41,12 @@
     };
 
   nixConfig = {
-    extra-substituters = [ "https://luke-channings.cachix.org" ];
+    extra-substituters = [
+      "https://devenv.cachix.org"
+      "https://luke-channings.cachix.org"
+    ];
     extra-trusted-public-keys = [
+      "devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
       "luke-channings.cachix.org-1:ETsZ3R5ue9QOwO4spg8aGJMwMU6k5tQIaHWnTakGHjo="
     ];
   };