flake: bump cnx-network so Kea waits for its VLAN sockets

f98226b -> 4146f2c. kea-dhcp4-server started before networkd had addressed vlan-lan/vlan-mgmt on stellio and ran with no socket on :67; Kea now requires every configured socket and retries the bind while networkd catches up.
flake: bump cnx-network for the wifi bridge enslave fix
2026-09-18 10:10:49 +00:00 · 2026-09-18 09:41:47 +00:00 · 2026-09-18 06:19:24 +00:00 · 2026-09-18 06:19:24 +00:00 · 2026-09-18 06:19:24 +00:00 · 2026-09-18 13:18:22 +07:00
1048 changed files with 18340 additions and 7605 deletions
@@ -3,3 +3,4 @@
 result
 result-*
 run-vm-*
+.nixos-test-history
@@ -38,6 +38,22 @@
        "type": "github"
      }
    },
+    "blobs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1604995301,
+        "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "blobs",
+        "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "repo": "blobs",
+        "type": "gitlab"
+      }
+    },
    "call-flake": {
      "locked": {
        "lastModified": 1687380775,
@@ -53,6 +69,69 @@
        "type": "github"
      }
    },
+    "clan-community": {
+      "inputs": {
+        "clan-core": [
+          "clan-core"
+        ],
+        "data-mesher": [
+          "clan-community",
+          "clan-core",
+          "data-mesher"
+        ],
+        "disko": [
+          "clan-community",
+          "clan-core",
+          "disko"
+        ],
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nix-darwin": [
+          "clan-community",
+          "clan-core",
+          "nix-darwin"
+        ],
+        "nix-github-actions": "nix-github-actions",
+        "nix-select": [
+          "clan-community",
+          "clan-core",
+          "nix-select"
+        ],
+        "nix-unit": "nix-unit",
+        "nixpkgs": [
+          "clan-community",
+          "clan-core",
+          "nixpkgs"
+        ],
+        "sops-nix": [
+          "clan-community",
+          "clan-core",
+          "sops-nix"
+        ],
+        "systems": [
+          "clan-community",
+          "clan-core",
+          "systems"
+        ],
+        "treefmt-nix": [
+          "treefmt-nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1784417092,
+        "narHash": "sha256-no5eDYWPUZZu4GtLufnA7b7CiZC4qAhCgf70gFiDLZk=",
+        "ref": "refs/heads/main",
+        "rev": "20371843d45f61217019e489d6857842dc8a0203",
+        "revCount": 73,
+        "type": "git",
+        "url": "https://git.clan.lol/clan/clan-community"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.clan.lol/clan/clan-community"
+      }
+    },
    "clan-core": {
      "inputs": {
        "data-mesher": "data-mesher",
@@ -72,11 +151,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772411144,
-        "narHash": "sha256-WhXudztwPNnKXaqGX4DOqNfHzHdBSiGCvKGHM20pscw=",
+        "lastModified": 1788346295,
+        "narHash": "sha256-k9Ol++FFhQuPya6ZNQwVhqZZkMvE1ytLtbdrbH5zkrI=",
        "ref": "refs/heads/main",
-        "rev": "92cc85bc24eb31ce5725e1e72753129810ce3fe9",
-        "revCount": 13201,
+        "rev": "b15797faeca7494a7fe5fde2691d93affa3d3e37",
+        "revCount": 15239,
        "type": "git",
        "url": "https://git.clan.lol/clan/clan-core"
      },
@@ -85,6 +164,37 @@
        "url": "https://git.clan.lol/clan/clan-core"
      }
    },
+    "cnx-network": {
+      "inputs": {
+        "clan-core": [
+          "clan-core"
+        ],
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nixos-mailserver": "nixos-mailserver",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": [
+          "treefmt-nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1789726083,
+        "narHash": "sha256-oxlp99L8KXYDdzroS+QeqhQyFigVHp44D6aVFsifpe0=",
+        "ref": "clanService-router-ai",
+        "rev": "4146f2c878b104d96d25575be553378ae276f6e0",
+        "revCount": 198,
+        "type": "git",
+        "url": "https://git.b4l.co.th/B4L/cnx-network-clan"
+      },
+      "original": {
+        "ref": "clanService-router-ai",
+        "type": "git",
+        "url": "https://git.b4l.co.th/B4L/cnx-network-clan"
+      }
+    },
    "data-mesher": {
      "inputs": {
        "flake-parts": [
@@ -101,11 +211,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772273147,
-        "narHash": "sha256-Wzhoc6ifjTDZi8aVRH3fuLJPdd4ouNTTwwVhgoMcMek=",
-        "rev": "d5de7a8d9e5726e678c94e62fe8ac3a809fee5da",
+        "lastModified": 1788308203,
+        "narHash": "sha256-dCOb9YIJv9I2udjqukvjlGiTyOvGnO7zVbot0PxjBGk=",
+        "rev": "644c49bbf121b3e256bc83ce10b5d97813d9181d",
        "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/644c49bbf121b3e256bc83ce10b5d97813d9181d.tar.gz"
      },
      "original": {
        "type": "tarball",
@@ -140,11 +250,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": {
@@ -186,6 +296,22 @@
        "type": "github"
      }
    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
@@ -294,11 +420,11 @@
        "std": "std"
      },
      "locked": {
-        "lastModified": 1779175997,
-        "narHash": "sha256-Ps/4s3jwaZdLVEpO+1cRs54VbPbgMeXJUqa4CWSPJSY=",
+        "lastModified": 1787631179,
+        "narHash": "sha256-l+Zt5XNTD0f0ChkzDJURfQlFAgANIMrGYrk51SZEJKU=",
        "owner": "kurogeek",
        "repo": "frappix",
-        "rev": "0f1b4bcfb8c3b976e808a57e491d10857a1a45ac",
+        "rev": "fcb797886ae753b26a6e4415a7f2c19ba6adcf3b",
        "type": "github"
      },
      "original": {
@@ -307,6 +433,57 @@
        "type": "github"
      }
    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "cnx-network",
+          "nixos-mailserver",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "cnx-network",
+          "nixos-mailserver",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778507602,
+        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "cnx-network",
+          "nixos-mailserver",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
    "haskell-flake": {
      "locked": {
        "lastModified": 1675296942,
@@ -353,11 +530,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1768068402,
-        "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=",
+        "lastModified": 1788355065,
+        "narHash": "sha256-gAz5oTI7ur34CfuakQduiQd/2ZhO62Bn2XXg08nZYYQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c",
+        "rev": "d9d750e4fc11c10cab2da677bdd31e427f3a3a71",
        "type": "github"
      },
      "original": {
@@ -434,6 +611,35 @@
        "url": "https://gti.telent.net/dan/liminix"
      }
    },
+    "matthew-hardware": {
+      "inputs": {
+        "disko": [
+          "clan-core",
+          "disko"
+        ],
+        "flake-parts": [
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "unf": "unf"
+      },
+      "locked": {
+        "lastModified": 1789393925,
+        "narHash": "sha256-8PHRxSVWxu1ol1AIrqiP8g6t+h9fLekTgDdpgRa+sME=",
+        "ref": "mc/wip",
+        "rev": "ebee3891bc9cbec584f611b4bcdf12618da25148",
+        "revCount": 34,
+        "type": "git",
+        "url": "https://codeberg.org/matthewcroughan/matthew-hardware"
+      },
+      "original": {
+        "ref": "mc/wip",
+        "type": "git",
+        "url": "https://codeberg.org/matthewcroughan/matthew-hardware"
+      }
+    },
    "microvm": {
      "inputs": {
        "flake-utils": "flake-utils",
@@ -484,11 +690,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772379624,
-        "narHash": "sha256-NG9LLTWlz4YiaTAiRGChbrzbVxBfX+Auq4Ab/SWmk4A=",
+        "lastModified": 1786845137,
+        "narHash": "sha256-oQFip+v0luP8NIxJzmiW4Wu8bILsbFWom5l0zonl8hQ=",
        "owner": "nix-darwin",
        "repo": "nix-darwin",
-        "rev": "52d061516108769656a8bd9c6e811c677ec5b462",
+        "rev": "4cff07de74b50e64bdd68cd4e722ab5b6b35ee48",
        "type": "github"
      },
      "original": {
@@ -497,6 +703,49 @@
        "type": "github"
      }
    },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "clan-community",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737420293,
+        "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
+    "nix-github-actions_2": {
+      "inputs": {
+        "nixpkgs": [
+          "clan-community",
+          "nix-unit",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737420293,
+        "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
    "nix-select": {
      "locked": {
        "lastModified": 1763303120,
@@ -510,6 +759,32 @@
        "url": "https://git.clan.lol/clan/nix-select/archive/main.tar.gz"
      }
    },
+    "nix-unit": {
+      "inputs": {
+        "nix-github-actions": "nix-github-actions_2",
+        "nixpkgs": [
+          "clan-community",
+          "nixpkgs"
+        ],
+        "treefmt-nix": [
+          "clan-community",
+          "treefmt-nix"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779338171,
+        "narHash": "sha256-affUbv/bwE8SLGhuWKniDr7SVO+Lo1XEPjCZdyU5kgQ=",
+        "owner": "nix-community",
+        "repo": "nix-unit",
+        "rev": "6ab1f232562a01d18b40d5ed6a58718c4f3a74bc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-unit",
+        "type": "github"
+      }
+    },
    "nixago": {
      "inputs": {
        "flake-utils": "flake-utils_3",
@@ -522,11 +797,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1714086354,
-        "narHash": "sha256-yKVQMxL9p7zCWUhnGhDzRVT8sDgHoI3V595lBK0C2YA=",
+        "lastModified": 1746801636,
+        "narHash": "sha256-dlcKfIXp/eqFHzFm+DzseXAWWlpVwyk9cTvCKGtVKkw=",
        "owner": "nix-community",
        "repo": "nixago",
-        "rev": "5133633e9fe6b144c8e00e3b212cdbd5a173b63d",
+        "rev": "8cc33f973ab3a891d8a41391e73ef451a783960b",
        "type": "github"
      },
      "original": {
@@ -535,6 +810,54 @@
        "type": "github"
      }
    },
+    "nixos-images": {
+      "inputs": {
+        "nixos-stable": [
+          "nixpkgs"
+        ],
+        "nixos-unstable": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1784802994,
+        "narHash": "sha256-4PcD0Ibzdkh85G+70w5dLlR9YgQ2bmNIjiPPMSzO57w=",
+        "owner": "nix-community",
+        "repo": "nixos-images",
+        "rev": "6ece16b0c97986fe085122e796044add4cc3ff64",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-images",
+        "type": "github"
+      }
+    },
+    "nixos-mailserver": {
+      "inputs": {
+        "blobs": "blobs",
+        "flake-compat": "flake-compat",
+        "git-hooks": "git-hooks",
+        "nixpkgs": [
+          "cnx-network",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785198005,
+        "narHash": "sha256-falBPi+PJtMx0vwII8L24wjDGXNZMwRiVXsw8WTXLEo=",
+        "owner": "simple-nixos-mailserver",
+        "repo": "nixos-mailserver",
+        "rev": "d357b9f048c5532ec81b0e0034c0b8463d5ddd46",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "simple-nixos-mailserver",
+        "ref": "nixos-26.05",
+        "repo": "nixos-mailserver",
+        "type": "gitlab"
+      }
+    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1712920918,
@@ -552,11 +875,27 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1778458615,
-        "narHash": "sha256-cY07EsdhBJ8tFXPzDYevgqxRev9ZLxFonuq9wmq5kwg=",
+        "lastModified": 1780365719,
+        "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c6e5ca3c836a5f4dd9af9f2c1fc1c38f0fac988a",
+        "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1788775869,
+        "narHash": "sha256-JRf1lSypbvKj6AzUZHpUA6YC1DirVuitZWOnRwcm+Ww=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "58973d74f1893afe13f5902919803a0e99da0ca4",
        "type": "github"
      },
      "original": {
@@ -597,16 +936,15 @@
        ]
      },
      "locked": {
-        "lastModified": 1708640854,
-        "narHash": "sha256-EpcAmvIS4ErqhXtVEfd2GPpU/E/s8CCRSfYzk6FZ/fY=",
+        "lastModified": 1787579760,
+        "narHash": "sha256-WGhIEINOICx7bhV3WrSz0QTzv8uzaaa9AXvD1clIWpc=",
        "owner": "paisano-nix",
        "repo": "core",
-        "rev": "adcf742bc9463c08764ca9e6955bd5e7dcf3a3fe",
+        "rev": "88739c84d308876714322eb9844ede6597c1a580",
        "type": "github"
      },
      "original": {
        "owner": "paisano-nix",
-        "ref": "0.2.0",
        "repo": "core",
        "type": "github"
      }
@@ -653,14 +991,18 @@
    },
    "root": {
      "inputs": {
+        "clan-community": "clan-community",
        "clan-core": "clan-core",
+        "cnx-network": "cnx-network",
        "devshell": "devshell",
        "flake-parts": "flake-parts",
        "frappix": "frappix",
        "home-manager": "home-manager",
        "import-tree": "import-tree",
        "liminix": "liminix",
-        "nixpkgs": "nixpkgs_2",
+        "matthew-hardware": "matthew-hardware",
+        "nixos-images": "nixos-images",
+        "nixpkgs": "nixpkgs_3",
        "plasma-manager": "plasma-manager",
        "treefmt-nix": "treefmt-nix"
      }
@@ -673,11 +1015,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1772340640,
-        "narHash": "sha256-1nq7+Kt5IUBD8Hu3nptVPbMf+22rNJoHT0t9L1X+GKA=",
+        "lastModified": 1788337237,
+        "narHash": "sha256-gkSH8VUtCo6hnysNmb9DbTuDepH2t5pv+QWjP75xKAk=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "dec4d8eac700dcd2fe3c020857d3ee220ec147f1",
+        "rev": "fbf759290e0cb0a98dfc813a4eb7d53ad1dacb57",
        "type": "github"
      },
      "original": {
@@ -764,15 +1106,16 @@
    },
    "systems": {
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "lastModified": 1774449309,
+        "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
        "owner": "nix-systems",
        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
+        "ref": "future-26.11",
        "repo": "default",
        "type": "github"
      }
@@ -827,6 +1170,24 @@
        "type": "github"
      }
    },
+    "unf": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1779596435,
+        "narHash": "sha256-ztzeJVOQDhQtE0z9DwtSWL+OyoWKZrAD4gzRRvUP9ug=",
+        "ref": "refs/heads/main",
+        "rev": "4f5ab30ee524f09126b09f42f249c0aba756459d",
+        "revCount": 6,
+        "type": "git",
+        "url": "https://git.atagen.co/atagen/unf"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.atagen.co/atagen/unf"
+      }
+    },
    "yants": {
      "inputs": {
        "nixpkgs": [
@@ -7,6 +7,12 @@
      inputs.treefmt-nix.follows = "treefmt-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+    clan-community = {
+      url = "git+https://git.clan.lol/clan/clan-community";
+      inputs.clan-core.follows = "clan-core";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.treefmt-nix.follows = "treefmt-nix";
+    };
    devshell = {
      url = "github:numtide/devshell";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -39,6 +45,29 @@
      inputs.nixpkgs.follows = "nixpkgs";
      inputs.devshell.follows = "devshell";
    };
+
+    nixos-images = {
+      url = "github:nix-community/nixos-images";
+      inputs.nixos-unstable.follows = "nixpkgs";
+      inputs.nixos-stable.follows = "nixpkgs";
+    };
+
+    matthew-hardware = {
+      url = "git+https://codeberg.org/matthewcroughan/matthew-hardware?ref=mc/wip";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.disko.follows = "clan-core/disko";
+    };
+
+    # `router` clan service (site gateway: PPPoE, VLAN bridge, Kea/Blocky,
+    # nftables). Consumed via `module.input = "cnx-network"` in inventories/router.nix.
+    cnx-network = {
+      url = "git+https://git.b4l.co.th/B4L/cnx-network-clan?ref=clanService-router-ai";
+      inputs.clan-core.follows = "clan-core";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
+      inputs.treefmt-nix.follows = "treefmt-nix";
+    };
  };
  outputs =
    {
@@ -56,7 +85,6 @@
          ./shell.nix

          ./overlays
-          ./modules/nixos
          ./machines
          ./routers
          ./inventories
@@ -78,6 +106,20 @@
            packages.think = pkgs.think-gtcm;
            packages.think-be = pkgs.think-backend-gtcm;
            packages.file-uploader = pkgs.gtcm-file-uploader;
+            packages.installer =
+              (pkgs.nixos [
+                inputs.nixos-images.nixosModules.image-installer
+                {
+                  users.users.root.openssh.authorizedKeys.keys = [
+                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAB/raxJR8gASmquP63weHelbi+da2WBJR1DgzHPNz/f"
+                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDuhpzDHBPvn8nv8RH1MRomDOaXyP4GziQm7r3MZ1Syk"
+                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEcZ/p1Ofa9liwIzPWzNtONhJ7+FUWd2lCz33r81t8+w kurogeek@kurogeek"
+                    "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIOJDRQfb1+7VK5tOe8W40iryfBWYRO6Uf1r2viDjmsJtAAAABHNzaDo="
+                    "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDgsWq+G/tcr6eUQYT7+sJeBtRmOMabgFiIgIV44XNc6AAAABHNzaDo="
+                    "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIJMi3TAuwDtIeO4MsORlBZ31HzaV5bji1fFBPcC9/tWuAAAABHNzaDo="
+                  ];
+                }
+              ]).config.system.build.isoImage;
          };
      }
    );
@@ -2,6 +2,7 @@
  imports = [
    ./personal-computer.nix
    ./emmie.nix
+    ./router.nix
  ];
  clan = {
    inventory = {
@@ -16,16 +17,17 @@
          "deneb"
          "bosona"
        ];
-        w = [ "sirius" ];
+        w = [
+          "sirius"
+          "stellio"
+        ];
        b4l = [
          "rigel"
-          "neptune"
          "rana"
          "petra"
          "alasia"
        ];
        phonebox = [
-          "neptune"
          "rigel"
          "almach"
          "alpheratz"
@@ -33,25 +35,173 @@
          "adhil"
          "buna"
        ];
-        global-network = [
+
+        prometheus = [
+          "cursa"
+          "rigel"
+          "vega"
+          "buna"
+        ];
+
+        dm-bootstrapper = [
+          "rigel"
+          "cursa"
+          "deneb"
+          "bosona"
+          "canopus"
+        ];
+
+        dm-pull-deploy = [
          "rana"
-          "sirius"
-          "hadar"
-          "procyon"
-          "alasia"
+          "rigel"
+          "vega"
        ];
      };

      instances = {

+        borgbackup = {
+          module = {
+            name = "borgbackup";
+            input = "clan-core";
+          };
+          roles.client.machines."cursa".settings.destinations = {
+            alex = {
+              repo = "ssh://borg@10.0.10.225:2222/backup/cursa/backup";
+              rsh = "ssh -i /run/secrets/vars/borgbackup/borgbackup.ssh";
+            };
+          };
+          roles.client.machines."hadar".settings.destinations = {
+            alex = {
+              repo = "ssh://borg@10.0.10.225:2222/backup/hadar/backup";
+              rsh = "ssh -i /run/secrets/vars/borgbackup/borgbackup.ssh";
+            };
+          };
+          roles.client.machines."procyon".settings.destinations = {
+            alex = {
+              repo = "ssh://borg@10.0.10.225:2222/backup/procyon/backup";
+              rsh = "ssh -i /run/secrets/vars/borgbackup/borgbackup.ssh";
+            };
+          };
+          roles.client.machines."bosona".settings.destinations = {
+            alex = {
+              repo = "ssh://borg@10.0.10.225:2222/backup/bosona/backup";
+              rsh = "ssh -i /run/secrets/vars/borgbackup/borgbackup.ssh";
+            };
+          };
+          roles.client.machines."canopus".settings.destinations = {
+            alex = {
+              repo = "ssh://borg@10.0.10.225:2222/backup/canopus/backup";
+              rsh = "ssh -i /run/secrets/vars/borgbackup/borgbackup.ssh";
+            };
+          };
+          roles.client.machines."deneb".settings.destinations = {
+            alex = {
+              repo = "ssh://borg@10.0.10.225:2222/backup/deneb/backup";
+              rsh = "ssh -i /run/secrets/vars/borgbackup/borgbackup.ssh";
+            };
+          };
+          roles.client.machines."alasia".settings.destinations = {
+            alex = {
+              repo = "ssh://borg@10.0.10.225:2222/backup/alasia/backup";
+              rsh = "ssh -i /run/secrets/vars/borgbackup/borgbackup.ssh";
+            };
+          };
+        };
+
+        data-mesher = {
+          module = {
+            name = "data-mesher";
+            input = "clan-core";
+          };
+          roles.bootstrap.tags = [ "dm-bootstrapper" ];
+          roles.default.tags = [ "all" ];
+          roles.default.settings.interfaces = [ "ygg" ];
+        };
+
+        auto-pull-update = {
+          module = {
+            name = "dm-pull-deploy";
+            input = "clan-community";
+          };
+          roles.push.machines."rigel".settings = {
+            gitUrl = "https://git.b4l.co.th/newedge/infra.git";
+            branch = "main";
+          };
+          roles.push.extraModules = [
+            (
+              { pkgs, config, ... }:
+              {
+                # work around until upstream is fixed
+                environment.systemPackages = [
+                  (pkgs.writeShellApplication {
+                    name = "custom-dm-send-deploy";
+                    runtimeInputs = [
+                      config.services.data-mesher.package
+                      pkgs.git
+                      pkgs.nix
+                      pkgs.jq
+                    ];
+                    text =
+                      let
+                        settings.gitUrl = "https://git.b4l.co.th/newedge/infra.git";
+                        settings.branch = "main";
+                      in
+                      ''
+                        if [ $# -gt 1 ]; then
+                          echo "Usage: dm-send-deploy [<flake-ref>]"
+                          echo "Without arguments, sends the latest commit on '${settings.branch}' from ${settings.gitUrl}"
+                          echo "Example: dm-send-deploy git+https://example.com/repo.git?rev=abc123..."
+                          exit 1
+                        fi
+
+                        KEY="${config.clan.core.vars.generators.dm-pull-deploy-signing-key.files."signing.key".path}"
+                        if [ ! -r "$KEY" ]; then
+                          echo "Error: cannot read signing key at $KEY (are you root?)"
+                          exit 1
+                        fi
+
+                        if [ $# -eq 1 ]; then
+                          FLAKE_REF="$1"
+                        else
+                          REV=$(git ls-remote "${settings.gitUrl}" "refs/heads/${settings.branch}" | cut -f1)
+                          if [ -z "$REV" ]; then
+                            echo "Error: could not determine latest commit on ${settings.branch} from ${settings.gitUrl}"
+                            exit 1
+                          fi
+                          FLAKE_REF="git+${settings.gitUrl}?rev=$REV"
+                        fi
+
+                        TMPFILE=$(mktemp)
+                        trap 'rm -f "$TMPFILE"' EXIT
+
+                        printf '%s' "$FLAKE_REF" > "$TMPFILE"
+
+                        NETWORK_ID="${config.clan.core.vars.generators.data-mesher-network.files."network.pub".path}"
+
+                        data-mesher file update "$TMPFILE" \
+                          --url http://localhost:7331 \
+                          --network-id "$NETWORK_ID" \
+                          --key "$KEY" \
+                          --name "dm_pull_deploy/target"
+
+                        echo "Deployment target pushed: $FLAKE_REF"
+                      '';
+                  })
+                ];
+              }
+            )
+          ];
+          roles.default.tags = [ "dm-pull-deploy" ];
+          roles.default.settings.action = "switch";
+        };
+
        sshd = {
          roles.server.tags."all" = { };
          roles.server.settings = {
            authorizedKeys = {
              "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" =
@@ -102,7 +252,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 = { };
        };

@@ -111,7 +267,13 @@
            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 = { };
        };

@@ -129,12 +291,24 @@
          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"
@@ -150,29 +324,30 @@
          };
          roles.server.machines."alasia".settings = {
            public_url = "tailvpn.public.newedge.house";
-            base_domain = "tailnet.newedge.house";
            advertise_routes = [ "10.0.10.0/24" ];
+            dns = {
+              magic_dns = true;
+              base_domain = "tailvpn.newedge.house";
              nameservers = [
                "10.0.10.82"
                "1.1.1.1"
                "8.8.8.8"
              ];
-          };
-        };
-
-        yggdrasil-phone-network = {
-          module = {
-            name = "yggdrasil";
-            input = "clan-core";
-          };
-          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"
+              extra_records = [
+                {
+                  name = "poyerp.newedge.house";
+                  type = "A";
+                  value = "10.0.10.1";
+                }
+                {
+                  name = "glomerp.newedge.house";
+                  type = "A";
+                  value = "10.0.10.1";
+                }
              ];
            };
+          };
+        };

        phonebox = {
          module = {
@@ -183,6 +358,13 @@
          roles.default.machines."adhil".settings = {
            ata-ethernet-iface = "end0";
          };
+          roles.default.machines."rigel".settings = {
+            extraClientNumbers = [
+              "01"
+              "02"
+            ];
+            extraFixedIPClient = { };
+          };
        };

        pulse-stream = {
@@ -277,6 +459,104 @@
            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 = { };
+            };
+            buna.settings = {
+              exporters.smartctl = { };
+            };
+            mirach.settings = {
+              exporters.smartctl = { };
+            };
+            almach.settings = {
+              exporters.smartctl = { };
+            };
+          };
+        };
+
+        wifi =
+          let
+            networks = {
+              home = { };
+              glom = { };
+            };
+          in
+          {
+            module.name = "wifi";
+            module.input = "clan-community";
+
+            roles.default = {
+              machines."buna".settings = { inherit networks; };
+
+              extraModules = [
+                (
+                  { lib, ... }:
+                  {
+                    # profile names match the network attr names above;
+                    # 0 = retry forever for both (defaults: 4 autoconnect attempts, 3 auth attempts)
+                    networking.networkmanager.ensureProfiles.profiles = lib.mapAttrs (_: _: {
+                      connection.autoconnect-retries = 0;
+                      connection.auth-retries = 0;
+                    }) networks;
+                  }
+                )
+              ];
+            };
+          };
+
      };
    };
  };
@@ -0,0 +1,88 @@
+# Site gateways: the `router` clan service from cnx-network-clan (see
+# flake.nix input `cnx-network`, and that repo's modules/clan/router/README.md).
+# One instance for the fleet; each site adds its gateway machine with the
+# site's port / VLAN layout. `clan vars generate <gw>` then prompts for the
+# PPPoE username/password.
+{ lib, ... }:
+let
+  # Admin mesh = the site's ZeroTier network. The service only opens SSH,
+  # metrics and iperf3 to this prefix, so the gateway must also be a peer of
+  # the same network (tag membership in default.nix). Prefix derivation as in
+  # cnx-network's modules/mesh-hosts.nix: fd + 8-byte network id + 0x9993,
+  # /88 covers every peer.
+  meshSubnet =
+    instance:
+    let
+      networkId = lib.fileContents ../vars/shared/zerotier-network-${instance}/network-id/value;
+      full = "fd" + networkId + "9993";
+      hextet = i: builtins.substring (i * 4) 4 full;
+    in
+    "${hextet 0}:${hextet 1}:${hextet 2}:${hextet 3}:${hextet 4}:${builtins.substring 20 2 full}00::/88";
+in
+{
+  clan.inventory.instances.router = {
+    module = {
+      name = "router";
+      input = "cnx-network";
+    };
+
+    roles.default.settings.mesh.subnet = meshSubnet "w-network";
+
+    # stellio: GL.iNet Flint 2 (GL-MT6000, MT7986a). Ports as named by the
+    # device tree in matthew-hardware: eth1 = the 2.5G "WAN" port, lan1 = the
+    # 2.5G LAN port, lan2-lan5 = the 1G LAN ports (DSA on the MT7531 switch).
+    roles.default.machines.stellio.settings = {
+      site = "white-house";
+      siteId = 8;
+
+      # PPPoE on the ISP's VLAN 10, as on the liminix router it replaces
+      # (routers/white-house); set to null if the ISP runs PPPoE untagged.
+      wan.interface = "end1";
+      wan.vlanId = 10;
+
+      # lan1 (2.5G): untagged mgmt port for on-site recovery. lan2-lan4 (1G):
+      # untagged client ports on lan. lan5 is the pre-cutover staging uplink:
+      # DHCP client into the old LAN (routers/white-house), SSH only, no VLAN
+      # membership; set stagingPort = null at cutover.
+      accessPorts = {
+        lan1 = "mgmt";
+        lan2 = "lan";
+        lan3 = "lan";
+        lan4 = "lan";
+      };
+      stagingPort = "lan5";
+
+      # Both MT7976 radios broadcast the site SSID (same name and passphrase
+      # as the liminix router's "WhiteHouse"/"WhiteHouse-5", merged into one
+      # dual-band SSID) as an untagged access port on lan. Passphrase is the
+      # `wifi-WhiteHouse-passphrase` vars prompt. Channels as on the old
+      # router. Check the band mapping with `iw phy` (mt7986: phy0/wlan0 =
+      # 2.4 GHz, phy1/wlan1 = 5 GHz).
+      wifi = {
+        enable = true;
+        countryCode = "TH";
+        networks.WhiteHouse.vlan = "lan";
+        radios = {
+          wlan0 = {
+            band = "2g";
+            channel = 2;
+            wifi6 = true;
+            networks = [ "WhiteHouse" ];
+          };
+          wlan1 = {
+            band = "5g";
+            channel = 36;
+            wifi6 = true;
+            networks = [ "WhiteHouse" ];
+          };
+        };
+      };
+
+      # 10.1.<id>.0/24, router .1, DHCP pool .100-.199.
+      vlans = {
+        mgmt.id = 10;
+        lan.id = 20;
+      };
+    };
+  };
+}
@@ -19,7 +19,7 @@
      "installedAt": 1765277591
    },
    "buna": {
-      "installedAt": 1765343708
+      "installedAt": 1787123510
    },
    "rana": {
      "installedAt": 1773134236
@@ -47,6 +47,12 @@
    },
    "bosona": {
      "installedAt": 1779098893
+    },
+    "tangra": {
+      "installedAt": 1779958921
+    },
+    "cursa": {
+      "installedAt": 1782187627
    }
  }
 }
@@ -25,10 +25,7 @@
      {
        "index": 8,
        "attached_to": 0,
-        "class_list": [
-          "pci",
-          "bridge"
-        ],
+        "class_list": ["pci", "bridge"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -76,10 +73,7 @@
      {
        "index": 9,
        "attached_to": 0,
-        "class_list": [
-          "pci",
-          "bridge"
-        ],
+        "class_list": ["pci", "bridge"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -131,10 +125,7 @@
      {
        "index": 10,
        "attached_to": 0,
-        "class_list": [
-          "pci",
-          "bridge"
-        ],
+        "class_list": ["pci", "bridge"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -182,10 +173,7 @@
      {
        "index": 11,
        "attached_to": 0,
-        "class_list": [
-          "pci",
-          "bridge"
-        ],
+        "class_list": ["pci", "bridge"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -241,10 +229,7 @@
      {
        "index": 12,
        "attached_to": 0,
-        "class_list": [
-          "pci",
-          "bridge"
-        ],
+        "class_list": ["pci", "bridge"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -297,21 +282,14 @@
        },
        "driver": "piix4_smbus",
        "driver_module": "i2c_piix4",
-        "drivers": [
-          "piix4_smbus"
-        ],
-        "driver_modules": [
-          "i2c_piix4"
-        ],
+        "drivers": ["piix4_smbus"],
+        "driver_modules": ["i2c_piix4"],
        "module_alias": "pci:v00008086d00007113sv00001AF4sd00001100bc06sc80i00"
      },
      {
        "index": 17,
        "attached_to": 0,
-        "class_list": [
-          "pci",
-          "bridge"
-        ],
+        "class_list": ["pci", "bridge"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -361,11 +339,7 @@
      {
        "index": 22,
        "attached_to": 15,
-        "class_list": [
-          "cdrom",
-          "scsi",
-          "block_device"
-        ],
+        "class_list": ["cdrom", "scsi", "block_device"],
        "bus_type": {
          "hex": "0084",
          "name": "SCSI",
@@ -422,14 +396,8 @@
        "unix_device_name2": "/dev/sg1",
        "driver": "ata_piix",
        "driver_module": "ata_piix",
-        "drivers": [
-          "ata_piix",
-          "sr"
-        ],
-        "driver_modules": [
-          "ata_piix",
-          "sr_mod"
-        ]
+        "drivers": ["ata_piix", "sr"],
+        "driver_modules": ["ata_piix", "sr_mod"]
      }
    ],
    "cpu": [
@@ -496,9 +464,7 @@
          "spectre_v2_user",
          "its"
        ],
-        "power_management": [
-          ""
-        ],
+        "power_management": [""],
        "bogo": 4224,
        "cache": 16384,
        "page_size": 4096,
@@ -580,9 +546,7 @@
          "spectre_v2_user",
          "its"
        ],
-        "power_management": [
-          ""
-        ],
+        "power_management": [""],
        "bogo": 4224,
        "cache": 16384,
        "page_size": 4096,
@@ -606,11 +570,7 @@
      {
        "index": 23,
        "attached_to": 19,
-        "class_list": [
-          "disk",
-          "scsi",
-          "block_device"
-        ],
+        "class_list": ["disk", "scsi", "block_device"],
        "bus_type": {
          "hex": "0084",
          "name": "SCSI",
@@ -674,24 +634,15 @@
        ],
        "driver": "virtio_scsi",
        "driver_module": "virtio_scsi",
-        "drivers": [
-          "sd",
-          "virtio_scsi"
-        ],
-        "driver_modules": [
-          "sd_mod",
-          "virtio_scsi"
-        ]
+        "drivers": ["sd", "virtio_scsi"],
+        "driver_modules": ["sd_mod", "virtio_scsi"]
      }
    ],
    "graphics_card": [
      {
        "index": 16,
        "attached_to": 0,
-        "class_list": [
-          "graphics_card",
-          "pci"
-        ],
+        "class_list": ["graphics_card", "pci"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -748,12 +699,8 @@
        },
        "driver": "bochs-drm",
        "driver_module": "bochs",
-        "drivers": [
-          "bochs-drm"
-        ],
-        "driver_modules": [
-          "bochs"
-        ],
+        "drivers": ["bochs-drm"],
+        "driver_modules": ["bochs"],
        "module_alias": "pci:v00001234d00001111sv00001AF4sd00001100bc03sc00i00"
      }
    ],
@@ -761,10 +708,7 @@
      {
        "index": 24,
        "attached_to": 7,
-        "class_list": [
-          "usb",
-          "hub"
-        ],
+        "class_list": ["usb", "hub"],
        "bus_type": {
          "hex": "0086",
          "name": "USB",
@@ -837,12 +781,8 @@
        "hotplug": "usb",
        "driver": "hub",
        "driver_module": "usbcore",
-        "drivers": [
-          "hub"
-        ],
-        "driver_modules": [
-          "usbcore"
-        ],
+        "drivers": ["hub"],
+        "driver_modules": ["usbcore"],
        "module_alias": "usb:v1D6Bp0001d0618dc09dsc00dp00ic09isc00ip00in00"
      }
    ],
@@ -850,9 +790,7 @@
      {
        "index": 5,
        "attached_to": 0,
-        "class_list": [
-          "memory"
-        ],
+        "class_list": ["memory"],
        "base_class": {
          "hex": "0101",
          "name": "Internally Used Class",
@@ -876,9 +814,7 @@
      {
        "index": 21,
        "attached_to": 16,
-        "class_list": [
-          "monitor"
-        ],
+        "class_list": ["monitor"],
        "base_class": {
          "hex": "0100",
          "name": "Monitor",
@@ -1024,10 +960,7 @@
      {
        "index": 25,
        "attached_to": 24,
-        "class_list": [
-          "mouse",
-          "usb"
-        ],
+        "class_list": ["mouse", "usb"],
        "bus_type": {
          "hex": "0086",
          "name": "USB",
@@ -1063,9 +996,7 @@
        "model": "QEMU USB Tablet",
        "sysfs_id": "/devices/pci0000:00/0000:00:01.2/usb1/1-1/1-1:1.0",
        "sysfs_bus_id": "1-1:1.0",
-        "unix_device_names": [
-          "/dev/input/mice"
-        ],
+        "unix_device_names": ["/dev/input/mice"],
        "unix_device_name2": "/dev/input/mouse0",
        "resources": [
          {
@@ -1106,18 +1037,11 @@
        "hotplug": "usb",
        "driver": "usbhid",
        "driver_module": "usbhid",
-        "drivers": [
-          "usbhid"
-        ],
-        "driver_modules": [
-          "usbhid"
-        ],
+        "drivers": ["usbhid"],
+        "driver_modules": ["usbhid"],
        "driver_info": {
          "type": "mouse",
-          "db_entry_0": [
-            "explorerps/2",
-            "exps2"
-          ],
+          "db_entry_0": ["explorerps/2", "exps2"],
          "xf86": "explorerps/2",
          "gpm": "exps2",
          "buttons": -1,
@@ -1130,9 +1054,7 @@
      {
        "index": 18,
        "attached_to": 13,
-        "class_list": [
-          "network_controller"
-        ],
+        "class_list": ["network_controller"],
        "bus_type": {
          "hex": "008f",
          "name": "Virtio",
@@ -1157,9 +1079,7 @@
        "model": "Virtio Ethernet Card 0",
        "sysfs_id": "/devices/pci0000:00/0000:00:12.0/virtio1",
        "sysfs_bus_id": "virtio1",
-        "unix_device_names": [
-          "ens18"
-        ],
+        "unix_device_names": ["ens18"],
        "resources": [
          {
            "type": "hwaddr",
@@ -1172,12 +1092,8 @@
        ],
        "driver": "virtio_net",
        "driver_module": "virtio_net",
-        "drivers": [
-          "virtio_net"
-        ],
-        "driver_modules": [
-          "virtio_net"
-        ],
+        "drivers": ["virtio_net"],
+        "driver_modules": ["virtio_net"],
        "module_alias": "virtio:d00000001v00001AF4"
      }
    ],
@@ -1185,9 +1101,7 @@
      {
        "index": 26,
        "attached_to": 18,
-        "class_list": [
-          "network_interface"
-        ],
+        "class_list": ["network_interface"],
        "base_class": {
          "hex": "0107",
          "name": "Network Interface",
@@ -1201,9 +1115,7 @@
        "model": "Ethernet network interface",
        "sysfs_id": "/class/net/ens18",
        "sysfs_device_link": "/devices/pci0000:00/0000:00:12.0/virtio1",
-        "unix_device_names": [
-          "ens18"
-        ],
+        "unix_device_names": ["ens18"],
        "resources": [
          {
            "type": "hwaddr",
@@ -1216,19 +1128,13 @@
        ],
        "driver": "virtio_net",
        "driver_module": "virtio_net",
-        "drivers": [
-          "virtio_net"
-        ],
-        "driver_modules": [
-          "virtio_net"
-        ]
+        "drivers": ["virtio_net"],
+        "driver_modules": ["virtio_net"]
      },
      {
        "index": 27,
        "attached_to": 0,
-        "class_list": [
-          "network_interface"
-        ],
+        "class_list": ["network_interface"],
        "base_class": {
          "hex": "0107",
          "name": "Network Interface",
@@ -1241,19 +1147,14 @@
        },
        "model": "Loopback network interface",
        "sysfs_id": "/class/net/lo",
-        "unix_device_names": [
-          "lo"
-        ]
+        "unix_device_names": ["lo"]
      }
    ],
    "pci": [
      {
        "index": 13,
        "attached_to": 0,
-        "class_list": [
-          "pci",
-          "unknown"
-        ],
+        "class_list": ["pci", "unknown"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -1310,21 +1211,14 @@
        },
        "driver": "virtio-pci",
        "driver_module": "virtio_pci",
-        "drivers": [
-          "virtio-pci"
-        ],
-        "driver_modules": [
-          "virtio_pci"
-        ],
+        "drivers": ["virtio-pci"],
+        "driver_modules": ["virtio_pci"],
        "module_alias": "pci:v00001AF4d00001000sv00001AF4sd00000001bc02sc00i00"
      },
      {
        "index": 14,
        "attached_to": 0,
-        "class_list": [
-          "pci",
-          "unknown"
-        ],
+        "class_list": ["pci", "unknown"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -1380,12 +1274,8 @@
        },
        "driver": "virtio-pci",
        "driver_module": "virtio_pci",
-        "drivers": [
-          "virtio-pci"
-        ],
-        "driver_modules": [
-          "virtio_pci"
-        ],
+        "drivers": ["virtio-pci"],
+        "driver_modules": ["virtio_pci"],
        "module_alias": "pci:v00001AF4d00001002sv00001AF4sd00000005bc00scFFi00"
      }
    ],
@@ -1393,10 +1283,7 @@
      {
        "index": 6,
        "attached_to": 17,
-        "class_list": [
-          "storage_controller",
-          "pci"
-        ],
+        "class_list": ["storage_controller", "pci"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -1453,21 +1340,14 @@
        },
        "driver": "virtio-pci",
        "driver_module": "virtio_pci",
-        "drivers": [
-          "virtio-pci"
-        ],
-        "driver_modules": [
-          "virtio_pci"
-        ],
+        "drivers": ["virtio-pci"],
+        "driver_modules": ["virtio_pci"],
        "module_alias": "pci:v00001AF4d00001004sv00001AF4sd00000008bc01sc00i00"
      },
      {
        "index": 15,
        "attached_to": 0,
-        "class_list": [
-          "storage_controller",
-          "pci"
-        ],
+        "class_list": ["storage_controller", "pci"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -1557,12 +1437,8 @@
        },
        "driver": "ata_piix",
        "driver_module": "ata_piix",
-        "drivers": [
-          "ata_piix"
-        ],
-        "driver_modules": [
-          "ata_piix"
-        ],
+        "drivers": ["ata_piix"],
+        "driver_modules": ["ata_piix"],
        "module_alias": "pci:v00008086d00007010sv00001AF4sd00001100bc01sc01i80"
      }
    ],
@@ -1573,9 +1449,7 @@
      {
        "index": 19,
        "attached_to": 6,
-        "class_list": [
-          "unknown"
-        ],
+        "class_list": ["unknown"],
        "base_class": {
          "hex": "0000",
          "name": "Unclassified device",
@@ -1593,20 +1467,14 @@
        "sysfs_bus_id": "virtio2",
        "driver": "virtio_scsi",
        "driver_module": "virtio_scsi",
-        "drivers": [
-          "virtio_scsi"
-        ],
-        "driver_modules": [
-          "virtio_scsi"
-        ],
+        "drivers": ["virtio_scsi"],
+        "driver_modules": ["virtio_scsi"],
        "module_alias": "virtio:d00000008v00001AF4"
      },
      {
        "index": 20,
        "attached_to": 14,
-        "class_list": [
-          "unknown"
-        ],
+        "class_list": ["unknown"],
        "base_class": {
          "hex": "0000",
          "name": "Unclassified device",
@@ -1624,12 +1492,8 @@
        "sysfs_bus_id": "virtio0",
        "driver": "virtio_balloon",
        "driver_module": "virtio_balloon",
-        "drivers": [
-          "virtio_balloon"
-        ],
-        "driver_modules": [
-          "virtio_balloon"
-        ],
+        "drivers": ["virtio_balloon"],
+        "driver_modules": ["virtio_balloon"],
        "module_alias": "virtio:d00000005v00001AF4"
      }
    ],
@@ -1637,10 +1501,7 @@
      {
        "index": 7,
        "attached_to": 0,
-        "class_list": [
-          "usb_controller",
-          "pci"
-        ],
+        "class_list": ["usb_controller", "pci"],
        "bus_type": {
          "hex": "0004",
          "name": "PCI",
@@ -1707,25 +1568,15 @@
        },
        "driver": "uhci_hcd",
        "driver_module": "uhci_hcd",
-        "drivers": [
-          "uhci_hcd"
-        ],
-        "driver_modules": [
-          "uhci_hcd"
-        ],
+        "drivers": ["uhci_hcd"],
+        "driver_modules": ["uhci_hcd"],
        "driver_info": {
          "type": "module",
-          "db_entry_0": [
-            "uhci-hcd"
-          ],
+          "db_entry_0": ["uhci-hcd"],
          "active": true,
          "modprobe": true,
-          "names": [
-            "uhci-hcd"
-          ],
-          "module_args": [
-            ""
-          ],
+          "names": ["uhci-hcd"],
+          "module_args": [""],
          "conf": ""
        },
        "module_alias": "pci:v00008086d00007020sv00001AF4sd00001100bc0Csc03i00"
@@ -1838,9 +1689,7 @@
          "name": "RAM",
          "value": 7
        },
-        "memory_type_details": [
-          "Other"
-        ],
+        "memory_type_details": ["Other"],
        "speed": 0
      }
    ],
@@ -50,7 +50,7 @@ in
    ];
    sites = {
      "${sitename}" = {
-        domains = [ "localhost" ];
+        domains = [ sitename ];
        apps = [
          "frappe"
          "erpnext"
@@ -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" ];
+}
@@ -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";
+            };
+          };
+        };
+      };
+    };
+  };
+}
@@ -9,7 +9,15 @@
  ];
  clan = {
    meta.name = "NewEdgeClan";
-    machines = { };
+    machines = {
+      cursa = { ... }: { clan.core.state."vars".folders = [ "/var/lib" ]; };
+      hadar = { ... }: { clan.core.state."vars".folders = [ "/var/lib" ]; };
+      procyon = { ... }: { clan.core.state."vars".folders = [ "/var/lib" ]; };
+      bosona = { ... }: { clan.core.state."vars".folders = [ "/var/lib" ]; };
+      canopus = { ... }: { clan.core.state."vars".folders = [ "/var/lib" ]; };
+      deneb = { ... }: { clan.core.state."vars".folders = [ "/var/lib" ]; };
+      alasia = { ... }: { clan.core.state."vars".folders = [ "/var/lib" ]; };
+    };
    secrets.age.plugins = [
      "age-plugin-yubikey"
      "age-plugin-fido2-hmac"
@@ -25,8 +25,11 @@ in
    inputs.self.overlays.frappixLibsOverlay
    inputs.self.overlays.frappixPythonOverlay
    inputs.self.overlays.frappixToolsOverlay
+    inputs.self.overlays.frappixAppsOverlay
  ];

+  fonts.packages = [ pkgs.tlwg ];
+
  clan.core.vars.generators.frappix = {
    files = {
      sslCertificate.secret = false;
@@ -56,6 +59,8 @@ in
      pkgs.frappix.erpnext
      pkgs.frappix.hrms
      pkgs.frappix.crm
+      pkgs.frappix.posprinter
+      pkgs.frappix.default_thai_company
    ];
    sites = {
      "${sitename}" = {
@@ -65,6 +70,8 @@ in
          "erpnext"
          "hrms"
          "crm"
+          "posprinter"
+          "default_thai_company"
        ];
      };
    };
@@ -9,13 +9,6 @@ let
 in
 {
  clan.core.settings.machine.description = "VM machine that host Inventree system for Poy";
-  imports = [
-    inputs.self.nixosModules.inventree
-  ];
-
-  nixpkgs.overlays = [
-    inputs.self.overlays.packagesOverlay
-  ];

  nixpkgs.hostPlatform = {
    system = "x86_64-linux";
@@ -82,19 +75,12 @@ in

  services.inventree = {
    enable = true;
-    hostName = "${domain}";
-    config.site_url = "https://${config.services.inventree.hostName}";
+    inherit domain;
    secretKeyFile = config.clan.core.vars.generators.inventree.files.secret-key.path;
-    config.oidc_private_key_file = config.clan.core.vars.generators.inventree.files.oidc-key.path;
-    config.adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
+    adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
+    settings.INVENTREE_SITE_URL = "https://${domain}";
  };

-  # 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" ];
 }
@@ -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

@@ -9,13 +9,6 @@ let
 in
 {
  clan.core.settings.machine.description = "VM machine that host Inventree system for Glom";
-  imports = [
-    inputs.self.nixosModules.inventree
-  ];
-
-  nixpkgs.overlays = [
-    inputs.self.overlays.packagesOverlay
-  ];

  nixpkgs.hostPlatform = {
    system = "x86_64-linux";
@@ -82,19 +75,12 @@ in

  services.inventree = {
    enable = true;
-    hostName = "${domain}";
-    config.site_url = "https://${config.services.inventree.hostName}";
+    inherit domain;
    secretKeyFile = config.clan.core.vars.generators.inventree.files.secret-key.path;
-    config.oidc_private_key_file = config.clan.core.vars.generators.inventree.files.oidc-key.path;
-    config.adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
+    adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path;
+    settings.INVENTREE_SITE_URL = "https://${domain}";
  };

-  # 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" ];
 }
@@ -9,7 +9,6 @@
  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;
@@ -1,18 +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";
 }
@@ -5,8 +5,6 @@
 }:
 {
  imports = [
-    self.nixosModules.common
-
    ./hardware-configuration.nix
  ];

@@ -23,15 +21,12 @@
  nixpkgs.hostPlatform = {
    system = "aarch64-linux";
  };
+  nixpkgs.buildPlatform = {
+    system = "x86_64-linux";
+  };

  system.stateVersion = "25.11";

-  services.journald.extraConfig = ''
-    Storage=volatile
-    RuntimeMaxUse=30M
-    RuntimeMaxFileSize=10M
-  '';
-
  services.udisks2.enable = false;

  nix.settings.log-lines = 25;
@@ -54,6 +49,23 @@
    "sd_mod"
  ];

+  boot = {
+    consoleLogLevel = 0;
+    kernel.sysctl = {
+      "fs.suid_dumpable" = 0;
+      "kernel.core_pattern" = "/dev/null";
+    };
+    tmp = {
+      useTmpfs = true;
+    };
+  };
+
+  services.journald.settings.Journal.Storage = "none";
+
+  systemd = {
+    coredump.enable = false;
+  };
+
  fileSystems."/mnt/hdd" = {
    device = "zdata/nas";
    fsType = "zfs";
@@ -0,0 +1,31 @@
+{ inputs, lib, ... }:
+{
+  imports = [
+    inputs.matthew-hardware.nixosModules.mt7986a-glinet-gl-mt6000
+  ];
+
+  # matthew-hardware's common/generic-uefi-image.nix still sets
+  # `image.repart.enable = true`; nixpkgs removed that option (importing
+  # image/repart.nix now always defines system.build.image). Declare it so the
+  # definition has somewhere to land. Drop once upstream stops setting it.
+  options.image.repart.enable = lib.mkOption {
+    type = lib.types.bool;
+    default = true;
+    internal = true;
+  };
+
+  config = {
+    hardware.mt7986a-glinet-gl-mt6000.enable = true;
+    hardware.mt7986a-glinet-gl-mt6000.zealous = true;
+    hardware.mt7986a-glinet-gl-mt6000.image.repart.enable = true;
+
+    nixpkgs.hostPlatform.system = "aarch64-linux";
+    nixpkgs.buildPlatform.system = "x86_64-linux";
+
+    system.stateVersion = "26.11";
+    clan.core.sops.defaultGroups = [ "admins" ];
+
+    clan.core.settings.name = "stellio";
+    clan.core.settings.machine.description = "Flint-2 router";
+  };
+}
@@ -0,0 +1,13 @@
+{ inputs, ... }:
+{
+  disko = {
+    imageBuilder = {
+      # Avoid double emulation to significantly speed up image building process.
+      # Update the system according to your host system.
+      # See https://github.com/nix-community/disko/issues/856
+      qemu =
+        inputs.nixpkgs.legacyPackages.x86_64-linux.qemu
+        + "/bin/qemu-system-aarch64 -M virt -cpu cortex-a57";
+    };
+  };
+}
@@ -0,0 +1,32 @@
+{
+  system.stateVersion = "25.11";
+  nixpkgs.hostPlatform = {
+    system = "x86_64-linux";
+  };
+
+  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;
+    files.email.secret = false;
+
+    prompts.email = {
+      type = "line";
+      description = "Email for ACME registeration";
+    };
+
+    script = ''
+      cat $prompts/email > $out/email
+    '';
+  };
+
+  users.users.nginx.extraGroups = [ "acme" ];
+
+  security.acme.acceptTerms = true;
+
+  imports = [ ];
+}
@@ -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";
+            };
+          };
+        };
+      };
+    };
+  };
+}
@@ -10,17 +10,9 @@

    (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";

@@ -0,0 +1,3 @@
+# Apple Network
+
+This service allows atalkd instances to connect to each other over vxlan over Yggdrasil. We need to use vxlan due to the support of broadcasting it provides. The service will form a network of star-topology vxlan using the underlying Yggdrasil network. With this vxlan network, we can have a private Apple Talk network over the internet.
@@ -0,0 +1,139 @@
+{ clanLib, ... }:
+{
+  _class = "clan.service";
+  manifest.name = "apple-network";
+  manifest.description = "This service will create an instance of `atalkd` for each peer to talk to Apple machines over Apple Talk protocol and automatically connect each peer using vxlan over Yggdrasil network to achieve Apple Talk over internet experience";
+  manifest.readme = builtins.readFile ./README.md;
+  manifest.categories = [ "Network" ];
+
+  roles.peer = {
+    description = "A gateway machine that allow classic Apple machines to connect to other Apple machines over the internet";
+
+    interface =
+      { lib, ... }:
+      {
+        options = {
+          zone_name = lib.mkOption {
+            type = with lib.types; str;
+            description = "Zone name for Apple Talk protocol";
+            default = "Default";
+          };
+        };
+      };
+
+    perInstance =
+      { roles, settings, ... }:
+      {
+        nixosModule =
+          {
+            lib,
+            config,
+            pkgs,
+            ...
+          }:
+          let
+            vxlanPort = 4789;
+
+            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";
+
+            noSelfPeers = builtins.filter (peerName: peerName != config.clan.core.settings.machine.name) (
+              lib.mapAttrsToList (machineName: _: machineName) roles.peer.machines
+            );
+
+            sortedPeers = builtins.sort (x: y: x < y) (
+              lib.mapAttrsToList (machineName: _: machineName) roles.peer.machines
+            );
+
+            getMachineIndex = machineName: lib.lists.findFirstIndex (x: x == machineName) null sortedPeers;
+
+            selfVXAddress = "192.168.254.${
+              lib.toString ((getMachineIndex config.clan.core.settings.machine.name) + 1)
+            }/24";
+          in
+          {
+
+            services.atalkd = {
+              enable = true;
+              interfaces = {
+                vxlan.config = ''
+                  -router -phase 2 -net 1 -zone "${settings.zone_name}"
+                '';
+              };
+            };
+
+            networking.useNetworkd = true;
+
+            networking.firewall.interfaces."ygg".allowedUDPPorts = [ vxlanPort ];
+
+            boot.kernelModules = [ "vxlan" ];
+
+            systemd.network.netdevs =
+              builtins.listToAttrs (
+                map (
+                  peerName:
+                  (lib.nameValuePair "10-apl-vxlan-${peerName}" {
+                    enable = true;
+                    netdevConfig = {
+                      Name = "vxlan-${peerName}";
+                      Kind = "vxlan";
+                    };
+                    vxlanConfig = {
+                      VNI = (getMachineIndex config.clan.core.settings.machine.name) + (getMachineIndex peerName);
+                      Remote = getYggdrasilIP peerName;
+                      DestinationPort = vxlanPort;
+                      Independent = true;
+                    };
+                  })
+                ) noSelfPeers
+              )
+              // {
+                "10-apl-vxlan" = {
+                  enable = true;
+                  netdevConfig = {
+                    Kind = "bridge";
+                    Name = "vxlan";
+                  };
+                  bridgeConfig = {
+                    STP = true;
+                  };
+                };
+              };
+
+            systemd.network.networks =
+              builtins.listToAttrs (
+                map (
+                  peerName:
+                  (lib.nameValuePair "10-apl-vxlan-${peerName}" {
+                    enable = true;
+                    matchConfig.Name = "vxlan-${peerName}";
+                    networkConfig.Bridge = "vxlan";
+                  })
+                ) noSelfPeers
+              )
+              // {
+                "10-apl-vxlan" = {
+                  enable = true;
+                  matchConfig.Name = "vxlan";
+                  address = [ selfVXAddress ];
+                };
+              };
+
+            environment.systemPackages = [
+              pkgs.netatalk
+              pkgs.bridge-utils
+            ];
+          };
+      };
+  };
+}
@@ -0,0 +1,19 @@
+{ inputs, self, ... }:
+let
+  module = ./default.nix;
+in
+{
+  clan.modules = {
+    apple-network = module;
+  };
+  perSystem =
+    { ... }:
+    {
+      clan.nixosTests.service-apple-network = {
+        imports = [ ./tests/vm/default.nix ];
+        _module.args = { inherit self inputs; };
+
+        clan.modules."@clan/apple-network" = module;
+      };
+    };
+}
@@ -0,0 +1,76 @@
+{
+  self,
+  lib,
+  config,
+  hostPkgs,
+  ...
+}:
+{
+  name = "service-apple-network";
+
+  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 = {
+    directory = ./.;
+    test.useContainers = false;
+
+    inventory = {
+      meta.domain = "test.clan";
+
+      machines.peer1 = { };
+      machines.peer2 = { };
+      machines.peer3 = { };
+
+      instances = {
+        apple-network = {
+          module.name = "@clan/apple-network";
+          module.input = "self";
+          roles.peer.machines = {
+            peer1 = { };
+            peer2 = { };
+            peer3 = { };
+          };
+        };
+        yggdrasil = {
+          module.name = "yggdrasil";
+          roles.default.tags.all = { };
+          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"
+          ];
+        };
+      };
+    };
+  };
+
+  nodes = {
+    peer1 = { };
+    peer2 = { };
+    peer3 = { };
+  };
+
+  testScript = _: ''
+    # cannot test connectivity due to Yggdrasil's establishment
+    start_all()
+    peer1.wait_for_unit("atalkd")
+    peer1.succeed("systemctl status atalkd")
+
+    peer2.wait_for_unit("atalkd")
+    peer2.succeed("systemctl status atalkd")
+
+    peer3.wait_for_unit("atalkd")
+    peer3.succeed("systemctl status atalkd")
+  '';
+}
@@ -0,0 +1,6 @@
+[
+  {
+    "publickey": "age1f92zl8y70z5w9gn0l5leg2fhyvxy6m93dfh7n6ltgvuu9nyg6epsrw6t8x",
+    "type": "age"
+  }
+]
@@ -0,0 +1,6 @@
+[
+  {
+    "publickey": "age1u36fr87cru90vfznf5szasya9nhvvseh4atk8zsdj0rrsu0nnvwqsyt8g6",
+    "type": "age"
+  }
+]
@@ -0,0 +1,6 @@
+[
+  {
+    "publickey": "age1rka3368ltqc787xw99uu762lqfk7qxld9265u2t62fpxnp9xhufsc2q5rw",
+    "type": "age"
+  }
+]
@@ -0,0 +1,14 @@
+{
+	"data": "ENC[AES256_GCM,data:hC4Lle6mXuTFq//wBHUTyH3X778u/gYJSXJOiQ7xUb+gnC8beH1olxL2ZhtUiMkktzhsPM/j6cxhltPp25UTeJnUOcoYesqZcp8=,iv:WOx2P2Cu4v58xM9ePjAw1gdA0fFnGG2UqEXH2iksGoo=,tag:43n1ibVSy2AeS9f5qQBKNQ==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtT244N1Q3Zk9pRjFFQlUr\ncDExSTBwSWk5UXVyMjhWclQwSFZaYnpTRFY0CnE5YStVdzMrS3BKYzYvc3V3QVFY\nbDVwVytoNERveU1xQllqNUFGV2hYbGMKLS0tIDJSUmkwMUQzL3Y0MU5qZTJ3eFN3\nNGdwamM1UDBPdzhvSWsyZzR6anZ0eFEKKnr1/7rf3fH1i7KUoZdilLDgb44K2qzn\nI9Y+7FbV4gzQUzKWjAQeFN37Z4Qiuy0xJVA0lw8KvM+NCxSZDfh3kw==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-07-03T10:46:56Z",
+		"mac": "ENC[AES256_GCM,data:hmpbOtra6EyNiPg7EsA3F4elHEO87JPUr4VKVppvzUwLX1HSj67WrU6k3rEoJT+k7Hq1lxnAzDEckSG1fUOap11rk8ksp1IAGR0+yqykC/Qj/Nl8wXqP84gr49bJK6xE/DDdCRCcBff2d6IpnehyEr8fGFEZbWGygblec8U8GPo=,iv:+M1C3rL22foowr0VD80jwrNFb5xz4k5JQ/DJm4ThKHk=,tag:wabFAC5NTCVGfIQQzm0yGg==,type:str]",
+		"version": "3.13.1"
+	}
+}
@@ -0,0 +1 @@
+../../../users/admin
@@ -0,0 +1,14 @@
+{
+	"data": "ENC[AES256_GCM,data:ndWIEOqP2ybCN7Ak5g+8q3YG5rLQ7OuSv/vCbnMA8AK6Lby2JMGRkRGysqJdyEF7eh4w7PpZ/AtKPtPbUucjeTB5+8g76PPJTBE=,iv:EYy0GGqEBmIc5rSWP7Zleb5eQ0JzTz84HqeJPpCSpxk=,tag:iMgTUb9+wxE9S2kKoOEvsQ==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQTEF6OXN4K0dHdXhWWmt2\neG5wdkNIc2F0UnFEeHFLQkdTWkFpUWhTa0NBCmw2N2J1T0FJVE9JR3VBRWV0THh5\nVEZlbVZrcXAwK3BsYXFOZUF6c3lRSkUKLS0tIFRCQzNUaGFHdERWNWR4enVWRGpx\nbDEzRU9jWHgxWHovaENjbkFlZERIbkkKvAW31gTJg9izrWuAMeDHS9SWPQYtxRBY\necDCn8QORFrnDdxEusCnGJrAU4kmS3Y3CwSHCtEijs3JdIgg9wl/MA==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-07-03T10:47:04Z",
+		"mac": "ENC[AES256_GCM,data:y1U2vsdqR97fPAnp6iZiLY1KbWYmgDqgZ5bwIkWPCr7Gjjrn+qV+sc2T1BTVz3Zo0JOz4ScCc+f6snVsFKdCDU/NmDVFt/sqyH4NHUPRQ3StsQim8C7IkSwUtm3EhrqpLYFD21MEjrYYdHMHbWybxrOI0qI6mDwZymHJFeCLdQA=,iv:lVvPn69eQE/huwDmwePepfpi2l9ZOPQO7W20o4AJBFQ=,tag:7VPfjKZsBVJTZxNwTcI6sg==,type:str]",
+		"version": "3.13.1"
+	}
+}
@@ -0,0 +1 @@
+../../../users/admin
@@ -0,0 +1,14 @@
+{
+	"data": "ENC[AES256_GCM,data:JPdetkhtF9eSmgEfCO2exXlGQ5KWLeIM3mnW5BfyTY8r0PxWSEGAwBskC1SiDdRERWB2VEbPiPgCNXMnGaYlDqSdZN6R9wSFvsQ=,iv:qGveNhUtgxvKnmdsPoPpffKyi5srlq0Pd6aW283B5C0=,tag:TcJsCrBlzfjXvztcRaxYFQ==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvdjNHa1RlcFJHazB5TXFu\nOUQ4REpCZm5Yc3ZhcVhwT1FqRHlvbnoxZWlFCnNrVUEyK2ZYSmlacmJ2b2QrclZl\nSDV1eWxXVmJxZlhMMXgrTWtjcjVhQlkKLS0tIHZPN3pCUVBLQmpRVGx6SDBQNDZo\nSitheGhXNGl5QW9HTGNsTTdTdWVwaE0KfuM5xZOPbR1lxkJPJUOVrtlW5Ujobemp\nid40reDqxKQxP3khJv8lf9ZoN8LAx2Iwh0DeAl+UJpsoVWgS7uI2qQ==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-07-07T04:54:10Z",
+		"mac": "ENC[AES256_GCM,data:Tt8yqzfAnSDe2n7KDt1Z/D73hkS1w7DsqIh+s5WljLzar9PEt5vUCLb8DIvBwITyzGAoHH1ym3v3NrnJWCdxajKExTMBf4aY3MJCtykeCG37701S/KxumjTW9/fJw74gcET5I6NafTWb6H5XHsrRaQX1Xnspcs8B7uLGZZ28dSM=,iv:Fo5UPVhnjuOx6Cp4grofHOiD2pm0TXuRRuoTwvxKn1s=,tag:VQ/TF1TiyJADj7/3RwPCAg==,type:str]",
+		"version": "3.13.1"
+	}
+}
@@ -0,0 +1 @@
+../../../users/admin
@@ -0,0 +1,4 @@
+{
+  "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
+  "type": "age"
+}
@@ -0,0 +1 @@
+26.11
@@ -0,0 +1 @@
+200:e6cc:c86:f02d:b0d5:fba9:9b2c:eb77
@@ -0,0 +1 @@
+../../../../../../sops/machines/peer1
@@ -0,0 +1,18 @@
+{
+	"data": "ENC[AES256_GCM,data:6YDp5S2TzEnhDgGhcz8cA3uBsfDt0Oc4JpztB1JUcg/+tDBbeaQN4MLxuZKstXn2Hb1mYtBLlX0vHw++T181Js2sIznyfC1lr68GOvQAp4NYgf23dXpdZk/CMPNUMiGOYVwKWQ/Z0/p0azJ6xV29dYQcM4Q9hys=,iv:Ijzz8hm0looCWoSpjg/rYKp9jhvzRuLboKWHrlwVeFA=,tag:kJcH/1Pu+9q9f2J68LETug==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYNDNEL3kvdEpEMjYyOFJG\nMk5adU04M3hxa21jTTZNM2dQREpmUlVES1NvCjh6eDNFZ1hzUVlTY3Nidnp3TkYr\nRVl4TFlrNUE3dVIzZzg2VWMwTFBYUXMKLS0tIFE0dVFQQmxwOFJ6YkdaQlh6dUlW\nTi8rdXdQbGR1eXpLcTdOandqQmxka3cKImbmJQo2YMYMSQD8kNTgol3VJ4YGIaoz\nl3AY4u/fobg5qlzVQwV33G0/Wf72Z2aTjSLnP4thnasQ89PdYvs7hA==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1f92zl8y70z5w9gn0l5leg2fhyvxy6m93dfh7n6ltgvuu9nyg6epsrw6t8x"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiaWw5SU9KWmJnVVVmTVpr\nL1V6RnRYUGg2UnhXR1BnVTh5eFhnNFpidGdjCmdMeU1nZkZmTTVwbkNaVElFa0Z4\nVkdGdjc4c2lPWGNrVGxocE9iQUZ3QTAKLS0tIHIzTzRRbXVkM3I4ZVRxeSs5eHV5\nTUxOaytzb2MxQ2UybkVCYWVWVmVEcUEKPeK+CC7r3CP5BJqg9thWNHWjPBp/ueHU\nRif6T79kqf+c3B34qXwR0zfyM1+a0r9GAVVC2/q+Ha/As5sPJU39ww==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-07-03T10:46:56Z",
+		"mac": "ENC[AES256_GCM,data:PffiPU1GR9DojTb7TxzBkpivKV2ybmmq9h4pOOyq7p5BAIPF+JSe+BDtbItQ+Gn5LnitQRUVvhat8E2iYfz3JgNxNKcsNFU/mWtCz3PlqyiuRzUBtEL3zYfhdMi8hYYlVdfMumaK3VMk+b4uDGExR+MpURL97TFku47qRbzbILs=,iv:3//fj7WtIX2QNYB9ub1JKAFIn5vJeuZl6rqaEsX0oQc=,tag:njU+WAVq7xBgE0sna2dMKA==,type:str]",
+		"version": "3.13.1"
+	}
+}
@@ -0,0 +1 @@
+../../../../../../sops/users/admin
@@ -0,0 +1 @@
+8c99f9bc87e92795022b32698a440d6f9fe01d1110f867de8176bb190b92acab
@@ -0,0 +1 @@
+26.11
@@ -0,0 +1 @@
+200:eb95:7d1b:3ac3:62e7:24af:2274:3771
@@ -0,0 +1 @@
+../../../../../../sops/machines/peer2
@@ -0,0 +1,18 @@
+{
+	"data": "ENC[AES256_GCM,data:vOwMqT12A5ap5hRvCGTjTUX4sXKO3N7KE8eQ+/SCcBWndU9/b2AehiNgplWWMGcYdmeDL9qI8V2pPkgBkQ/tWH6N8DccSM/zQzrBUkXvRApl6hvNZAWuBVf/P4MW4/EbRGtMg2tEXkaPDtRn2TsDK7ygmXmqArI=,iv:FkxFx/ClAftLu85S6Uq3ZOom+YDOpeWGlYLOFBmFfnk=,tag:zprw62qiu+hmLZEZbnqYXA==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0WVB1M2ttd0FocGhTSjNo\nUDFIcmpsL051TndWbkJVakJHbUxjY3Q3NjM0CnkrbFlHS1E4bkZJQTIvMDJ3VDFv\nNW1OdmwvalBEelN2d3YwbHVqTW94OFEKLS0tIGtpOWxCM29xdXhQL2Yzb094OG1n\nT21mc25yU1dJL29vekRHdldzdDR3dEkKoZ1dPRaPg8iVsuec6IhV3cLPchokV2wv\nu6qb92hsLQuyPHDA01Oey0jxmaYMQGtAVjo2zEM+E+zrKY+f2pHIUQ==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArcmo5d2x6c3J0YTkwMGJE\nanphd2FiUjdGdmdNeW0rL0FpcTVSM3dublZ3CnphajNVV2YrTGl2a3ZqMTJKeU4v\nTzZRS2F5MlA5Ny84cFFoNWZQZnpBZTgKLS0tIHVKQUJWcmlPdy9GNXNBYnpJcEVC\nNmJVMlpvSzZPdk1JY2hIZVEvc3cwV2MKE/cMJU/j5g62njJ49AfnLutmxkpz/gxX\nIqWe1m7Uxl/awVFa7F8N7TUkd0jLbAGXZaonDjiBxOTwg/jr/apnuQ==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1u36fr87cru90vfznf5szasya9nhvvseh4atk8zsdj0rrsu0nnvwqsyt8g6"
+			}
+		],
+		"lastmodified": "2026-07-03T10:47:04Z",
+		"mac": "ENC[AES256_GCM,data:wiIkwEDwGJZe0u8qLHthPkCXubeIGyHV8yBo8CsSengLVTOtRZ877zTrFvE74ATF1pGE3DFJ5qGRrOGgKJ4VOl043LbEBs0bxZC495pPMPYszimp2UAf/XE3QWlNi9p4Ce/kbvUDd0W3SRt4hIv6HOLWApiRoqfS2qSMUnBQeW0=,iv:Hs7EysUnje/iWZRhJLlqf8wuFJnIMpWfXWHrilfmM5I=,tag:Rgj9x4ZOM2fihKKNQ4ux3g==,type:str]",
+		"version": "3.13.1"
+	}
+}
@@ -0,0 +1 @@
+../../../../../../sops/users/admin
@@ -0,0 +1 @@
+8a354172629e4e8c6da86ec5e447411e4238cf7bb439b798fae56509a82d7472
@@ -0,0 +1 @@
+26.11
@@ -0,0 +1 @@
+200:3dcd:9b0d:103c:f953:1e8:e3a2:ed90
@@ -0,0 +1 @@
+../../../../../../sops/machines/peer3
@@ -0,0 +1,18 @@
+{
+	"data": "ENC[AES256_GCM,data:7no9ZnfatNLEykz+JOUExxmaRzBr7B5PEcevETySJWHTCCjSULdRb2KLxbXP5OKWSuJbR8pJ+p+nZuyr7aOTyXrU+fgwf/Pff4KGaZbKf1t3HJun8wJ2q62uaFYu8ACbNFfwIzJ51SPGcO7IHxfjWn5k9zG7av4=,iv:+VNvFKAJ+HDCGZciug8SKHOcM1JZQUAbZpRT5en4xcU=,tag:3kcDHWIs9ITzTKDiyyYhnQ==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvZ0VFcGhPR0NrMGU4dStU\nZGpnMHZmbUF0R0NFNWQzNGVpZXhYQ24xNXk0CnJIYmJYMnBmeURLZytBcXNRNG5u\nZzk4cXdPdnJIU0JVam1NWFA3TkhuWFkKLS0tIDZYUEVGMUtCQWdSM3k4WEZhdUt3\naElkc3o5SXlFYTJLNUpGZ0ptNm96M2MKYKW5emktK2M+IYX0v/swCV1fgrQXQVlb\nmz11rN5fJWV5wvLcTtyU9imgZLB9MfRMyIYlHzD2HPbW+zr8Fe+bBQ==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZVDVxY3JrWk1TY3ZsazNz\naVl4Vk1vRUdkRTdlaDU1TE15dC96ZHlxQ1ZBCmYvSmh1QlBNRnJyRy9kcDR0cXhY\neDdPUXZ6b2FkWnBXbzA4bzU1aFo3bEUKLS0tIHMrb05Oa3FrRzh5VHN1RWRmUU9W\ndGZUYTVVQkIzM3FRRHp6NXlEdEU0VTgK7ibTaEcvbVTQjcbgeylu2s5tmI5kAadM\nFGiOgJhDFuzbHxXIEQlsCBIaXe6LlGhBo41VZbMxme5py6nJFTBHKg==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1rka3368ltqc787xw99uu762lqfk7qxld9265u2t62fpxnp9xhufsc2q5rw"
+			}
+		],
+		"lastmodified": "2026-07-07T04:54:10Z",
+		"mac": "ENC[AES256_GCM,data:gonhuGY61G3Gdtj7q23aTNYU95fjLMz2uVTsSX+Hw10LGUTEMM8LF/Phae9kr5BZKD8BYaIgH32As2+n0B9jZ4WV77A5hUe2NJze9d0A40P2MtMh9xFWWh7yEXXnx5dy1UDrthL2LBa7ebPspuaC0mFhRHdoJK3J2W1m41PGjZc=,iv:H4yNuE8i3UxVjAUIpnaFX6i8/DaO4uIlHrEY9VaSiRs=,tag:9lJtixSNv7tpox0V3ZoNnA==,type:str]",
+		"version": "3.13.1"
+	}
+}
@@ -0,0 +1 @@
+../../../../../../sops/users/admin
@@ -0,0 +1 @@
+e119327977e183567f0b8e2e8937c9d04708e296beed57792a1b6935eacf69d9
@@ -19,12 +19,6 @@
            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 = [ ];
@@ -32,6 +26,13 @@
            example = [ "192.168.1.0/24" ];
          };

+          dns = {
+            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)";
+            };
+
            nameservers = lib.mkOption {
              type = with lib.types; listOf str;
              default = [
@@ -41,6 +42,42 @@
              description = "List of nameservers to pass to Tailscale clients";
              example = [ "10.0.10.1" ];
            };
+
+            magic_dns = lib.mkOption {
+              type = with lib.types; bool;
+              default = true;
+              description = "Whether to enable MagicDNS";
+            };
+
+            extra_records = lib.mkOption {
+              type =
+                with lib.types;
+                nullOr (
+                  listOf (submodule {
+                    options = {
+                      name = lib.mkOption {
+                        type = lib.types.str;
+                        description = "DNS record name.";
+                        example = "grafana.tailnet.example.com";
+                      };
+                      type = lib.mkOption {
+                        type = lib.types.enum [
+                          "A"
+                          "AAAA"
+                        ];
+                        description = "DNS record type.";
+                        example = "A";
+                      };
+                      value = lib.mkOption {
+                        type = lib.types.str;
+                        description = "DNS record value (IP address).";
+                        example = "100.64.0.3";
+                      };
+                    };
+                  })
+                );
+            };
+          };
        };
      };

@@ -170,9 +207,11 @@
              settings.server_url = "https://${settings.public_url}";

              settings.dns = {
-                base_domain = settings.base_domain;
+                base_domain = settings.dns.base_domain;
                override_local_dns = true;
-                nameservers.global = settings.nameservers;
+                nameservers.global = settings.dns.nameservers;
+                magic_dns = settings.dns.magic_dns;
+                extra_records = settings.dns.extra_records;
              };
            };

@@ -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
@@ -100,6 +116,11 @@
                  ];
                };
                programs.chromium.package = pkgs.brave;
+
+                programs.firefox = {
+                  enable = true;
+                };
+
                programs.home-manager.enable = true;
                services.syncthing.tray.enable = osConfig.services.syncthing.enable;
                programs.plasma.enable = true;
@@ -11,7 +11,7 @@
    homeDirectory = lib.mkForce "/home/${username}";
    stateVersion = osConfig.system.stateVersion;
    packages = with pkgs; [
-      libreoffice-fresh
+      libreoffice-stable
      element-desktop
      signal-desktop
      brave
@@ -16,18 +16,6 @@
        ...
      }:
      {
-        nixpkgs.overlays = [
-          (final: prev: {
-            pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-              (pyFinal: pyPrev: {
-                psycopg = pyPrev.psycopg.overrideAttrs (old: {
-                  disabledTests = old.disabledTests ++ [ "test_stats_connect" ];
-                });
-              })
-            ];
-          })
-        ];
-
        services.paperless = {
          enable = lib.mkDefault true;
        };
@@ -0,0 +1,5 @@
+{
+  boot.supportedFilesystems = {
+    ntfs = true;
+  };
+}
@@ -5,5 +5,4 @@

  services.displayManager.sddm.enable = lib.mkForce false;
  services.displayManager.gdm.enable = true;
-  services.displayManager.gdm.wayland = true;
 }
@@ -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;
                };
            };
@@ -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;
+          };
+      };
+  };
+
+}
@@ -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;
+      };
+    };
+}
@@ -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")
+
+    '';
+}
@@ -0,0 +1,6 @@
+[
+  {
+    "publickey": "age1kxsp8pa8am6k333nxs4akjqkhht8gspznmlqz4pxn35h5dj4uv5qj6q6fl",
+    "type": "age"
+  }
+]
@@ -0,0 +1,6 @@
+[
+  {
+    "publickey": "age1dkrf438z3337d2qnc7ugkggua99xkh55wuf9zgun35fjrxdpnf5qkg4z6j",
+    "type": "age"
+  }
+]
@@ -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"
+	}
+}
@@ -0,0 +1 @@
+../../../users/admin
@@ -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"
+	}
+}
@@ -0,0 +1 @@
+../../../users/admin
@@ -0,0 +1,4 @@
+{
+  "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
+  "type": "age"
+}
@@ -0,0 +1 @@
+26.05
@@ -0,0 +1 @@
+204:b10b:6057:4bbe:2b44:fc58:c6fd:90ad
@@ -0,0 +1 @@
+../../../../../../sops/machines/nodeA
@@ -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"
+	}
+}
@@ -0,0 +1 @@
+../../../../../../sops/users/admin
@@ -0,0 +1 @@
+0a77a4fd45a20ea5d81d39c8137a97dd4988c692ce4263959559b8c3f966c1de
@@ -0,0 +1 @@
+../../../../../../sops/machines/server
@@ -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"
+	}
+}
@@ -0,0 +1 @@
+../../../../../../sops/users/admin
@@ -0,0 +1 @@
+../../../../../../sops/machines/server
@@ -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"
+	}
+}
@@ -0,0 +1 @@
+../../../../../../sops/users/admin
@@ -0,0 +1 @@
+../../../../../../sops/machines/server
@@ -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"
+	}
+}
@@ -0,0 +1 @@
+../../../../../../sops/users/admin
@@ -0,0 +1 @@
+26.05
@@ -0,0 +1 @@
+202:8a70:e215:f822:c67a:f191:b04a:a8f
@@ -0,0 +1 @@
+../../../../../../sops/machines/server
@@ -0,0 +1,18 @@
+{
+	"data": "ENC[AES256_GCM,data:JcxiDqZDX3J3ooSeN0pQ28uvI86mtHUf2BEcOQdFIDhJZODGCc+BhZvBQmu2mabV8Jf4skrTWqD+60c1fkRcsM+MMXfoyNsrRyQ2K39mG4kl8jJKVKDs+BqXa+CvZ96kesOMgi9vdc3YUKo5cCLY4bQ9VwymqH8=,iv:W3z8Pbyo2IMzkxI4k14FlirLa28qgZ3rnTAWuusiw/0=,tag:EQc8mo/UvACbt8hQv3zPEw==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkRDNOSU81alN2THNQQ3ZW\nbHVjMmxaYWpzak1NZHplNTVzZzQvMHg4azAwCkExb0VLYlZUd2JjVGNlcXUyR0p1\nWHk5cXpOeGZ0VFRFTGllQWpxRlBTRk0KLS0tIDhKeUc4RHQvb0o0ZXFXZUNCanVY\nYm04TVBoWjlLT0tFOHRnLzd3RHV2ZzAKVpLtENDySGC6UDgAwhDb+7KJiHXOZF6n\nIaeIQWQqiB+45h72NE3yh02boPK8pl6IoJFcK3e4zSO7/G8jGUp0MQ==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1dkrf438z3337d2qnc7ugkggua99xkh55wuf9zgun35fjrxdpnf5qkg4z6j"
+			},
+			{
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGSUZXVzJwVHdwZGtxOVRu\nN1hMZkltdVM0cnNRL2tSNENkSGV2VzFIU1VBCmRZWlJTODNPMVRjVWY1V1VZcFln\nTDE3N0xsMXdMWityRUNUYWlQOXBMMTgKLS0tIGViTzBrQk5wQXBYQitIb1ZPUitC\nLysyUER0UjFlZm95c3ZGK3hEMEtrNUEKABpoKBUnvzQKSrgsdnU+uyDyED0Tlr7D\nnSsf12c84cvdt0OeCWwf2WvBANZL26XTcFq1fBYOFTJqNLs1ZfO2kg==\n-----END AGE ENCRYPTED FILE-----\n",
+				"recipient": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg"
+			}
+		],
+		"lastmodified": "2026-06-11T07:45:55Z",
+		"mac": "ENC[AES256_GCM,data:jjhkZB9NdpvV2R0k9yS/AcUqeMr1RLv1UZwGCemlKSwhBfs8E5NxTXLhtmJeQ+hltOTYpz51BIporVtlaH6ElVnh7khOrG3Lb5cLBrL41QM59y3Tbfu6TjNOE3NyMiWuxZnwuqUGWQjsjrIIhE0ftKnpSpkGHMie+BC3iNSB1tY=,iv:onOVK9eJxWOaIjChQD54tz8lY+r/jpp6AArsBIuoRUM=,tag:2Oas1C5D2kZOe4iiD5huyw==,type:str]",
+		"version": "3.13.0"
+	}
+}
@@ -0,0 +1 @@
+../../../../../../sops/users/admin
@@ -0,0 +1 @@
+2eb1e3bd40fba730a1cdc9f6beae1848e4b965e37f18a61593327964108fe6a8
@@ -14,11 +14,6 @@
        ...
      }:
      {
-        nixpkgs.overlays = [
-          (final: prev: {
-            libreoffice = prev.libreoffice-fresh;
-          })
-        ];

        services.stirling-pdf = {
          enable = lib.mkDefault true;
@@ -10,10 +10,10 @@ in
  perSystem =
    { ... }:
    {
-      clan.nixosTests.service-stirling-pdf = {
-        imports = [ ./tests/vm/default.nix ];
-
-        clan.modules."@clan/stirling-pdf" = module;
-      };
+      # clan.nixosTests.service-stirling-pdf = {
+      #   imports = [ ./tests/vm/default.nix ];
+      #
+      #   clan.modules."@clan/stirling-pdf" = module;
+      # };
    };
 }
@@ -0,0 +1,174 @@
+{ ... }:
+{
+  _class = "clan.service";
+  manifest.name = "wordpress";
+  manifest.description = "wordpress with multi-tenant support and state of plugins and themes are allowed";
+  manifest.readme = "wordpress with multi-tenant support and state of plugins and themes are allowed";
+  manifest.categories = [ "System" ];
+
+  roles.server = {
+    description = "A default server role";
+    interface =
+      { lib, ... }:
+      {
+        options = {
+          tenants = lib.mkOption {
+            type = with lib.types; listOf str;
+            default = [ "localhost" ];
+            description = "List of tenants website to host on the instance";
+            example = [ "example.com" ];
+          };
+          phpfpmOptions = lib.mkOption {
+            type = with lib.types; lines;
+            default = "";
+            description = "options appended to the PHP configuration file";
+          };
+          wpExtraConfig = lib.mkOption {
+            type = with lib.types; lines;
+            default = "";
+            description = "Any additional text to be appended to the wp-config.php";
+          };
+        };
+      };
+
+    perInstance =
+      { settings, ... }:
+      {
+        nixosModule =
+          {
+            pkgs,
+            lib,
+            config,
+            ...
+          }:
+          let
+            user = "wordpress";
+
+            mkSafeDBName = domain: "wp_${builtins.replaceStrings [ "." ] [ "_" ] domain}";
+
+            mkWordpressSite = domain: {
+              database = {
+                name = mkSafeDBName domain;
+                user = user;
+              };
+              package = wp-pkg domain;
+              extraConfig = ''
+                define('FS_METHOD', 'direct');
+              ''
+              + settings.wpExtraConfig;
+              themes = { };
+            };
+
+            stateDir = hostName: "/var/lib/wordpress/${hostName}";
+
+            wp-pkg =
+              hostName:
+              let
+                upStreamSrc = pkgs.wordpress;
+              in
+              pkgs.stdenv.mkDerivation {
+                pname = "wordpress-custom";
+                version = upStreamSrc.version;
+                src = upStreamSrc;
+
+                installPhase = ''
+                  mkdir -p $out
+                  cp -r * $out/
+
+                  rm -rf $out/share/wordpress/wp-content/plugins
+                  rm -rf $out/share/wordpress/wp-content/themes
+
+                  # symlink uploads directory
+                  ln -s "${stateDir hostName}"/wp-content/themes $out/share/wordpress/wp-content/themes
+                  ln -s "${stateDir hostName}"/wp-content/plugins $out/share/wordpress/wp-content/plugins
+                  ln -s "${stateDir hostName}"/wp-content/upgrade $out/share/wordpress/wp-content/upgrade
+                  ln -s "${stateDir hostName}"/wp-content/upgrade-temp-backup $out/share/wordpress/wp-content/upgrade-temp-backup
+                  ln -s "${stateDir hostName}"/wp-content/ai1wm-backups $out/share/wordpress/wp-content/ai1wm-backups
+
+                '';
+              };
+            webserver = config.services.${config.services.wordpress.webserver};
+          in
+          {
+            services.wordpress.webserver = "nginx";
+
+            services.wordpress.sites = builtins.listToAttrs (
+              map (tenant: {
+                name = tenant;
+                value = mkWordpressSite tenant;
+
+              }) settings.tenants
+            );
+
+            systemd.tmpfiles.rules = lib.flatten (
+              map (tenant: [
+                "d '${stateDir tenant}/wp-content' 0750 ${user} ${webserver.group} - -"
+                "d '${stateDir tenant}/wp-content/themes' 0750 ${user} ${webserver.group} - -"
+                "Z '${stateDir tenant}/wp-content/themes' 0750 ${user} ${webserver.group} - -"
+                "d '${stateDir tenant}/wp-content/plugins' 0750 ${user} ${webserver.group} - -"
+                "Z '${stateDir tenant}/wp-content/plugins' 0750 ${user} ${webserver.group} - -"
+                "d '${stateDir tenant}/wp-content/upgrade' 0750 ${user} ${webserver.group} - -"
+                "Z '${stateDir tenant}/wp-content/upgrade' 0750 ${user} ${webserver.group} - -"
+                "d '${stateDir tenant}/wp-content/upgrade-temp-backup' 0750 ${user} ${webserver.group} - -"
+                "Z '${stateDir tenant}/wp-content/upgrade-temp-backup' 0750 ${user} ${webserver.group} - -"
+                "d '${stateDir tenant}/wp-content/ai1wm-backups' 0750 ${user} ${webserver.group} - -"
+                "Z '${stateDir tenant}/wp-content/ai1wm-backups' 0750 ${user} ${webserver.group} - -"
+              ]) settings.tenants
+            );
+
+            networking.firewall.allowedTCPPorts = [
+              80
+              443
+            ];
+
+            services.phpfpm.pools = builtins.listToAttrs (
+              map (
+                tenant: lib.nameValuePair "wordpress-${tenant}" { phpOptions = settings.phpfpmOptions; }
+              ) settings.tenants
+            );
+
+            security.acme.acceptTerms = true;
+
+            users.users.nginx.extraGroups = [ "acme" ];
+
+            security.acme.certs = lib.listToAttrs (
+              map (
+                tenant:
+                (lib.nameValuePair tenant {
+                  email = config.clan.core.vars.generators.acme.files.email.value;
+                  webroot = "/var/lib/acme/acme-challenge/${tenant}";
+                })
+              ) settings.tenants
+            );
+
+            services.nginx.clientMaxBodySize = "128m";
+
+            services.nginx.virtualHosts = lib.listToAttrs (
+              map (
+                tenant:
+                (lib.nameValuePair tenant {
+                  forceSSL = true;
+                  useACMEHost = tenant;
+                  acmeRoot = config.security.acme.certs.${tenant}.webroot;
+                })
+              ) settings.tenants
+            );
+
+            clan.core.vars.generators.acme = {
+              share = true;
+              files.email.secret = false;
+
+              prompts.email = {
+                type = "line";
+                description = "Email for ACME registeration";
+              };
+
+              script = ''
+                cat $prompts/email > $out/email
+              '';
+            };
+
+          };
+      };
+  };
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
kurogeek	6d131cc727	flake: bump cnx-network so Kea waits for its VLAN sockets f98226b -> 4146f2c. kea-dhcp4-server started before networkd had addressed vlan-lan/vlan-mgmt on stellio and ran with no socket on :67; Kea now requires every configured socket and retries the bind while networkd catches up.	2026-09-18 10:10:49 +00:00
kurogeek	8a2d67c7a0	flake: bump cnx-network for the wifi bridge enslave fix 60aac6e -> f98226b. Wireless BSS .network files now match on WLANInterfaceType=ap so networkd enslaves the radios to br0 only once hostapd has switched them to AP mode; on stellio (mt798x-wmac) the earlier one-shot enslave failed in station mode and wifi clients never reached Kea. Also picks up the assertion that no supplicant owns the radios.	2026-09-18 09:41:47 +00:00
kurogeek	c8f17c2aab	router: stellio wifi APs on wlan0/wlan1 One dual-band SSID "WhiteHouse" on lan (replaces the liminix router's WhiteHouse/WhiteHouse-5), WPA3 transition, WiFi 6, old channels 2/36, country TH. Band mapping wlan0=2g/wlan1=5g assumed from mt7986 phy order; verify with `iw phy`.	2026-09-18 06:19:24 +00:00
kurogeek	0b35b6da6e	router: stellio lan1 (2.5G) as untagged mgmt port	2026-09-18 06:19:24 +00:00
kurogeek	0db9ea384a	router: stellio lan5 as pre-cutover staging uplink DHCP client into the old white-house LAN, SSH only, no VLAN membership. lan5 goes back to accessPorts.lan5 = "mgmt" at cutover.	2026-09-18 06:19:24 +00:00
kurogeek	76694e817c	vars: update via generator zerotier-ip-stellio-w-network (shared)	2026-09-18 13:18:22 +07:00
kurogeek	2d35075e1f	vars: update via generator wifi-WhiteHouse-passphrase (machine: stellio)	2026-09-18 13:18:21 +07:00
kurogeek	21934f9494	vars: update via generator pppoe-credentials (machine: stellio)	2026-09-18 13:18:20 +07:00
kurogeek	b8684a9a6f	vars: update via generator zerotier-identity-stellio (shared)	2026-09-18 13:18:19 +07:00
kurogeek	cf1451b1a0	mob next [ci-skip] [ci skip] [skip ci] lastFile:vars/per-machine/stellio/yggdrasil/privateKey/secret	2026-09-18 10:13:15 +07:00
kurogeek	fa95098b7e	frappix: bump default_thai_company to 68f0817 (main)	2026-09-17 10:55:54 +00:00
kurogeek	0906700ad6	deneb: add default_thai_company frappe app to poyerp Package git.b4l.co.th/newedge/default_thai_company as a frappix app (pkgs/frappix/default-thai-company.nix) and expose it through a new frappixAppsOverlay that extends the pkgs.frappix scope. Install it on the poyerp.newedge.house site on deneb.	2026-09-15 16:18:30 +07:00
kurogeek	b9302e6192	clanService/prometheus: add mirach and almach	2026-09-11 10:53:00 +07:00
kurogeek	5cb262857e	inventory/wifi: retry autoconnect and auth indefinitely Set connection.autoconnect-retries=0 and connection.auth-retries=0 on the NetworkManager profiles generated by the clan wifi module for buna, so a flaky AP or slow auth never leaves the connection permanently blocked.	2026-09-09 04:15:18 +00:00
kurogeek	47e536540f	flake: bump nixpkgs to fix broken prettier build prettier 3.9.6 in nixpkgs e8be781 failed to build (stale pnpm lockfile in binding-wasm32-wasi), breaking nix fmt. Fixed upstream in 58973d7.	2026-09-08 08:35:21 +00:00
kurogeek	282a8f8287	clanService/personal-computer: supportedFilesystems ntfs	2026-09-04 14:06:30 +07:00
kurogeek	a9254c424d	machines/sirius: buildPlatform.system = x86_64-linux	2026-09-04 13:43:04 +07:00
kurogeek	5961254878	machines/sirius: rm common module	2026-09-04 13:42:10 +07:00
kurogeek	9403ddbf08	clanService/headscale: adjust magic dns settings	2026-09-03 17:17:36 +07:00
kurogeek	37ff958560	inventory/auto-pull-update: limited to selected machines until a build machine is present	2026-09-03 13:58:29 +07:00
kurogeek	efa4b39782	libreoffice-fresh -> libreoffice-stable	2026-09-03 12:22:15 +07:00
kurogeek	e2341b7c79	inputs/nixpkgs,home-manager,clan-core,frappix, bump version	2026-09-03 12:21:00 +07:00
kurogeek	dc1c94796a	machines/sirius: reduce write on disk	2026-09-02 11:34:40 +07:00
kurogeek	5b07b98f40	inventory/prometheus: add buna to monitored machines	2026-08-21 12:03:34 +07:00
kurogeek	88ac5cbd83	machines/buna: use wifi	2026-08-19 14:34:34 +07:00
kurogeek	969c006f97	machines/deneb: support Thai characters	2026-08-16 14:02:41 +07:00
kurogeek	1c7d0bb388	hm/emmie: librewolf -> firefox	2026-08-05 09:07:15 +07:00
kurogeek	84c3bd92bb	hm/emmie: enable librewolf	2026-08-03 13:51:12 +07:00
kurogeek	3340731c8d	flake/packages/installer: init	2026-07-30 17:55:41 +07:00
kurogeek	cd979fb771	inventory/borgbackup: init	2026-07-29 12:38:12 +07:00
kurogeek	7f6abc1d04	clanService/apple-network: init	2026-07-23 17:33:04 +07:00
kurogeek	0946de0e46	vars: update prometheus/matrix-alertmanager-token for machine cursa	2026-07-23 15:12:16 +07:00
kurogeek	a29e4611b2	inventory/auto-pull-update: init	2026-07-23 14:12:34 +07:00
kurogeek	7246ab1437	vars: secret rotation	2026-07-21 18:15:45 +07:00
kurogeek	f8193425af	drop vi	2026-07-20 10:31:42 +07:00
kurogeek	3c54e8d6ef	inventory/internet: add tangra machine	2026-07-17 15:41:59 +07:00
kurogeek	4a7d5340f3	inventory/internet: add ramus machine	2026-07-17 15:41:44 +07:00
kurogeek	458265f96b	inventory/yggdrasil-global-network: allow kurogeek laptop as extra ip	2026-07-17 15:01:09 +07:00
kurogeek	702ef6ab86	inventory/yggdrasil-global-network: enable on all machines	2026-07-17 14:55:06 +07:00
kurogeek	ea4e2f03a7	nix fmt	2026-07-16 16:34:46 +07:00
kurogeek	e738692558	clanService/phonebox: allow multi-clients to exist on one node	2026-07-16 16:25:51 +07:00
kurogeek	ef698f8ad3	inventory/prometheus: add sirius to monitor machines	2026-07-13 10:28:47 +07:00
kurogeek	824b099ad6	Merge pull request 'clanService/wordpress: allow mutable at `wp-content/ai1wm-backups`' (#2 ) from mooyai/infra:mooyai-patch-1 into main Reviewed-on: #2	2026-07-08 16:41:27 +07:00
mooyai	651240f5a1	clanService/wordpress: symlink upgrade-temp-backup and ai1wm-backups to state dir WordPress writes into wp-content/upgrade-temp-backup (core rollback on theme/plugin updates) and wp-content/ai1wm-backups (All-in-One WP Migration). Both sit directly under wp-content, which is the read-only Nix store path, so creation fails. Symlink both dirs out to the writable state dir and add matching tmpfiles rules, same pattern as themes/plugins/upgrade. Fixes "Could not create the upgrade-temp-backup directory" on Bricks theme update, and the ai1wm-backups permission errors.	2026-07-08 16:18:17 +07:00
kurogeek	3b8c11b096	inputs/frappix: bump version	2026-07-02 11:19:35 +07:00
kurogeek	982c6c23ca	machines/deneb: frappe add posprinter app	2026-07-01 17:05:40 +07:00
kurogeek	e55bbaaa6b	inputs/frappix: bump version	2026-07-01 17:05:11 +07:00
kurogeek	53c98dcba8	Merge pull request 'Update modules/clan/wordpress/default.nix' (#1 ) from mooyai/infra:main into main Reviewed-on: #1	2026-06-23 16:59:11 +07:00
mooyai	ce5f4ff43f	Update modules/clan/wordpress/default.nix make dir to support plugin update temp dir	2026-06-23 16:44:52 +07:00
kurogeek	dbb3e55cad	init cursa as a prometheus server, vega and rigel are monitored	2026-06-23 15:28:35 +07:00
kurogeek	d09f67a757	clanService/prometheus: init monitoring system	2026-06-23 15:27:31 +07:00
kurogeek	77b487a709	clancore bumped, zerotier migration	2026-06-16 15:01:21 +07:00
kurogeek	2b239eb162	hm/emmie: use hunspell dictionary with systemd user session variables, libreoffice -> libreoffice-qt	2026-06-16 11:20:05 +07:00
kurogeek	8e64e88d8f	inputs: bump home-manager	2026-06-16 11:18:34 +07:00
kurogeek	6276d9aee0	inputs: bump nixpkgs, frappix. migrate inventree	2026-06-15 16:36:18 +07:00
kurogeek	9471d1a4e6	machines/bosona: nix fmt	2026-06-15 15:55:04 +07:00
kurogeek	77d8e42ec2	hm/emmie: add hunspellDicts en and th	2026-06-15 13:28:58 +07:00
kurogeek	0dafb8cd52	clanService/wordpress: nginx clientMaxBodySize is 128m	2026-06-12 12:22:27 +07:00
kurogeek	8b12656149	clanService/wordpress: phpfpm options and wp-config.php are configurable from inventory interface	2026-06-12 12:09:56 +07:00
kurogeek	d622040d30	hm/emmie: rm DnsOverHttpsMode and DnsOverHttpsTemplates	2026-06-11 13:54:17 +07:00
kurogeek	2bc05c2d6d	clanService/wordpress: test vars	2026-06-10 18:59:30 +07:00
kurogeek	5fa8444112	clanService/wordpress: security.acme.acceptTerms = true and nginx is in acme group	2026-06-10 18:59:01 +07:00
kurogeek	8874b33a5d	greaterchiangmai: nodejs_20 -> nodejs	2026-06-10 18:56:48 +07:00
kurogeek	521ccdc886	clanService/personal-computer: rm services.displayManager.gdm.wayland	2026-06-10 18:53:46 +07:00
kurogeek	07b648db9a	clanService/headscale: magic_dns is disabled	2026-06-10 15:11:26 +07:00
kurogeek	da6be4946f	machines/tangra: poyfestival.com website	2026-06-01 10:42:03 +07:00
kurogeek	bc16c72707	machines/canopus: localhost -> sitename	2026-05-25 14:20:44 +07:00
				`@@ -0,0 +1 @@`
				`8c99f9bc87e92795022b32698a440d6f9fe01d1110f867de8176bb190b92acab`
				`@@ -0,0 +1 @@`
				`8a354172629e4e8c6da86ec5e447411e4238cf7bb439b798fae56509a82d7472`
				`@@ -0,0 +1 @@`
				`e119327977e183567f0b8e2e8937c9d04708e296beed57792a1b6935eacf69d9`
				`@@ -0,0 +1 @@`
				`0a77a4fd45a20ea5d81d39c8137a97dd4988c692ce4263959559b8c3f966c1de`
				`@@ -0,0 +1 @@`
				`2eb1e3bd40fba730a1cdc9f6beae1848e4b965e37f18a61593327964108fe6a8`