diff --git a/modules/users/systemwide.nix b/modules/users/systemwide.nix index e3df684..8944736 100644 --- a/modules/users/systemwide.nix +++ b/modules/users/systemwide.nix @@ -21,9 +21,17 @@ let name: moduleConfig: { pkgs, ... }: { - config = mkIf (any (user: user.modules.${name}.enable) (attrValues config.home-manager.users)) ( - if (isAttrs moduleConfig) then moduleConfig else (moduleConfig { inherit config pkgs; }) - ); + config = + mkIf + (any ( + user: + (user.modules.${name}.enable + or (any (specialisation: specialisation.configuration.modules.${name}.enable) ( + attrValues user.modules.${name}.specialisations + )) + ) + ) (attrValues config.home-manager.users)) + (if (isAttrs moduleConfig) then moduleConfig else (moduleConfig { inherit config pkgs; })); }; imports = map (name: mkModule name moduleConfig."${name}") moduleNames;