nix fmt

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

@@ -7,15 +7,16 @@ from ..dirs import specific_flake_dir
 from ..machines.machines import Machine
 from ..nix import nix_shell
 from ..secrets.generate import generate_secrets
+from ..types import FlakeName
 
 
-def install_nixos(machine: Machine) -> None:
+def install_nixos(machine: Machine, flake_name: FlakeName) -> None:
     h = machine.host
     target_host = f"{h.user or 'root'}@{h.host}"
 
     flake_attr = h.meta.get("flake_attr", "")
 
-    generate_secrets(machine)
+    generate_secrets(machine, flake_name)
 
     with TemporaryDirectory() as tmpdir_:
         tmpdir = Path(tmpdir_)
@@ -43,7 +44,7 @@ def install_command(args: argparse.Namespace) -> None:
     machine = Machine(args.machine, flake_dir=specific_flake_dir(args.flake))
     machine.deployment_address = args.target_host
 
-    install_nixos(machine)
+    install_nixos(machine, args.flake)
 
 
 def register_install_parser(parser: argparse.ArgumentParser) -> None:

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

@@ -10,6 +10,7 @@ from ..nix import nix_build, nix_command, nix_config
 from ..secrets.generate import generate_secrets
 from ..secrets.upload import upload_secrets
 from ..ssh import Host, HostGroup, HostKeyCheck, parse_deployment_address
+from ..types import FlakeName
 
 
 def deploy_nixos(hosts: HostGroup, clan_dir: Path) -> None:
@@ -40,7 +41,7 @@ def deploy_nixos(hosts: HostGroup, clan_dir: Path) -> None:
 
         flake_attr = h.meta.get("flake_attr", "")
 
-        generate_secrets(h.meta["machine"])
+        generate_secrets(h.meta["machine"], FlakeName(clan_dir.name))
         upload_secrets(h.meta["machine"])
 
         target_host = h.meta.get("target_host")

pkgs/clan-cli/tests/test_import_sops_cli.py

@@ -5,8 +5,6 @@ import pytest
 from cli import Cli
 from fixtures_flakes import FlakeForTest
 
-from clan_cli.debug import repro_env_break
-
 if TYPE_CHECKING:
     from age_keys import KeyPair
 

pkgs/clan-cli/tests/test_machines_cli.py

@@ -1,10 +1,11 @@
-from pathlib import Path
-
 import pytest
 from cli import Cli
 from fixtures_flakes import FlakeForTest
 
-def test_machine_subcommands(test_flake: FlakeForTest, capsys: pytest.CaptureFixture) -> None:
+
+def test_machine_subcommands(
+    test_flake: FlakeForTest, capsys: pytest.CaptureFixture
+) -> None:
     cli = Cli()
     cli.run(["machines", "create", "machine1", test_flake.name])