From 246ce7eeb11ea8803f29567e475d9249e5234dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Wed, 27 May 2026 18:06:06 +0200 Subject: [PATCH] only enable home manager binary caches if home manager is enabled --- nixosConfigurations.nix | 5 ++++- nixosModules/extra-caches.nix | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/nixosConfigurations.nix b/nixosConfigurations.nix index 6082283..6f6edce 100644 --- a/nixosConfigurations.nix +++ b/nixosConfigurations.nix @@ -72,7 +72,10 @@ forDevice ( # keep-sorted start autoupdate.enable = true; distributedBuilds.enable = true; - extraCaches.enable = true; + extraCaches = { + enable = true; + homeManager = home-manager-users != { }; + }; git.enable = true; globalinstalls.enable = true; lixIsNix.enable = true; diff --git a/nixosModules/extra-caches.nix b/nixosModules/extra-caches.nix index 6a72755..8c45ede 100644 --- a/nixosModules/extra-caches.nix +++ b/nixosModules/extra-caches.nix @@ -1,27 +1,33 @@ { lib, config, ... }: +let + cfg = config.my.extraCaches; +in { - options.my.extraCaches.enable = lib.mkEnableOption "extra Nix binary caches"; + options.my.extraCaches = { + enable = lib.mkEnableOption "extra Nix binary caches"; + homeManager = lib.mkEnableOption "the home-manager (nix-community) binary cache"; + }; - config = lib.mkIf config.my.extraCaches.enable { + config = lib.mkIf cfg.enable { nix.settings = { substituters = [ # keep-sorted start "https://cache.lix.systems" "https://cache.nixos.org/" "https://niri.cachix.org" - "https://nix-community.cachix.org" "https://nixos-raspberrypi.cachix.org" # keep-sorted end - ]; + ] + ++ lib.optional cfg.homeManager "https://nix-community.cachix.org"; trusted-public-keys = [ # keep-sorted start "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixos-raspberrypi.cachix.org-1:4iMO9LXa8BqhU+Rpg6LQKiGa2lsNh/j2oiYLNOQ5sPI=" # keep-sorted end - ]; + ] + ++ lib.optional cfg.homeManager "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; }; }; }