From dc213487276f1f0faa32b12a06b362dfc70d598b Mon Sep 17 00:00:00 2001 From: Berwn Date: Thu, 18 Jun 2026 14:49:48 +0700 Subject: [PATCH] Format drifted files to satisfy the treefmt flake-check gate Pure formatting (nixfmt/prettier/yamlfmt); no behavior change. These files predate the current treefmt config and were failing nix flake check; reformatting them makes the gate green again. --- docs/src/overview.md | 12 +++++----- machines/mx1/disko.nix | 2 +- modules/dns/authoritative.nix | 7 +++++- modules/mesh-hosts.nix | 3 +-- modules/monitoring/dashboards/backups.json | 28 ++++++++++++++++++---- modules/monitoring/dashboards/dns.json | 22 +++++++++++++---- 6 files changed, 54 insertions(+), 20 deletions(-) diff --git a/docs/src/overview.md b/docs/src/overview.md index ae1a490..c8297bc 100644 --- a/docs/src/overview.md +++ b/docs/src/overview.md @@ -6,12 +6,12 @@ this book is built from `docs/` and served on `control` over the ZeroTier mesh. ## Machines -| Machine | Role | Public IPv4 | Public IPv6 | -| --------- | -------------------------------------- | ---------------- | --------------------------- | -| `control` | ZeroTier controller, monitoring, docs | `77.42.68.181` | `2a01:4f9:c013:e6d0::1` | -| `ns1` | Knot DNS **primary** (master) | `46.224.170.206` | `2a01:4f8:c014:b5c5::1` | -| `ns2` | Knot DNS **secondary** (slave) | `157.180.70.82` | `2a01:4f9:c014:6d87::1` | -| `mx1` | Mail server (**MX** for cnx.email) | `5.223.65.38` | `2a01:4ff:2f0:1963::1` | +| Machine | Role | Public IPv4 | Public IPv6 | +| --------- | ------------------------------------- | ---------------- | ----------------------- | +| `control` | ZeroTier controller, monitoring, docs | `77.42.68.181` | `2a01:4f9:c013:e6d0::1` | +| `ns1` | Knot DNS **primary** (master) | `46.224.170.206` | `2a01:4f8:c014:b5c5::1` | +| `ns2` | Knot DNS **secondary** (slave) | `157.180.70.82` | `2a01:4f9:c014:6d87::1` | +| `mx1` | Mail server (**MX** for cnx.email) | `5.223.65.38` | `2a01:4ff:2f0:1963::1` | ## Access diff --git a/machines/mx1/disko.nix b/machines/mx1/disko.nix index 92f3acd..3211262 100644 --- a/machines/mx1/disko.nix +++ b/machines/mx1/disko.nix @@ -1,7 +1,7 @@ # --- # schema = "single-disk" # [placeholders] -# mainDisk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_117494657" +# mainDisk = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_117494657" # --- # This file was automatically generated! # CHANGING this configuration requires wiping and reinstalling the machine diff --git a/modules/dns/authoritative.nix b/modules/dns/authoritative.nix index d5b8b82..29de972 100644 --- a/modules/dns/authoritative.nix +++ b/modules/dns/authoritative.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let # ZeroTier addresses — zone transfers run over the mesh, not the public net. mesh = import ../mesh-hosts.nix { inherit config lib; }; diff --git a/modules/mesh-hosts.nix b/modules/mesh-hosts.nix index 0599f4c..033dd51 100644 --- a/modules/mesh-hosts.nix +++ b/modules/mesh-hosts.nix @@ -11,8 +11,7 @@ let dir = config.clan.core.settings.directory; readVar = - machine: file: - builtins.readFile "${dir}/vars/per-machine/${machine}/zerotier/${file}/value"; + machine: file: builtins.readFile "${dir}/vars/per-machine/${machine}/zerotier/${file}/value"; hosts = lib.genAttrs [ "control" "ns1" "ns2" "mx1" ] (m: readVar m "zerotier-ip"); diff --git a/modules/monitoring/dashboards/backups.json b/modules/monitoring/dashboards/backups.json index 3968c0d..a37f3a8 100644 --- a/modules/monitoring/dashboards/backups.json +++ b/modules/monitoring/dashboards/backups.json @@ -26,7 +26,10 @@ "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] }, + "thresholds": { + "mode": "absolute", + "steps": [{ "color": "green", "value": null }] + }, "noValue": "no data", "mappings": [ { @@ -41,7 +44,11 @@ "overrides": [] }, "options": { - "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false }, + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, "colorMode": "background", "graphMode": "none", "textMode": "auto", @@ -72,7 +79,11 @@ "overrides": [] }, "options": { - "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false }, + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, "colorMode": "none", "graphMode": "none", "textMode": "auto", @@ -110,7 +121,11 @@ "overrides": [] }, "options": { - "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false }, + "reduceOptions": { + "calcs": ["lastNotNull"], + "fields": "", + "values": false + }, "colorMode": "background", "graphMode": "none", "textMode": "auto", @@ -168,7 +183,10 @@ "id": 6, "datasource": { "type": "prometheus", "uid": "victoriametrics" }, "gridPos": { "h": 8, "w": 12, "x": 12, "y": 6 }, - "fieldConfig": { "defaults": { "unit": "short", "min": 0, "max": 1 }, "overrides": [] }, + "fieldConfig": { + "defaults": { "unit": "short", "min": 0, "max": 1 }, + "overrides": [] + }, "targets": [ { "refId": "A", diff --git a/modules/monitoring/dashboards/dns.json b/modules/monitoring/dashboards/dns.json index e58595d..7187a3b 100644 --- a/modules/monitoring/dashboards/dns.json +++ b/modules/monitoring/dashboards/dns.json @@ -224,7 +224,10 @@ "options": { "showHeader": true }, "fieldConfig": { "defaults": { - "custom": { "align": "auto", "cellOptions": { "type": "color-background" } }, + "custom": { + "align": "auto", + "cellOptions": { "type": "color-background" } + }, "thresholds": { "mode": "absolute", "steps": [ @@ -245,15 +248,21 @@ "overrides": [ { "matcher": { "id": "byName", "options": "zone" }, - "properties": [{ "id": "custom.cellOptions", "value": { "type": "auto" } }] + "properties": [ + { "id": "custom.cellOptions", "value": { "type": "auto" } } + ] }, { "matcher": { "id": "byName", "options": "query" }, - "properties": [{ "id": "custom.cellOptions", "value": { "type": "auto" } }] + "properties": [ + { "id": "custom.cellOptions", "value": { "type": "auto" } } + ] }, { "matcher": { "id": "byName", "options": "instance" }, - "properties": [{ "id": "custom.cellOptions", "value": { "type": "auto" } }] + "properties": [ + { "id": "custom.cellOptions", "value": { "type": "auto" } } + ] } ] }, @@ -283,7 +292,10 @@ "id": 22, "datasource": { "type": "prometheus", "uid": "victoriametrics" }, "gridPos": { "h": 8, "w": 12, "x": 12, "y": 43 }, - "fieldConfig": { "defaults": { "unit": "short", "min": 0, "max": 1 }, "overrides": [] }, + "fieldConfig": { + "defaults": { "unit": "short", "min": 0, "max": 1 }, + "overrides": [] + }, "targets": [ { "refId": "A",