Merge pull request 'move flake test into flake folder' (#3682) from flake-in-lib into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3682

pkgs/clan-cli/clan_cli/vars/generate.py

@@ -22,7 +22,7 @@ from clan_cli.vars._types import StoreBase
 from clan_cli.vars.migration import check_can_migrate, migrate_files
 from clan_lib.api import API
 from clan_lib.errors import ClanError
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 from .check import check_vars
 from .graph import (

pkgs/clan-cli/clan_cli/vars/get.py

@@ -5,7 +5,7 @@ import sys
 from clan_cli.completions import add_dynamic_completer, complete_machines
 from clan_lib.api import API
 from clan_lib.errors import ClanError
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 from .generate import Var
 from .list import get_vars

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

@@ -5,7 +5,7 @@ from clan_cli.completions import add_dynamic_completer, complete_machines
 from clan_cli.machines.machines import Machine
 from clan_lib.api import API
 from clan_lib.errors import ClanError
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 from ._types import GeneratorUpdate
 from .generate import Generator, Prompt, Var, execute_generator

pkgs/clan-cli/clan_cli/vars/set.py

@@ -7,7 +7,7 @@ from clan_cli.git import commit_files
 from clan_cli.machines.machines import Machine
 from clan_cli.vars.get import get_var
 from clan_cli.vars.prompt import PromptType
-from clan_lib.flake.flake import Flake
+from clan_lib.flake import Flake
 
 from .generate import Var
 from .prompt import ask