From 4624480c8b3ca832e40efd3592521be50559cab5 Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Wed, 13 Dec 2023 22:57:54 +0000
Subject: [PATCH] home-manager/common: Fix Nix cache config for users

---
 home-manager/modules/common.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix
index 72b14f4..de3b453 100644
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -47,9 +47,14 @@ in
 
       nix = {
         package = mkIf (!(versionAtLeast config.home.stateVersion "22.11")) pkgs.nix;
-        settings = {
+        settings = with lib.my.c.nix; {
           experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
           max-jobs = mkDefault "auto";
+
+          extra-substituters = cache.substituters;
+          extra-trusted-public-keys = cache.keys;
+          connect-timeout = 5;
+          fallback = true;
         };
       };
 
@@ -235,12 +240,6 @@ in
             exact = true;
           };
         };
-        settings = with lib.my.c.nix; {
-          extra-substituters = cache.substituters;
-          extra-trusted-public-keys = cache.keys;
-          connect-timeout = 5;
-          fallback = true;
-        };
       };
     })
     (mkIf config.my.isStandalone {