clan_cli: flake_name -> flake_dir

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

@@ -12,9 +12,4 @@ def create_command(args: argparse.Namespace) -> None:
 
 def register_create_parser(parser: argparse.ArgumentParser) -> None:
     parser.add_argument("machine", type=str)
-    parser.add_argument(
-        "flake",
-        type=str,
-        help="name of the flake to create machine for",
-    )
     parser.set_defaults(func=create_command)

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

@@ -15,9 +15,4 @@ def delete_command(args: argparse.Namespace) -> None:
 
 def register_delete_parser(parser: argparse.ArgumentParser) -> None:
     parser.add_argument("host", type=str)
-    parser.add_argument(
-        "flake",
-        type=str,
-        help="name of the flake to create machine for",
-    )
     parser.set_defaults(func=delete_command)

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

@@ -1,10 +1,11 @@
+from pathlib import Path
+
 from ..dirs import specific_machine_dir
-from ..types import FlakeName
 
 
-def machine_has_fact(flake_name: FlakeName, machine: str, fact: str) -> bool:
-    return (specific_machine_dir(flake_name, machine) / "facts" / fact).exists()
+def machine_has_fact(flake_dir: Path, machine: str, fact: str) -> bool:
+    return (specific_machine_dir(flake_dir, machine) / "facts" / fact).exists()
 
 
-def machine_get_fact(flake_name: FlakeName, machine: str, fact: str) -> str:
-    return (specific_machine_dir(flake_name, machine) / "facts" / fact).read_text()
+def machine_get_fact(flake_dir: Path, machine: str, fact: str) -> str:
+    return (specific_machine_dir(flake_dir, machine) / "facts" / fact).read_text()

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

@@ -3,14 +3,12 @@ import subprocess
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-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, flake_name: FlakeName) -> None:
+def install_nixos(machine: Machine) -> None:
     h = machine.host
     target_host = f"{h.user or 'root'}@{h.host}"
 
@@ -41,10 +39,10 @@ def install_nixos(machine: Machine, flake_name: FlakeName) -> None:
 
 
 def install_command(args: argparse.Namespace) -> None:
-    machine = Machine(args.machine, flake_dir=specific_flake_dir(args.flake))
+    machine = Machine(args.machine, flake_dir=args.flake)
     machine.deployment_address = args.target_host
 
-    install_nixos(machine, args.flake)
+    install_nixos(machine)
 
 
 def register_install_parser(parser: argparse.ArgumentParser) -> None:
@@ -58,9 +56,4 @@ def register_install_parser(parser: argparse.ArgumentParser) -> None:
         type=str,
         help="ssh address to install to in the form of user@host:2222",
     )
-    parser.add_argument(
-        "flake",
-        type=str,
-        help="name of the flake to install machine from",
-    )
     parser.set_defaults(func=install_command)

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

@@ -1,16 +1,16 @@
 import argparse
 import logging
 import os
+from pathlib import Path
 
 from ..dirs import machines_dir
-from ..types import FlakeName
 from .types import validate_hostname
 
 log = logging.getLogger(__name__)
 
 
-def list_machines(flake_name: FlakeName) -> list[str]:
-    path = machines_dir(flake_name)
+def list_machines(flake_dir: Path) -> list[str]:
+    path = machines_dir(flake_dir)
     log.debug(f"Listing machines in {path}")
     if not path.exists():
         return []
@@ -22,14 +22,9 @@ def list_machines(flake_name: FlakeName) -> list[str]:
 
 
 def list_command(args: argparse.Namespace) -> None:
-    for machine in list_machines(args.flake):
+    for machine in list_machines(Path(args.flake)):
         print(machine)
 
 
 def register_list_parser(parser: argparse.ArgumentParser) -> None:
-    parser.add_argument(
-        "flake",
-        type=str,
-        help="name of the flake to create machine for",
-    )
     parser.set_defaults(func=list_command)