From bbb7773567aaf601ea1d44540c5f8f2464cd8da3 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 7 Jul 2025 00:46:06 +0200 Subject: [PATCH] rename lingering clan.vars -> clan.core.vars --- nixosModules/clanCore/vars/default.nix | 2 +- nixosModules/clanCore/vars/secret/password-store.nix | 12 ++++++------ .../clan_cli/vars/secret_modules/password_store.py | 10 ++++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/nixosModules/clanCore/vars/default.nix b/nixosModules/clanCore/vars/default.nix index afe8962ad..42532b284 100644 --- a/nixosModules/clanCore/vars/default.nix +++ b/nixosModules/clanCore/vars/default.nix @@ -46,7 +46,7 @@ in assertion = config.clan.core.vars.settings.passBackend == null; message = '' The option `clan.core.vars.settings.passBackend' has been removed. - Use clan.vars.password-store.passPackage instead. + Use clan.core.vars.password-store.passPackage instead. Set it to pkgs.pass for GPG or pkgs.passage for age encryption. ''; } diff --git a/nixosModules/clanCore/vars/secret/password-store.nix b/nixosModules/clanCore/vars/secret/password-store.nix index d79c46cf4..9654b43c8 100644 --- a/nixosModules/clanCore/vars/secret/password-store.nix +++ b/nixosModules/clanCore/vars/secret/password-store.nix @@ -54,7 +54,7 @@ in { _class = "nixos"; - options.clan.vars.password-store = { + options.clan.core.vars.password-store = { secretLocation = lib.mkOption { type = lib.types.path; default = "/etc/secret-vars"; @@ -83,7 +83,7 @@ in else if file.config.neededFor == "services" then "/run/secrets/${file.config.generatorName}/${file.config.name}" else if file.config.neededFor == "activation" then - "${config.clan.vars.password-store.secretLocation}/activation/${file.config.generatorName}/${file.config.name}" + "${config.clan.core.vars.password-store.secretLocation}/activation/${file.config.generatorName}/${file.config.name}" else if file.config.neededFor == "partitioning" then "/run/partitioning-secrets/${file.config.generatorName}/${file.config.name}" else @@ -102,7 +102,7 @@ in ] '' [ -e /run/current-system ] || echo setting up secrets... - ${installSecretTarball}/bin/install-secret-tarball ${config.clan.vars.password-store.secretLocation}/secrets_for_users.tar.gz /run/user-secrets + ${installSecretTarball}/bin/install-secret-tarball ${config.clan.core.vars.password-store.secretLocation}/secrets_for_users.tar.gz /run/user-secrets '' // lib.optionalAttrs (config.system ? dryActivationScript) { supportsDryActivation = true; @@ -118,7 +118,7 @@ in ] '' [ -e /run/current-system ] || echo setting up secrets... - ${installSecretTarball}/bin/install-secret-tarball ${config.clan.vars.password-store.secretLocation}/secrets.tar.gz /run/secrets + ${installSecretTarball}/bin/install-secret-tarball ${config.clan.core.vars.password-store.secretLocation}/secrets.tar.gz /run/secrets '' // lib.optionalAttrs (config.system ? dryActivationScript) { supportsDryActivation = true; @@ -136,7 +136,7 @@ in serviceConfig = { Type = "oneshot"; ExecStart = [ - "${installSecretTarball}/bin/install-secret-tarball ${config.clan.vars.password-store.secretLocation}/secrets_for_users.tar.gz /run/user-secrets" + "${installSecretTarball}/bin/install-secret-tarball ${config.clan.core.vars.password-store.secretLocation}/secrets_for_users.tar.gz /run/user-secrets" ]; RemainAfterExit = true; }; @@ -149,7 +149,7 @@ in serviceConfig = { Type = "oneshot"; ExecStart = [ - "${installSecretTarball}/bin/install-secret-tarball ${config.clan.vars.password-store.secretLocation}/secrets.tar.gz /run/secrets" + "${installSecretTarball}/bin/install-secret-tarball ${config.clan.core.vars.password-store.secretLocation}/secrets.tar.gz /run/secrets" ]; RemainAfterExit = true; }; diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py index d23cf18a4..071729681 100644 --- a/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py +++ b/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py @@ -45,11 +45,11 @@ class SecretStore(StoreBase): @property def _pass_command(self) -> str: out_path = self.machine.select( - "config.clan.vars.password-store.passPackage.outPath" + "config.clan.core.vars.password-store.passPackage.outPath" ) main_program = ( self.machine.select( - "config.clan.vars.password-store.passPackage.?meta.?mainProgram" + "config.clan.core.vars.password-store.passPackage.?meta.?mainProgram" ) .get("meta", {}) .get("mainProgram") @@ -158,7 +158,7 @@ class SecretStore(StoreBase): remote_hash = host.run( [ "cat", - f"{self.machine.select('config.clan.vars.password-store.secretLocation')}/.pass_info", + f"{self.machine.select('config.clan.core.vars.password-store.secretLocation')}/.pass_info", ], RunOpts(log=Log.STDERR, check=False), ).stdout.strip() @@ -247,6 +247,8 @@ class SecretStore(StoreBase): pass_dir = Path(_tempdir).resolve() self.populate_dir(pass_dir, phases) upload_dir = Path( - self.machine.select("config.clan.vars.password-store.secretLocation") + self.machine.select( + "config.clan.core.vars.password-store.secretLocation" + ) ) upload(host, pass_dir, upload_dir)