Fixed cyclic dependencie AND swapped pytest-parallel for pytest-xdist to fix deadlock in tests

pkgs/clan-cli/clan_cli/secrets/folders.py

@@ -5,7 +5,7 @@ from typing import Callable
 
 from ..dirs import specific_flake_dir
 from ..errors import ClanError
-from ..flakes.types import FlakeName
+from ..types import FlakeName
 
 
 def get_sops_folder(flake_name: FlakeName) -> Path:

pkgs/clan-cli/clan_cli/secrets/groups.py

@@ -3,7 +3,7 @@ import os
 from pathlib import Path
 
 from ..errors import ClanError
-from ..flakes.types import FlakeName
+from ..types import FlakeName
 from ..machines.types import machine_name_type, validate_hostname
 from . import secrets
 from .folders import (

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

@@ -1,6 +1,6 @@
 import argparse
 
-from ..flakes.types import FlakeName
+from ..types import FlakeName
 from ..machines.types import machine_name_type, validate_hostname
 from . import secrets
 from .folders import list_objects, remove_object, sops_machines_folder

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

@@ -8,7 +8,7 @@ from typing import IO
 
 from .. import tty
 from ..errors import ClanError
-from ..flakes.types import FlakeName
+from ..types import FlakeName
 from .folders import (
     list_objects,
     sops_groups_folder,

pkgs/clan-cli/clan_cli/secrets/sops.py

@@ -9,7 +9,7 @@ from typing import IO, Iterator
 
 from ..dirs import user_config_dir
 from ..errors import ClanError
-from ..flakes.types import FlakeName
+from ..types import FlakeName
 from ..nix import nix_shell
 from .folders import sops_machines_folder, sops_users_folder
 

pkgs/clan-cli/clan_cli/secrets/sops_generate.py

@@ -11,7 +11,7 @@ from clan_cli.nix import nix_shell
 
 from ..dirs import specific_flake_dir
 from ..errors import ClanError
-from ..flakes.types import FlakeName
+from ..types import FlakeName
 from .folders import sops_secrets_folder
 from .machines import add_machine, has_machine
 from .secrets import decrypt_secret, encrypt_secret, has_secret

pkgs/clan-cli/clan_cli/secrets/users.py

@@ -1,6 +1,6 @@
 import argparse
 
-from ..flakes.types import FlakeName
+from ..types import FlakeName
 from . import secrets
 from .folders import list_objects, remove_object, sops_users_folder
 from .sops import read_key, write_key