clan_lib: move clan_lib.flake.flake to clan_lib.flake

pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py

@@ -23,7 +23,7 @@ from clan_cli.tests import age_keys
 from clan_cli.tests.fixture_error import FixtureError
 from clan_cli.tests.root import CLAN_CORE
 from clan_cli.tests.temporary_dir import TEMPDIR
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 log = logging.getLogger(__name__)
 

pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py

@@ -19,7 +19,7 @@ from clan_cli.templates import (
     list_templates,
 )
 from clan_cli.tests.fixtures_flakes import FlakeForTest
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 
 # Function to write clan attributes to a file

pkgs/clan-cli/clan_cli/tests/test_flake_caching.py

@@ -348,7 +348,7 @@ def test_conditional_all_selector(flake: ClanFlake) -> None:
 def test_caching_works(flake: ClanFlake) -> None:
     from unittest.mock import patch
 
-    from clan_lib.flake.flake import Flake
+    from clan_lib.flake import Flake
 
     my_flake = Flake(str(flake.path))
 

pkgs/clan-cli/clan_cli/tests/test_inventory_serde.py

@@ -2,7 +2,7 @@ from typing import Any, cast
 
 import pytest
 from clan_cli.tests.fixtures_flakes import FlakeForTest
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 from clan_lib.persist.inventory_store import InventoryStore
 
 

pkgs/clan-cli/clan_cli/tests/test_machines_cli.py

@@ -5,7 +5,7 @@ from clan_cli.tests import fixtures_flakes
 from clan_cli.tests.age_keys import SopsSetup, assert_secrets_file_recipients
 from clan_cli.tests.helpers import cli
 from clan_cli.tests.stdout import CaptureOutput
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 
 @pytest.mark.impure

pkgs/clan-cli/clan_cli/tests/test_modules.py

@@ -7,7 +7,7 @@ from clan_cli.machines.create import CreateOptions, create_machine
 from clan_cli.nix import nix_eval, run
 from clan_cli.tests.fixtures_flakes import FlakeForTest
 from clan_lib.api.modules import list_modules
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 from clan_lib.nix_models.inventory import (
     Inventory,
     Machine,

pkgs/clan-cli/clan_cli/tests/test_secrets_generate.py

@@ -8,7 +8,7 @@ from clan_cli.secrets.folders import sops_secrets_folder
 from clan_cli.tests.fixtures_flakes import FlakeForTest
 from clan_cli.tests.helpers import cli
 from clan_cli.tests.helpers.validator import is_valid_age_key
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 if TYPE_CHECKING:
     from .age_keys import KeyPair

pkgs/clan-cli/clan_cli/tests/test_vars.py

@@ -23,7 +23,7 @@ from clan_cli.vars.public_modules import in_repo
 from clan_cli.vars.secret_modules import password_store, sops
 from clan_cli.vars.set import set_var
 from clan_lib.errors import ClanError
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 
 def test_dependencies_as_files(temp_dir: Path) -> None:

pkgs/clan-cli/clan_cli/tests/test_vars_deployment.py

@@ -12,7 +12,7 @@ from clan_cli.tests.fixtures_flakes import ClanFlake
 from clan_cli.tests.helpers import cli
 from clan_cli.tests.nix_config import ConfigItem
 from clan_cli.vms.run import inspect_vm, spawn_vm
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 
 @pytest.mark.impure

pkgs/clan-cli/clan_cli/tests/test_vms_cli.py

@@ -7,7 +7,7 @@ from clan_cli.tests.fixtures_flakes import ClanFlake, FlakeForTest
 from clan_cli.tests.helpers import cli
 from clan_cli.tests.stdout import CaptureOutput
 from clan_cli.vms.run import inspect_vm, spawn_vm
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 if TYPE_CHECKING:
     from .age_keys import KeyPair