From 23e5a04d70389d58b7c1447924d59cfb78218215 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Wed, 25 Mar 2026 17:44:05 -0500 Subject: [PATCH] flake: pass systems.modules.home into create-systems for NixOS-integrated homes systems.modules.home was previously only applied to standalone homeConfigurations. Homes embedded inside nixosConfigurations (evaluated via create-home-system-modules) received the raw homes attrset without the systems.modules.home merge, so external HM modules listed there were not available in nixosConfiguration-hosted homes. Extract the merge into homes-with-system-modules and pass it to both create-homes (standalone) and create-systems (NixOS-integrated). --- snowfall-lib/flake/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/snowfall-lib/flake/default.nix b/snowfall-lib/flake/default.nix index ee77c2e..7c75349 100644 --- a/snowfall-lib/flake/default.nix +++ b/snowfall-lib/flake/default.nix @@ -193,16 +193,16 @@ let namespace = snowfall-config.namespace or "internal"; custom-flake-options = flake.without-snowfall-options full-flake-options; alias = full-flake-options.alias or { }; - homes = snowfall-lib.home.create-homes ( - (full-flake-options.homes or { }) - // { - modules = - (full-flake-options.homes.modules or [ ]) ++ (full-flake-options.systems.modules.home or [ ]); - } - ); + # Merge systems.modules.home into the homes attrset so it is available + # in both standalone homeConfigurations and NixOS-integrated homes. + homes-with-system-modules = (full-flake-options.homes or { }) // { + modules = + (full-flake-options.homes.modules or [ ]) ++ (full-flake-options.systems.modules.home or [ ]); + }; + homes = snowfall-lib.home.create-homes homes-with-system-modules; systems = snowfall-lib.system.create-systems { systems = full-flake-options.systems or { }; - homes = full-flake-options.homes or { }; + homes = homes-with-system-modules; }; hosts = snowfall-lib.attrs.merge-shallow [ (full-flake-options.systems.hosts or { })