diff --git a/checks/schemas.nix b/checks/schemas.nix index 4939139..f2a9960 100644 --- a/checks/schemas.nix +++ b/checks/schemas.nix @@ -1,6 +1,6 @@ { self, runCommand, check-jsonschema, pkgs, lib, ... }: let - clanModules = self.clanModules; + clanModules.clanCore = self.nixosModules.clanCore; baseModule = { imports = @@ -16,7 +16,7 @@ let modules = [ module baseModule ]; }; in - evaled.options.clan.networking; + evaled.options.clan; clanModuleSchemas = lib.mapAttrs (_: module: self.lib.jsonschema.parseOptions (optionsFromModule module)) clanModules; diff --git a/checks/secrets/default.nix b/checks/secrets/default.nix index af4f13b..c6b1a8b 100644 --- a/checks/secrets/default.nix +++ b/checks/secrets/default.nix @@ -3,11 +3,12 @@ nodes.machine = { self, config, ... }: { imports = [ - self.nixosModules.secrets + (self.nixosModules.clanCore) ]; environment.etc."secret".source = config.sops.secrets.foo.path; sops.age.keyFile = ./key.age; - clan.sops.sopsDirectory = ./sops; + clanCore.clanDir = "${./.}"; + clanCore.machineName = "machine"; networking.hostName = "machine"; }; testScript = ''