From ccb93404789bd1b0cf5dd5faabbc5deac4814041 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 8 Aug 2025 20:55:54 +0200 Subject: [PATCH 1/3] Host: add None as default to command_prefix --- pkgs/clan-cli/clan_lib/ssh/host.py | 2 +- pkgs/clan-cli/clan_lib/ssh/remote.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-cli/clan_lib/ssh/host.py b/pkgs/clan-cli/clan_lib/ssh/host.py index 4c804de8f..019e0d1b8 100644 --- a/pkgs/clan-cli/clan_lib/ssh/host.py +++ b/pkgs/clan-cli/clan_lib/ssh/host.py @@ -18,7 +18,7 @@ class Host(ABC): This provides a common interface for both local and remote hosts. """ - command_prefix: str + command_prefix: str | None @property @abstractmethod diff --git a/pkgs/clan-cli/clan_lib/ssh/remote.py b/pkgs/clan-cli/clan_lib/ssh/remote.py index 720453fc8..caf762b2a 100644 --- a/pkgs/clan-cli/clan_lib/ssh/remote.py +++ b/pkgs/clan-cli/clan_lib/ssh/remote.py @@ -33,7 +33,7 @@ NO_OUTPUT_TIMEOUT = 20 @dataclass(frozen=True) class Remote(Host): address: str - command_prefix: str + command_prefix: str | None user: str = "root" port: int | None = None private_key: Path | None = None From cc07e0ea44b526ef1b86c0506720656591dbf358 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 8 Aug 2025 20:56:15 +0200 Subject: [PATCH 2/3] update hw config: add nixos-facter as default --- pkgs/clan-cli/clan_lib/machines/hardware.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/clan-cli/clan_lib/machines/hardware.py b/pkgs/clan-cli/clan_lib/machines/hardware.py index 5c39ed6fb..93e8bb363 100644 --- a/pkgs/clan-cli/clan_lib/machines/hardware.py +++ b/pkgs/clan-cli/clan_lib/machines/hardware.py @@ -62,7 +62,7 @@ def get_machine_target_platform(machine: Machine) -> str | None: @dataclass class HardwareGenerateOptions: machine: Machine - backend: HardwareConfig + backend: HardwareConfig = HardwareConfig.NIXOS_FACTER password: str | None = None From 3cf8f605d56f2df20b761efa69211bd44e2239a0 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 8 Aug 2025 20:56:45 +0200 Subject: [PATCH 3/3] flash: default keymap and lang --- pkgs/clan-cli/clan_lib/flash/flash.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-cli/clan_lib/flash/flash.py b/pkgs/clan-cli/clan_lib/flash/flash.py index a7dbbede2..7127e15d0 100644 --- a/pkgs/clan-cli/clan_lib/flash/flash.py +++ b/pkgs/clan-cli/clan_lib/flash/flash.py @@ -26,8 +26,10 @@ log = logging.getLogger(__name__) @dataclass class SystemConfig: - language: str | None = field(default=None) - keymap: str | None = field(default=None) + keymap: str = field(default="en") + language: str = field( + default="en_US.UTF-8" + ) # Leave this default, or implement virtual scrolling for the 400+ options in the UI. ssh_keys_path: list[str] | None = field(default=None)