Added flake_name:str argument everywhere, nix fmt doesn't complain anymore

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

@@ -3,7 +3,7 @@ import logging
 from typing import Dict
 
 from ..async_cmd import CmdOut, run, runforcli
-from ..dirs import get_flake_path, specific_machine_dir
+from ..dirs import specific_flake_dir, specific_machine_dir
 from ..errors import ClanError
 from ..nix import nix_shell
 
@@ -35,7 +35,7 @@ async def create_machine(flake_name: str, machine_name: str) -> Dict[str, CmdOut
 
 def create_command(args: argparse.Namespace) -> None:
     try:
-        flake_dir = get_flake_path(args.flake)
+        flake_dir = specific_flake_dir(args.flake)
         runforcli(create_machine, flake_dir, args.machine)
     except ClanError as e:
         print(e)

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

@@ -3,7 +3,7 @@ import subprocess
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from ..dirs import get_flake_path
+from ..dirs import specific_flake_dir
 from ..machines.machines import Machine
 from ..nix import nix_shell
 from ..secrets.generate import generate_secrets
@@ -40,7 +40,7 @@ def install_nixos(machine: Machine) -> None:
 
 
 def install_command(args: argparse.Namespace) -> None:
-    machine = Machine(args.machine, flake_dir=get_flake_path(args.flake))
+    machine = Machine(args.machine, flake_dir=specific_flake_dir(args.flake))
     machine.deployment_address = args.target_host
 
     install_nixos(machine)

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

@@ -5,7 +5,6 @@ import sys
 from pathlib import Path
 from typing import Optional
 
-from ..dirs import get_clan_flake_toplevel
 from ..nix import nix_build, nix_config, nix_eval
 from ..ssh import Host, parse_deployment_address
 
@@ -31,7 +30,7 @@ class Machine:
     def __init__(
         self,
         name: str,
-        flake_dir: Optional[Path] = None,
+        flake_dir: Path,
         machine_data: Optional[dict] = None,
     ) -> None:
         """
@@ -41,10 +40,7 @@ class Machine:
         @machine_json: can be optionally used to skip evaluation of the machine, location of the json file with machine data
         """
         self.name = name
-        if flake_dir is None:
-            self.flake_dir = get_clan_flake_toplevel()
-        else:
-            self.flake_dir = flake_dir
+        self.flake_dir = flake_dir
 
         if machine_data is None:
             self.machine_data = build_machine_data(name, self.flake_dir)

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

@@ -4,7 +4,7 @@ import os
 import subprocess
 from pathlib import Path
 
-from ..dirs import get_flake_path
+from ..dirs import specific_flake_dir
 from ..machines.machines import Machine
 from ..nix import nix_build, nix_command, nix_config
 from ..secrets.generate import generate_secrets
@@ -95,7 +95,11 @@ def get_all_machines(clan_dir: Path) -> HostGroup:
         host = parse_deployment_address(
             name,
             machine_data["deploymentAddress"],
-            meta={"machine": Machine(name=name, machine_data=machine_data)},
+            meta={
+                "machine": Machine(
+                    name=name, flake_dir=clan_dir, machine_data=machine_data
+                )
+            },
         )
         hosts.append(host)
     return HostGroup(hosts)
@@ -111,7 +115,7 @@ def get_selected_machines(machine_names: list[str], flake_dir: Path) -> HostGrou
 
 # FIXME: we want some kind of inventory here.
 def update(args: argparse.Namespace) -> None:
-    flake_dir = get_flake_path(args.flake)
+    flake_dir = specific_flake_dir(args.flake)
     if len(args.machines) == 1 and args.target_host is not None:
         machine = Machine(name=args.machines[0], flake_dir=flake_dir)
         machine.deployment_address = args.target_host