rename clanCore to clan.core in more instances

pkgs/clan-cli/clan_cli/__init__.py

@@ -330,7 +330,7 @@ State can be folders and databases that modules depend on managed by clan.
 
 State directories can be added to on a per machine basis:
 ```
-  config.clanCore.state.[SERVICE_NAME].folders = [
+  config.clan.core.state.[SERVICE_NAME].folders = [
     "/home"
     "/root"
   ];

pkgs/clan-cli/clan_cli/vms/run.py

@@ -24,13 +24,14 @@ log = logging.getLogger(__name__)
 
 def facts_to_nixos_config(facts: dict[str, dict[str, bytes]]) -> dict:
     nixos_config: dict = {}
-    nixos_config["clanCore"] = {}
-    nixos_config["clanCore"]["secrets"] = {}
+    nixos_config["clan"] = {}
+    nixos_config["clan"]["core"] = {}
+    nixos_config["clan"]["core"]["secrets"] = {}
     for service, service_facts in facts.items():
-        nixos_config["clanCore"]["secrets"][service] = {}
-        nixos_config["clanCore"]["secrets"][service]["facts"] = {}
+        nixos_config["clan"]["core"]["secrets"][service] = {}
+        nixos_config["clan"]["core"]["secrets"][service]["facts"] = {}
         for fact, value in service_facts.items():
-            nixos_config["clanCore"]["secrets"][service]["facts"][fact] = {
+            nixos_config["clan"]["core"]["secrets"][service]["facts"][fact] = {
                 "value": value.decode()
             }
     return nixos_config

pkgs/clan-cli/tests/test_vms_cli.py

@@ -177,17 +177,21 @@ def test_vm_persistence(
         machine_configs=dict(
             my_machine=dict(
                 services=dict(getty=dict(autologinUser="root")),
-                clanCore=dict(
-                    state=dict(
-                        my_state=dict(
-                            folders=[
-                                # to be owned by root
-                                "/var/my-state",
-                                # to be owned by user 'test'
-                                "/var/user-state",
-                            ]
+                clan=dict(
+                    core=dict(
+                        state=dict(
+                            my_state=dict(
+                                folders=[
+                                    # to be owned by root
+                                    "/var/my-state",
+                                    # to be owned by user 'test'
+                                    "/var/user-state",
+                                ]
+                            )
                         )
-                    )
+                    ),
+                    virtualisation=dict(graphics=False),
+                    networking=dict(targetHost="client"),
                 ),
                 # create test user to test if state can be owned by user
                 users=dict(
@@ -261,10 +265,6 @@ def test_vm_persistence(
                         ),
                     )
                 ),
-                clan=dict(
-                    virtualisation=dict(graphics=False),
-                    networking=dict(targetHost="client"),
-                ),
             )
         ),
     )