mob next [ci-skip] [ci skip] [skip ci]

lastFile:vars/per-machine/bosona/openssh-cert/ssh.id_ed25519-cert.pub/value

flake.lock

@@ -1,5 +1,58 @@
 {
   "nodes": {
+    "arion": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "haskell-flake": "haskell-flake",
+        "nixpkgs": [
+          "frappix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733918465,
+        "narHash": "sha256-hSuGa8Hh67EHr2x812Ay6WFyFT2BGKn+zk+FJWeKXPg=",
+        "owner": "hercules-ci",
+        "repo": "arion",
+        "rev": "f01c95c10f9d4f04bb08d97b3233b530b180f12e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "arion",
+        "type": "github"
+      }
+    },
+    "blank": {
+      "locked": {
+        "lastModified": 1625557891,
+        "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=",
+        "owner": "divnix",
+        "repo": "blank",
+        "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "blank",
+        "type": "github"
+      }
+    },
+    "call-flake": {
+      "locked": {
+        "lastModified": 1687380775,
+        "narHash": "sha256-bmhE1TmrJG4ba93l9WQTLuYM53kwGQAjYHRvHOeuxWU=",
+        "owner": "divnix",
+        "repo": "call-flake",
+        "rev": "74061f6c241227cd05e79b702db9a300a2e4131a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "call-flake",
+        "type": "github"
+      }
+    },
     "clan-core": {
       "inputs": {
         "data-mesher": "data-mesher",
@@ -19,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772411144,
-        "narHash": "sha256-WhXudztwPNnKXaqGX4DOqNfHzHdBSiGCvKGHM20pscw=",
+        "lastModified": 1781517972,
+        "narHash": "sha256-G8bIXFqifs/y62GNPwg20Ksf71raYwzmyN99gf1tXak=",
         "ref": "refs/heads/main",
-        "rev": "92cc85bc24eb31ce5725e1e72753129810ce3fe9",
-        "revCount": 13201,
+        "rev": "7fc62d0c25c7a97d7027a9c248e21c97c9b3acc1",
+        "revCount": 14604,
         "type": "git",
         "url": "https://git.clan.lol/clan/clan-core"
       },
@@ -48,11 +101,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772273147,
-        "narHash": "sha256-Wzhoc6ifjTDZi8aVRH3fuLJPdd4ouNTTwwVhgoMcMek=",
-        "rev": "d5de7a8d9e5726e678c94e62fe8ac3a809fee5da",
+        "lastModified": 1778718524,
+        "narHash": "sha256-pXLoI6Ax0EnUK6r34UM1vibVC7CfTu6j72R2692ZzPs=",
+        "rev": "12c552ad547d87254f33f33bddd1a2cdbeac754d",
         "type": "tarball",
-        "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/d5de7a8d9e5726e678c94e62fe8ac3a809fee5da.tar.gz"
+        "url": "https://git.clan.lol/api/v1/repos/clan/data-mesher/archive/12c552ad547d87254f33f33bddd1a2cdbeac754d.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -87,11 +140,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771881364,
-        "narHash": "sha256-A5uE/hMium5of/QGC6JwF5TGoDAfpNtW00T0s9u/PN8=",
+        "lastModified": 1781152676,
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "a4cb7bf73f264d40560ba527f9280469f1f081c6",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
         "type": "github"
       },
       "original": {
@@ -100,6 +153,39 @@
         "type": "github"
       }
     },
+    "dmerge": {
+      "inputs": {
+        "haumea": [
+          "frappix",
+          "std",
+          "haumea"
+        ],
+        "nixlib": [
+          "frappix",
+          "std",
+          "lib"
+        ],
+        "yants": [
+          "frappix",
+          "std",
+          "yants"
+        ]
+      },
+      "locked": {
+        "lastModified": 1686862774,
+        "narHash": "sha256-ojGtRQ9pIOUrxsQEuEPerUkqIJEuod9hIflfNkY+9CE=",
+        "owner": "divnix",
+        "repo": "dmerge",
+        "rev": "9f7f7a8349d33d7bd02e0f2b484b1f076e503a96",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "ref": "0.2.1",
+        "repo": "dmerge",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -120,6 +206,146 @@
         "type": "github"
       }
     },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "frappix",
+          "arion",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "frappix": {
+      "inputs": {
+        "arion": "arion",
+        "devshell": [
+          "devshell"
+        ],
+        "microvm": "microvm",
+        "n2c": "n2c",
+        "nixago": "nixago",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "std": "std"
+      },
+      "locked": {
+        "lastModified": 1782964989,
+        "narHash": "sha256-pU2Gye+1f+nvFleBTgXdeQfrQnKaJEuO2LT7PnsJ1p0=",
+        "owner": "kurogeek",
+        "repo": "frappix",
+        "rev": "ac5e2814fc1aca188080bf6b50504cd329790e56",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kurogeek",
+        "repo": "frappix",
+        "type": "github"
+      }
+    },
+    "haskell-flake": {
+      "locked": {
+        "lastModified": 1675296942,
+        "narHash": "sha256-u1X1sblozi5qYEcLp1hxcyo8FfDHnRUVX3dJ/tW19jY=",
+        "owner": "srid",
+        "repo": "haskell-flake",
+        "rev": "c2cafce9d57bfca41794dc3b99c593155006c71e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "ref": "0.1.0",
+        "repo": "haskell-flake",
+        "type": "github"
+      }
+    },
+    "haumea": {
+      "inputs": {
+        "nixpkgs": [
+          "frappix",
+          "std",
+          "lib"
+        ]
+      },
+      "locked": {
+        "lastModified": 1685133229,
+        "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=",
+        "owner": "nix-community",
+        "repo": "haumea",
+        "rev": "34dd58385092a23018748b50f9b23de6266dffc2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "v0.2.2",
+        "repo": "haumea",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -127,11 +353,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768068402,
-        "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=",
+        "lastModified": 1781557312,
+        "narHash": "sha256-QOIRYSUFSq7L5mY3dZymaVhcnne3tPgoR9riB0WocjA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c",
+        "rev": "c03e4752899e55705dfa63979abd885c582a5c48",
         "type": "github"
       },
       "original": {
@@ -155,14 +381,51 @@
         "type": "github"
       }
     },
+    "incl": {
+      "inputs": {
+        "nixlib": [
+          "frappix",
+          "std",
+          "lib"
+        ]
+      },
+      "locked": {
+        "lastModified": 1693483555,
+        "narHash": "sha256-Beq4WhSeH3jRTZgC1XopTSU10yLpK1nmMcnGoXO0XYo=",
+        "owner": "divnix",
+        "repo": "incl",
+        "rev": "526751ad3d1e23b07944b14e3f6b7a5948d3007b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "incl",
+        "type": "github"
+      }
+    },
+    "lib": {
+      "locked": {
+        "lastModified": 1722128034,
+        "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "liminix": {
       "flake": false,
       "locked": {
-        "lastModified": 1773253359,
-        "narHash": "sha256-LogvYVd2NfZnTlxAkl5K9tqX9c7wEEPdnYJsW9WTSG4=",
+        "lastModified": 1777223456,
+        "narHash": "sha256-yqZ9OFSXoKgdT6nWwt2d0OFwmfQXASl73hhjtvAD11A=",
         "ref": "refs/heads/main",
-        "rev": "7f23c5dc0f442de9fe07c076297c3a74f2a34e72",
-        "revCount": 1656,
+        "rev": "5f2abc0d2b30eb5878d60488a72138958c228976",
+        "revCount": 1672,
         "type": "git",
         "url": "https://gti.telent.net/dan/liminix"
       },
@@ -171,6 +434,48 @@
         "url": "https://gti.telent.net/dan/liminix"
       }
     },
+    "microvm": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "frappix",
+          "nixpkgs"
+        ],
+        "spectrum": "spectrum"
+      },
+      "locked": {
+        "lastModified": 1737981104,
+        "narHash": "sha256-7AGmPPBgLHHWgzzFYDJcyhv/NiuCrpgzg8IyA7Q/H9o=",
+        "owner": "astro",
+        "repo": "microvm.nix",
+        "rev": "3768f4937f38334898c67e03f40e244a57a74caa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "astro",
+        "repo": "microvm.nix",
+        "type": "github"
+      }
+    },
+    "n2c": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1730479402,
+        "narHash": "sha256-79NLeNjpCa4mSasmFsE3QA6obURezF0TUO5Pm+1daog=",
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "rev": "5fb215a1564baa74ce04ad7f903d94ad6617e17a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nlewo",
+        "repo": "nix2container",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -179,11 +484,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772379624,
-        "narHash": "sha256-NG9LLTWlz4YiaTAiRGChbrzbVxBfX+Auq4Ab/SWmk4A=",
+        "lastModified": 1781242433,
+        "narHash": "sha256-bchLZZ3sRn740zyvD2icZSnNoTaanN0nw7l6fjVXO+E=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "52d061516108769656a8bd9c6e811c677ec5b462",
+        "rev": "aabb2037edfc0f210723b72cd5f528aab5dd3f0b",
         "type": "github"
       },
       "original": {
@@ -205,13 +510,53 @@
         "url": "https://git.clan.lol/clan/nix-select/archive/main.tar.gz"
       }
     },
+    "nixago": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixago-exts": [
+          "frappix"
+        ],
+        "nixpkgs": [
+          "frappix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746801636,
+        "narHash": "sha256-dlcKfIXp/eqFHzFm+DzseXAWWlpVwyk9cTvCKGtVKkw=",
+        "owner": "nix-community",
+        "repo": "nixago",
+        "rev": "8cc33f973ab3a891d8a41391e73ef451a783960b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixago",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772173633,
-        "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=",
+        "lastModified": 1712920918,
+        "narHash": "sha256-1yxFvUcJfUphK9V91KufIQom7gCsztza0H4Rz2VCWUU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "92323443a56f4e9fc4e4b712e3119f66d0969297",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1781359544,
+        "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6",
+        "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156",
         "type": "github"
       },
       "original": {
@@ -221,6 +566,68 @@
         "type": "github"
       }
     },
+    "nosys": {
+      "locked": {
+        "lastModified": 1668010795,
+        "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=",
+        "owner": "divnix",
+        "repo": "nosys",
+        "rev": "feade0141487801c71ff55623b421ed535dbdefa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "nosys",
+        "type": "github"
+      }
+    },
+    "paisano": {
+      "inputs": {
+        "call-flake": "call-flake",
+        "nixpkgs": [
+          "frappix",
+          "std",
+          "nixpkgs"
+        ],
+        "nosys": "nosys",
+        "yants": [
+          "frappix",
+          "std",
+          "yants"
+        ]
+      },
+      "locked": {
+        "lastModified": 1708640854,
+        "narHash": "sha256-EpcAmvIS4ErqhXtVEfd2GPpU/E/s8CCRSfYzk6FZ/fY=",
+        "owner": "paisano-nix",
+        "repo": "core",
+        "rev": "adcf742bc9463c08764ca9e6955bd5e7dcf3a3fe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "paisano-nix",
+        "ref": "0.2.0",
+        "repo": "core",
+        "type": "github"
+      }
+    },
+    "paisano-tui": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1708637035,
+        "narHash": "sha256-R19YURSK+MY/Rw6FZnojQS9zuDh+OoTAyngQAjjoubc=",
+        "owner": "paisano-nix",
+        "repo": "tui",
+        "rev": "231761b260587a64817e4ffae3afc15defaa15db",
+        "type": "github"
+      },
+      "original": {
+        "owner": "paisano-nix",
+        "ref": "v0.5.0",
+        "repo": "tui",
+        "type": "github"
+      }
+    },
     "plasma-manager": {
       "inputs": {
         "home-manager": [
@@ -249,10 +656,11 @@
         "clan-core": "clan-core",
         "devshell": "devshell",
         "flake-parts": "flake-parts",
+        "frappix": "frappix",
         "home-manager": "home-manager",
         "import-tree": "import-tree",
         "liminix": "liminix",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "plasma-manager": "plasma-manager",
         "treefmt-nix": "treefmt-nix"
       }
@@ -265,11 +673,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772340640,
-        "narHash": "sha256-1nq7+Kt5IUBD8Hu3nptVPbMf+22rNJoHT0t9L1X+GKA=",
+        "lastModified": 1780547341,
+        "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "dec4d8eac700dcd2fe3c020857d3ee220ec147f1",
+        "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
         "type": "github"
       },
       "original": {
@@ -278,7 +686,114 @@
         "type": "github"
       }
     },
+    "spectrum": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733308308,
+        "narHash": "sha256-+RcbMAjSxV1wW5UpS9abIG1lFZC8bITPiFIKNnE7RLs=",
+        "ref": "refs/heads/main",
+        "rev": "80c9e9830d460c944c8f730065f18bb733bc7ee2",
+        "revCount": 792,
+        "type": "git",
+        "url": "https://spectrum-os.org/git/spectrum"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://spectrum-os.org/git/spectrum"
+      }
+    },
+    "std": {
+      "inputs": {
+        "arion": [
+          "frappix",
+          "arion"
+        ],
+        "blank": "blank",
+        "devshell": [
+          "frappix",
+          "devshell"
+        ],
+        "dmerge": "dmerge",
+        "haumea": "haumea",
+        "incl": "incl",
+        "lib": "lib",
+        "makes": [
+          "frappix",
+          "std",
+          "blank"
+        ],
+        "microvm": [
+          "frappix",
+          "microvm"
+        ],
+        "n2c": [
+          "frappix",
+          "n2c"
+        ],
+        "nixago": [
+          "frappix",
+          "nixago"
+        ],
+        "nixpkgs": [
+          "frappix",
+          "nixpkgs"
+        ],
+        "paisano": "paisano",
+        "paisano-tui": "paisano-tui",
+        "terranix": [
+          "frappix",
+          "std",
+          "blank"
+        ],
+        "yants": "yants"
+      },
+      "locked": {
+        "lastModified": 1738072995,
+        "narHash": "sha256-jfwWnAVeQzIBS5Pex0xSUbGk88g1GFF2w+ohOtbRtcY=",
+        "owner": "divnix",
+        "repo": "std",
+        "rev": "2874513c4b76be4c4200779814993b546fe4a909",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "ref": "v0.33.4",
+        "repo": "std",
+        "type": "github"
+      }
+    },
     "systems": {
+      "locked": {
+        "lastModified": 1774449309,
+        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "ref": "future-26.11",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -300,11 +815,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768158989,
-        "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
+        "lastModified": 1775636079,
+        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
+        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
         "type": "github"
       },
       "original": {
@@ -312,6 +827,28 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
+    },
+    "yants": {
+      "inputs": {
+        "nixpkgs": [
+          "frappix",
+          "std",
+          "lib"
+        ]
+      },
+      "locked": {
+        "lastModified": 1686863218,
+        "narHash": "sha256-kooxYm3/3ornWtVBNHM3Zh020gACUyFX2G0VQXnB+mk=",
+        "owner": "divnix",
+        "repo": "yants",
+        "rev": "8f0da0dba57149676aa4817ec0c880fbde7a648d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "divnix",
+        "repo": "yants",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -34,6 +34,11 @@
       url = "git+https://gti.telent.net/dan/liminix";
       flake = false;
     };
+    frappix = {
+      url = "github:kurogeek/frappix";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.devshell.follows = "devshell";
+    };
   };
   outputs =
     {
@@ -50,6 +55,7 @@
           ./fmt.nix
           ./shell.nix
 
+          ./overlays
           ./machines
           ./routers
           ./inventories

inventories/default.nix

@@ -10,16 +10,20 @@
         glom = [
           "vega"
           "ramus"
+          "canopus"
+        ];
+        poy = [
+          "deneb"
+          "bosona"
         ];
         w = [ "sirius" ];
         b4l = [
           "rigel"
-          "neptune"
           "rana"
           "petra"
+          "alasia"
         ];
         phonebox = [
-          "neptune"
           "rigel"
           "almach"
           "alpheratz"
@@ -27,32 +31,42 @@
           "adhil"
           "buna"
         ];
-        global-network = [
-          "rana"
-          "sirius"
+
+        prometheus = [
+          "cursa"
+          "rigel"
+          "vega"
         ];
       };
 
       instances = {
-        admin = {
+
+        sshd = {
+          roles.server.tags."all" = { };
+          roles.server.settings = {
+            authorizedKeys = {
+              "berwn" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAB/raxJR8gASmquP63weHelbi+da2WBJR1DgzHPNz/f";
+              "davhau" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDuhpzDHBPvn8nv8RH1MRomDOaXyP4GziQm7r3MZ1Syk";
+              "kurogeek" =
+                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEcZ/p1Ofa9liwIzPWzNtONhJ7+FUWd2lCz33r81t8+w kurogeek@kurogeek";
+              "matthewcroughan" =
+                "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIOJDRQfb1+7VK5tOe8W40iryfBWYRO6Uf1r2viDjmsJtAAAABHNzaDo=";
+              "matthewcroughan-1" =
+                "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDgsWq+G/tcr6eUQYT7+sJeBtRmOMabgFiIgIV44XNc6AAAABHNzaDo=";
+              "matthewcroughan-2" =
+                "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIJMi3TAuwDtIeO4MsORlBZ31HzaV5bji1fFBPcC9/tWuAAAABHNzaDo=";
+            };
+          };
+        };
+
+        root-password = {
           module = {
-            name = "admin";
+            name = "users";
             input = "clan-core";
           };
           roles.default.tags."all" = { };
-          roles.default.settings.allowedKeys = {
-            "berwn" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAB/raxJR8gASmquP63weHelbi+da2WBJR1DgzHPNz/f";
-            "davhau" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDuhpzDHBPvn8nv8RH1MRomDOaXyP4GziQm7r3MZ1Syk";
-            "vi" =
-              "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAmgyEGuY/r7SDlJgrzYmQqpcWS5W+fCzRi3OS59ne4W openpgp:0xFF687387";
-            "kurogeek" =
-              "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEcZ/p1Ofa9liwIzPWzNtONhJ7+FUWd2lCz33r81t8+w kurogeek@kurogeek";
-            "matthewcroughan" =
-              "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIOJDRQfb1+7VK5tOe8W40iryfBWYRO6Uf1r2viDjmsJtAAAABHNzaDo=";
-            "matthewcroughan-1" =
-              "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDgsWq+G/tcr6eUQYT7+sJeBtRmOMabgFiIgIV44XNc6AAAABHNzaDo=";
-            "matthewcroughan-2" =
-              "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIJMi3TAuwDtIeO4MsORlBZ31HzaV5bji1fFBPcC9/tWuAAAABHNzaDo=";
+          roles.default.settings = {
+            user = "root";
           };
         };
 
@@ -83,7 +97,13 @@
             name = "zerotier";
             input = "clan-core";
           };
-          roles.controller.machines."vega" = { };
+          roles.controller.machines."vega" = {
+            settings.allowedIds = [
+              "dbe44c0287" # Alex-gateway
+              "b0e0b84fd3" # Alex
+              "2bd36db8cc" # kurogeek-thinkpad
+            ];
+          };
           roles.peer.tags.glom = { };
         };
 
@@ -92,16 +112,48 @@
             name = "zerotier";
             input = "clan-core";
           };
-          roles.controller.machines."rigel" = { };
+          roles.controller.machines."rigel" = {
+            settings.allowedIds = [
+              "dbe44c0287" # Alex-gateway
+              "b0e0b84fd3" # Alex
+              "2bd36db8cc" # kurogeek-thinkpad
+            ];
+          };
           roles.peer.tags.b4l = { };
         };
 
+        poy-network = {
+          module = {
+            name = "zerotier";
+            input = "clan-core";
+          };
+          roles.controller.machines."deneb" = {
+            settings.allowedIps = [
+              #kurogeek
+              "fdfe:7bf:a795:4524:4c99:932b:d36d:b8cc"
+            ];
+          };
+          roles.peer.tags."poy" = { };
+        };
+
+        internet = {
+          module.name = "internet";
+          roles.default.machines = {
+            ramus.settings.host = "5.223.63.55";
+            tangra.settings.host = "5.223.65.50";
+          };
+        };
+
         yggdrasil-global-network = {
           module = {
             name = "yggdrasil";
             input = "clan-core";
           };
-          roles.default.tags."global-network" = { };
+          roles.default.tags."all" = { };
+          roles.default.settings.extraYggdrasilIPs = [
+            # kurogeek's laptop
+            "200:c8db:ea9b:5bdc:44ed:ad87:462a:6bd0"
+          ];
           roles.default.settings.extraPeers = [
             "tls://ygg.jjolly.dev:3443"
             "tls://[2602:fc24:18:7a42::1]:993"
@@ -110,18 +162,21 @@
           ];
         };
 
-        yggdrasil-phone-network = {
+        newedge-headscale = {
           module = {
-            name = "yggdrasil";
-            input = "clan-core";
+            name = "headscale";
+            input = "self";
+          };
+          roles.server.machines."alasia".settings = {
+            public_url = "tailvpn.public.newedge.house";
+            base_domain = "tailnet.newedge.house";
+            advertise_routes = [ "10.0.10.0/24" ];
+            nameservers = [
+              "10.0.10.82"
+              "1.1.1.1"
+              "8.8.8.8"
+            ];
           };
-          roles.default.tags."phonebox" = { };
-          roles.default.settings.extraPeers = [
-            "tls://ygg.jjolly.dev:3443"
-            "tls://[2602:fc24:18:7a42::1]:993"
-            "tcp://leo.node.3dt.net:9002"
-            "tcp://ygg-kcmo.incognet.io:8883"
-          ];
         };
 
         phonebox = {
@@ -133,64 +188,15 @@
           roles.default.machines."adhil".settings = {
             ata-ethernet-iface = "end0";
           };
+          roles.default.machines."rigel".settings = {
+            extraClientNumbers = [
+              "01"
+              "02"
+            ];
+            extraFixedIPClient = { };
+          };
         };
 
-        pocket-id = {
-          module = {
-            name = "pocket-id";
-            input = "self";
-          };
-          roles.default.machines.b4l = { };
-        };
-        nextcloud = {
-          module = {
-            name = "nextcloud";
-            input = "self";
-          };
-          roles.default.machines.b4l = { };
-        };
-        stirling-pdf = {
-          module = {
-            name = "stirling-pdf";
-            input = "self";
-          };
-          roles.default.machines.b4l = { };
-        };
-        actual-budget = {
-          module = {
-            name = "actual-budget";
-            input = "self";
-          };
-          roles.default.machines.b4l = { };
-        };
-        victoriametrics = {
-          module = {
-            name = "victoriametrics";
-            input = "self";
-          };
-          roles.default.machines.b4l = { };
-        };
-        vikunja = {
-          module = {
-            name = "vikunja";
-            input = "self";
-          };
-          roles.default.machines.b4l = { };
-        };
-        grafana = {
-          module = {
-            name = "grafana";
-            input = "self";
-          };
-          roles.default.machines.b4l = { };
-        };
-        paperless = {
-          module = {
-            name = "paperless";
-            input = "self";
-          };
-          roles.default.machines.b4l = { };
-        };
         pulse-stream = {
           module = {
             name = "pulse-stream";
@@ -283,6 +289,64 @@
             dataDir = "/mnt/hdd/samba";
           };
         };
+
+        wordpress = {
+          module = {
+            name = "wordpress";
+            input = "self";
+          };
+          roles.server.machines."tangra".settings = {
+            tenants = [
+              "poyfestival.com"
+            ];
+            phpfpmOptions = ''
+              upload_max_filesize=64M
+              post_max_size=128M
+            '';
+            wpExtraConfig = ''
+              define('WP_MEMORY_LIMIT', '256M');
+              define('WP_DEBUG', false);
+              define('WP_DEBUG_DISPLAY', false);
+              define('WP_DEBUG_LOG', false);
+            '';
+          };
+        };
+
+        prometheus-monitoring = {
+          module = {
+            name = "prometheus";
+            input = "self";
+          };
+          roles.server.machines."cursa".settings = {
+            matrix-alertmanager = {
+              enable = true;
+              homeserverUrl = "https://matrix-client.matrix.org";
+              matrixUser = "@nixapollo:matrix.org";
+              matrixRooms = [
+                {
+                  receivers = [
+                    "matrix"
+                  ];
+                  roomId = "!rqIrWqPvsXqMgYpcNZ:matrix.org";
+                }
+              ];
+            };
+          };
+
+          roles.nodes.machines = {
+            vega.settings = {
+              exporters.smartctl = { };
+              exporters.zfs = { };
+            };
+            rigel.settings = {
+              exporters.smartctl = { };
+            };
+            sirius.settings = {
+              exporters.smartctl = { };
+              exporters.zfs = { };
+            };
+          };
+        };
       };
     };
   };

inventories/emmie.nix

@@ -18,9 +18,8 @@ in
         roles.peer.tags.emmie = { };
         roles.peer.settings = {
           folders = {
-            Syncthing = {
-              path = "${userhome}/Share/Syncthing";
-            };
+            Syncthing.path = "${userhome}/Share/Syncthing";
+            Desktop.path = "${userhome}/Desktop";
           };
           extraDevices = {
             pixel7a = {

inventory.json

@@ -29,6 +29,30 @@
     },
     "sirius": {
       "installedAt": 1770974584
+    },
+    "deneb": {
+      "installedAt": 1775718970
+    },
+    "canopus": {
+      "installedAt": 1775793532
+    },
+    "hadar": {
+      "installedAt": 1774427255
+    },
+    "procyon": {
+      "installedAt": 1775458442
+    },
+    "alasia": {
+      "installedAt": 1778661666
+    },
+    "bosona": {
+      "installedAt": 1779098893
+    },
+    "tangra": {
+      "installedAt": 1779958921
+    },
+    "cursa": {
+      "installedAt": 1782187627
     }
   }
 }

machines/adhil/configuration.nix

@@ -8,6 +8,7 @@
   # clan.core.networking.targetHost = "root@";
 
   clan.core.settings.name = "adhil";
-  # clan.meta.description = "Raspberry Pi 4 SBC board for one of w phone network. (With w office)";
+  clan.core.settings.machine.description =
+    "Raspberry Pi 4 SBC board for one of w phone network. (With w office)";
 
 }

machines/alasia/configuration.nix

@@ -0,0 +1,15 @@
+{
+  clan.core.settings.machine.description = "VM machine to host headplane instance";
+
+  nixpkgs.hostPlatform = {
+    system = "x86_64-linux";
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
+
+  system.stateVersion = "25.11";
+  clan.core.sops.defaultGroups = [ "admins" ];
+}

machines/alasia/disko.nix

@@ -0,0 +1,85 @@
+let
+  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
+  os = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
+in
+{
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
+
+  boot.zfs.forceImportRoot = false;
+
+  disko.devices = {
+    disk = {
+      "os-${hashDisk os}" = {
+        type = "disk";
+        device = os;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "nofail" ];
+              };
+            };
+            system = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        rootFsOptions = {
+          mountpoint = "none";
+          compression = "lz4";
+          acltype = "posixacl";
+          xattr = "sa";
+          "com.sun:auto-snapshot" = "true";
+        };
+        options.ashift = "12";
+        datasets = {
+          "root" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+          };
+          "root/nixos" = {
+            type = "zfs_fs";
+            options.mountpoint = "/";
+            mountpoint = "/";
+          };
+          "root/home" = {
+            type = "zfs_fs";
+            options.mountpoint = "/home";
+            mountpoint = "/home";
+          };
+          "root/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/tmp";
+            options = {
+              mountpoint = "/tmp";
+              sync = "disabled";
+            };
+          };
+        };
+      };
+    };
+  };
+}

machines/almach/configuration.nix

@@ -8,6 +8,6 @@
   # clan.core.networking.targetHost = "root@";
 
   clan.core.settings.name = "almach";
-  # clan.meta.description = "Radxa X4 SBC board for one of w phone network.";
+  clan.core.settings.machine.description = "Radxa X4 SBC board for one of w phone network.";
 
 }

machines/almach/disko.nix

@@ -14,6 +14,8 @@ in
     };
   };
 
+  boot.zfs.forceImportRoot = true;
+
   disko.devices = {
     disk = {
       "os-${hashDisk os}" = {

machines/alpheratz/configuration.nix

@@ -8,6 +8,6 @@
   # clan.core.networking.targetHost = "root@";
 
   clan.core.settings.name = "alpheratz";
-  # clan.meta.description = "Radxa X4 SBC board for one of w phone network.";
+  clan.core.settings.machine.description = "Radxa X4 SBC board for one of w phone network.";
 
 }

machines/alpheratz/disko.nix

@@ -14,6 +14,8 @@ in
     };
   };
 
+  boot.zfs.forceImportRoot = true;
+
   disko.devices = {
     disk = {
       "os-${hashDisk os}" = {

machines/b4l/services/actual-budget.nix

@@ -1,36 +0,0 @@
-{ config, ... }:
-let
-  abDomain = "${config.clan.core.vars.generators.b4l-actual-budget.files.subdomain.value}.${config.networking.fqdn}";
-in
-{
-  clan.core.vars.generators.b4l-actual-budget = {
-    files.subdomain.secret = false;
-
-    prompts = {
-      subdomain = {
-        persist = true;
-        type = "line";
-        description = "Sub-domain for Actual Budget app. Default:(budget)";
-      };
-    };
-
-    script = ''cat $prompts/subdomain || echo -n "budget" > $out/subdomain'';
-  };
-
-  services.actual = {
-    settings = {
-      allowedLoginMethods = [
-        "password"
-        "openid"
-      ];
-      trustedProxies = [ "127.0.0.1" ];
-    };
-  };
-  services.nginx.virtualHosts."${abDomain}" = {
-    useACMEHost = "${config.networking.fqdn}";
-    forceSSL = true;
-    locations."/" = {
-      proxyPass = "http://localhost:${builtins.toString config.services.actual.settings.port}";
-    };
-  };
-}

machines/b4l/services/grafana.nix

@@ -1,79 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
-with lib;
-let
-  serviceName = "${config.networking.hostName}-grafana";
-  gfDomain = "${
-    config.clan.core.vars.generators."${serviceName}".files.subdomain.value
-  }.${config.networking.fqdn}";
-
-  settingsFormatIni = pkgs.formats.ini {
-    listToValue = concatMapStringsSep " " (generators.mkValueStringDefault { });
-    mkKeyValue = generators.mkKeyValueDefault {
-      mkValueString = v: if v == null then "" else generators.mkValueStringDefault { } v;
-    } "=";
-  };
-  configFile = settingsFormatIni.generate "config.ini" config.services.grafana.settings;
-in
-{
-  clan.core.vars.generators."${serviceName}" = {
-    files = {
-      adminpassword.secret = true;
-      subdomain.secret = false;
-    };
-    prompts = {
-      subdomain = {
-        persist = true;
-        type = "line";
-        description = "Sub-domain for Grafana. Default:(grafana)";
-      };
-      adminpassword = {
-        persist = true;
-        type = "hidden";
-        description = "Password for the admin user. Leave empty to auto-generate.";
-      };
-    };
-
-    runtimeInputs = [
-      pkgs.xkcdpass
-      pkgs.coreutils
-    ];
-
-    script = ''
-      prompt_domain=$(cat "$prompts"/subdomain)
-      if [[ -n "''${prompt_domain-}" ]]; then
-        echo $prompt_domain | tr -d "\n" > "$out"/subdomain
-      else
-        echo -n "grafana" > "$out"/subdomain
-      fi
-
-      prompt_password=$(cat "$prompts"/adminpassword)
-      if [[ -n "''${prompt_password-}" ]]; then
-        echo "$prompt_password" | tr -d "\n" > "$out"/adminpassword
-      else
-        xkcdpass --numwords 4 --delimiter - --count 1 | tr -d "\n" > "$out"/adminpassword
-      fi
-    '';
-  };
-
-  systemd.services.grafana.serviceConfig.ExecStartPre = [
-    "+${pkgs.writeShellScript "grafana-set-password" ''
-      ${pkgs.grafana}/bin/grafana cli --homepath ${config.services.grafana.dataDir} --config ${configFile} admin reset-admin-password $(cat ${
-        config.clan.core.vars.generators."${serviceName}".files.adminpassword.path
-      })
-    ''}"
-  ];
-
-  services.nginx.virtualHosts."${gfDomain}" = {
-    forceSSL = true;
-    useACMEHost = "${config.networking.fqdn}";
-    locations."/" = {
-      proxyPass = "http://localhost:${builtins.toString config.services.grafana.settings.server.http_port}";
-    };
-  };
-
-}

machines/b4l/services/nextcloud.nix

@@ -1,35 +0,0 @@
-{ config, pkgs, ... }:
-let
-  ncDomain = "${config.clan.core.vars.generators.b4l-nextcloud.files.subdomain.value}.${config.networking.fqdn}";
-in
-{
-  clan.core.vars.generators.b4l-nextcloud = {
-    files.subdomain.secret = false;
-
-    prompts = {
-      subdomain = {
-        persist = true;
-        type = "line";
-        description = "Sub-domain for Nextcloud app. Default:(cloud)";
-      };
-    };
-
-    script = ''cat $prompts/subdomain || echo -n "cloud" > $out/subdomain'';
-  };
-
-  services.nextcloud = {
-    hostName = ncDomain;
-    package = pkgs.nextcloud32;
-
-    settings = {
-
-      overwriteprotocol = "https";
-      trusted_domains = [ ];
-      trusted_proxies = [ ];
-    };
-  };
-  services.nginx.virtualHosts."${ncDomain}" = {
-    useACMEHost = "${config.networking.fqdn}";
-    forceSSL = true;
-  };
-}

machines/b4l/services/paperless.nix

@@ -1,67 +0,0 @@
-{ config, pkgs, ... }:
-let
-  serviceName = "${config.networking.hostName}-paperless";
-  domain-name = "${
-    config.clan.core.vars.generators."${serviceName}".files.subdomain.value
-  }.${config.networking.fqdn}";
-in
-{
-  clan.core.vars.generators."${serviceName}" = {
-    files = {
-      subdomain.secret = false;
-      adminpassword = {
-        secret = true;
-        owner = config.services.paperless.user;
-        group = config.services.paperless.user;
-      };
-    };
-    prompts = {
-      subdomain = {
-        persist = true;
-        type = "line";
-        description = "Sub-domain for Paperless. Default:(paperless)";
-      };
-      adminpassword = {
-        persist = true;
-        type = "hidden";
-        description = "Password for the admin user. Leave empty to auto-generate.";
-      };
-    };
-
-    runtimeInputs = [
-      pkgs.xkcdpass
-      pkgs.coreutils
-    ];
-
-    script = ''
-      prompt_domain=$(cat "$prompts"/subdomain)
-      if [[ -n "''${prompt_domain-}" ]]; then
-        echo $prompt_domain | tr -d "\n" > "$out"/subdomain
-      else
-        echo -n "paperless" > "$out"/subdomain
-      fi
-
-      prompt_password=$(cat "$prompts"/adminpassword)
-      if [[ -n "''${prompt_password-}" ]]; then
-        echo "$prompt_password" | tr -d "\n" > "$out"/adminpassword
-      else
-        xkcdpass --numwords 4 --delimiter - --count 1 | tr -d "\n" > "$out"/adminpassword
-      fi
-    '';
-  };
-
-  environment.systemPackages = [ pkgs.toybox ];
-
-  services.paperless = {
-    passwordFile = config.clan.core.vars.generators."${serviceName}".files.adminpassword.path;
-  };
-
-  services.nginx.virtualHosts."${domain-name}" = {
-    forceSSL = true;
-    useACMEHost = "${config.networking.fqdn}";
-    locations."/" = {
-      proxyPass = "http://localhost:${builtins.toString config.services.paperless.port}";
-    };
-  };
-
-}

machines/b4l/services/pocket-id.nix

@@ -1,35 +0,0 @@
-{ config, ... }:
-let
-  pidDomain = "${config.clan.core.vars.generators.b4l-pocket-id.files.subdomain.value}.${config.networking.fqdn}";
-in
-{
-  clan.core.vars.generators.b4l-pocket-id = {
-    files.subdomain.secret = false;
-
-    prompts = {
-      subdomain = {
-        persist = true;
-        type = "line";
-        description = "Sub-domain for Pocket-ID app. Default:(auth)";
-      };
-    };
-
-    script = ''cat $prompts/subdomain || echo -n "auth" > $out/subdomain'';
-  };
-
-  services.pocket-id = {
-    settings = {
-      APP_ENV = "production";
-      APP_URL = "https://${pidDomain}";
-      TRUST_PROXY = true;
-    };
-  };
-
-  services.nginx.virtualHosts."${pidDomain}" = {
-    useACMEHost = "${config.networking.fqdn}";
-    forceSSL = true;
-    locations."/" = {
-      proxyPass = "http://localhost:${builtins.toString config.services.pocket-id.settings.PORT}";
-    };
-  };
-}

machines/b4l/services/stirling-pdf.nix

@@ -1,26 +0,0 @@
-{ config, ... }:
-let
-  stDomain = "${config.clan.core.vars.generators.b4l-stirling-pdf.files.subdomain.value}.${config.networking.fqdn}";
-in
-{
-  clan.core.vars.generators.b4l-stirling-pdf = {
-    files.subdomain.secret = false;
-
-    prompts = {
-      subdomain = {
-        persist = true;
-        type = "line";
-        description = "Sub-domain for Stirling PDF app. Default:(pdf)";
-      };
-    };
-    script = ''cat $prompts/subdomain || echo -n "pdf" > $out/subdomain'';
-  };
-
-  services.nginx.virtualHosts."${stDomain}" = {
-    forceSSL = true;
-    useACMEHost = "${config.networking.fqdn}";
-    locations."/" = {
-      proxyPass = "http://localhost:${builtins.toString config.services.stirling-pdf.environment.SERVER_PORT}";
-    };
-  };
-}

machines/b4l/services/victoriametrics.nix

@@ -1,73 +0,0 @@
-{ config, pkgs, ... }:
-let
-  vmDomain = "${config.clan.core.vars.generators.b4l-victoriametrics.files.subdomain.value}.${config.networking.fqdn}";
-in
-{
-  clan.core.vars.generators.b4l-victoriametrics = {
-    files.subdomain.secret = false;
-    files.adminuser.secret = false;
-    files.adminpassword.secret = true;
-
-    prompts = {
-      subdomain = {
-        persist = true;
-        type = "line";
-        description = "Sub-domain for Victoria Metrics app. Default:(metrics)";
-      };
-      adminuser = {
-        persist = true;
-        type = "line";
-        description = "Username for an admin user. Default:(admin)";
-      };
-      adminpassword = {
-        persist = true;
-        type = "hidden";
-        description = "Password for the admin user. Leave empty to auto-generate.";
-      };
-    };
-
-    runtimeInputs = [
-      pkgs.xkcdpass
-      pkgs.coreutils
-    ];
-
-    script = ''
-      prompt_domain=$(cat "$prompts"/subdomain)
-      if [[ -n "''${prompt_domain-}" ]]; then
-        echo $prompt_domain | tr -d "\n" > "$out"/subdomain
-      else
-        echo -n "metrics" > "$out"/subdomain
-      fi
-
-      prompt_adminuser=$(cat "$prompts"/adminuser)
-      if [[ -n "''${prompt_adminuser-}" ]]; then
-        echo $prompt_adminuser | tr -d "\n" > "$out"/adminuser
-      else
-        echo -n "admin" > "$out"/adminuser
-      fi
-
-      prompt_password=$(cat "$prompts"/adminpassword)
-      if [[ -n "''${prompt_password-}" ]]; then
-        echo "$prompt_password" | tr -d "\n" > "$out"/adminpassword
-      else
-        xkcdpass --numwords 4 --delimiter - --count 1 | tr -d "\n" > "$out"/adminpassword
-      fi
-    '';
-  };
-
-  services.victoriametrics = {
-    extraOptions = [
-      "-httpAuth.username=file://${config.clan.core.vars.generators.b4l-victoriametrics.files.adminuser.path}"
-      "-httpAuth.password=file://${config.clan.core.vars.generators.b4l-victoriametrics.files.adminpassword.path}"
-    ];
-  };
-
-  services.nginx.virtualHosts."${vmDomain}" = {
-    forceSSL = true;
-    useACMEHost = "${config.networking.fqdn}";
-    locations."/" = {
-      proxyPass = "http://localhost${builtins.toString config.services.victoriametrics.listenAddress}";
-    };
-  };
-
-}

machines/b4l/services/vikunja.nix

@@ -1,26 +0,0 @@
-{ config, ... }:
-{
-  clan.core.vars.generators.b4l-vikunja = {
-    files.subdomain.secret = false;
-
-    prompts = {
-      subdomain = {
-        persist = true;
-        type = "line";
-        description = "Sub-domain for Vikunja todo app. Default:(todo)";
-      };
-    };
-
-    script = ''cat $prompts/subdomain || echo "todo" > $out/subdomain'';
-  };
-  services.vikunja = {
-    frontendHostname = "${config.clan.core.vars.generators.b4l-vikunja.files.subdomain.value}.${config.networking.fqdn}";
-  };
-  services.nginx.virtualHosts."${config.services.vikunja.frontendHostname}" = {
-    useACMEHost = "${config.networking.fqdn}";
-    forceSSL = true;
-    locations."/" = {
-      proxyPass = "${config.services.vikunja.frontendScheme}://${config.services.vikunja.frontendHostname}:${builtins.toString config.services.vikunja.port}";
-    };
-  };
-}

machines/bosona/configuration.nix

@@ -0,0 +1,105 @@
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
+let
+  sitename = "tempoerp.newedge.house";
+in
+{
+  clan.core.settings.machine.description = "VM machine that host ERPNext for tempo";
+  imports = [
+    inputs.frappix.nixosModules.x86_64-linux.frappix
+  ];
+  nixpkgs.overlays = [
+    inputs.self.overlays.frappixFrappeOverlay
+    inputs.self.overlays.frappixLibsOverlay
+    inputs.self.overlays.frappixPythonOverlay
+    inputs.self.overlays.frappixToolsOverlay
+  ];
+
+  clan.core.vars.generators.frappix = {
+    files = {
+      sslCertificate.secret = false;
+      sslCertificateKey = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+      adminPassword.secret = true;
+    };
+    runtimeInputs = with pkgs; [
+      openssl
+      xkcdpass
+    ];
+    script = ''
+      openssl req -x509 -newkey rsa:4096 -keyout $out/sslCertificateKey -out $out/sslCertificate -sha256 -days 3650 -nodes -subj "/C=TH/ST=ChiangMai/L=ChiangMai/O=kurogeek/CN=kurogeek.home" 
+      xkcdpass --numwords 4 --delimiter - --count 1 | tr -d "\n" > "$out"/adminPassword
+    '';
+  };
+
+  services.frappe = {
+    enable = true;
+    project = "poyerp";
+    gunicorn_workers = 2;
+    adminPassword = config.clan.core.vars.generators.frappix.files.adminPassword.path;
+    apps = [
+      pkgs.frappix.erpnext
+      pkgs.frappix.hrms
+      pkgs.frappix.crm
+    ];
+    sites = {
+      "${sitename}" = {
+        domains = [ sitename ];
+        apps = [
+          "frappe"
+          "erpnext"
+          "hrms"
+          "crm"
+        ];
+      };
+    };
+  };
+  services.nginx.virtualHosts."${sitename}" = {
+    sslCertificate = config.clan.core.vars.generators.frappix.files.sslCertificate.path;
+    sslCertificateKey = config.clan.core.vars.generators.frappix.files.sslCertificateKey.path;
+  };
+
+  nixpkgs.hostPlatform = {
+    system = "x86_64-linux";
+  };
+
+  clan.core.vars.generators.nginx = {
+    files = {
+      sslCert = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+      sslKey = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+    };
+
+    runtimeInputs = [
+      pkgs.openssl
+    ];
+    script = ''
+      openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \
+        -keyout $out/sslKey \
+        -out $out/sslCert \
+        -subj "/CN=localhost"
+    '';
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
+
+  system.stateVersion = "25.11";
+  clan.core.sops.defaultGroups = [ "admins" ];
+}

machines/bosona/disko.nix

@@ -0,0 +1,85 @@
+let
+  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
+  os = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
+in
+{
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
+
+  boot.zfs.forceImportRoot = true;
+
+  disko.devices = {
+    disk = {
+      "os-${hashDisk os}" = {
+        type = "disk";
+        device = os;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "nofail" ];
+              };
+            };
+            system = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        rootFsOptions = {
+          mountpoint = "none";
+          compression = "lz4";
+          acltype = "posixacl";
+          xattr = "sa";
+          "com.sun:auto-snapshot" = "true";
+        };
+        options.ashift = "12";
+        datasets = {
+          "root" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+          };
+          "root/nixos" = {
+            type = "zfs_fs";
+            options.mountpoint = "/";
+            mountpoint = "/";
+          };
+          "root/home" = {
+            type = "zfs_fs";
+            options.mountpoint = "/home";
+            mountpoint = "/home";
+          };
+          "root/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/tmp";
+            options = {
+              mountpoint = "/tmp";
+              sync = "disabled";
+            };
+          };
+        };
+      };
+    };
+  };
+}

machines/buna/configuration.nix

@@ -8,6 +8,7 @@
   # clan.core.networking.targetHost = "root@";
 
   clan.core.settings.name = "buna";
-  # clan.meta.description = "Radxa X4 SBC board for one of w phone network. (With w whitehouse)";
+  clan.core.settings.machine.description =
+    "Radxa X4 SBC board for one of w phone network. (With w whitehouse)";
 
 }

machines/canopus/configuration.nix

@@ -0,0 +1,109 @@
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
+let
+  sitename = "glomerp.newedge.house";
+  nbClientName = "netbird-b4l";
+in
+{
+  clan.core.settings.machine.description = "VM machine that host ERPNext for glomglom";
+
+  imports = [ inputs.frappix.nixosModules.x86_64-linux.frappix ];
+  nixpkgs.overlays = [
+    inputs.self.overlays.frappixFrappeOverlay
+    inputs.self.overlays.frappixLibsOverlay
+    inputs.self.overlays.frappixPythonOverlay
+    inputs.self.overlays.frappixToolsOverlay
+  ];
+
+  clan.core.vars.generators.frappix = {
+    files = {
+      sslCertificate.secret = false;
+      sslCertificateKey = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+      adminPassword.secret = true;
+    };
+    runtimeInputs = with pkgs; [
+      openssl
+      xkcdpass
+    ];
+    script = ''
+      openssl req -x509 -newkey rsa:4096 -keyout $out/sslCertificateKey -out $out/sslCertificate -sha256 -days 3650 -nodes -subj "/C=TH/ST=ChiangMai/L=ChiangMai/O=kurogeek/CN=kurogeek.home" 
+      xkcdpass --numwords 4 --delimiter - --count 1 | tr -d "\n" > "$out"/adminPassword
+    '';
+  };
+
+  services.frappe = {
+    enable = true;
+    project = "glomerp";
+    gunicorn_workers = 2;
+    adminPassword = config.clan.core.vars.generators.frappix.files.adminPassword.path;
+    apps = [
+      pkgs.frappix.erpnext
+      pkgs.frappix.hrms
+    ];
+    sites = {
+      "${sitename}" = {
+        domains = [ sitename ];
+        apps = [
+          "frappe"
+          "erpnext"
+          "hrms"
+        ];
+      };
+    };
+  };
+  services.nginx.virtualHosts."${sitename}" = {
+    sslCertificate = config.clan.core.vars.generators.frappix.files.sslCertificate.path;
+    sslCertificateKey = config.clan.core.vars.generators.frappix.files.sslCertificateKey.path;
+  };
+
+  nixpkgs.hostPlatform = {
+    system = "x86_64-linux";
+  };
+
+  clan.core.vars.generators.nginx = {
+    files = {
+      sslCert = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+      sslKey = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+    };
+
+    runtimeInputs = [
+      pkgs.openssl
+    ];
+    script = ''
+      openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \
+        -keyout $out/sslKey \
+        -out $out/sslCert \
+        -subj "/CN=localhost"
+    '';
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
+
+  # services.nginx.virtualHosts."${domain}" = {
+  #   forceSSL = true;
+  #   sslCertificate = config.clan.core.vars.generators.nginx.files.sslCert.path;
+  #   sslCertificateKey = config.clan.core.vars.generators.nginx.files.sslKey.path;
+  # };
+
+  system.stateVersion = "25.11";
+  clan.core.sops.defaultGroups = [ "admins" ];
+}

machines/canopus/disko.nix

@@ -0,0 +1,85 @@
+let
+  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
+  os = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
+in
+{
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
+
+  boot.zfs.forceImportRoot = true;
+
+  disko.devices = {
+    disk = {
+      "os-${hashDisk os}" = {
+        type = "disk";
+        device = os;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "nofail" ];
+              };
+            };
+            system = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        rootFsOptions = {
+          mountpoint = "none";
+          compression = "lz4";
+          acltype = "posixacl";
+          xattr = "sa";
+          "com.sun:auto-snapshot" = "true";
+        };
+        options.ashift = "12";
+        datasets = {
+          "root" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+          };
+          "root/nixos" = {
+            type = "zfs_fs";
+            options.mountpoint = "/";
+            mountpoint = "/";
+          };
+          "root/home" = {
+            type = "zfs_fs";
+            options.mountpoint = "/home";
+            mountpoint = "/home";
+          };
+          "root/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/tmp";
+            options = {
+              mountpoint = "/tmp";
+              sync = "disabled";
+            };
+          };
+        };
+      };
+    };
+  };
+}

machines/cursa/configuration.nix

@@ -0,0 +1,14 @@
+{
+  ...
+}:
+{
+  clan.core.settings.machine.description =
+    "VM machine for collecting prometheus metrics and fire alerts";
+
+  nixpkgs.hostPlatform = {
+    system = "x86_64-linux";
+  };
+
+  system.stateVersion = "25.11";
+  clan.core.sops.defaultGroups = [ "admins" ];
+}

machines/cursa/disko.nix

@@ -0,0 +1,85 @@
+let
+  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
+  os = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
+in
+{
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
+
+  boot.zfs.forceImportRoot = true;
+
+  disko.devices = {
+    disk = {
+      "os-${hashDisk os}" = {
+        type = "disk";
+        device = os;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "nofail" ];
+              };
+            };
+            system = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        rootFsOptions = {
+          mountpoint = "none";
+          compression = "lz4";
+          acltype = "posixacl";
+          xattr = "sa";
+          "com.sun:auto-snapshot" = "true";
+        };
+        options.ashift = "12";
+        datasets = {
+          "root" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+          };
+          "root/nixos" = {
+            type = "zfs_fs";
+            options.mountpoint = "/";
+            mountpoint = "/";
+          };
+          "root/home" = {
+            type = "zfs_fs";
+            options.mountpoint = "/home";
+            mountpoint = "/home";
+          };
+          "root/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/tmp";
+            options = {
+              mountpoint = "/tmp";
+              sync = "disabled";
+            };
+          };
+        };
+      };
+    };
+  };
+}

machines/default.nix

@@ -1,4 +1,8 @@
-{ inputs, self, ... }:
+{
+  inputs,
+  self,
+  ...
+}:
 {
   imports = [
     inputs.clan-core.flakeModules.default

machines/deneb/configuration.nix

@@ -0,0 +1,121 @@
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
+let
+  sitename = "poyerp.newedge.house";
+in
+{
+  clan.core.settings.machine.description = "VM machine that host ERPNext for poysound";
+  imports = [
+    inputs.frappix.nixosModules.x86_64-linux.frappix
+
+    # (import ../../lib/auto-accept-zerotier-members.nix {
+    #   memberIds = [
+    #     # Alex Caddy gateway
+    #     "dbe44c0287"
+    #     "e3d6559697"
+    #   ];
+    # })
+  ];
+  nixpkgs.overlays = [
+    inputs.self.overlays.frappixFrappeOverlay
+    inputs.self.overlays.frappixLibsOverlay
+    inputs.self.overlays.frappixPythonOverlay
+    inputs.self.overlays.frappixToolsOverlay
+  ];
+
+  clan.core.vars.generators.frappix = {
+    files = {
+      sslCertificate.secret = false;
+      sslCertificateKey = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+      adminPassword.secret = true;
+    };
+    runtimeInputs = with pkgs; [
+      openssl
+      xkcdpass
+    ];
+    script = ''
+      openssl req -x509 -newkey rsa:4096 -keyout $out/sslCertificateKey -out $out/sslCertificate -sha256 -days 3650 -nodes -subj "/C=TH/ST=ChiangMai/L=ChiangMai/O=kurogeek/CN=kurogeek.home" 
+      xkcdpass --numwords 4 --delimiter - --count 1 | tr -d "\n" > "$out"/adminPassword
+    '';
+  };
+
+  services.frappe = {
+    enable = true;
+    project = "poyerp";
+    gunicorn_workers = 2;
+    adminPassword = config.clan.core.vars.generators.frappix.files.adminPassword.path;
+    apps = [
+      pkgs.frappix.erpnext
+      pkgs.frappix.hrms
+      pkgs.frappix.crm
+      pkgs.frappix.posprinter
+    ];
+    sites = {
+      "${sitename}" = {
+        domains = [ sitename ];
+        apps = [
+          "frappe"
+          "erpnext"
+          "hrms"
+          "crm"
+          "posprinter"
+        ];
+      };
+    };
+  };
+  services.nginx.virtualHosts."${sitename}" = {
+    sslCertificate = config.clan.core.vars.generators.frappix.files.sslCertificate.path;
+    sslCertificateKey = config.clan.core.vars.generators.frappix.files.sslCertificateKey.path;
+  };
+
+  nixpkgs.hostPlatform = {
+    system = "x86_64-linux";
+  };
+
+  clan.core.vars.generators.nginx = {
+    files = {
+      sslCert = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+      sslKey = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+    };
+
+    runtimeInputs = [
+      pkgs.openssl
+    ];
+    script = ''
+      openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \
+        -keyout $out/sslKey \
+        -out $out/sslCert \
+        -subj "/CN=localhost"
+    '';
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
+
+  # services.nginx.virtualHosts."${domain}" = {
+  #   forceSSL = true;
+  #   sslCertificate = config.clan.core.vars.generators.nginx.files.sslCert.path;
+  #   sslCertificateKey = config.clan.core.vars.generators.nginx.files.sslKey.path;
+  # };
+
+  system.stateVersion = "25.11";
+  clan.core.sops.defaultGroups = [ "admins" ];
+}

machines/deneb/disko.nix

@@ -0,0 +1,85 @@
+let
+  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
+  os = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
+in
+{
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
+
+  boot.zfs.forceImportRoot = true;
+
+  disko.devices = {
+    disk = {
+      "os-${hashDisk os}" = {
+        type = "disk";
+        device = os;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "nofail" ];
+              };
+            };
+            system = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        rootFsOptions = {
+          mountpoint = "none";
+          compression = "lz4";
+          acltype = "posixacl";
+          xattr = "sa";
+          "com.sun:auto-snapshot" = "true";
+        };
+        options.ashift = "12";
+        datasets = {
+          "root" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+          };
+          "root/nixos" = {
+            type = "zfs_fs";
+            options.mountpoint = "/";
+            mountpoint = "/";
+          };
+          "root/home" = {
+            type = "zfs_fs";
+            options.mountpoint = "/home";
+            mountpoint = "/home";
+          };
+          "root/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/tmp";
+            options = {
+              mountpoint = "/tmp";
+              sync = "disabled";
+            };
+          };
+        };
+      };
+    };
+  };
+}

machines/hadar/configuration.nix

@@ -0,0 +1,86 @@
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
+let
+  domain = "poy-inventory.newedge.house";
+in
+{
+  clan.core.settings.machine.description = "VM machine that host Inventree system for Poy";
+
+  nixpkgs.hostPlatform = {
+    system = "x86_64-linux";
+  };
+
+  clan.core.vars.generators.inventree = {
+    files = {
+      secret-key = {
+        owner = "inventree";
+        group = "inventree";
+        secret = true;
+      };
+      oidc-key = {
+        owner = "inventree";
+        group = "inventree";
+        secret = true;
+      };
+      admin-password = {
+        owner = "inventree";
+        group = "inventree";
+        secret = true;
+      };
+    };
+    runtimeInputs = [
+      pkgs.pwgen
+      pkgs.xkcdpass
+    ];
+    script = ''
+      pwgen -s 32 1 > $out/secret-key
+      pwgen -s 32 1 > $out/oidc-key
+      xkcdpass --numwords 4 --delimiter - --count 1 | tr -d "\n" > "$out"/admin-password
+    '';
+  };
+
+  clan.core.vars.generators.nginx = {
+    files = {
+      sslCert = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+      sslKey = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+    };
+
+    runtimeInputs = [
+      pkgs.openssl
+    ];
+    script = ''
+      openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \
+        -keyout $out/sslKey \
+        -out $out/sslCert \
+        -subj "/CN=localhost"
+    '';
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
+
+  services.inventree = {
+    enable = true;
+    inherit domain;
+    secretKeyFile = config.clan.core.vars.generators.inventree.files.secret-key.path;
+    adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
+    settings.INVENTREE_SITE_URL = "https://${domain}";
+  };
+
+  system.stateVersion = "25.11";
+  clan.core.sops.defaultGroups = [ "admins" ];
+}

machines/hadar/disko.nix

@@ -0,0 +1,85 @@
+let
+  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
+  os = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
+in
+{
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
+
+  boot.zfs.forceImportRoot = true;
+
+  disko.devices = {
+    disk = {
+      "os-${hashDisk os}" = {
+        type = "disk";
+        device = os;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "nofail" ];
+              };
+            };
+            system = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        rootFsOptions = {
+          mountpoint = "none";
+          compression = "lz4";
+          acltype = "posixacl";
+          xattr = "sa";
+          "com.sun:auto-snapshot" = "true";
+        };
+        options.ashift = "12";
+        datasets = {
+          "root" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+          };
+          "root/nixos" = {
+            type = "zfs_fs";
+            options.mountpoint = "/";
+            mountpoint = "/";
+          };
+          "root/home" = {
+            type = "zfs_fs";
+            options.mountpoint = "/home";
+            mountpoint = "/home";
+          };
+          "root/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/tmp";
+            options = {
+              mountpoint = "/tmp";
+              sync = "disabled";
+            };
+          };
+        };
+      };
+    };
+  };
+}

machines/mirach/configuration.nix

@@ -8,6 +8,6 @@
   # clan.core.networking.targetHost = "root@";
 
   clan.core.settings.name = "mirach";
-  # clan.meta.description = "Radxa X4 SBC board for one of w phone network.";
+  clan.core.settings.machine.description = "Radxa X4 SBC board for one of w phone network.";
 
 }

machines/mirach/disko.nix

@@ -14,6 +14,8 @@ in
     };
   };
 
+  boot.zfs.forceImportRoot = true;
+
   disko.devices = {
     disk = {
       "os-${hashDisk os}" = {

machines/neptune/configuration.nix

@@ -10,7 +10,6 @@
   };
   system.stateVersion = "25.11";
   clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
 
   networking.interfaces.enx00e04c106368.useDHCP = true; # recovery
 
@@ -57,6 +56,6 @@
   ];
 
   clan.core.settings.name = "neptune";
-  # clan.meta.description = "Radxa SBC board for testing. (With vi)";
+  clan.core.settings.machine.description = "Radxa SBC board for testing. (With vi)";
 
 }

machines/neptune/disko.nix

@@ -14,6 +14,8 @@ in
     };
   };
 
+  boot.zfs.forceImportRoot = true;
+
   disko.devices = {
     disk = {
       "os-${hashDisk os}" = {

machines/petra/configuration.nix

@@ -9,4 +9,5 @@
   };
   system.stateVersion = "25.11";
   clan.core.sops.defaultGroups = [ "admins" ];
+  clan.core.settings.machine.description = "A personal computer for Chocolate Shop";
 }

machines/petra/disko.nix

@@ -14,6 +14,8 @@ in
     };
   };
 
+  boot.zfs.forceImportRoot = true;
+
   disko.devices = {
     disk = {
       "os-${hashDisk os}" = {

machines/procyon/configuration.nix

@@ -0,0 +1,86 @@
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
+let
+  domain = "glom-inventory.newedge.house";
+in
+{
+  clan.core.settings.machine.description = "VM machine that host Inventree system for Glom";
+
+  nixpkgs.hostPlatform = {
+    system = "x86_64-linux";
+  };
+
+  clan.core.vars.generators.inventree = {
+    files = {
+      secret-key = {
+        owner = "inventree";
+        group = "inventree";
+        secret = true;
+      };
+      oidc-key = {
+        owner = "inventree";
+        group = "inventree";
+        secret = true;
+      };
+      admin-password = {
+        owner = "inventree";
+        group = "inventree";
+        secret = true;
+      };
+    };
+    runtimeInputs = [
+      pkgs.pwgen
+      pkgs.xkcdpass
+    ];
+    script = ''
+      pwgen -s 32 1 > $out/secret-key
+      pwgen -s 32 1 > $out/oidc-key
+      xkcdpass --numwords 4 --delimiter - --count 1 | tr -d "\n" > "$out"/admin-password
+    '';
+  };
+
+  clan.core.vars.generators.nginx = {
+    files = {
+      sslCert = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+      sslKey = {
+        owner = "nginx";
+        group = "nginx";
+        secret = true;
+      };
+    };
+
+    runtimeInputs = [
+      pkgs.openssl
+    ];
+    script = ''
+      openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \
+        -keyout $out/sslKey \
+        -out $out/sslCert \
+        -subj "/CN=localhost"
+    '';
+  };
+
+  networking.firewall.allowedTCPPorts = [
+    80
+    443
+  ];
+
+  services.inventree = {
+    enable = true;
+    inherit domain;
+    secretKeyFile = config.clan.core.vars.generators.inventree.files.secret-key.path;
+    adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
+    settings.INVENTREE_SITE_URL = "https://${domain}";
+  };
+
+  system.stateVersion = "25.11";
+  clan.core.sops.defaultGroups = [ "admins" ];
+}

machines/procyon/disko.nix

@@ -0,0 +1,85 @@
+let
+  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
+  os = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0";
+in
+{
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
+
+  boot.zfs.forceImportRoot = true;
+
+  disko.devices = {
+    disk = {
+      "os-${hashDisk os}" = {
+        type = "disk";
+        device = os;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "nofail" ];
+              };
+            };
+            system = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        rootFsOptions = {
+          mountpoint = "none";
+          compression = "lz4";
+          acltype = "posixacl";
+          xattr = "sa";
+          "com.sun:auto-snapshot" = "true";
+        };
+        options.ashift = "12";
+        datasets = {
+          "root" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+          };
+          "root/nixos" = {
+            type = "zfs_fs";
+            options.mountpoint = "/";
+            mountpoint = "/";
+          };
+          "root/home" = {
+            type = "zfs_fs";
+            options.mountpoint = "/home";
+            mountpoint = "/home";
+          };
+          "root/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/tmp";
+            options = {
+              mountpoint = "/tmp";
+              sync = "disabled";
+            };
+          };
+        };
+      };
+    };
+  };
+}

machines/ramus/configuration.nix

@@ -6,12 +6,9 @@
   };
 
   clan.core.settings.name = "ramus";
-  # clan.meta.description = ''
-  #   A Hetzner VPS machine own by Alex.
-  # '';
+  clan.core.settings.machine.description = "A Hetzner VPS machine own by Alex.";
 
   clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
 
   clan.core.vars.generators.acme = {
     share = true;

machines/ramus/disko.nix

@@ -14,6 +14,8 @@ in
     };
   };
 
+  boot.zfs.forceImportRoot = true;
+
   disko.devices = {
     disk = {
       "os-${hashDisk os}" = {

machines/rana/configuration.nix

@@ -1,5 +1,7 @@
-{ self, ... }:
+{ self, pkgs, ... }:
 {
+  clan.core.settings.machine.description = "Emmie personal computer";
+
   imports = [
     self.nixosModules.common
   ];
@@ -9,4 +11,12 @@
   };
   system.stateVersion = "25.11";
   clan.core.sops.defaultGroups = [ "admins" ];
+
+  boot.kernelParams = [
+    "amdgpu.dcdebugmask=0x10"
+    "amdgpu.cwsr_enable=0"
+    "amdgpu.gpu_recovery=1"
+  ];
+
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
 }

machines/rana/disko.nix

@@ -14,6 +14,8 @@ in
     };
   };
 
+  boot.zfs.forceImportRoot = true;
+
   disko.devices = {
     disk = {
       "os-${hashDisk os}" = {

machines/rigel/configuration.nix

@@ -1,16 +1,7 @@
 { config, ... }:
 {
-  imports = [
-    (import ../../lib/auto-accept-zerotier-members.nix {
-      memberIds = [
-        "dbe44c0287" # Alex-gateway
-        "b0e0b84fd3" # Alex
-        "2bd36db8cc" # kurogeek-thinkpad
-      ];
-    })
-  ];
-
   system.stateVersion = "25.11";
   clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
+
+  clan.core.settings.machine.description = "Zima board computer for testing in B4L";
 }

machines/sirius/configuration.nix

@@ -1,5 +1,6 @@
 {
   self,
+  pkgs,
   ...
 }:
 {
@@ -15,6 +16,8 @@
     ];
   };
 
+  clan.core.settings.machine.description = "w NAS";
+
   clan.core.sops.defaultGroups = [ "admins" ];
 
   nixpkgs.hostPlatform = {
@@ -42,6 +45,8 @@
   boot.loader.grub.enable = false;
   boot.loader.generic-extlinux-compatible.enable = true;
 
+  boot.zfs.forceImportRoot = false;
+
   boot.zfs.extraPools = [ "zdata" ];
   boot.supportedFilesystems = [ "zfs" ];
   boot.initrd.availableKernelModules = [
@@ -70,4 +75,22 @@
     ];
   };
 
+  systemd.services.heartbeat-push = {
+    description = "Heartbeat push to uptime monitor";
+    serviceConfig = {
+      Type = "oneshot";
+      ExecStart = "${pkgs.curl}/bin/curl -s -o /dev/null https://uptime.b4l.co.th/api/push/X0WCHAcY5gPf1U8If7BT1FLjpacZqGZu?status=up&msg=OK&ping=";
+    };
+  };
+
+  systemd.timers.heartbeat-push = {
+    description = "Heartbeat push timer";
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      OnBootSec = "60s";
+      OnUnitActiveSec = "60s";
+      Unit = "heartbeat-push.service";
+    };
+  };
+
 }

machines/tangra/configuration.nix

@@ -1,24 +1,14 @@
-{ inputs, config, ... }:
 {
-  imports = [
-    (inputs.import-tree ./services)
-  ];
+  system.stateVersion = "25.11";
   nixpkgs.hostPlatform = {
     system = "x86_64-linux";
   };
-  boot.loader.grub.devices = [ "/dev/disk/by-id/FIXME" ];
-  fileSystems = {
-    "/".device = "/dev/FIXME";
-  };
-  networking.fqdn = "b4l.co.th";
-  system.stateVersion = "25.11";
-  clan.core.sops.defaultGroups = [ "admins" ];
 
-  security.acme.defaults.email = "admin@b4l.co.th";
-  security.acme.acceptTerms = true;
-  services.nginx.virtualHosts."${config.networking.fqdn}" = {
-    enableACME = true;
-  };
+  clan.core.settings.name = "tangra";
+  clan.core.settings.machine.description =
+    "A Hetzner VPS machine own by Alex. This is a machine for poyfestival.com";
+
+  clan.core.sops.defaultGroups = [ "admins" ];
 
   clan.core.vars.generators.acme = {
     share = true;
@@ -33,4 +23,10 @@
       cat $prompts/email > $out/email
     '';
   };
+
+  users.users.nginx.extraGroups = [ "acme" ];
+
+  security.acme.acceptTerms = true;
+
+  imports = [ ];
 }

machines/tangra/disko.nix

@@ -0,0 +1,86 @@
+{ ... }:
+let
+  hashDisk = disk: "os-${builtins.substring 0 5 (builtins.hashString "sha256" disk)}";
+  os = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_119349241";
+in
+{
+
+  boot.loader = {
+    systemd-boot = {
+      enable = true;
+    };
+    efi = {
+      canTouchEfiVariables = true;
+    };
+  };
+
+  boot.zfs.forceImportRoot = true;
+
+  disko.devices = {
+    disk = {
+      "os-${hashDisk os}" = {
+        type = "disk";
+        device = os;
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "nofail" ];
+              };
+            };
+            system = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "zroot";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      zroot = {
+        type = "zpool";
+        rootFsOptions = {
+          mountpoint = "none";
+          compression = "lz4";
+          acltype = "posixacl";
+          xattr = "sa";
+          "com.sun:auto-snapshot" = "true";
+        };
+        options.ashift = "12";
+        datasets = {
+          "root" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+          };
+          "root/nixos" = {
+            type = "zfs_fs";
+            options.mountpoint = "/";
+            mountpoint = "/";
+          };
+          "root/home" = {
+            type = "zfs_fs";
+            options.mountpoint = "/home";
+            mountpoint = "/home";
+          };
+          "root/tmp" = {
+            type = "zfs_fs";
+            mountpoint = "/tmp";
+            options = {
+              mountpoint = "/tmp";
+              sync = "disabled";
+            };
+          };
+        };
+      };
+    };
+  };
+}

machines/vega/configuration.nix

@@ -10,17 +10,11 @@
 
     (inputs.import-tree ./services)
 
-    (import ../../lib/auto-accept-zerotier-members.nix {
-      memberIds = [
-        "dbe44c0287" # Alex-gateway
-        "b0e0b84fd3" # Alex
-        "2bd36db8cc" # kurogeek-thinkpad
-      ];
-    })
   ];
 
   clan.core.sops.defaultGroups = [ "admins" ];
-  clan.core.networking.targetHost = "root@[${config.clan.core.vars.generators.zerotier.files.zerotier-ip.value}]";
+
+  clan.core.settings.machine.description = "Glom NAS";
 
   nixpkgs.hostPlatform = {
     system = "x86_64-linux";

machines/vega/disko.nix

@@ -18,6 +18,8 @@ in
     };
   };
 
+  boot.zfs.forceImportRoot = true;
+
   disko.devices = {
     disk = {
       "os-${hashDisk os}" = {

modules/clan/actual-budget/tests/vm/default.nix

@@ -5,6 +5,7 @@
   name = "service-actual-budget";
 
   clan = {
+    test.useContainers = false;
     directory = ./.;
     inventory = {
       machines.server = { };

modules/clan/grafana/tests/vm/default.nix

@@ -20,6 +20,7 @@
     '';
 
   clan = {
+    test.useContainers = false;
     directory = ./.;
     inventory = {
       machines.server = { };

modules/clan/headscale/default.nix

@@ -0,0 +1,183 @@
+{ ... }:
+{
+  _class = "clan.service";
+  manifest.name = "headscale";
+  manifest.description = "An open source, self-hosted implementation of the Tailscale control server";
+  manifest.readme = "An open source, self-hosted implementation of the Tailscale control server";
+  manifest.categories = [ "System" ];
+
+  roles.server = {
+    description = "A server role";
+
+    interface =
+      { lib, config, ... }:
+      {
+        options = {
+          public_url = lib.mkOption {
+            type = with lib.types; nullOr str;
+            default = config.services.headscale.settings.server_url;
+            description = "Public URL for accessing the instance";
+          };
+
+          base_domain = lib.mkOption {
+            type = with lib.types; str;
+            default = "";
+            description = "Defines the base domain to create the hostnames for MagicDNS in Headscale. `base_domain` must be a FQDN, without the trailing dot. The FQDN of the hosts will be `hostname.base_domain (e.g. myhost.tailnet.example.com)";
+          };
+
+          advertise_routes = lib.mkOption {
+            type = with lib.types; listOf str;
+            default = [ ];
+            description = "Expose physical subnet routes to your entire Tailscale network.";
+            example = [ "192.168.1.0/24" ];
+          };
+
+          nameservers = lib.mkOption {
+            type = with lib.types; listOf str;
+            default = [
+              "1.1.1.1"
+              "8.8.8.8"
+            ];
+            description = "List of nameservers to pass to Tailscale clients";
+            example = [ "10.0.10.1" ];
+          };
+        };
+      };
+
+    perInstance =
+      { settings, ... }:
+      {
+        nixosModule =
+          {
+            config,
+            pkgs,
+            lib,
+            ...
+          }:
+          let
+            preAuthKeyFile = "/var/lib/headscale/preauth.key";
+
+            routes = lib.concatStringsSep "," settings.advertise_routes;
+          in
+          {
+
+            systemd.services.headscale-auto-enroll =
+              let
+                serverUser = "hcserver";
+              in
+              {
+                description = "Enroll this machine into headscale automatically";
+                after = [
+                  "headscale.service"
+                  "tailscaled.service"
+                ];
+                requires = [
+                  "headscale.service"
+                  "tailscaled.service"
+                ];
+                wantedBy = [ "multi-user.target" ];
+
+                serviceConfig = {
+                  Type = "oneshot";
+                  RemainAfterExit = true;
+                  User = "root";
+                };
+
+                path = [ pkgs.jq ];
+
+                script = ''
+                  set -euo pipefail
+
+                  if ${pkgs.tailscale}/bin/tailscale status &>/dev/null; then
+                    echo "Already enrolled, skipping."
+                    exit 0
+                  fi
+
+                  for i in $(seq 1 30); do
+                    ${pkgs.headscale}/bin/headscale users list &>/dev/null && break
+                    sleep 1
+                  done
+
+                  ${pkgs.headscale}/bin/headscale users create ${serverUser} 2>/dev/null || true
+
+                  USER_ID=$(${pkgs.headscale}/bin/headscale users list --name ${serverUser} -o json | jq '.[0].id')
+
+                  KEY=$(${pkgs.headscale}/bin/headscale preauthkeys create \
+                    --user $USER_ID \
+                    --reusable \
+                    --expiration 30m \
+                    --output json | ${pkgs.jq}/bin/jq -r '.key')
+
+                  echo "$KEY" > ${preAuthKeyFile}
+                  chmod 600 ${preAuthKeyFile}
+
+                  ${pkgs.tailscale}/bin/tailscale up \
+                    --login-server=https://${settings.public_url} \
+                    --authkey="$KEY" \
+                    --accept-routes \
+                    --advertise-routes=${routes}
+                '';
+              };
+
+            systemd.services.headscale-approve-routes = {
+              description = "Auto approve routes";
+              after = [
+                "headscale.service"
+                "tailscaled.service"
+                "headscale-auto-enroll.service"
+              ];
+              requires = [
+                "headscale.service"
+                "tailscaled.service"
+                "headscale-auto-enroll.service"
+              ];
+
+              path = [ pkgs.jq ];
+
+              wantedBy = [ "multi-user.target" ];
+
+              serviceConfig = {
+                Type = "oneshot";
+                User = "root";
+              };
+
+              script = ''
+                set -euo pipefail
+                NODE_ID=$(${pkgs.tailscale}/bin/tailscale status --json | jq '.Self.ID' | tr -d '"')
+                ${pkgs.headscale}/bin/headscale node approve-routes --identifier $NODE_ID --routes ${routes}
+              '';
+
+            };
+
+            systemd.services.tailscaled-autoconnect.after = [
+              "tailscaled.service"
+              "headscale-auto-enroll.service"
+            ];
+
+            services.tailscale = {
+              enable = true;
+              useRoutingFeatures = "server";
+              openFirewall = true;
+            };
+
+            networking.firewall.allowedTCPPorts = [
+              config.services.headscale.port
+            ];
+
+            services.headscale = {
+              enable = true;
+              address = "0.0.0.0";
+              settings.server_url = "https://${settings.public_url}";
+
+              settings.dns = {
+                base_domain = settings.base_domain;
+                override_local_dns = true;
+                nameservers.global = settings.nameservers;
+                magic_dns = false;
+              };
+            };
+
+          };
+      };
+  };
+}

modules/clan/headscale/flake-module.nix

@@ -0,0 +1,19 @@
+{ self, inputs, ... }:
+let
+  module = ./default.nix;
+in
+{
+  clan.modules = {
+    headscale = module;
+  };
+  # perSystem =
+  #   { ... }:
+  #   {
+  #     clan.nixosTests.service-headplane = {
+  #       imports = [ ./tests/vm/default.nix ];
+  #       _module.args = { inherit self inputs; };
+  #
+  #       clan.modules."@clan/headplane" = module;
+  #     };
+  #   };
+}

modules/clan/home-profiles/home-user/emmie.nix

@@ -66,8 +66,6 @@
                 "AutofillAddressEnabled" = false;
                 "AutofillCreditCardEnabled" = false;
                 "TranslateEnabled" = false;
-                "DnsOverHttpsMode" = "secure";
-                "DnsOverHttpsTemplates" = "https://dns.adguard-dns.com/dns-query";
               };
             };
 
@@ -81,14 +79,32 @@
                 inputs,
                 ...
               }:
+              let
+                dictionaries =
+                  with pkgs;
+                  (hunspellWithDicts (
+                    with hunspellDicts;
+                    [
+                      en-us-large
+                      th-th
+                    ]
+                  ));
+              in
               {
                 imports = [ inputs.plasma-manager.homeModules.plasma-manager ];
 
+                systemd.user.sessionVariables = {
+                  DICPATH = "${dictionaries}/share/hunspell";
+                };
+
                 home = {
                   homeDirectory = lib.mkForce "/home/${username}";
                   stateVersion = osConfig.system.stateVersion;
+
                   packages = with pkgs; [
-                    libreoffice-fresh
+                    libreoffice-qt6
+                    dictionaries
+
                     element-desktop
                     signal-desktop
                     brave

modules/clan/nextcloud/tests/vm/default.nix

@@ -5,6 +5,7 @@
   name = "service-nextcloud";
 
   clan = {
+    test.useContainers = false;
     directory = ./.;
     inventory = {
       machines.server = { };

modules/clan/paperless/tests/vm/default.nix

@@ -5,6 +5,7 @@
   name = "service-paperless";
 
   clan = {
+    test.useContainers = false;
     directory = ./.;
     inventory = {
       machines.server = { };

modules/clan/personal-computer/desktop-environment.nix

@@ -5,5 +5,4 @@
 
   services.displayManager.sddm.enable = lib.mkForce false;
   services.displayManager.gdm.enable = true;
-  services.displayManager.gdm.wayland = true;
 }

modules/clan/personal-computer/printing.nix

@@ -22,11 +22,27 @@ let
 
 in
 {
+  environment.systemPackages = [ pkgs.simple-scan ];
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "brgenml1lpr"
+      "cups-brother-dcpt310"
+      "cups-brother-dcpt720dw"
+      "cups-brother-dcpt725dw"
+    ];
+  # nixpkgs.config.allowUnfree = true;
+  services.ipp-usb.enable = true;
   services.printing = {
     enable = true;
     drivers = [
       pkgs.brlaser
       pkgs.gutenprint
+      pkgs.brgenml1lpr
+      pkgs.brgenml1cupswrapper
+      pkgs.cups-brother-dcpt310
+      pkgs.cups-brother-dcpt720dw
+      pkgs.cups-brother-dcpt725dw
     ];
 
     extraFilesConf = ''

modules/clan/phonebox/default.nix

@@ -24,6 +24,36 @@
           description = "";
           default = "";
         };
+        options.extraClientNumbers = lib.mkOption {
+          type = with lib.types; listOf str;
+          description = "List of client suffix number.";
+          default = [ ];
+        };
+
+        options.extraFixedIPClient = lib.mkOption {
+          type = lib.types.attrsOf (
+            lib.types.submodule {
+              options = {
+                ip = lib.mkOption {
+                  type = lib.types.str;
+                  description = "IP address for this client";
+                };
+
+                name = lib.mkOption {
+                  type = lib.types.str;
+                  description = "Name of the client";
+                };
+              };
+            }
+          );
+          description = "Extra client to be added to pjsip config as a fixed IP auth";
+          example = {
+            "01" = {
+              ip = "192.168.1.3";
+              name = "bob";
+            };
+          };
+        };
       };
     perInstance =
       {
@@ -126,6 +156,41 @@
                 remove_existing=yes
               '';
 
+            genLocalSIPEndpointV6 =
+              { localNumber }:
+              ''
+                [${localNumber}](internal_endpoint)
+                transport=transport-udp6
+                aors=${localNumber}
+                auth=${localNumber}
+
+                [${localNumber}](userpass_auth)
+                username=${localNumber}
+                password=${localNumber}
+
+                [${localNumber}](dynamiic_aor)
+                max_contacts=1
+              '';
+
+            genLocalSIPIPEndpoint = number: ''
+
+              [${number}](internal_endpoint)
+              aors=${number}
+              auth=${number}
+              contact_deny=0.0.0.0/0
+              contact_deny=::/0
+              contact_permit=${settings.extraFixedIPClient.${number}.ip}/128
+
+              [${number}](dynamiic_aor)
+              max_contacts=1
+              remove_existing=yes
+
+              [${number}](userpass_auth)
+              username=${number}
+              password=${number}
+
+            '';
+
             genLocalExtenConf =
               { localNumber }:
               ''
@@ -356,6 +421,14 @@
                     + (genLocalExtenConf {
                       localNumber = config.clan.core.vars.generators.phonebox.files.ata-local-number.value;
                     })
+                    + lib.concatStringsSep "\n" (
+                      builtins.map (number: genLocalExtenConf { localNumber = number; }) settings.extraClientNumbers
+                    )
+                    + lib.concatStringsSep "\n" (
+                      lib.mapAttrsToList (
+                        number: _: genLocalExtenConf { localNumber = number; }
+                      ) settings.extraFixedIPClient
+                    )
                     + serverConf;
 
                   "rtp.conf" = ''
@@ -409,6 +482,12 @@
                     + (genLocalSIPEndpoint {
                       localNumber = config.clan.core.vars.generators.phonebox.files.ata-local-number.value;
                     })
+                    + lib.concatStringsSep "\n" (
+                      builtins.map (number: genLocalSIPEndpointV6 { localNumber = number; }) settings.extraClientNumbers
+                    )
+                    + lib.concatStringsSep "\n" (
+                      lib.mapAttrsToList (number: _: genLocalSIPIPEndpoint number) settings.extraFixedIPClient
+                    )
                     + serverConf;
                 };
             };

modules/clan/phonebox/tests/vm/default.nix

@@ -21,6 +21,7 @@
     '';
 
   clan = {
+    test.useContainers = false;
     directory = ./.;
     inventory = {
       machines.server = { };

modules/clan/pocket-id/tests/vm/default.nix

@@ -3,6 +3,7 @@
   name = "service-pocket-id";
 
   clan = {
+    test.useContainers = false;
     directory = ./.;
     inventory = {
       machines.server = { };

modules/clan/prometheus/default.nix

@@ -0,0 +1,308 @@
+{ clanLib, ... }:
+{
+  _class = "clan.service";
+  manifest.name = "prometheus";
+  manifest.description = "The Prometheus monitoring system and time series database.";
+  manifest.readme = builtins.readFile ./README.md;
+  manifest.categories = [ "System" ];
+
+  roles.server = {
+    description = "Prometheus server that scraps all data from nodes";
+
+    interface =
+      { lib, ... }:
+      {
+        options = {
+          scrape_interval = lib.mkOption {
+            type = with lib.types; nullOr str;
+            default = "1m";
+            description = "How often to scrape targets. Default is 1 minutes";
+          };
+          extra_rules = lib.mkOption {
+            type = with lib.types; listOf attrs;
+            default = [ ];
+            description = "Additional rules for Prometheus";
+          };
+          default_receiver = lib.mkOption {
+            type = with lib.types; attrs;
+            default = {
+              name = "default";
+            };
+            description = "Definition of a default receiver, default is doing nothing";
+          };
+          matrix-alertmanager = {
+            enable = lib.mkOption {
+              type = with lib.types; bool;
+              default = false;
+              description = "Whether to enable `services.matrix-alertmanager`";
+            };
+            homeserverUrl = lib.mkOption {
+              type = with lib.types; str;
+              default = "https://matrix-client.matrix.org";
+              description = "URL of the Matrix homeserver to use";
+            };
+            matrixUser = lib.mkOption {
+              type = with lib.types; str;
+              description = "Matrix user for the bot";
+            };
+            matrixRooms = lib.mkOption {
+              type = lib.types.listOf (
+                lib.types.submodule {
+                  options = {
+                    receivers = lib.mkOption {
+                      type = lib.types.listOf lib.types.str;
+                      description = "List of receivers for this room";
+                    };
+                    roomId = lib.mkOption {
+                      type = lib.types.str;
+                      description = "Matrix room ID";
+                      apply =
+                        x:
+                        assert lib.assertMsg (lib.hasPrefix "!" x) "Matrix room ID must start with a '!'. Got: ${x}";
+                        x;
+                    };
+                  };
+                }
+              );
+              description = ''
+                Combination of Alertmanager receiver(s) and rooms for the bot to join.
+                Each Alertmanager receiver can be mapped to post to a matrix room.
+
+                Note, you must use a room ID and not a room alias/name. Room IDs start
+                with a "!".
+              '';
+              example = [
+                {
+                  receivers = [
+                    "receiver1"
+                    "receiver2"
+                  ];
+                  roomId = "!roomid@example.com";
+                }
+                {
+                  receivers = [ "receiver3" ];
+                  roomId = "!differentroomid@example.com";
+                }
+              ];
+            };
+
+          };
+        };
+      };
+
+    perInstance =
+      {
+        settings,
+        roles,
+        ...
+      }:
+      {
+        nixosModule =
+          {
+            config,
+            lib,
+            pkgs,
+            ...
+          }:
+          let
+            getYggdrasilIP =
+              machineName:
+              if config.clan.core.vars.generators.yggdrasil.files.address ? value then
+                clanLib.getPublicValue {
+                  flake = config.clan.core.settings.directory;
+                  machine = machineName;
+                  generator = "yggdrasil";
+                  file = "address";
+                  default = null;
+                }
+              else
+                throw "clanService/yggdrasil is required";
+
+            matrixRoomReceivers = lib.unique (
+              lib.concatMap (entry: entry.receivers) settings.matrix-alertmanager.matrixRooms
+            );
+          in
+          lib.mkMerge [
+            {
+              networking.firewall.allowedTCPPorts = [
+                9090
+              ];
+              services.prometheus = {
+                enable = true;
+
+                globalConfig = {
+                  scrape_interval = settings.scrape_interval;
+                };
+
+                alertmanagers = [
+                  {
+                    scheme = "http";
+                    path_prefix = "/";
+                    static_configs = [ { targets = [ "localhost:9093" ]; } ];
+                  }
+                ];
+
+                alertmanager = {
+                  enable = true;
+                  configuration = {
+                    global = {
+                      resolve_timeout = "5m";
+                    };
+                    route = {
+                      receiver = "default";
+                      routes = map (mReceiver: { receiver = mReceiver; }) matrixRoomReceivers;
+                    };
+                    receivers = [
+                      { name = "default"; }
+                    ]
+                    ++ map (mReceiver: {
+                      name = mReceiver;
+                      webhook_configs = [
+                        {
+                          url_file = config.clan.core.vars.generators.prometheus.files.matrix-alertmanager-urlfile.path;
+                          send_resolved = true;
+                        }
+                      ];
+                    }) matrixRoomReceivers;
+                  };
+                };
+
+                scrapeConfigs = lib.mapAttrsToList (machineName: machineVal: {
+                  tls_config.insecure_skip_verify = true;
+                  job_name = "${machineName}";
+                  static_configs = lib.mapAttrsToList (
+                    exporterName: exporterVal:
+                    let
+                      targetPort =
+                        if exporterVal ? port then
+                          exporterVal.port
+                        else
+                          config.services.prometheus.exporters."${exporterName}".port;
+                      targetHost = getYggdrasilIP machineName;
+                    in
+                    {
+                      targets = [ "[${targetHost}]:${lib.toString targetPort}" ];
+                    }
+                  ) machineVal.settings.exporters;
+                }) roles.nodes.machines;
+
+                rules = [
+                  (builtins.toJSON {
+                    groups = [
+                      {
+                        name = "default";
+                        rules = [
+                          {
+                            alert = "NodesDown";
+                            expr = "count by (job) (up == 0) > 0";
+                            for = "1m";
+                            labels = {
+                              severity = "critical";
+                            };
+                            annotations.summary = "Node **{{ $labels.job }}** has been down for more than 1 minutes.";
+                          }
+                          {
+                            alert = "SmartCtlErrors";
+                            expr = "smartctl_device_error_log_count > 0";
+                            for = "5m";
+                            labels = {
+                              severity = "critical";
+                            };
+                            annotations.summary = ''
+                              Errors occur on **{{ $labels.job }}**
+                              Disk {{ $labels.device }} {{ $value }}
+                            '';
+                          }
+                          {
+                            alert = "ZFSPoolsHealth";
+                            expr = "zfs_pool_health > 0";
+                            for = "5m";
+                            labels = {
+                              severity = "critical";
+                            };
+                            annotations.summary = ''
+                              Unhealthy Pool at **{{ $labels.job }}**
+                              Pool {{ $labels.pool }} value {{ $value }}
+                            '';
+                          }
+                        ]
+                        ++ settings.extra_rules;
+                      }
+                    ];
+                  })
+                ];
+
+              };
+
+            }
+            (lib.optionalAttrs settings.matrix-alertmanager.enable {
+
+              clan.core.vars.generators.prometheus = {
+                files.matrix-alertmanager-token.secret = true;
+                files.matrix-alertmanager-secret.secret = true;
+                files.matrix-alertmanager-urlfile = {
+                  secret = true;
+                  owner = "alertmanager";
+                  group = "alertmanager";
+                };
+                script = ''
+                  echo "" > $out/matrix-alertmanager-token
+                  openssl rand -hex 32 > "$out"/matrix-alertmanager-secret
+
+                  echo "http://localhost:3000/alerts?secret=$(cat $out/matrix-alertmanager-secret)" > $out/matrix-alertmanager-urlfile
+                '';
+                runtimeInputs = [
+                  pkgs.openssl
+                ];
+              };
+
+              services.matrix-alertmanager = lib.mkIf settings.matrix-alertmanager.enable {
+                enable = true;
+                tokenFile = config.clan.core.vars.generators.prometheus.files.matrix-alertmanager-token.path;
+                secretFile = config.clan.core.vars.generators.prometheus.files.matrix-alertmanager-secret.path;
+                homeserverUrl = settings.matrix-alertmanager.homeserverUrl;
+                matrixUser = settings.matrix-alertmanager.matrixUser;
+                matrixRooms = settings.matrix-alertmanager.matrixRooms;
+              };
+            })
+          ];
+      };
+  };
+
+  roles.nodes = {
+    description = "A node will expose metrics for server to harvest";
+
+    interface =
+      { lib, ... }:
+      {
+        options = {
+          exporters = lib.mkOption {
+            type = lib.types.attrsOf (lib.types.submodule { });
+            default = { };
+            description = "Mirror of services.prometheus.exporters";
+          };
+        };
+      };
+
+    perInstance =
+      { settings, ... }:
+      let
+        enabledExporters = builtins.mapAttrs (
+          name: value:
+          value
+          // {
+            enable = true;
+            openFirewall = true;
+          }
+        ) settings.exporters;
+      in
+      {
+        nixosModule =
+          { ... }:
+          {
+            services.prometheus.exporters = enabledExporters;
+          };
+      };
+  };
+
+}

modules/clan/prometheus/flake-module.nix

@@ -0,0 +1,19 @@
+{ self, inputs, ... }:
+let
+  module = ./default.nix;
+in
+{
+  clan.modules = {
+    prometheus = module;
+  };
+  perSystem =
+    { ... }:
+    {
+      clan.nixosTests.service-prometheus = {
+        imports = [ ./tests/vm/default.nix ];
+        _module.args = { inherit self inputs; };
+
+        clan.modules."@clan/prometheus" = module;
+      };
+    };
+}

modules/clan/prometheus/tests/vm/default.nix

@@ -0,0 +1,101 @@
+{
+  self,
+  hostPkgs,
+  config,
+  lib,
+  ...
+}:
+{
+  name = "service-prometheus";
+  result.update-vars =
+    let
+      relativeDir = lib.removePrefix "${self}/" (toString config.clan.directory);
+    in
+    hostPkgs.writeShellScriptBin "update-vars" ''
+      set -x
+      export PRJ_ROOT=$(git rev-parse --show-toplevel)
+      ${
+        self.inputs.clan-core.packages.${hostPkgs.system}.clan-cli
+      }/bin/clan-generate-test-vars $PRJ_ROOT/${relativeDir} ${config.name}
+    '';
+
+  clan = {
+    test.useContainers = false;
+    directory = ./.;
+    inventory = {
+      machines.server = { };
+      machines.nodeA = { };
+
+      instances = {
+        yggdrasil = {
+          module.name = "yggdrasil";
+          roles.default.machines.server = { };
+          roles.default.machines.nodeA = { };
+        };
+
+        prometheus = {
+          module.name = "@clan/prometheus";
+          module.input = "self";
+          roles.nodes.machines."nodeA".settings = {
+            exporters.smartctl = { };
+          };
+          roles.server.machines."server".settings = {
+            extra_rules = [
+              {
+                alert = "test";
+                expr = "zfs_pool_health > 0";
+                for = "5m";
+                labels = {
+                  severity = "critical";
+                };
+                annotations.summary = ''
+                  Unhealthy Pool at {{ $labels.job }}
+                  Pool {{ $labels.pool }} value {{ $value }}
+                '';
+              }
+            ];
+
+            matrix-alertmanager = {
+              enable = true;
+              matrixUser = "test@matrixtest.org";
+              matrixRooms = [
+                {
+                  roomId = "!testroom";
+                  receivers = [ "matrix" ];
+                }
+              ];
+            };
+
+          };
+        };
+      };
+    };
+  };
+
+  nodes = {
+    server = { };
+    nodeA = { };
+  };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      start_all()
+
+      server.wait_for_unit("prometheus.service")
+
+      nodeA.wait_for_unit("prometheus-smartctl-exporter.service")
+      nodeA.wait_for_open_port(9633)
+
+      nodeA.succeed("systemctl status prometheus-smartctl-exporter.service")
+      nodeA.succeed("curl http://localhost:9633/metrics")
+
+
+      server_ip = server.succeed("ip -4 addr show eth1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}'").strip()
+      nodeA_ip = nodeA.succeed("ip -4 addr show eth1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}'").strip()
+
+      server.succeed(f"ping -c 3 {nodeA_ip}")
+      server.succeed(f"curl -v http://{nodeA_ip}:9633/metrics")
+
+    '';
+}

modules/clan/prometheus/tests/vm/sops/machines/nodeA/key.json

@@ -0,0 +1,6 @@
+[
+  {
+    "publickey": "age1kxsp8pa8am6k333nxs4akjqkhht8gspznmlqz4pxn35h5dj4uv5qj6q6fl",
+    "type": "age"
+  }
+]

modules/clan/prometheus/tests/vm/sops/machines/server/key.json

@@ -0,0 +1,6 @@
+[
+  {
+    "publickey": "age1dkrf438z3337d2qnc7ugkggua99xkh55wuf9zgun35fjrxdpnf5qkg4z6j",
+    "type": "age"
+  }
+]

modules/clan/prometheus/tests/vm/sops/secrets/nodeA-age.key/secret

@@ -0,0 +1,14 @@
+{
+	"data": "ENC[AES256_GCM,data:Z8I3ecNV2N2jed1sPBU+tI5r5qB2nVTO7aNyMxvp0ztujn8kXjw+thSvLGtRygL2V9rSmPJalHQf1IYUriXgCmYtfg5InPDCAqk=,iv:O4rSyg2G6PJWHURZ/BTBKmn1AVekbNBdg5137sOPL/U=,tag:4/CLfO50laZ8ljWkr6o4qA==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTSWxnekYvREdZMTBMVlRq\nRmtCemFYZDhLYU93azc5czdoTVUydFFUL1JzCmo4ZHlrNi8yeW15N2JxTytWeCtk\nbjRwWUVlazUwTlMwc1RZVU8xYlVlckEKLS0tIFVPeU5KMVFwdExFT0wzeXZka2Jo\nSmxEM2RPTWdoZXJxK0dpemUzVkNzdGcKfXdiSeAcNwEZi7kh9c89ss5K+dYG0lhq\nFsf2I0A1csxqqnYJqXPmwlVGMzuWDrWRU0uc+hQLndP3TbadVux64w==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-06-11T07:43:55Z",
+		"mac": "ENC[AES256_GCM,data:OCPR2tkbN72MdaczO47UNCJBb1KjABHQH9q7dtVEwoAhKg4QWFtsDaMwBTVE9qe48nlaWQbxT1mM7uztm6RXLkc5y2c3danPUYFj/FK/ffqpaxv3oReyxWqMoGayT23kFbB0TWEx1K8Jp3gOkwCPg+ZRClvhV1dXrfnwIwZHrBY=,iv:3puPIWFIxRF1KtrmyG54LqCc7Zg4/AOMD65QjYdN970=,tag:RoIVltMKw7WUvgW6sNk6mA==,type:str]",
+		"version": "3.13.0"
+	}
+}

modules/clan/prometheus/tests/vm/sops/secrets/nodeA-age.key/users/admin

@@ -0,0 +1 @@
+../../../users/admin

modules/clan/prometheus/tests/vm/sops/secrets/server-age.key/secret

@@ -0,0 +1,14 @@
+{
+	"data": "ENC[AES256_GCM,data:Nuq6ege3HJOxpRgA6fnxdD2Wj+KCw+3PaJCxmZirJl3mkRVLnZgUUhr+gOVEup9Ifjl1ZnP+PqV7b9pPR/WQg0LARYtxIC1QGJ8=,iv:v9p9lsefP5V9McAJCzS7v9sl8XHr9/hAL41XwFbwMOA=,tag:ETK+CFFJAAzGTpowQNAZMQ==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArN0NEWFZoZWlyeUtZc3hi\ndnVNcHl4eVVHckRLeFhPYUt4a3BwMElFMVZZCklkU1NEWVVmSGw1NmJmWWkrVHFH\nVTN5U0x3NXdiQUJCc095TElzMWZCMXMKLS0tIHRXQkJNREFYUFFvMXM1Sk53VW5z\naTRjMXozZXZiNU8zSkF5d2hhdklBY1EKWwsPi6YiHKFfAyqWH2u75hw47gzcQOz/\n95Im0FgadhqGDCeZhTDfEAc4b1VWQULInsjeRapzf5OJOwekbz6guA==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-06-11T07:45:26Z",
+		"mac": "ENC[AES256_GCM,data:mTKFSBFnUzu3rldQCHPZHoyzDdwPzBWPIAhemC1XyG5PiQ/OczStjYaLzZQGCpPvOjBb5Ntqrc+dnaOedZgKlOdaPjZs1U2ZDWadoeWQ2TAKWYA6+kN7PXomsxtHhntiaujMy3502eh06VyiutpVuCdzK2cfEwuno8nyIcHgtXk=,iv:/5DRvFVDQA+yd8m/+Cyxb+aIsfwoaFcV6KRQ/7ISHnU=,tag:z31P6CL0NNRlQThqwapVNA==,type:str]",
+		"version": "3.13.0"
+	}
+}

modules/clan/prometheus/tests/vm/sops/secrets/server-age.key/users/admin

@@ -0,0 +1 @@
+../../../users/admin

modules/clan/prometheus/tests/vm/sops/users/admin/key.json

@@ -0,0 +1,4 @@
+{
+  "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
+  "type": "age"
+}

modules/clan/prometheus/tests/vm/vars/per-machine/nodeA/state-version/version/value

@@ -0,0 +1 @@
+26.05

modules/clan/prometheus/tests/vm/vars/per-machine/nodeA/yggdrasil/address/value

@@ -0,0 +1 @@
+204:b10b:6057:4bbe:2b44:fc58:c6fd:90ad

modules/clan/prometheus/tests/vm/vars/per-machine/nodeA/yggdrasil/privateKey/machines/nodeA

@@ -0,0 +1 @@
+../../../../../../sops/machines/nodeA

modules/clan/prometheus/tests/vm/vars/per-machine/nodeA/yggdrasil/privateKey/secret

@@ -0,0 +1,18 @@
+{
+	"data": "ENC[AES256_GCM,data:JkuciSmL5nmSjcYn22W7iHKzuRxWMJ5dixYllm0aSM7DsyAp9mQzIYJJmalepp7sEhSJ5As3vQW6ZpOQ3G8ZheG06++1GlM8lvVV2FKmYvKHQpI+V7WyUJl7dpfu+5A6BzWES0GbC1g8l/a8sb/+jjEoqUTAj/4=,iv:tehdHsdm2uSRAAzImHhwBSnSBF6lzjLzF9HIPnoi9s0=,tag:dWnQhAiJeCkcssjko+dUpw==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOVmRSR2xDNmdPYW5MNUVH\nYWVpaTc0TjdOZFBTSEJDL1Z3VG9vVHkrZUFjCklUMUU1bnVmZFJYbzVPd09oZm1U\nNHY0R1hNQnBBc2V4Y2RWQ1ZZRjdOK0kKLS0tIEJkSWFaTDJzMDNJR3QwQzRVdld4\ndDA5ZmZSeTYyVUE5Y1Z1T1l5QmpHRTQKSaN+MIazA8RXhRSyFSkDTyXEp43COpbf\nXOzAhTXja+ut/akUuKadDS4xycZ+ZXAreVmdsF4SWvwZkmPeew+hKQ==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1kxsp8pa8am6k333nxs4akjqkhht8gspznmlqz4pxn35h5dj4uv5qj6q6fl"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMNmZkTHlaRWl1V3UvcGxk\nR0hhL1lNekNzb0REaEc4bitBZkcwYmRDb2hjCnloQTZUL3ZneWZQZk9NTEc1bGNB\nY3ljdFRMMUhLeDdyblhVY3lSOFBXc1UKLS0tIEJUc1ZpQmtuNlRUUEVmajY5TGdP\ncSs2RkZXcnJYRlEvcEtYSWxIWmkrVEkKgQnfxuZuxl1OpZDUPVuqseSN89WnBGFw\nx2PI3cqN67R2tV/FEjOZo+GFgxW93SYdMvxzg2aG2q/7xOQxfj9sjg==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-06-11T07:44:25Z",
+		"mac": "ENC[AES256_GCM,data:gRk1t7xFxXSTUcZQw0DCH3QtRnQJF4Mc4kZeeckhuQdc/VATj+cq+ugicrcGJWbbXzAscQLG6g72+Qiane5nFfzmjNoO6JMe181wm7pY/5St+2MjXZEzwAaYjn6ZAm+U7aiUVcp8RBjFIL9HCvBF8qFl7rqqTvYHnTOU0V6TIIo=,iv:eUvZFDKl8PX5QaQPmwJXaokawQMNP0TGOklTAMgB/sg=,tag:3cHICox8bKWkPKMUgvLuXA==,type:str]",
+		"version": "3.13.0"
+	}
+}

modules/clan/prometheus/tests/vm/vars/per-machine/nodeA/yggdrasil/privateKey/users/admin

@@ -0,0 +1 @@
+../../../../../../sops/users/admin

modules/clan/prometheus/tests/vm/vars/per-machine/nodeA/yggdrasil/publicKey/value

@@ -0,0 +1 @@
+0a77a4fd45a20ea5d81d39c8137a97dd4988c692ce4263959559b8c3f966c1de

modules/clan/prometheus/tests/vm/vars/per-machine/server/prometheus/matrix-alertmanager-secret/machines/server

@@ -0,0 +1 @@
+../../../../../../sops/machines/server

modules/clan/prometheus/tests/vm/vars/per-machine/server/prometheus/matrix-alertmanager-secret/secret

@@ -0,0 +1,18 @@
+{
+	"data": "ENC[AES256_GCM,data:VszBHfdaNOOYYa6tNUPq9CsJHp+KMBTnZOdHnJz6v3pZQl1zCeYdW3ExvDfNY85tUAZ3YAHthD9JhuR1D+VVVn8=,iv:zbMmaTDZ5mL9IzRTEzuTSPkfwrwOlOIFJtLQyTzGkPw=,tag:Ez68y6gMIj0e/RYQ/Z+s8Q==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlenlYOCt2RkJOK1hDdUti\ncUpxS1F1RTBnZGo1Njg0Y0EwbzM1dWM5b1hJClFKQ1NDRVVpRXRpOGx3SU52MDZZ\nVVh2NDg5TDgzckFKZ0lNaG1tTEk0MmsKLS0tIHRvR0IzWFZUVkJEM0dwRFZ2SFRz\nNHpCYkI4dUx6YXJSd0xreUN1aUtKNEUK/SJqs5pbFipbp9P7ASUMby7H5ProXknF\nGMvHcIxa6OLLOCRA39YZBVEUlRd03j3rVFILZqVq47CwfaeHj0WBdw==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1dkrf438z3337d2qnc7ugkggua99xkh55wuf9zgun35fjrxdpnf5qkg4z6j"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4cWMzaElhYmZaRGhmMXJQ\nbWk2WVl0UmtidjdzYXM0enB3MGdTMWRMVDBjCmdiNEx2RURGL0ZtWCtkcHlabUs0\nVis2d3JieC8yOXV5OW9sN1l5ZWs5Sk0KLS0tIFNmaVpDQklaUDFQK1JnZWZzMDF6\nY0g1M2NHNTEvSkRsTVJSODcxcVVrV0EK8FLzflXqPcooAPh38L7oVliUY8WbB97W\naQYvGf/yo9Izmm8Pa0/ZUGSRnCVRAXtQ1IeR1uPNyuy47mHXO7n7Bw==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-06-22T07:46:31Z",
+		"mac": "ENC[AES256_GCM,data:ewR8kGgrAj7i6b5UUwh4Fn4CbtRcsDSHhHzrBwGBi9S0XWaatVTQAAmsAVm7DEiJ+a3SQLIAyx6Ef7uqCsZagmzs7LBq0YXNxWtxv62EWPwx8Vihzz3gscDJo1DM3ictX7yi6EiipQ0aYoPCh1veqw8AspLdwnkBxdUF2C+0muc=,iv:bo7vq8BfL437ZI63Os96pAg8EKi8NnrqhABz4Jft9YI=,tag:8krOKra/Z3MJdlmZFBZ7YQ==,type:str]",
+		"version": "3.13.1"
+	}
+}

modules/clan/prometheus/tests/vm/vars/per-machine/server/prometheus/matrix-alertmanager-secret/users/admin

@@ -0,0 +1 @@
+../../../../../../sops/users/admin

modules/clan/prometheus/tests/vm/vars/per-machine/server/prometheus/matrix-alertmanager-token/machines/server

@@ -0,0 +1 @@
+../../../../../../sops/machines/server

modules/clan/prometheus/tests/vm/vars/per-machine/server/prometheus/matrix-alertmanager-token/secret

@@ -0,0 +1,18 @@
+{
+	"data": "ENC[AES256_GCM,data:Mw==,iv:ylmBzsJVBD2pcQNkLcdthT9FX7YW84yZk0u7SlJUdaY=,tag:O1oT/MVijlrQDQG1ddFKlg==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRd2ZIMElrK2ZacXFTTHFl\nWDkwbGROS1d3WlhzcHhQK21Fc1pmWFZ1VkJRCjlrY1E0cndsZUR1dVQ2L0dud3RQ\nbDlNa3NQZjBPQTAxdUVkUk9lYkgyTGcKLS0tIEUyMVE5Y25BOFJyUWdkdWI1L3VQ\nSE5ubkMvWU9YbE94VTN2VXFUc2F0ajQKKz5VJEtEQcKggoO89ZSfpB3KLBHCnMf+\no8llbCm5bZ39S3qA2Q8spOK4AlkW/NiaCQE4G1LSkvvT6tYEMkwbyQ==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1dkrf438z3337d2qnc7ugkggua99xkh55wuf9zgun35fjrxdpnf5qkg4z6j"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnNHhVMWNhZGR6LzgrcG05\nMmVUYU1zcC93YklZUkVETFhZL1BISU13MEFNCjFSZ25EQUQrZTNIcmliTG5UV2xp\nKzQ3MzhkdzcxeGgyV3oxbXo5Y0ZMcmMKLS0tIDVMZjdYWjRkUE50dmE5dm42alpn\nbk1JN1poZWp2bEZNQ3VIdm9PS3Z1ZlEKYOTa7L9tVKq3gZbAeKmCifIxs/sqaPoj\nqdUlsPkwBPjSvlv1QLdRbjBICPdyfH+GiHCmj78DitzZ+KUnRKYqSQ==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-06-22T07:46:31Z",
+		"mac": "ENC[AES256_GCM,data:NqKlCAKKPF0OTesGozt0GSSd/HT8+h4meiO57EBzD7vwLc9mobG0rLn5C2i3e7tBM13VYzR66qPzQtaWI/jVA7BpJ0PNa2u9MHA2JV6nshRdhMtYgxVCBy8Had7IixAZEs1lLE2zHcWRvLMJPOvUp7tpghb34RddmF/Po/Mkm2s=,iv:9XCsu+rO/DbtaLt13O0/PUo/yV2eUjNP+GGmkYjOIfY=,tag:7tzJE5XBR5PfOqdIh7IKAQ==,type:str]",
+		"version": "3.13.1"
+	}
+}

modules/clan/prometheus/tests/vm/vars/per-machine/server/prometheus/matrix-alertmanager-token/users/admin

@@ -0,0 +1 @@
+../../../../../../sops/users/admin

modules/clan/prometheus/tests/vm/vars/per-machine/server/prometheus/matrix-alertmanager-urlfile/machines/server

@@ -0,0 +1 @@
+../../../../../../sops/machines/server

modules/clan/prometheus/tests/vm/vars/per-machine/server/prometheus/matrix-alertmanager-urlfile/secret

@@ -0,0 +1,18 @@
+{
+	"data": "ENC[AES256_GCM,data:LetAgJg1TgcJL+W7dX8k8MlvpS3PPwVGdco3Z6a8fGhGeQARcuHWV57K4lLQzPpJ7Cruxc6XGQn1U/t3cubdp2NPtwQsP9jaIqPnlZblrq6foHaUmBLaRzc4ed7HOo94ErfV5ZY=,iv:jdt3jMNlK3QvJP8i3OlGydkRPRd2rVybnmUxCDCxfz4=,tag:imNVcalMwnpuaLCdaoaegg==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4WU9IT3g4TVpiSWdYMUFo\nZGpSUG5xekZLaGMzNTZlcHFaSm1kbTBxUHhjClRIMzlhWW9ub2JFZHhVY3I3TkF3\nU0t5eHJVeFVHRStoNTFkT0lpYnNoMFkKLS0tIEM3aWdIL2RrSGx0ZkdheVRtYUhm\nUHZxeGZvUlBybWJFTHIrZDNxZVloemMKvpt+hkFaRUEXNp1dcfnIWD1i6fyVkaZm\neTn6RBxl1idVN1XlXAwrHHTekuZIobST5kGTV0uR3nLk5Cmhe2x93g==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1dkrf438z3337d2qnc7ugkggua99xkh55wuf9zgun35fjrxdpnf5qkg4z6j"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjTDlTM0JBaEowaXJOV1hE\nZWZ2UmUzQmlyek5NRWlqWDZiY0FXVHpKL1d3CitreGc3OUFzS0tYYm5UZ0tUb2pX\nb0pZZ3VacVBma09pSDEyalc0VU1HTVUKLS0tIE5YcnY2RnFCVk13dDZJQ3NMZDQ4\nTGgrY3FwMW5ybjM0a0FmNllrRWZYNWMK2BklSFSm1jT1SsdaMtFWZX4uu4JT2kGi\njyD9E/G0yGl5JH8xfKO/x7vIPuow96WW8bx9aqGRnshXqbe6WzvbIQ==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-06-22T07:46:31Z",
+		"mac": "ENC[AES256_GCM,data:bO9VvnIcjXDSyTdEHm1l5Dqm4umLC7FCEaJIbuC+M776q+GR3crq1FWm7J6tinlHDNFX/WmcS417b5WY5VJlP3jqvCalQdttg0EzlhwT65vATvJHoYEp8uqahyLzA9tj9ncQ9LL2XGFeIsvWnU9OcZ5s/42v2DtVdS1/32PT+7U=,iv:W29qp/zHP367rkwiMmpPQcKS/5g6HR5CZGkGCIacwD4=,tag:3DHc5kdj1Ar+7TcaSOnj+Q==,type:str]",
+		"version": "3.13.1"
+	}
+}

modules/clan/prometheus/tests/vm/vars/per-machine/server/prometheus/matrix-alertmanager-urlfile/users/admin

@@ -0,0 +1 @@
+../../../../../../sops/users/admin

modules/clan/prometheus/tests/vm/vars/per-machine/server/state-version/version/value

@@ -0,0 +1 @@
+26.05

modules/clan/prometheus/tests/vm/vars/per-machine/server/yggdrasil/address/value

@@ -0,0 +1 @@
+202:8a70:e215:f822:c67a:f191:b04a:a8f

modules/clan/prometheus/tests/vm/vars/per-machine/server/yggdrasil/privateKey/machines/server

@@ -0,0 +1 @@
+../../../../../../sops/machines/server