From 1bb2f3b9b3db6387548f030ed36b770192e05ca2 Mon Sep 17 00:00:00 2001
From: Chris Kruining <chris@kruining.eu>
Date: Wed, 17 Sep 2025 21:02:13 +0200
Subject: [PATCH] hmmm

---
 clanServices/k3s/default.nix              |  2 +-
 clanServices/k3s/flake-module.nix         | 14 +++++++-------
 clanServices/zitadel/README.md            |  1 +
 clanServices/zitadel/default.nix          |  2 +-
 clanServices/zitadel/flake-module.nix     | 12 ++++++------
 clanServices/zitadel/tests/vm/default.nix | 14 +++++++-------
 flake.lock                                | 17 ++++++++++++++++-
 flake.nix                                 | 13 ++++++++-----
 8 files changed, 47 insertions(+), 28 deletions(-)
 create mode 100644 clanServices/zitadel/README.md

diff --git a/clanServices/k3s/default.nix b/clanServices/k3s/default.nix
index 07d753b..7c8df2d 100644
--- a/clanServices/k3s/default.nix
+++ b/clanServices/k3s/default.nix
@@ -6,7 +6,7 @@ in
   _class = "clan.service";
 
   manifest = {
-    name = "amarth/k3s";
+    name = "amarth-services/k3s";
     description = "K3s service in order to set up a cluster";
     categories = [ "System" "Network" "Containers" "Virtualisation" ];
     readme = readFile ./README.md;
diff --git a/clanServices/k3s/flake-module.nix b/clanServices/k3s/flake-module.nix
index 37fc062..187ef77 100644
--- a/clanServices/k3s/flake-module.nix
+++ b/clanServices/k3s/flake-module.nix
@@ -1,15 +1,15 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix {};
+  module = ./default.nix;
 in
 {
   clan.modules.k3s = module;
 
   perSystem = { ... }: {
-    # clan.nixosTests.k3s = {
-    #   imports = [ ./tests/vm/default.nix ];
+    clan.nixosTests.k3s = {
+      imports = [ ./tests/vm/default.nix ];
 
-    #   clan.modules."@amarth/k3s" = module;
-    # };
+      clan.modules."@amarth/k3s" = module;
+    };
   };
-}
\ No newline at end of file
+}
diff --git a/clanServices/zitadel/README.md b/clanServices/zitadel/README.md
new file mode 100644
index 0000000..d853c5d
--- /dev/null
+++ b/clanServices/zitadel/README.md
@@ -0,0 +1 @@
+# Zitadel Clan-service
diff --git a/clanServices/zitadel/default.nix b/clanServices/zitadel/default.nix
index 4d61b0c..7b084ce 100644
--- a/clanServices/zitadel/default.nix
+++ b/clanServices/zitadel/default.nix
@@ -6,7 +6,7 @@ in
   _class = "clan.service";
 
   manifest = {
-    name = "amarth/zitadel";
+    name = "amarth-services/zitadel";
     description = "Zitadel service module";
     categories = [ "System" "Identity" "IAM" ];
     readme = readFile ./README.md;
diff --git a/clanServices/zitadel/flake-module.nix b/clanServices/zitadel/flake-module.nix
index 06881c8..1f58e32 100644
--- a/clanServices/zitadel/flake-module.nix
+++ b/clanServices/zitadel/flake-module.nix
@@ -1,15 +1,15 @@
-{ lib, ... }:
+{ ... }:
 let
-  module = lib.modules.importApply ./default.nix {};
+  module = ./default.nix;
 in
 {
   clan.modules.zitadel = module;
 
   perSystem = { ... }: {
-    # clan.nixosTests.zitadel = {
-    #   imports = [ ./tests/vm/default.nix ];
+    clan.nixosTests.zitadel = {
+      imports = [ ./tests/vm/default.nix ];
 
-    #   clan.modules."@amarth/zitadel" = module;
-    # };
+      clan.modules."@amarth/zitadel" = module;
+    };
   };
 }
diff --git a/clanServices/zitadel/tests/vm/default.nix b/clanServices/zitadel/tests/vm/default.nix
index b011702..18af792 100644
--- a/clanServices/zitadel/tests/vm/default.nix
+++ b/clanServices/zitadel/tests/vm/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-  name = "service-k3s";
+  name = "service-zitadel";
 
   clan = {
     directory = ./.;
@@ -13,16 +13,16 @@
       };
 
       instances = {
-        k3s = {
+        zitadel = {
           module = {
-            name = "@amarth/k3s";
+            name = "@amarth/zitadel";
             input = "self";
           };
 
-          roles.server.machines."node1" = {};
+          roles.controller.machines."node1" = {};
 
-          roles.agent.machines."node2" = {};
-          roles.agent.machines."node3" = {};
+          roles.peer.machines."node2" = {};
+          roles.peer.machines."node3" = {};
         };
       };
     };
@@ -37,4 +37,4 @@
       start_all()
     '';
   };
-}
\ No newline at end of file
+}
diff --git a/flake.lock b/flake.lock
index 43ce87c..fe81cfb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -201,7 +201,8 @@
         "clan-core": "clan-core",
         "devshell": "devshell",
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "systems": "systems_2"
       }
     },
     "sops-nix": {
@@ -240,6 +241,20 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "id": "systems",
+        "type": "indirect"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index d8bd7c9..86f6edb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,24 +21,27 @@
   };
 
   outputs =
-    inputs@{ flake-parts, ... }:
+    inputs@{ flake-parts, systems, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: {
       systems = [
         "x86_64-linux"
       ];
 
       imports = [
+        flake-parts.flakeModules.modules
         inputs.clan-core.flakeModules.default
         inputs.devshell.flakeModule
+
+        ./clanServices/flake-module.nix
       ];
 
       clan = {
         meta.name = "amarth-services";
 
-        modules = {
-          "@amarth/zitadel" = flake-parts.lib.importApply ./clanServices/zitadel/default.nix {};
-          "@amarth/k3s" = flake-parts.lib.importApply ./clanServices/k3s/default.nix {};
-        };
+        # modules = {
+        #   "@amarth/zitadel" = flake-parts.lib.importApply ./clanServices/zitadel/default.nix {};
+        #   "@amarth/k3s" = flake-parts.lib.importApply ./clanServices/k3s/default.nix {};
+        # };
       };
 
       perSystem = { system, ... }: {