clan-cli: Remove unecessary nix_options args from functions

pkgs/clan-cli/clan_cli/flash/flash_cmd.py

@@ -26,7 +26,6 @@ class FlashOptions:
     debug: bool
     mode: str
     write_efi_boot_entries: bool
-    nix_options: list[str]
     system_config: SystemConfig
 
 
@@ -72,7 +71,6 @@ def flash_command(args: argparse.Namespace) -> None:
             ssh_keys_path=args.ssh_pubkey,
         ),
         write_efi_boot_entries=args.write_efi_boot_entries,
-        nix_options=args.option,
     )
 
     machine = Machine(opts.machine, flake=opts.flake)
@@ -94,7 +92,6 @@ def flash_command(args: argparse.Namespace) -> None:
         dry_run=opts.dry_run,
         debug=opts.debug,
         write_efi_boot_entries=opts.write_efi_boot_entries,
-        extra_args=opts.nix_options,
     )
 
 

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

@@ -72,7 +72,6 @@ def install_command(args: argparse.Namespace) -> None:
                 phases=args.phases,
                 debug=args.debug,
                 no_reboot=args.no_reboot,
-                nix_options=args.option,
                 build_on=BuildOn(args.build_on) if args.build_on is not None else None,
                 update_hardware_config=HardwareConfig(args.update_hardware_config),
                 password=password,

pkgs/clan-cli/clan_cli/vms/run.py

@@ -49,20 +49,15 @@ def facts_to_nixos_config(facts: dict[str, dict[str, bytes]]) -> dict:
 
 
 # TODO move this to the Machines class
-def build_vm(
-    machine: Machine, tmpdir: Path, nix_options: list[str] | None = None
-) -> dict[str, str]:
+def build_vm(machine: Machine, tmpdir: Path) -> dict[str, str]:
     # TODO pass prompt here for the GTK gui
-    if nix_options is None:
-        nix_options = []
+
     secrets_dir = get_secrets(machine, tmpdir)
 
     public_facts = machine.public_facts_store.get_all()
 
     nixos_config_file = machine.build_nix(
-        "config.system.clan.vm.create",
-        extra_config=facts_to_nixos_config(public_facts),
-        nix_options=nix_options,
+        "config.system.clan.vm.create", extra_config=facts_to_nixos_config(public_facts)
     )
     try:
         vm_data = json.loads(Path(nixos_config_file).read_text())
@@ -204,7 +199,6 @@ def spawn_vm(
     *,
     cachedir: Path | None = None,
     socketdir: Path | None = None,
-    nix_options: list[str] | None = None,
     portmap: dict[int, int] | None = None,
     stdout: int | None = None,
     stderr: int | None = None,
@@ -212,8 +206,7 @@ def spawn_vm(
 ) -> Iterator[QemuVm]:
     if portmap is None:
         portmap = {}
-    if nix_options is None:
-        nix_options = []
+
     with ExitStack() as stack:
         machine = Machine(name=vm.machine_name, flake=vm.flake_url)
         machine.debug(f"Creating VM for {machine}")
@@ -234,7 +227,7 @@ def spawn_vm(
             socketdir = Path(socket_tmp)
 
         # TODO: We should get this from the vm argument
-        nixos_config = build_vm(machine, cachedir, nix_options)
+        nixos_config = build_vm(machine, cachedir)
 
         state_dir = vm_state_dir(vm.flake_url.identifier, machine.name)
         state_dir.mkdir(parents=True, exist_ok=True)
@@ -321,7 +314,6 @@ def spawn_vm(
 class RuntimeConfig:
     cachedir: Path | None = None
     socketdir: Path | None = None
-    nix_options: list[str] | None = None
     portmap: dict[int, int] | None = None
     command: list[str] | None = None
     no_block: bool = False
@@ -339,7 +331,6 @@ def run_vm(
             vm_config,
             cachedir=runtime_config.cachedir,
             socketdir=runtime_config.socketdir,
-            nix_options=runtime_config.nix_options,
             portmap=runtime_config.portmap,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
@@ -395,7 +386,6 @@ def run_command(
     portmap = dict(p.split(":") for p in args.publish)
 
     runtime_config = RuntimeConfig(
-        nix_options=args.option,
         portmap=portmap,
         command=args.command,
         no_block=args.no_block,

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

@@ -1,6 +1,6 @@
 import logging
 import os
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
 from tempfile import TemporaryDirectory
@@ -32,7 +32,6 @@ class InstallOptions:
     no_reboot: bool = False
     phases: str | None = None
     build_on: BuildOn | None = None
-    nix_options: list[str] = field(default_factory=list)
     update_hardware_config: HardwareConfig = HardwareConfig.NONE
     password: str | None = None
     identity_file: Path | None = None
@@ -127,7 +126,7 @@ def install_machine(opts: InstallOptions, target_host: Remote) -> None:
             cmd.append("--debug")
 
         # Add nix options to nixos-anywhere
-        cmd.extend(opts.nix_options)
+        cmd.extend(opts.machine.flake.nix_options or [])
 
         cmd.append(target_host.target)
         if opts.use_tor:

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

@@ -162,14 +162,11 @@ class Machine:
     def nix(
         self,
         attr: str,
-        nix_options: list[str] | None = None,
     ) -> Any:
         """
         Build the machine and return the path to the result
         accepts a secret store and a facts store # TODO
         """
-        if nix_options is None:
-            nix_options = []
 
         config = nix_config()
         system = config["system"]
@@ -178,12 +175,7 @@ class Machine:
             f'clanInternals.machines."{system}"."{self.name}".{attr}'
         )
 
-    def eval_nix(
-        self,
-        attr: str,
-        extra_config: None | dict = None,
-        nix_options: list[str] | None = None,
-    ) -> Any:
+    def eval_nix(self, attr: str, extra_config: None | dict = None) -> Any:
         """
         eval a nix attribute of the machine
         @attr: the attribute to get
@@ -192,17 +184,9 @@ class Machine:
         if extra_config:
             log.warning("extra_config in eval_nix is no longer supported")
 
-        if nix_options is None:
-            nix_options = []
+        return self.nix(attr)
 
-        return self.nix(attr, nix_options)
-
-    def build_nix(
-        self,
-        attr: str,
-        extra_config: None | dict = None,
-        nix_options: list[str] | None = None,
-    ) -> Path:
+    def build_nix(self, attr: str, extra_config: None | dict = None) -> Path:
         """
         build a nix attribute of the machine
         @attr: the attribute to get
@@ -211,10 +195,7 @@ class Machine:
         if extra_config:
             log.warning("extra_config in build_nix is no longer supported")
 
-        if nix_options is None:
-            nix_options = []
-
-        output = self.nix(attr, nix_options)
+        output = self.nix(attr)
         output = Path(output)
         if tmp_store := nix_test_store():
             output = tmp_store.joinpath(*output.parts[1:])