use machine.{secrets,public}_{vars,fact}_store everywhere

pkgs/clan-cli/clan_cli/machines/delete.py

@@ -14,12 +14,6 @@ from clan_cli.secrets.machines import remove_machine as secrets_machine_remove
 from clan_cli.secrets.secrets import (
     list_secrets,
 )
-from clan_cli.vars.list import (
-    public_store as vars_public_store,
-)
-from clan_cli.vars.list import (
-    secret_store as vars_secret_store,
-)
 
 from .machines import Machine
 
@@ -55,8 +49,8 @@ def delete_machine(flake: Flake, name: str) -> None:
         shutil.rmtree(secret_path)
 
     machine = Machine(name, flake)
-    changed_paths.extend(vars_public_store(machine).delete_store())
-    changed_paths.extend(vars_secret_store(machine).delete_store())
+    changed_paths.extend(machine.public_vars_store.delete_store())
+    changed_paths.extend(machine.secret_vars_store.delete_store())
     # Remove the machine's key, and update secrets & vars that referenced it:
     if secrets_has_machine(flake.path, name):
         secrets_machine_remove(flake.path, name)

pkgs/clan-cli/clan_cli/machines/machines.py

@@ -5,7 +5,7 @@ import re
 from dataclasses import dataclass, field
 from functools import cached_property
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Literal
+from typing import TYPE_CHECKING, Any
 
 from clan_cli.cmd import Log, RunOpts, run_no_stdout
 from clan_cli.errors import ClanCmdError, ClanError
@@ -94,50 +94,24 @@ class Machine:
             )
         return val
 
-    @property
-    def secret_facts_module(
-        self,
-    ) -> Literal[
-        "clan_cli.facts.secret_modules.sops",
-        "clan_cli.facts.secret_modules.vm",
-        "clan_cli.facts.secret_modules.password_store",
-    ]:
-        return self.deployment["facts"]["secretModule"]
-
-    @property
-    def public_facts_module(
-        self,
-    ) -> Literal[
-        "clan_cli.facts.public_modules.in_repo", "clan_cli.facts.public_modules.vm"
-    ]:
-        return self.deployment["facts"]["publicModule"]
-
     @cached_property
     def secret_facts_store(self) -> facts_secret_modules.SecretStoreBase:
-        module = importlib.import_module(self.secret_facts_module)
+        module = importlib.import_module(self.deployment["facts"]["secretModule"])
         return module.SecretStore(machine=self)
 
     @cached_property
     def public_facts_store(self) -> facts_public_modules.FactStoreBase:
-        module = importlib.import_module(self.public_facts_module)
+        module = importlib.import_module(self.deployment["facts"]["publicModule"])
         return module.FactStore(machine=self)
 
-    @property
-    def secret_vars_module(self) -> str:
-        return self.deployment["vars"]["secretModule"]
-
-    @property
-    def public_vars_module(self) -> str:
-        return self.deployment["vars"]["publicModule"]
-
     @cached_property
     def secret_vars_store(self) -> StoreBase:
-        module = importlib.import_module(self.secret_vars_module)
+        module = importlib.import_module(self.deployment["vars"]["secretModule"])
         return module.SecretStore(machine=self)
 
     @cached_property
     def public_vars_store(self) -> StoreBase:
-        module = importlib.import_module(self.public_vars_module)
+        module = importlib.import_module(self.deployment["vars"]["publicModule"])
         return module.FactStore(machine=self)
 
     @property