clan-cli: move clan_cli.nix to clan_lib.nix

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

@@ -18,12 +18,12 @@ from clan_cli.dirs import (
 )
 from clan_cli.locked_open import locked_open
 from clan_cli.machines.machines import Machine
-from clan_cli.nix import nix_test_store
 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 import Flake
+from clan_lib.nix import nix_test_store
 
 log = logging.getLogger(__name__)
 

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

@@ -2,7 +2,7 @@ import subprocess
 from pathlib import Path
 
 import pytest
-from clan_cli.nix import nix_shell
+from clan_lib.nix import nix_shell
 
 
 # fixture for git_repo

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

@@ -8,7 +8,6 @@ import pytest
 from clan_cli.cmd import run
 from clan_cli.git import commit_file
 from clan_cli.locked_open import locked_open
-from clan_cli.nix import nix_command
 from clan_cli.templates import (
     ClanExports,
     InputName,
@@ -20,6 +19,7 @@ from clan_cli.templates import (
 )
 from clan_cli.tests.fixtures_flakes import FlakeForTest
 from clan_lib.flake import Flake
+from clan_lib.nix import nix_command
 
 
 # Function to write clan attributes to a file

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

@@ -4,10 +4,10 @@ from pathlib import Path
 
 import pytest
 from clan_cli.cmd import run
-from clan_cli.nix import nix_flake_show
 from clan_cli.tests.fixtures_flakes import FlakeForTest, substitute
 from clan_cli.tests.helpers import cli
 from clan_cli.tests.stdout import CaptureOutput
+from clan_lib.nix import nix_flake_show
 
 log = logging.getLogger(__name__)
 

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

@@ -4,10 +4,10 @@ from typing import TYPE_CHECKING
 
 import pytest
 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 import Flake
+from clan_lib.nix import nix_eval, run
 from clan_lib.nix_models.inventory import (
     Inventory,
     Machine,

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

@@ -5,7 +5,6 @@ from pathlib import Path
 
 import pytest
 from clan_cli.machines.machines import Machine
-from clan_cli.nix import nix_eval, run
 from clan_cli.tests.age_keys import SopsSetup
 from clan_cli.tests.fixtures_flakes import ClanFlake
 from clan_cli.tests.helpers import cli
@@ -24,6 +23,7 @@ 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 import Flake
+from clan_lib.nix import nix_eval, run
 
 
 def test_dependencies_as_files(temp_dir: Path) -> None:
@@ -451,7 +451,7 @@ def test_generate_secret_for_multiple_machines(
 ) -> None:
     flake = flake_with_sops
 
-    from clan_cli.nix import nix_config
+    from clan_lib.nix import nix_config
 
     local_system = nix_config()["system"]
 

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

@@ -6,13 +6,13 @@ from contextlib import ExitStack
 import pytest
 from clan_cli import cmd
 from clan_cli.machines.machines import Machine
-from clan_cli.nix import nix_eval, run
 from clan_cli.tests.age_keys import SopsSetup
 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 import Flake
+from clan_lib.nix import nix_eval, run
 
 
 @pytest.mark.impure