From 940aa6145f4e2234d0ebc67341f4d71a957fe36d Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Sun, 17 Jul 2022 02:56:26 +0100
Subject: [PATCH] Fix missing key for cache.nixos.org

---
 devshell/default.nix            | 3 ++-
 home-manager/modules/common.nix | 4 +---
 lib/default.nix                 | 5 ++++-
 nixos/modules/common.nix        | 4 +---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/devshell/default.nix b/devshell/default.nix
index 6d81242..8a5dced 100644
--- a/devshell/default.nix
+++ b/devshell/default.nix
@@ -1,5 +1,6 @@
 { lib, pkgs, ... }:
 let
+  inherit (lib) concatStringsSep;
   inherit (lib.my) attrsToNVList;
 in
 {
@@ -13,7 +14,7 @@ in
       ''
         experimental-features = nix-command flakes ca-derivations
         substituters = https://nix-cache.nul.ie https://cache.nixos.org
-        trusted-public-keys = ${lib.my.nix.cacheKey}
+        trusted-public-keys = ${concatStringsSep " " lib.my.nix.cacheKeys}
       '');
 
     INSTALLER_SSH_OPTS = "-i .keys/deploy.key";
diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index c7ced48..915ec75 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -233,9 +233,7 @@ in
             "https://nix-cache.nul.ie"
             "https://cache.nixos.org"
           ];
-          trusted-public-keys = [
-            lib.my.nix.cacheKey
-          ];
+          trusted-public-keys = lib.my.nix.cacheKeys;
         };
       };
     })
diff --git a/lib/default.nix b/lib/default.nix
index b350015..0fd5451 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -191,7 +191,10 @@ rec {
   };
 
   nix = {
-    cacheKey = "nix-cache.nul.ie-1:XofkqdHQSGFoPjB6aRohQbCU2ILKFqhNjWfoOdQgF5Y=";
+    cacheKeys = [
+      "nix-cache.nul.ie-1:XofkqdHQSGFoPjB6aRohQbCU2ILKFqhNjWfoOdQgF5Y="
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+    ];
   };
 
   pubDomain = "nul.ie";
diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix
index 4f637c0..386ead8 100644
--- a/nixos/modules/common.nix
+++ b/nixos/modules/common.nix
@@ -52,9 +52,7 @@ in
             "https://nix-cache.nul.ie"
             "https://cache.nixos.org"
           ];
-          trusted-public-keys = [
-            lib.my.nix.cacheKey
-          ];
+          trusted-public-keys = lib.my.nix.cacheKeys;
         };
         registry = {
           pkgs = {