diff --git a/default.nix b/default.nix index c6eb46b4..dd0ee821 100644 --- a/default.nix +++ b/default.nix @@ -39,9 +39,9 @@ let # This is where the meta config is evaluated. eval = lib.evalModules { modules = lib.singleton metaConfig - ++ (lib.attrValues (removeAttrs argGen.targets ["common"])) - ++ (lib.attrValues hosts) - ++ (lib.optional (builtins.pathExists ./config/trusted/meta.nix) ./config/trusted/meta.nix) + ++ lib.attrValues (removeAttrs argGen.targets ["common"]) + ++ lib.attrValues hosts + ++ lib.optional (builtins.pathExists ./config/trusted/meta.nix) ./config/trusted/meta.nix ++ lib.singleton ./config/modules/meta/default.nix; specialArgs = { diff --git a/pkgs/lib/host-import.nix b/pkgs/lib/host-import.nix index bd5b607e..cf7298ec 100644 --- a/pkgs/lib/host-import.nix +++ b/pkgs/lib/host-import.nix @@ -1,8 +1,8 @@ { lib }: { hostName, profiles }: with lib; filter builtins.pathExists [ (../../config/hosts + "/${hostName}/nixos.nix") (../../config/trusted/hosts + "/${hostName}/nixos.nix") -] ++ if builtins.isList profiles.base.imports then profiles.base.imports -else singleton profiles.base.imports ++ singleton { +] ++ (if builtins.isList profiles.base.imports then profiles.base.imports +else singleton profiles.base.imports) ++ singleton { home-manager.users.kat = { imports = filter builtins.pathExists [ (../../config/hosts + "/${hostName}/home.nix")