From 4f3bf154c017c4160da9b7d8b016e8d1590143b0 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Fri, 5 Sep 2025 12:31:41 +0100
Subject: [PATCH] Fix substituter settings

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 hosts/common/configs/system/nix/default.nix   |  2 +-
 .../user/console/home-manager/default.nix     | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/hosts/common/configs/system/nix/default.nix b/hosts/common/configs/system/nix/default.nix
index b3fbda3..cfb912a 100644
--- a/hosts/common/configs/system/nix/default.nix
+++ b/hosts/common/configs/system/nix/default.nix
@@ -43,7 +43,7 @@
       ];
       download-buffer-size = 524288000;
       substituters = lib.mkBefore [ "https://nix.karaolidis.com/main" ];
-      trusted-substituters = lib.mkBefore [ "https://nix.karaolidis.com/main" ];
+      trusted-substituters = config.nix.settings.substituters;
       trusted-public-keys = lib.mkBefore [ "main:nJVRBnv73MDkwuV5sgm52m4E2ImOhWHvY12qzjPegAk=" ];
       netrc-file = config.sops.templates.nix-netrc.path;
     };
diff --git a/hosts/common/configs/user/console/home-manager/default.nix b/hosts/common/configs/user/console/home-manager/default.nix
index bcdba0a..87383ca 100644
--- a/hosts/common/configs/user/console/home-manager/default.nix
+++ b/hosts/common/configs/user/console/home-manager/default.nix
@@ -21,16 +21,15 @@
       systemd.user.startServices = true;
 
       nix.settings = {
-        use-xdg-base-directories = true;
-        experimental-features = [
-          "nix-command"
-          "flakes"
-        ];
-        download-buffer-size = 524288000;
-        substituters = lib.mkBefore [ "https://nix.karaolidis.com/main" ];
-        trusted-substituters = lib.mkBefore [ "https://nix.karaolidis.com/main" ];
-        trusted-public-keys = lib.mkBefore [ "main:nJVRBnv73MDkwuV5sgm52m4E2ImOhWHvY12qzjPegAk=" ];
-        netrc-file = config.sops.templates.nix-netrc.path;
+        inherit (config.nix.settings)
+          use-xdg-base-directories
+          experimental-features
+          download-buffer-size
+          substituters
+          trusted-substituters
+          trusted-public-keys
+          netrc-file
+          ;
       };
     };
   };