From 35cd5bf0eeacd8d998ea55ee809692eed57dfc71 Mon Sep 17 00:00:00 2001
From: clan-tool <clan@example.com>
Date: Mon, 22 Sep 2025 06:45:38 +0000
Subject: [PATCH 1/4] I didn't push my code again...

---
 clan.nix                                      |  2 +-
 flake.lock                                    | 53 ++++++-------------
 flake.nix                                     | 17 +++---
 vars/per-machine/c1/k3s/ip_v4/value           |  1 -
 vars/per-machine/c1/k3s/ip_v6/value           |  1 -
 .../c1/state-version/version/value            |  1 -
 .../c2/state-version/version/value            |  1 -
 .../c3/state-version/version/value            |  1 -
 .../m1/state-version/version/value            |  1 -
 9 files changed, 27 insertions(+), 51 deletions(-)
 delete mode 100644 vars/per-machine/c1/k3s/ip_v4/value
 delete mode 100644 vars/per-machine/c1/k3s/ip_v6/value
 delete mode 100644 vars/per-machine/c1/state-version/version/value
 delete mode 100644 vars/per-machine/c2/state-version/version/value
 delete mode 100644 vars/per-machine/c3/state-version/version/value
 delete mode 100644 vars/per-machine/m1/state-version/version/value

diff --git a/clan.nix b/clan.nix
index 4cc945d..252d012 100644
--- a/clan.nix
+++ b/clan.nix
@@ -11,7 +11,7 @@
       description = "Management node 1";
       machineClass = "nixos";
       tags = [ "cloud:amarth" "region:oss" "nodeType:management" "criticallity:critical" "" ];
-      deploy.targetHost = "root@192.168.1.222";
+      deploy.targetHost = "root@192.168.1.223";
     };
     c1 = {
       name = "compute-1";
diff --git a/flake.lock b/flake.lock
index c61f67d..cf8ebef 100644
--- a/flake.lock
+++ b/flake.lock
@@ -157,24 +157,6 @@
         "type": "github"
       }
     },
-    "devshell_2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1741473158,
-        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -391,22 +373,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1722073938,
-        "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1758035966,
         "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
@@ -426,9 +392,9 @@
       "inputs": {
         "amarth-services": "amarth-services",
         "clan-core": "clan-core_2",
-        "devshell": "devshell_2",
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems_4"
       }
     },
     "sops-nix": {
@@ -518,6 +484,21 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index e9fb98f..e2f78b7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,4 +1,6 @@
 {
+  description = "Infrastructure of Amarth Cloud";
+
   inputs = {
     nixpkgs = {
       url = "github:NixOS/nixpkgs?ref=nixos-unstable";
@@ -15,23 +17,22 @@
       inputs.flake-parts.follows = "flake-parts";
     };
 
-    devshell = {
-      url = "github:numtide/devshell";
-    };
-
     amarth-services = {
       url = "git+https://git.amarth.cloud/amarth/services";
     };
+
+    systems = {
+      url = "github:nix-systems/default";
+    };
   };
 
   outputs =
-    inputs@{ flake-parts, self, clan-core, ... }:
+    inputs@{ flake-parts, self, clan-core, systems, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: {
-      systems = [
-        "x86_64-linux"
-      ];
+      systems = import systems;
 
       imports = [
+        flake-parts.flakeModules.modules
         clan-core.flakeModules.default
 
         ./devShells/flake-module.nix
diff --git a/vars/per-machine/c1/k3s/ip_v4/value b/vars/per-machine/c1/k3s/ip_v4/value
deleted file mode 100644
index 7b9ad53..0000000
--- a/vars/per-machine/c1/k3s/ip_v4/value
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1
diff --git a/vars/per-machine/c1/k3s/ip_v6/value b/vars/per-machine/c1/k3s/ip_v6/value
deleted file mode 100644
index 20e29b1..0000000
--- a/vars/per-machine/c1/k3s/ip_v6/value
+++ /dev/null
@@ -1 +0,0 @@
-::1
diff --git a/vars/per-machine/c1/state-version/version/value b/vars/per-machine/c1/state-version/version/value
deleted file mode 100644
index 115ab7a..0000000
--- a/vars/per-machine/c1/state-version/version/value
+++ /dev/null
@@ -1 +0,0 @@
-25.11
\ No newline at end of file
diff --git a/vars/per-machine/c2/state-version/version/value b/vars/per-machine/c2/state-version/version/value
deleted file mode 100644
index 115ab7a..0000000
--- a/vars/per-machine/c2/state-version/version/value
+++ /dev/null
@@ -1 +0,0 @@
-25.11
\ No newline at end of file
diff --git a/vars/per-machine/c3/state-version/version/value b/vars/per-machine/c3/state-version/version/value
deleted file mode 100644
index 115ab7a..0000000
--- a/vars/per-machine/c3/state-version/version/value
+++ /dev/null
@@ -1 +0,0 @@
-25.11
\ No newline at end of file
diff --git a/vars/per-machine/m1/state-version/version/value b/vars/per-machine/m1/state-version/version/value
deleted file mode 100644
index 115ab7a..0000000
--- a/vars/per-machine/m1/state-version/version/value
+++ /dev/null
@@ -1 +0,0 @@
-25.11
\ No newline at end of file

From ebcdc671fb963cade206fd67fdc9600f2d8b303d Mon Sep 17 00:00:00 2001
From: clan-tool <clan@example.com>
Date: Mon, 22 Sep 2025 08:46:36 +0200
Subject: [PATCH 2/4] .

---
 sops/machines/c1/key.json | 0
 sops/machines/c2/key.json | 0
 sops/machines/c3/key.json | 0
 sops/machines/m1/key.json | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 sops/machines/c1/key.json
 mode change 100755 => 100644 sops/machines/c2/key.json
 mode change 100755 => 100644 sops/machines/c3/key.json
 mode change 100755 => 100644 sops/machines/m1/key.json

diff --git a/sops/machines/c1/key.json b/sops/machines/c1/key.json
old mode 100755
new mode 100644
diff --git a/sops/machines/c2/key.json b/sops/machines/c2/key.json
old mode 100755
new mode 100644
diff --git a/sops/machines/c3/key.json b/sops/machines/c3/key.json
old mode 100755
new mode 100644
diff --git a/sops/machines/m1/key.json b/sops/machines/m1/key.json
old mode 100755
new mode 100644

From 63441374a8855fc55e3078502cc98957e0d3ec52 Mon Sep 17 00:00:00 2001
From: clan-tool <clan@example.com>
Date: Mon, 22 Sep 2025 08:47:03 +0200
Subject: [PATCH 3/4] .

---
 sops/users/chris/key.json                                        | 0
 vars/per-machine/c1/k3s/token/machines/c1                        | 1 -
 vars/per-machine/c1/k3s/token/users/chris                        | 1 -
 vars/per-machine/c1/openssh/ssh.id_ed25519/machines/c1           | 1 -
 vars/per-machine/c1/openssh/ssh.id_ed25519/users/chris           | 1 -
 vars/per-machine/c1/root-password/password-hash/machines/c1      | 1 -
 vars/per-machine/c1/root-password/password-hash/users/chris      | 1 -
 vars/per-machine/c1/root-password/password/users/chris           | 1 -
 .../per-machine/c1/zerotier/zerotier-identity-secret/machines/c1 | 1 -
 .../per-machine/c1/zerotier/zerotier-identity-secret/users/chris | 1 -
 vars/per-machine/c2/openssh/ssh.id_ed25519/machines/c2           | 1 -
 vars/per-machine/c2/openssh/ssh.id_ed25519/users/chris           | 1 -
 vars/per-machine/c2/root-password/password-hash/machines/c2      | 1 -
 vars/per-machine/c2/root-password/password-hash/users/chris      | 1 -
 vars/per-machine/c2/root-password/password/users/chris           | 1 -
 .../per-machine/c2/zerotier/zerotier-identity-secret/machines/c2 | 1 -
 .../per-machine/c2/zerotier/zerotier-identity-secret/users/chris | 1 -
 vars/per-machine/c3/openssh/ssh.id_ed25519/machines/c3           | 1 -
 vars/per-machine/c3/openssh/ssh.id_ed25519/users/chris           | 1 -
 vars/per-machine/c3/root-password/password-hash/machines/c3      | 1 -
 vars/per-machine/c3/root-password/password-hash/users/chris      | 1 -
 vars/per-machine/c3/root-password/password/users/chris           | 1 -
 .../per-machine/c3/zerotier/zerotier-identity-secret/machines/c3 | 1 -
 .../per-machine/c3/zerotier/zerotier-identity-secret/users/chris | 1 -
 vars/per-machine/m1/openssh/ssh.id_ed25519/machines/m1           | 1 -
 vars/per-machine/m1/openssh/ssh.id_ed25519/users/chris           | 1 -
 vars/per-machine/m1/root-password/password-hash/machines/m1      | 1 -
 vars/per-machine/m1/root-password/password-hash/users/chris      | 1 -
 vars/per-machine/m1/root-password/password/users/chris           | 1 -
 .../per-machine/m1/zerotier/zerotier-identity-secret/machines/m1 | 1 -
 .../per-machine/m1/zerotier/zerotier-identity-secret/users/chris | 1 -
 vars/per-machine/m1/zitadel/masterKey/machines/m1                | 1 -
 vars/per-machine/m1/zitadel/masterKey/users/chris                | 1 -
 33 files changed, 32 deletions(-)
 mode change 100755 => 100644 sops/users/chris/key.json
 delete mode 120000 vars/per-machine/c1/k3s/token/machines/c1
 delete mode 120000 vars/per-machine/c1/k3s/token/users/chris
 delete mode 120000 vars/per-machine/c1/openssh/ssh.id_ed25519/machines/c1
 delete mode 120000 vars/per-machine/c1/openssh/ssh.id_ed25519/users/chris
 delete mode 120000 vars/per-machine/c1/root-password/password-hash/machines/c1
 delete mode 120000 vars/per-machine/c1/root-password/password-hash/users/chris
 delete mode 120000 vars/per-machine/c1/root-password/password/users/chris
 delete mode 120000 vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1
 delete mode 120000 vars/per-machine/c1/zerotier/zerotier-identity-secret/users/chris
 delete mode 120000 vars/per-machine/c2/openssh/ssh.id_ed25519/machines/c2
 delete mode 120000 vars/per-machine/c2/openssh/ssh.id_ed25519/users/chris
 delete mode 120000 vars/per-machine/c2/root-password/password-hash/machines/c2
 delete mode 120000 vars/per-machine/c2/root-password/password-hash/users/chris
 delete mode 120000 vars/per-machine/c2/root-password/password/users/chris
 delete mode 120000 vars/per-machine/c2/zerotier/zerotier-identity-secret/machines/c2
 delete mode 120000 vars/per-machine/c2/zerotier/zerotier-identity-secret/users/chris
 delete mode 120000 vars/per-machine/c3/openssh/ssh.id_ed25519/machines/c3
 delete mode 120000 vars/per-machine/c3/openssh/ssh.id_ed25519/users/chris
 delete mode 120000 vars/per-machine/c3/root-password/password-hash/machines/c3
 delete mode 120000 vars/per-machine/c3/root-password/password-hash/users/chris
 delete mode 120000 vars/per-machine/c3/root-password/password/users/chris
 delete mode 120000 vars/per-machine/c3/zerotier/zerotier-identity-secret/machines/c3
 delete mode 120000 vars/per-machine/c3/zerotier/zerotier-identity-secret/users/chris
 delete mode 120000 vars/per-machine/m1/openssh/ssh.id_ed25519/machines/m1
 delete mode 120000 vars/per-machine/m1/openssh/ssh.id_ed25519/users/chris
 delete mode 120000 vars/per-machine/m1/root-password/password-hash/machines/m1
 delete mode 120000 vars/per-machine/m1/root-password/password-hash/users/chris
 delete mode 120000 vars/per-machine/m1/root-password/password/users/chris
 delete mode 120000 vars/per-machine/m1/zerotier/zerotier-identity-secret/machines/m1
 delete mode 120000 vars/per-machine/m1/zerotier/zerotier-identity-secret/users/chris
 delete mode 120000 vars/per-machine/m1/zitadel/masterKey/machines/m1
 delete mode 120000 vars/per-machine/m1/zitadel/masterKey/users/chris

diff --git a/sops/users/chris/key.json b/sops/users/chris/key.json
old mode 100755
new mode 100644
diff --git a/vars/per-machine/c1/k3s/token/machines/c1 b/vars/per-machine/c1/k3s/token/machines/c1
deleted file mode 120000
index 01430a8..0000000
--- a/vars/per-machine/c1/k3s/token/machines/c1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/c1
\ No newline at end of file
diff --git a/vars/per-machine/c1/k3s/token/users/chris b/vars/per-machine/c1/k3s/token/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c1/k3s/token/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c1/openssh/ssh.id_ed25519/machines/c1 b/vars/per-machine/c1/openssh/ssh.id_ed25519/machines/c1
deleted file mode 120000
index 01430a8..0000000
--- a/vars/per-machine/c1/openssh/ssh.id_ed25519/machines/c1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/c1
\ No newline at end of file
diff --git a/vars/per-machine/c1/openssh/ssh.id_ed25519/users/chris b/vars/per-machine/c1/openssh/ssh.id_ed25519/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c1/openssh/ssh.id_ed25519/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c1/root-password/password-hash/machines/c1 b/vars/per-machine/c1/root-password/password-hash/machines/c1
deleted file mode 120000
index 01430a8..0000000
--- a/vars/per-machine/c1/root-password/password-hash/machines/c1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/c1
\ No newline at end of file
diff --git a/vars/per-machine/c1/root-password/password-hash/users/chris b/vars/per-machine/c1/root-password/password-hash/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c1/root-password/password-hash/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c1/root-password/password/users/chris b/vars/per-machine/c1/root-password/password/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c1/root-password/password/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1 b/vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1
deleted file mode 120000
index 01430a8..0000000
--- a/vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/c1
\ No newline at end of file
diff --git a/vars/per-machine/c1/zerotier/zerotier-identity-secret/users/chris b/vars/per-machine/c1/zerotier/zerotier-identity-secret/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c1/zerotier/zerotier-identity-secret/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c2/openssh/ssh.id_ed25519/machines/c2 b/vars/per-machine/c2/openssh/ssh.id_ed25519/machines/c2
deleted file mode 120000
index 42c1f4d..0000000
--- a/vars/per-machine/c2/openssh/ssh.id_ed25519/machines/c2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/c2
\ No newline at end of file
diff --git a/vars/per-machine/c2/openssh/ssh.id_ed25519/users/chris b/vars/per-machine/c2/openssh/ssh.id_ed25519/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c2/openssh/ssh.id_ed25519/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c2/root-password/password-hash/machines/c2 b/vars/per-machine/c2/root-password/password-hash/machines/c2
deleted file mode 120000
index 42c1f4d..0000000
--- a/vars/per-machine/c2/root-password/password-hash/machines/c2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/c2
\ No newline at end of file
diff --git a/vars/per-machine/c2/root-password/password-hash/users/chris b/vars/per-machine/c2/root-password/password-hash/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c2/root-password/password-hash/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c2/root-password/password/users/chris b/vars/per-machine/c2/root-password/password/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c2/root-password/password/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c2/zerotier/zerotier-identity-secret/machines/c2 b/vars/per-machine/c2/zerotier/zerotier-identity-secret/machines/c2
deleted file mode 120000
index 42c1f4d..0000000
--- a/vars/per-machine/c2/zerotier/zerotier-identity-secret/machines/c2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/c2
\ No newline at end of file
diff --git a/vars/per-machine/c2/zerotier/zerotier-identity-secret/users/chris b/vars/per-machine/c2/zerotier/zerotier-identity-secret/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c2/zerotier/zerotier-identity-secret/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c3/openssh/ssh.id_ed25519/machines/c3 b/vars/per-machine/c3/openssh/ssh.id_ed25519/machines/c3
deleted file mode 120000
index 4115c15..0000000
--- a/vars/per-machine/c3/openssh/ssh.id_ed25519/machines/c3
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/c3
\ No newline at end of file
diff --git a/vars/per-machine/c3/openssh/ssh.id_ed25519/users/chris b/vars/per-machine/c3/openssh/ssh.id_ed25519/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c3/openssh/ssh.id_ed25519/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c3/root-password/password-hash/machines/c3 b/vars/per-machine/c3/root-password/password-hash/machines/c3
deleted file mode 120000
index 4115c15..0000000
--- a/vars/per-machine/c3/root-password/password-hash/machines/c3
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/c3
\ No newline at end of file
diff --git a/vars/per-machine/c3/root-password/password-hash/users/chris b/vars/per-machine/c3/root-password/password-hash/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c3/root-password/password-hash/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c3/root-password/password/users/chris b/vars/per-machine/c3/root-password/password/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c3/root-password/password/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c3/zerotier/zerotier-identity-secret/machines/c3 b/vars/per-machine/c3/zerotier/zerotier-identity-secret/machines/c3
deleted file mode 120000
index 4115c15..0000000
--- a/vars/per-machine/c3/zerotier/zerotier-identity-secret/machines/c3
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/c3
\ No newline at end of file
diff --git a/vars/per-machine/c3/zerotier/zerotier-identity-secret/users/chris b/vars/per-machine/c3/zerotier/zerotier-identity-secret/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/c3/zerotier/zerotier-identity-secret/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/m1/openssh/ssh.id_ed25519/machines/m1 b/vars/per-machine/m1/openssh/ssh.id_ed25519/machines/m1
deleted file mode 120000
index 9be3644..0000000
--- a/vars/per-machine/m1/openssh/ssh.id_ed25519/machines/m1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/m1
\ No newline at end of file
diff --git a/vars/per-machine/m1/openssh/ssh.id_ed25519/users/chris b/vars/per-machine/m1/openssh/ssh.id_ed25519/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/m1/openssh/ssh.id_ed25519/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/m1/root-password/password-hash/machines/m1 b/vars/per-machine/m1/root-password/password-hash/machines/m1
deleted file mode 120000
index 9be3644..0000000
--- a/vars/per-machine/m1/root-password/password-hash/machines/m1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/m1
\ No newline at end of file
diff --git a/vars/per-machine/m1/root-password/password-hash/users/chris b/vars/per-machine/m1/root-password/password-hash/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/m1/root-password/password-hash/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/m1/root-password/password/users/chris b/vars/per-machine/m1/root-password/password/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/m1/root-password/password/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/m1/zerotier/zerotier-identity-secret/machines/m1 b/vars/per-machine/m1/zerotier/zerotier-identity-secret/machines/m1
deleted file mode 120000
index 9be3644..0000000
--- a/vars/per-machine/m1/zerotier/zerotier-identity-secret/machines/m1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/m1
\ No newline at end of file
diff --git a/vars/per-machine/m1/zerotier/zerotier-identity-secret/users/chris b/vars/per-machine/m1/zerotier/zerotier-identity-secret/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/m1/zerotier/zerotier-identity-secret/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/m1/zitadel/masterKey/machines/m1 b/vars/per-machine/m1/zitadel/masterKey/machines/m1
deleted file mode 120000
index 9be3644..0000000
--- a/vars/per-machine/m1/zitadel/masterKey/machines/m1
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/machines/m1
\ No newline at end of file
diff --git a/vars/per-machine/m1/zitadel/masterKey/users/chris b/vars/per-machine/m1/zitadel/masterKey/users/chris
deleted file mode 120000
index 91b7741..0000000
--- a/vars/per-machine/m1/zitadel/masterKey/users/chris
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../sops/users/chris
\ No newline at end of file

From 982fcfb2575d6677bcd3fb58f5db8640023bd726 Mon Sep 17 00:00:00 2001
From: clan-tool <clan@example.com>
Date: Mon, 22 Sep 2025 08:47:40 +0200
Subject: [PATCH 4/4] .

---
 sops/machines/c1/key.json                                        | 0
 sops/machines/c2/key.json                                        | 0
 sops/machines/c3/key.json                                        | 0
 sops/machines/m1/key.json                                        | 0
 sops/users/chris/key.json                                        | 0
 vars/per-machine/c1/k3s/token/machines/c1                        | 1 +
 vars/per-machine/c1/k3s/token/users/chris                        | 1 +
 vars/per-machine/c1/openssh/ssh.id_ed25519/machines/c1           | 1 +
 vars/per-machine/c1/openssh/ssh.id_ed25519/users/chris           | 1 +
 vars/per-machine/c1/root-password/password-hash/machines/c1      | 1 +
 vars/per-machine/c1/root-password/password-hash/users/chris      | 1 +
 vars/per-machine/c1/root-password/password/users/chris           | 1 +
 .../per-machine/c1/zerotier/zerotier-identity-secret/machines/c1 | 1 +
 .../per-machine/c1/zerotier/zerotier-identity-secret/users/chris | 1 +
 vars/per-machine/c2/openssh/ssh.id_ed25519/machines/c2           | 1 +
 vars/per-machine/c2/openssh/ssh.id_ed25519/users/chris           | 1 +
 vars/per-machine/c2/root-password/password-hash/machines/c2      | 1 +
 vars/per-machine/c2/root-password/password-hash/users/chris      | 1 +
 vars/per-machine/c2/root-password/password/users/chris           | 1 +
 .../per-machine/c2/zerotier/zerotier-identity-secret/machines/c2 | 1 +
 .../per-machine/c2/zerotier/zerotier-identity-secret/users/chris | 1 +
 vars/per-machine/c3/openssh/ssh.id_ed25519/machines/c3           | 1 +
 vars/per-machine/c3/openssh/ssh.id_ed25519/users/chris           | 1 +
 vars/per-machine/c3/root-password/password-hash/machines/c3      | 1 +
 vars/per-machine/c3/root-password/password-hash/users/chris      | 1 +
 vars/per-machine/c3/root-password/password/users/chris           | 1 +
 .../per-machine/c3/zerotier/zerotier-identity-secret/machines/c3 | 1 +
 .../per-machine/c3/zerotier/zerotier-identity-secret/users/chris | 1 +
 vars/per-machine/m1/openssh/ssh.id_ed25519/machines/m1           | 1 +
 vars/per-machine/m1/openssh/ssh.id_ed25519/users/chris           | 1 +
 vars/per-machine/m1/root-password/password-hash/machines/m1      | 1 +
 vars/per-machine/m1/root-password/password-hash/users/chris      | 1 +
 vars/per-machine/m1/root-password/password/users/chris           | 1 +
 .../per-machine/m1/zerotier/zerotier-identity-secret/machines/m1 | 1 +
 .../per-machine/m1/zerotier/zerotier-identity-secret/users/chris | 1 +
 vars/per-machine/m1/zitadel/masterKey/machines/m1                | 1 +
 vars/per-machine/m1/zitadel/masterKey/users/chris                | 1 +
 37 files changed, 32 insertions(+)
 mode change 100644 => 100755 sops/machines/c1/key.json
 mode change 100644 => 100755 sops/machines/c2/key.json
 mode change 100644 => 100755 sops/machines/c3/key.json
 mode change 100644 => 100755 sops/machines/m1/key.json
 mode change 100644 => 100755 sops/users/chris/key.json
 create mode 120000 vars/per-machine/c1/k3s/token/machines/c1
 create mode 120000 vars/per-machine/c1/k3s/token/users/chris
 create mode 120000 vars/per-machine/c1/openssh/ssh.id_ed25519/machines/c1
 create mode 120000 vars/per-machine/c1/openssh/ssh.id_ed25519/users/chris
 create mode 120000 vars/per-machine/c1/root-password/password-hash/machines/c1
 create mode 120000 vars/per-machine/c1/root-password/password-hash/users/chris
 create mode 120000 vars/per-machine/c1/root-password/password/users/chris
 create mode 120000 vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1
 create mode 120000 vars/per-machine/c1/zerotier/zerotier-identity-secret/users/chris
 create mode 120000 vars/per-machine/c2/openssh/ssh.id_ed25519/machines/c2
 create mode 120000 vars/per-machine/c2/openssh/ssh.id_ed25519/users/chris
 create mode 120000 vars/per-machine/c2/root-password/password-hash/machines/c2
 create mode 120000 vars/per-machine/c2/root-password/password-hash/users/chris
 create mode 120000 vars/per-machine/c2/root-password/password/users/chris
 create mode 120000 vars/per-machine/c2/zerotier/zerotier-identity-secret/machines/c2
 create mode 120000 vars/per-machine/c2/zerotier/zerotier-identity-secret/users/chris
 create mode 120000 vars/per-machine/c3/openssh/ssh.id_ed25519/machines/c3
 create mode 120000 vars/per-machine/c3/openssh/ssh.id_ed25519/users/chris
 create mode 120000 vars/per-machine/c3/root-password/password-hash/machines/c3
 create mode 120000 vars/per-machine/c3/root-password/password-hash/users/chris
 create mode 120000 vars/per-machine/c3/root-password/password/users/chris
 create mode 120000 vars/per-machine/c3/zerotier/zerotier-identity-secret/machines/c3
 create mode 120000 vars/per-machine/c3/zerotier/zerotier-identity-secret/users/chris
 create mode 120000 vars/per-machine/m1/openssh/ssh.id_ed25519/machines/m1
 create mode 120000 vars/per-machine/m1/openssh/ssh.id_ed25519/users/chris
 create mode 120000 vars/per-machine/m1/root-password/password-hash/machines/m1
 create mode 120000 vars/per-machine/m1/root-password/password-hash/users/chris
 create mode 120000 vars/per-machine/m1/root-password/password/users/chris
 create mode 120000 vars/per-machine/m1/zerotier/zerotier-identity-secret/machines/m1
 create mode 120000 vars/per-machine/m1/zerotier/zerotier-identity-secret/users/chris
 create mode 120000 vars/per-machine/m1/zitadel/masterKey/machines/m1
 create mode 120000 vars/per-machine/m1/zitadel/masterKey/users/chris

diff --git a/sops/machines/c1/key.json b/sops/machines/c1/key.json
old mode 100644
new mode 100755
diff --git a/sops/machines/c2/key.json b/sops/machines/c2/key.json
old mode 100644
new mode 100755
diff --git a/sops/machines/c3/key.json b/sops/machines/c3/key.json
old mode 100644
new mode 100755
diff --git a/sops/machines/m1/key.json b/sops/machines/m1/key.json
old mode 100644
new mode 100755
diff --git a/sops/users/chris/key.json b/sops/users/chris/key.json
old mode 100644
new mode 100755
diff --git a/vars/per-machine/c1/k3s/token/machines/c1 b/vars/per-machine/c1/k3s/token/machines/c1
new file mode 120000
index 0000000..01430a8
--- /dev/null
+++ b/vars/per-machine/c1/k3s/token/machines/c1
@@ -0,0 +1 @@
+../../../../../../sops/machines/c1
\ No newline at end of file
diff --git a/vars/per-machine/c1/k3s/token/users/chris b/vars/per-machine/c1/k3s/token/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c1/k3s/token/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c1/openssh/ssh.id_ed25519/machines/c1 b/vars/per-machine/c1/openssh/ssh.id_ed25519/machines/c1
new file mode 120000
index 0000000..01430a8
--- /dev/null
+++ b/vars/per-machine/c1/openssh/ssh.id_ed25519/machines/c1
@@ -0,0 +1 @@
+../../../../../../sops/machines/c1
\ No newline at end of file
diff --git a/vars/per-machine/c1/openssh/ssh.id_ed25519/users/chris b/vars/per-machine/c1/openssh/ssh.id_ed25519/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c1/openssh/ssh.id_ed25519/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c1/root-password/password-hash/machines/c1 b/vars/per-machine/c1/root-password/password-hash/machines/c1
new file mode 120000
index 0000000..01430a8
--- /dev/null
+++ b/vars/per-machine/c1/root-password/password-hash/machines/c1
@@ -0,0 +1 @@
+../../../../../../sops/machines/c1
\ No newline at end of file
diff --git a/vars/per-machine/c1/root-password/password-hash/users/chris b/vars/per-machine/c1/root-password/password-hash/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c1/root-password/password-hash/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c1/root-password/password/users/chris b/vars/per-machine/c1/root-password/password/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c1/root-password/password/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1 b/vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1
new file mode 120000
index 0000000..01430a8
--- /dev/null
+++ b/vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1
@@ -0,0 +1 @@
+../../../../../../sops/machines/c1
\ No newline at end of file
diff --git a/vars/per-machine/c1/zerotier/zerotier-identity-secret/users/chris b/vars/per-machine/c1/zerotier/zerotier-identity-secret/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c1/zerotier/zerotier-identity-secret/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c2/openssh/ssh.id_ed25519/machines/c2 b/vars/per-machine/c2/openssh/ssh.id_ed25519/machines/c2
new file mode 120000
index 0000000..42c1f4d
--- /dev/null
+++ b/vars/per-machine/c2/openssh/ssh.id_ed25519/machines/c2
@@ -0,0 +1 @@
+../../../../../../sops/machines/c2
\ No newline at end of file
diff --git a/vars/per-machine/c2/openssh/ssh.id_ed25519/users/chris b/vars/per-machine/c2/openssh/ssh.id_ed25519/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c2/openssh/ssh.id_ed25519/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c2/root-password/password-hash/machines/c2 b/vars/per-machine/c2/root-password/password-hash/machines/c2
new file mode 120000
index 0000000..42c1f4d
--- /dev/null
+++ b/vars/per-machine/c2/root-password/password-hash/machines/c2
@@ -0,0 +1 @@
+../../../../../../sops/machines/c2
\ No newline at end of file
diff --git a/vars/per-machine/c2/root-password/password-hash/users/chris b/vars/per-machine/c2/root-password/password-hash/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c2/root-password/password-hash/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c2/root-password/password/users/chris b/vars/per-machine/c2/root-password/password/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c2/root-password/password/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c2/zerotier/zerotier-identity-secret/machines/c2 b/vars/per-machine/c2/zerotier/zerotier-identity-secret/machines/c2
new file mode 120000
index 0000000..42c1f4d
--- /dev/null
+++ b/vars/per-machine/c2/zerotier/zerotier-identity-secret/machines/c2
@@ -0,0 +1 @@
+../../../../../../sops/machines/c2
\ No newline at end of file
diff --git a/vars/per-machine/c2/zerotier/zerotier-identity-secret/users/chris b/vars/per-machine/c2/zerotier/zerotier-identity-secret/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c2/zerotier/zerotier-identity-secret/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c3/openssh/ssh.id_ed25519/machines/c3 b/vars/per-machine/c3/openssh/ssh.id_ed25519/machines/c3
new file mode 120000
index 0000000..4115c15
--- /dev/null
+++ b/vars/per-machine/c3/openssh/ssh.id_ed25519/machines/c3
@@ -0,0 +1 @@
+../../../../../../sops/machines/c3
\ No newline at end of file
diff --git a/vars/per-machine/c3/openssh/ssh.id_ed25519/users/chris b/vars/per-machine/c3/openssh/ssh.id_ed25519/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c3/openssh/ssh.id_ed25519/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c3/root-password/password-hash/machines/c3 b/vars/per-machine/c3/root-password/password-hash/machines/c3
new file mode 120000
index 0000000..4115c15
--- /dev/null
+++ b/vars/per-machine/c3/root-password/password-hash/machines/c3
@@ -0,0 +1 @@
+../../../../../../sops/machines/c3
\ No newline at end of file
diff --git a/vars/per-machine/c3/root-password/password-hash/users/chris b/vars/per-machine/c3/root-password/password-hash/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c3/root-password/password-hash/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c3/root-password/password/users/chris b/vars/per-machine/c3/root-password/password/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c3/root-password/password/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/c3/zerotier/zerotier-identity-secret/machines/c3 b/vars/per-machine/c3/zerotier/zerotier-identity-secret/machines/c3
new file mode 120000
index 0000000..4115c15
--- /dev/null
+++ b/vars/per-machine/c3/zerotier/zerotier-identity-secret/machines/c3
@@ -0,0 +1 @@
+../../../../../../sops/machines/c3
\ No newline at end of file
diff --git a/vars/per-machine/c3/zerotier/zerotier-identity-secret/users/chris b/vars/per-machine/c3/zerotier/zerotier-identity-secret/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/c3/zerotier/zerotier-identity-secret/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/m1/openssh/ssh.id_ed25519/machines/m1 b/vars/per-machine/m1/openssh/ssh.id_ed25519/machines/m1
new file mode 120000
index 0000000..9be3644
--- /dev/null
+++ b/vars/per-machine/m1/openssh/ssh.id_ed25519/machines/m1
@@ -0,0 +1 @@
+../../../../../../sops/machines/m1
\ No newline at end of file
diff --git a/vars/per-machine/m1/openssh/ssh.id_ed25519/users/chris b/vars/per-machine/m1/openssh/ssh.id_ed25519/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/m1/openssh/ssh.id_ed25519/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/m1/root-password/password-hash/machines/m1 b/vars/per-machine/m1/root-password/password-hash/machines/m1
new file mode 120000
index 0000000..9be3644
--- /dev/null
+++ b/vars/per-machine/m1/root-password/password-hash/machines/m1
@@ -0,0 +1 @@
+../../../../../../sops/machines/m1
\ No newline at end of file
diff --git a/vars/per-machine/m1/root-password/password-hash/users/chris b/vars/per-machine/m1/root-password/password-hash/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/m1/root-password/password-hash/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/m1/root-password/password/users/chris b/vars/per-machine/m1/root-password/password/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/m1/root-password/password/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/m1/zerotier/zerotier-identity-secret/machines/m1 b/vars/per-machine/m1/zerotier/zerotier-identity-secret/machines/m1
new file mode 120000
index 0000000..9be3644
--- /dev/null
+++ b/vars/per-machine/m1/zerotier/zerotier-identity-secret/machines/m1
@@ -0,0 +1 @@
+../../../../../../sops/machines/m1
\ No newline at end of file
diff --git a/vars/per-machine/m1/zerotier/zerotier-identity-secret/users/chris b/vars/per-machine/m1/zerotier/zerotier-identity-secret/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/m1/zerotier/zerotier-identity-secret/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file
diff --git a/vars/per-machine/m1/zitadel/masterKey/machines/m1 b/vars/per-machine/m1/zitadel/masterKey/machines/m1
new file mode 120000
index 0000000..9be3644
--- /dev/null
+++ b/vars/per-machine/m1/zitadel/masterKey/machines/m1
@@ -0,0 +1 @@
+../../../../../../sops/machines/m1
\ No newline at end of file
diff --git a/vars/per-machine/m1/zitadel/masterKey/users/chris b/vars/per-machine/m1/zitadel/masterKey/users/chris
new file mode 120000
index 0000000..91b7741
--- /dev/null
+++ b/vars/per-machine/m1/zitadel/masterKey/users/chris
@@ -0,0 +1 @@
+../../../../../../sops/users/chris
\ No newline at end of file