From 0eb2fbcccf75737cc0964e8b457c7628ffec8a62 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sun, 9 Apr 2023 10:52:44 -0300
Subject: [PATCH] hosts: features: required: nix: enable extra substituters

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 flake.nix                       | 12 ------------
 hosts/features/required/nix.nix | 11 +++++++++--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index 47e936d..4b5255e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -119,16 +119,4 @@
           '';
         };
       });
-
-  nixConfig = {
-    extra-substituters = [
-      "https://nix-community.cachix.org"
-      "https://otavio-nix-config.cachix.org"
-    ];
-
-    extra-trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "otavio-nix-config.cachix.org-1:4HXl0KPGJ0+tkTUn/0tHRpz1wJst9MxovLjKbsPnqS4="
-    ];
-  };
 }
diff --git a/hosts/features/required/nix.nix b/hosts/features/required/nix.nix
index 49d3932..1354ad3 100644
--- a/hosts/features/required/nix.nix
+++ b/hosts/features/required/nix.nix
@@ -2,12 +2,19 @@
 {
   nix = {
     settings = {
-      substituters = [
+      # Caches in trusted-substituters can be used by unprivileged users i.e. in
+      # flakes but are not enabled by default.
+      trusted-substituters = [
         "https://nix-community.cachix.org"
+        "https://cache.garnix.io"
+        "https://otavio-nix-config.cachix.org"
+        "https://numtide.cachix.org"
       ];
-
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+        "otavio-nix-config.cachix.org-1:4HXl0KPGJ0+tkTUn/0tHRpz1wJst9MxovLjKbsPnqS4="
+        "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
       ];
 
       trusted-users = [ "root" "@wheel" ];