Refactor(clan_lib): move nix bound classes out of the cli folder

This commit is contained in:
Johannes Kirschbauer
2025-05-13 17:35:54 +02:00
parent 59e1512cfc
commit c77a3b11a8
14 changed files with 29 additions and 43 deletions

View File

@@ -5,6 +5,13 @@ from dataclasses import dataclass
from pathlib import Path
from clan_lib.api import API
from clan_lib.api.serde import dataclass_to_dict
from clan_lib.nix_models.inventory import (
Machine as InventoryMachine,
)
from clan_lib.nix_models.inventory import (
MachineDeploy,
)
from clan_cli.completions import add_dynamic_completer, complete_tags
from clan_cli.dirs import get_clan_flake_toplevel_or_env
@@ -12,11 +19,6 @@ from clan_cli.errors import ClanError
from clan_cli.flake import Flake
from clan_cli.git import commit_file
from clan_cli.inventory import (
Machine as InventoryMachine,
)
from clan_cli.inventory import (
MachineDeploy,
dataclass_to_dict,
patch_inventory_with,
)
from clan_cli.machines.list import list_nixos_machines

View File

@@ -11,6 +11,7 @@ from clan_lib.api import API
from clan_lib.api.disk import MachineDiskMatter
from clan_lib.api.modules import parse_frontmatter
from clan_lib.api.serde import dataclass_to_dict
from clan_lib.nix_models.inventory import Machine as InventoryMachine
from clan_cli.cmd import RunOpts, run
from clan_cli.completions import add_dynamic_completer, complete_tags
@@ -21,7 +22,6 @@ from clan_cli.inventory import (
load_inventory_eval,
patch_inventory_with,
)
from clan_cli.inventory.classes import Machine as InventoryMachine
from clan_cli.machines.hardware import HardwareConfig
from clan_cli.machines.machines import Machine
from clan_cli.nix import nix_eval

View File

@@ -7,11 +7,12 @@ import re
from pathlib import Path
from tempfile import TemporaryDirectory
from clan_lib.nix_models.inventory import Machine as InventoryMachine
from clan_cli.cmd import Log, RunOpts, run
from clan_cli.dirs import get_clan_flake_toplevel_or_env
from clan_cli.errors import ClanError
from clan_cli.flake import Flake
from clan_cli.inventory import Machine as InventoryMachine
from clan_cli.machines.create import CreateOptions, create_machine
from clan_cli.machines.machines import Machine
from clan_cli.nix import nix_build, nix_command