Chore: init settings submdule, move clanDir into settings submodule

This commit is contained in:
Johannes Kirschbauer
2024-12-31 14:08:25 +01:00
parent f823336cba
commit 315be52e34
31 changed files with 111 additions and 75 deletions

View File

@@ -15,9 +15,9 @@ let
secretPath =
secret:
if secret.share then
config.clan.core.clanDir + "/vars/shared/${secret.generator}/${secret.name}/secret"
config.clan.core.settings.directory + "/vars/shared/${secret.generator}/${secret.name}/secret"
else
config.clan.core.clanDir
config.clan.core.settings.directory
+ "/vars/per-machine/${machineName}/${secret.generator}/${secret.name}/secret";
vars = collectFiles config.clan.core.vars;
@@ -53,7 +53,7 @@ in
lib.mkDefault (builtins.toString (pkgs.writeText "dummy.yaml" ""))
);
age.keyFile = lib.mkIf (builtins.pathExists (
config.clan.core.clanDir + "/sops/secrets/${machineName}-age.key/secret"
config.clan.core.settings.directory + "/sops/secrets/${machineName}-age.key/secret"
)) (lib.mkDefault "/var/lib/sops-nix/key.txt");
};
}