clan_cli: move flake class to clan_lib

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

@@ -5,6 +5,7 @@ from dataclasses import dataclass
 from pathlib import Path
 
 from clan_lib.api import API
+from clan_lib.flake.flake import Flake
 from clan_lib.nix_models.inventory import (
     Machine as InventoryMachine,
 )
@@ -17,7 +18,6 @@ from clan_lib.persist.util import apply_patch
 from clan_cli.completions import add_dynamic_completer, complete_tags
 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.git import commit_file
 from clan_cli.machines.list import list_machines
 from clan_cli.templates import (

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

@@ -6,12 +6,12 @@ from dataclasses import dataclass
 from clan_lib.api import API
 from clan_lib.api.disk import MachineDiskMatter
 from clan_lib.api.modules import parse_frontmatter
+from clan_lib.flake.flake import Flake
 from clan_lib.nix_models.inventory import Machine as InventoryMachine
 from clan_lib.persist.inventory_store import InventoryStore
 
 from clan_cli.completions import add_dynamic_completer, complete_tags
 from clan_cli.dirs import specific_machine_dir
-from clan_cli.flake import Flake
 from clan_cli.machines.hardware import HardwareConfig
 from clan_cli.machines.inventory import get_inv_machine
 from clan_cli.machines.machines import Machine

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

@@ -9,11 +9,12 @@ from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
+from clan_lib.flake.flake import Flake
+
 from clan_cli.cmd import Log, RunOpts, run
 from clan_cli.errors import ClanCmdError, ClanError
 from clan_cli.facts import public_modules as facts_public_modules
 from clan_cli.facts import secret_modules as facts_secret_modules
-from clan_cli.flake import Flake
 from clan_cli.nix import nix_config, nix_eval, nix_test_store
 from clan_cli.ssh.host import Host
 from clan_cli.ssh.host_key import HostKeyCheck

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

@@ -1,6 +1,6 @@
 import pytest
+from clan_lib.flake.flake import Flake
 
-from clan_cli.flake import Flake
 from clan_cli.machines.machines import Machine
 
 # Functions to test

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

@@ -7,12 +7,12 @@ import re
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
+from clan_lib.flake.flake import Flake
 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.machines.create import CreateOptions, create_machine
 from clan_cli.machines.machines import Machine
 from clan_cli.nix import nix_build, nix_command