From 6b9b0ba3cffaaeab2295f775aa618e59d02ca352 Mon Sep 17 00:00:00 2001 From: kat witch Date: Sat, 7 Aug 2021 01:15:13 +0100 Subject: [PATCH] Host and targets are now automatically imported --- default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/default.nix b/default.nix index d43199c3..b47c46a9 100644 --- a/default.nix +++ b/default.nix @@ -40,15 +40,10 @@ let eval = lib.evalModules { modules = [ metaConfig - argGen.targets.personal - argGen.targets.infra - hosts.dummy - hosts.athame - hosts.beltane - hosts.samhain - hosts.yule ./config/modules/meta/default.nix - ] ++ (lib.optional (builtins.pathExists ./config/trusted/meta.nix) ./config/trusted/meta.nix); + ] ++ (lib.attrValues hosts) + ++ (lib.attrValues (removeAttrs argGen.targets ["common"])) + ++ (lib.optional (builtins.pathExists ./config/trusted/meta.nix) ./config/trusted/meta.nix); specialArgs = { inherit sources; inherit (argGen) profiles users services;