From b7c86ff8b6f602b7d59a4d181a41f5588f31157a Mon Sep 17 00:00:00 2001 From: John Bargman Date: Mon, 3 Aug 2026 21:14:03 +0000 Subject: [PATCH 1/6] flake lock update --- flake.lock | 636 +++++++++++++++++++++++++++++------------------------ flake.nix | 7 +- 2 files changed, 357 insertions(+), 286 deletions(-) diff --git a/flake.lock b/flake.lock index 43ea586..b9d3b11 100644 --- a/flake.lock +++ b/flake.lock @@ -2,6 +2,7 @@ "nodes": { "LLM-CORE": { "inputs": { + "gitlab-ci": "gitlab-ci", "nix-mcp-servers": "nix-mcp-servers", "nixpkgs": [ "nixpkgs_llm" @@ -9,11 +10,11 @@ "opencode-flake": "opencode-flake" }, "locked": { - "lastModified": 1784902283, - "narHash": "sha256-rHFmoQr4b7QFuP3NgZaNyWAgA73NfJgPlCHjfX8sdWY=", + "lastModified": 1785523099, + "narHash": "sha256-pH6Bqto9B4G5d5hwWkzS1omKtg2Em3HMCDImKz7Yf9w=", "owner": "mecha-team-zero", "repo": "llm-core", - "rev": "926ad1b93a1f5b6b83183f7092eb0af9012313f0", + "rev": "8114ab845b3c7d54a76e3319b9949a050e46b224", "type": "gitlab" }, "original": { @@ -24,7 +25,7 @@ }, "bargman-assets": { "inputs": { - "gitlab-ci": "gitlab-ci", + "gitlab-ci": "gitlab-ci_2", "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, @@ -44,15 +45,15 @@ }, "carmelsite": { "inputs": { - "gitlab-ci": "gitlab-ci_2", + "gitlab-ci": "gitlab-ci_3", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1785431187, - "narHash": "sha256-asuVNR9b67icvzjUUiMGLIDKBTfbctrIwF5b/7kGPX4=", + "lastModified": 1782448073, + "narHash": "sha256-Pnaby4izMjVTaMv6yqom1jUfq58d5Ufu7Vr/j7hQ5CI=", "ref": "refs/heads/main", - "rev": "1eadcc176d7647458a1c651f720b612b370a5f10", - "revCount": 41, + "rev": "4588254294534f39f5f56710fb53a9edf0774d98", + "revCount": 39, "type": "git", "url": "https://gitlab.com/mecha-team-zero/carmelsite.git" }, @@ -79,7 +80,7 @@ "deadnix": { "inputs": { "nixpkgs": [ - "bargman-assets", + "LLM-CORE", "gitlab-ci", "nixpkgs" ], @@ -102,7 +103,7 @@ "deadnix_2": { "inputs": { "nixpkgs": [ - "carmelsite", + "bargman-assets", "gitlab-ci", "nixpkgs" ], @@ -124,9 +125,32 @@ }, "deadnix_3": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "carmelsite", + "gitlab-ci", + "nixpkgs" + ], "utils": "utils_3" }, + "locked": { + "lastModified": 1764114543, + "narHash": "sha256-+C39E8qmGODT6eB0rhE/VX+DcekXW/Xww5IL/xlERNY=", + "owner": "astro", + "repo": "deadnix", + "rev": "d590041677add62267bef35ddec63cd9402d3505", + "type": "github" + }, + "original": { + "owner": "astro", + "repo": "deadnix", + "type": "github" + } + }, + "deadnix_4": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "utils": "utils_4" + }, "locked": { "lastModified": 1753110829, "narHash": "sha256-WrzIqt28RhoFYhCMu5oY5jAdGh0Gv5uryW/1jTX99aY=", @@ -140,13 +164,13 @@ "url": "https://flakehub.com/f/astro/deadnix/1" } }, - "deadnix_4": { + "deadnix_5": { "inputs": { "nixpkgs": [ "denton-glasses", "nixpkgs_unstable" ], - "utils": "utils_4" + "utils": "utils_5" }, "locked": { "lastModified": 1764114543, @@ -162,14 +186,14 @@ "type": "github" } }, - "deadnix_5": { + "deadnix_6": { "inputs": { "nixpkgs": [ "denton-glasses", "openface", "nixpkgs_stable" ], - "utils": "utils_5" + "utils": "utils_6" }, "locked": { "lastModified": 1764114543, @@ -185,13 +209,36 @@ "type": "github" } }, - "deadnix_6": { + "deadnix_7": { "inputs": { "nixpkgs": [ "malayalam", "nixpkgs" ], - "utils": "utils_6" + "utils": "utils_7" + }, + "locked": { + "lastModified": 1764114543, + "narHash": "sha256-+C39E8qmGODT6eB0rhE/VX+DcekXW/Xww5IL/xlERNY=", + "owner": "astro", + "repo": "deadnix", + "rev": "d590041677add62267bef35ddec63cd9402d3505", + "type": "github" + }, + "original": { + "owner": "astro", + "repo": "deadnix", + "type": "github" + } + }, + "deadnix_8": { + "inputs": { + "nixpkgs": [ + "malayalam", + "gitlab-ci", + "nixpkgs" + ], + "utils": "utils_8" }, "locked": { "lastModified": 1764114543, @@ -209,7 +256,7 @@ }, "denton-glasses": { "inputs": { - "deadnix": "deadnix_4", + "deadnix": "deadnix_5", "lint-utils": "lint-utils", "nixpkgs_unstable": "nixpkgs_unstable", "openface": "openface" @@ -233,16 +280,18 @@ "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", - "nix": "nix", - "nixpkgs": "nixpkgs_7" + "nix": [ + "nix-src" + ], + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1783537817, - "narHash": "sha256-1Xu/0aFdCij0oyB5/i5flZBfGXOVCYeDvVE2jSv08PM=", - "rev": "7adcb07f6a603447b1d6aa674ce5747a4a91f029", - "revCount": 426, + "lastModified": 1785432255, + "narHash": "sha256-IrqJV+9NcFevwyBBqEkxkbqhX3rtJI7sSzHz5wDVaLo=", + "rev": "782adcaacdc5b72dcae7093ff07e7f0be1271a76", + "revCount": 430, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.5/019f4326-f1c4-7f13-b58b-98979a78c513/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.9/019fb411-e801-74a0-8c53-b41643853e87/source.tar.gz" }, "original": { "type": "tarball", @@ -252,13 +301,13 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-oz9PLBISeJ+ipMoi4xmcVG41P/Q8IcptQ62xAJ9ZiZg=", + "narHash": "sha256-EOdnfemxahb/n6vo/7qAentrZ7zguj9Lxg3c4dGZ73c=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/macOS" } }, "determinate-nixd-aarch64-darwin_2": { @@ -276,13 +325,13 @@ "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-tvhnv4tS6GIX0DkngUOxWcZ1wW+G7BEOTszojDNDBeY=", + "narHash": "sha256-BzjpknBhy8yI3i/WFi+8rvbI8MC6VUkty47TSDBc/yE=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/aarch64-linux" } }, "determinate-nixd-aarch64-linux_2": { @@ -300,13 +349,13 @@ "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-brJCRiMDagnf2TLZLAq7UVfKrgow7I/5uNIXfhZsEWA=", + "narHash": "sha256-k9OeW3/AAHm/kYAXqi5WKTMNNtQ4o9kTeBlHrXonGBA=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.5/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.9/x86_64-linux" } }, "determinate-nixd-x86_64-linux_2": { @@ -326,8 +375,8 @@ "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin_2", "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux_2", "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux_2", - "nix": "nix_2", - "nixpkgs": "nixpkgs_13" + "nix": "nix", + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1783537817, @@ -404,20 +453,6 @@ "type": "github" } }, - "fetchurl-sources": { - "flake": false, - "locked": { - "path": "./consumer-overridable/fetchurl-sources.nix", - "type": "path" - }, - "original": { - "path": "./consumer-overridable/fetchurl-sources.nix", - "type": "path" - }, - "parent": [ - "xlibre-overlay" - ] - }, "flake-compat": { "flake": false, "locked": { @@ -437,15 +472,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -467,6 +502,7 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "malayalam", "determinate", "nix", "nixpkgs" @@ -488,19 +524,17 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "malayalam", - "determinate", - "nix", + "nix-src", "nixpkgs" ] }, "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", - "revCount": 377, + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "revCount": 480, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.480%2Brev-17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e/019f2195-dee5-7233-9747-eca0c27f7406/source.tar.gz" }, "original": { "type": "tarball", @@ -512,11 +546,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -530,11 +564,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -545,7 +579,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -593,7 +627,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -611,7 +645,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1731533236, @@ -634,7 +668,6 @@ "nix-gaming", "flake-compat" ], - "gitignore": "gitignore", "nixpkgs": [ "star-citizen", "nix-gaming", @@ -642,11 +675,11 @@ ] }, "locked": { - "lastModified": 1781733627, - "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", "type": "github" }, "original": { @@ -659,10 +692,12 @@ "inputs": { "flake-compat": "flake-compat", "gitignore": [ + "malayalam", "determinate", "nix" ], "nixpkgs": [ + "malayalam", "determinate", "nix", "nixpkgs" @@ -684,57 +719,49 @@ "git-hooks-nix_2": { "inputs": { "flake-compat": "flake-compat_2", - "gitignore": [ - "malayalam", - "determinate", - "nix" - ], "nixpkgs": [ - "malayalam", - "determinate", - "nix", + "nix-src", "nixpkgs" ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", - "revCount": 1026, + "lastModified": 1784288435, + "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "revCount": 1231, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1231%2Brev-43b3c1ab9d40fb1dbb008f451988a91e375825e9/019f7135-8fdf-76f0-b1a1-d2c67e91af8d/source.tar.gz" }, "original": { "type": "tarball", "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" } }, - "gitignore": { + "gitlab-ci": { "inputs": { + "deadnix": "deadnix", "nixpkgs": [ - "star-citizen", - "nix-gaming", - "git-hooks", + "LLM-CORE", "nixpkgs" ] }, "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" + "lastModified": 1776771152, + "narHash": "sha256-CaBZZ9WnLlTunKeGhOu4K+jnegB3PoLr/4FmRov6i4k=", + "owner": "platonic", + "repo": "gitlab-ci.nix", + "rev": "afaa102fb41913a86421e2b994e76966ab2ef82d", + "type": "gitlab" }, "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" + "owner": "platonic", + "repo": "gitlab-ci.nix", + "type": "gitlab" } }, - "gitlab-ci": { + "gitlab-ci_2": { "inputs": { - "deadnix": "deadnix", + "deadnix": "deadnix_2", "nixpkgs": [ "bargman-assets", "nixpkgs" @@ -754,9 +781,9 @@ "type": "gitlab" } }, - "gitlab-ci_2": { + "gitlab-ci_3": { "inputs": { - "deadnix": "deadnix_2", + "deadnix": "deadnix_3", "nixpkgs": [ "carmelsite", "nixpkgs" @@ -777,7 +804,7 @@ "url": "ssh://git@gitlab.platonic.systems/platonic/gitlab-ci.nix" } }, - "gitlab-ci_3": { + "gitlab-ci_4": { "inputs": { "nixpkgs": [ "hype-train-outlaw", @@ -799,11 +826,33 @@ "type": "gitlab" } }, + "gitlab-ci_5": { + "inputs": { + "deadnix": "deadnix_8", + "nixpkgs": [ + "malayalam", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776771152, + "narHash": "sha256-CaBZZ9WnLlTunKeGhOu4K+jnegB3PoLr/4FmRov6i4k=", + "owner": "platonic", + "repo": "gitlab-ci.nix", + "rev": "afaa102fb41913a86421e2b994e76966ab2ef82d", + "type": "gitlab" + }, + "original": { + "owner": "platonic", + "repo": "gitlab-ci.nix", + "type": "gitlab" + } + }, "hype-train-claw": { "inputs": { "fenix": "fenix", "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1773564392, @@ -821,15 +870,15 @@ }, "hype-train-outlaw": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "star-beam": "star-beam" }, "locked": { - "lastModified": 1780570485, - "narHash": "sha256-6KMwohPxcwl9AvBO1vS6tWKiZOe3795/tQQfI/mt3ZI=", + "lastModified": 1784053616, + "narHash": "sha256-xspLMIP/pdOgIY8d9ofG0zRGto2otC6A80u90/H9Fao=", "ref": "refs/heads/main", - "rev": "8126867704e4f5abdef7d90f64bc8989932f66a8", - "revCount": 84, + "rev": "b51fa711a6cfeb570f7453376450ac5b3cc2f0a5", + "revCount": 93, "type": "git", "url": "https://gitlab.com/mecha-team-zero/macha-orchestration" }, @@ -840,7 +889,7 @@ }, "ikbaeb-th": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1768706892, @@ -903,20 +952,21 @@ }, "malayalam": { "inputs": { - "deadnix": "deadnix_6", + "deadnix": "deadnix_7", "determinate": "determinate_2", + "gitlab-ci": "gitlab-ci_5", "nixinate": "nixinate", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "nixpkgs_cuda": "nixpkgs_cuda", "nixpkgs_unstable": "nixpkgs_unstable_2", "secrix": "secrix_2" }, "locked": { - "lastModified": 1785443298, - "narHash": "sha256-9l6i9LMzq90kpmtf7goJP9v2hNluCFk/fBshFZ17hks=", + "lastModified": 1785518413, + "narHash": "sha256-kA9/ADsoxqN0hfkptJ28Zz4GfN2lqrwYnKWcAIAULnk=", "ref": "refs/heads/master", - "rev": "70ede7d5ffd9b3bd720e41de33e6f4ebe48b201c", - "revCount": 40, + "rev": "c0adf9deb413c3ba5cee11503ff538e791c95d36", + "revCount": 48, "type": "git", "url": "https://gitlab.com/mecha-team-zero/Malayalam.git" }, @@ -929,23 +979,21 @@ "inputs": { "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_11", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1784714439, - "narHash": "sha256-JVQmN7z8ipIT/l8/YZ0g1Sjjt85LO5a5MVIbYU00gTo=", - "owner": "darthpjb", - "repo": "nix-src", - "rev": "c3416c7cb5867ead77983627331015627837d7c1", - "type": "github" + "lastModified": 1783531012, + "narHash": "sha256-oR+h2cF6jderMyM+CMvGu/gbh8s3xceSY+oFqYOcrGg=", + "rev": "1318433ee92773c7c4ab7b3950c8c24d7a8bcc2b", + "revCount": 26214, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.5/019f42f2-bfcf-72d3-ba62-dd63f71ea07e/source.tar.gz" }, "original": { - "owner": "darthpjb", - "ref": "fix/ssh-master-localcommand-protocol-leak", - "repo": "nix-src", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" } }, "nix-gaming": { @@ -962,11 +1010,11 @@ ] }, "locked": { - "lastModified": 1782934759, - "narHash": "sha256-1YTEea1x4jfVZkwj2P9K+EpN4huU4PlCsMXbl4ili/A=", + "lastModified": 1784741039, + "narHash": "sha256-FtTmye8k/65loV0GYq4/ENZdQCU7BAQ2FM3/CgAxuIY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "a34118c61059e72f9276680400c4f52e8b4db4dd", + "rev": "8628091b9b9313664c7dfc833c93431b0277b726", "type": "github" }, "original": { @@ -996,25 +1044,27 @@ "type": "github" } }, - "nix_2": { + "nix-src": { "inputs": { "flake-parts": "flake-parts_2", "git-hooks-nix": "git-hooks-nix_2", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_15", "nixpkgs-23-11": "nixpkgs-23-11_2", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { - "lastModified": 1783531012, - "narHash": "sha256-oR+h2cF6jderMyM+CMvGu/gbh8s3xceSY+oFqYOcrGg=", - "rev": "1318433ee92773c7c4ab7b3950c8c24d7a8bcc2b", - "revCount": 26214, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.5/019f42f2-bfcf-72d3-ba62-dd63f71ea07e/source.tar.gz" + "lastModified": 1785791258, + "narHash": "sha256-sTzGzy0Vxyv4lzqw5LurN8UTwuWVLwoltjTxNh0TuXI=", + "owner": "darthpjb", + "repo": "nix-src", + "rev": "a80eb82de1e25ef5aee1a55505727bb73a696822", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" + "owner": "darthpjb", + "ref": "fix/ssh-master-localcommand-protocol-leak", + "repo": "nix-src", + "type": "github" } }, "nixinate": { @@ -1064,11 +1114,11 @@ "nixpkgs": "nixpkgs_16" }, "locked": { - "lastModified": 1782562157, - "narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", + "lastModified": 1784723954, + "narHash": "sha256-1CfD8ZUjCkTgjsneLZ/lxCHhgDfqxxE7/GX0MmsgiqA=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "a9cf7546a938c737b079e738de73934a13de9784", + "rev": "a017f5b72210026af5b3ac5949f08d94380a6fbd", "type": "github" }, "original": { @@ -1127,11 +1177,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -1142,11 +1192,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -1188,22 +1238,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1704290814, "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", @@ -1219,7 +1253,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1782767157, "narHash": "sha256-db/8NgfehQlPNt8rMY0J1gvwzTaURU/foM7y/AQimIM=", @@ -1233,7 +1267,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2511" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1782723713, "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", @@ -1247,7 +1281,7 @@ "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1783389287, "narHash": "sha256-0xIy4dVLqq47rA+mRy0hXDfjhQd4E5PoIns/RmB7nR4=", @@ -1261,7 +1295,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1763678758, "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", @@ -1277,6 +1311,20 @@ "type": "github" } }, + "nixpkgs_15": { + "locked": { + "lastModified": 1784160687, + "narHash": "sha256-iYL/bixrb6FlHFu/gIuBYzq6c6lM5AAXsXNSWXtIgQc=", + "rev": "4382ed2b7a6839d4280a9b386db49cbc5907414d", + "revCount": 1009383, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009383%2Brev-4382ed2b7a6839d4280a9b386db49cbc5907414d/019f6c11-ad78-7500-a194-d18a5bad0fbe/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2605" + } + }, "nixpkgs_16": { "locked": { "lastModified": 1767892417, @@ -1324,11 +1372,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1784356753, + "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", "type": "github" }, "original": { @@ -1370,11 +1418,11 @@ }, "nixpkgs_21": { "locked": { - "lastModified": 1782959384, - "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", + "lastModified": 1784796856, + "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "type": "github" }, "original": { @@ -1386,17 +1434,17 @@ }, "nixpkgs_22": { "locked": { - "lastModified": 1767996987, - "narHash": "sha256-/CF5vSpXfjX4Obn1byOuIBirki0U/JDtvVCn6U/HQew=", + "lastModified": 1784356753, + "narHash": "sha256-12KrbMiWLcf8m7pCvAtZh1ZrgF85ZXDXvfR/fWTKy84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4815e6a6f767d60edfd2d3ee816d0e9c120fb27", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "d4815e6a6f767d60edfd2d3ee816d0e9c120fb27", "type": "github" } }, @@ -1450,33 +1498,19 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1782767157, - "narHash": "sha256-db/8NgfehQlPNt8rMY0J1gvwzTaURU/foM7y/AQimIM=", - "rev": "1d4e0f865d68258aada31e68e6d79c8c463f3b34", - "revCount": 914302, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.914302%2Brev-1d4e0f865d68258aada31e68e6d79c8c463f3b34/019f1c78-b5ab-7af2-8516-c0d5406b0646/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2511" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1782723713, - "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", - "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", - "revCount": 1024265, + "lastModified": 1784497964, + "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", + "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", + "revCount": 1037713, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1024265%2Brev-b5aa0fbd538984f6e3d201be0005b4463d8b09f8/019f3b54-a452-7bf0-9017-aa0cf4ad1907/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1037713%2Brev-241313f4e8e508cb9b13278c2b0fa25b9ca27163/019fa760-2880-7491-9ad9-7ba4669f6a84/source.tar.gz" }, "original": { "type": "tarball", "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1771369470, "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", @@ -1491,7 +1525,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1767313136, "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", @@ -1507,6 +1541,22 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_cuda": { "locked": { "lastModified": 1767313136, @@ -1523,12 +1573,12 @@ }, "nixpkgs_llm": { "locked": { - "lastModified": 1784497964, - "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", - "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", - "revCount": 1037713, + "lastModified": 1785090369, + "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=", + "rev": "624af665418d3c65d544145b4d34ad696439570e", + "revCount": 1042126, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1037713%2Brev-241313f4e8e508cb9b13278c2b0fa25b9ca27163/019f7ea2-cc7f-76e3-b0ff-0fefb2384cde/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.1042126%2Brev-624af665418d3c65d544145b4d34ad696439570e/019fa1cf-40cf-7c70-b618-69ba95bd4fea/source.tar.gz" }, "original": { "type": "tarball", @@ -1551,12 +1601,12 @@ }, "nixpkgs_stable_2": { "locked": { - "lastModified": 1783703440, - "narHash": "sha256-O3/YajjWo001VUIgD8BwaRdSNLUFe7nZ1qV5TwhRBcw=", - "rev": "8f0500b9660505dc3cb647775fe9a978a74b5283", - "revCount": 1008950, + "lastModified": 1784856561, + "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=", + "rev": "597283ad8aa0b331c788e97c4c262d58877074ef", + "revCount": 1010275, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1008950%2Brev-8f0500b9660505dc3cb647775fe9a978a74b5283/019f524e-086b-7663-9920-faf4fe5cefed/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1010275%2Brev-597283ad8aa0b331c788e97c4c262d58877074ef/019f9a67-5b95-7fd0-afb3-7a7416577852/source.tar.gz" }, "original": { "type": "tarball", @@ -1595,12 +1645,12 @@ }, "nixpkgs_unstable_3": { "locked": { - "lastModified": 1782723713, - "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", - "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", - "revCount": 1024265, + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", + "revCount": 1032869, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1024265%2Brev-b5aa0fbd538984f6e3d201be0005b4463d8b09f8/019f3b54-a452-7bf0-9017-aa0cf4ad1907/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1032869%2Brev-e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3/019f8355-02b4-7432-8b0c-3d57029bf5e6/source.tar.gz" }, "original": { "type": "tarball", @@ -1627,7 +1677,7 @@ }, "openface": { "inputs": { - "deadnix": "deadnix_5", + "deadnix": "deadnix_6", "lint-utils": "lint-utils_2", "nixpkgs_stable": "nixpkgs_stable", "secrix": "secrix" @@ -1714,16 +1764,15 @@ "nixpkgs": "nixpkgs_19" }, "locked": { - "lastModified": 1782235606, - "narHash": "sha256-NNDOtvkGB4sue6ihQ/BH3ZbnvLag/58P0f2aMWYPySI=", - "owner": "DarthPJB", + "lastModified": 1785362724, + "narHash": "sha256-ndEMBoRD7c2A1brCc5Qv5WQgTX5QQfbsD6qPxID0JTg=", + "owner": "orhun", "repo": "ratty", - "rev": "47c7d3be5f1e07682e18c7cf28853a21dabb2d82", + "rev": "eb1ef47b99d56a5df86bb67302e41a5255dad2f3", "type": "github" }, "original": { - "owner": "DarthPJB", - "ref": "fix/nix-module-improvements", + "owner": "orhun", "repo": "ratty", "type": "github" } @@ -1733,7 +1782,7 @@ "LLM-CORE": "LLM-CORE", "bargman-assets": "bargman-assets", "carmelsite": "carmelsite", - "deadnix": "deadnix_3", + "deadnix": "deadnix_4", "denton-glasses": "denton-glasses", "determinate": "determinate", "disko": "disko", @@ -1741,6 +1790,7 @@ "hype-train-outlaw": "hype-train-outlaw", "ikbaeb-th": "ikbaeb-th", "malayalam": "malayalam", + "nix-src": "nix-src", "nixinate": "nixinate_2", "nixos-hardware": "nixos-hardware", "nixpkgs_llm": "nixpkgs_llm", @@ -1791,7 +1841,7 @@ }, "secrix_2": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1781802448, @@ -1828,15 +1878,15 @@ "star-beam": { "inputs": { "flake-utils": "flake-utils_5", - "gitlab-ci": "gitlab-ci_3", - "nixpkgs": "nixpkgs_10" + "gitlab-ci": "gitlab-ci_4", + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1777599510, - "narHash": "sha256-8VPg5tgujlQmUuOEmWVSi1Hlto5nAOIgXlG5tjAbwzs=", + "lastModified": 1777888375, + "narHash": "sha256-NjAVR4Ta2QWOOImATee+Pz7CXwqyhuqpaKNCB41/nPo=", "ref": "refs/heads/master", - "rev": "3fb2249b85369b1043752bfc51098ee165520929", - "revCount": 48, + "rev": "a869a5adb2d0f6c2404f7e48d6b962f7878dfe01", + "revCount": 51, "type": "git", "url": "ssh://git@gitlab.platonic.systems/operation/star-beam.git" }, @@ -1853,11 +1903,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1783192860, - "narHash": "sha256-gJPZkL4+9LkU3PPxlGOAyTH5vf4W9vLhhODNU1vh3+o=", + "lastModified": 1784888556, + "narHash": "sha256-objrARvlyaoK3ib3xkgx4KoKZXbcNBZ8WTK/XheiPCE=", "owner": "LovingMelody", "repo": "nix-citizen", - "rev": "b3c67abfab626bdd0be226fcf8120eefcae545c8", + "rev": "89d83133b5c65130171ebe0922a39dd53deb365b", "type": "github" }, "original": { @@ -1882,18 +1932,34 @@ } }, "systems_10": { - "flake": false, "locked": { - "path": "./systems.nix", - "type": "path" + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" }, "original": { - "path": "./systems.nix", - "type": "path" + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" }, - "parent": [ - "xlibre-overlay" - ] + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } }, "systems_2": { "locked": { @@ -2044,11 +2110,11 @@ ] }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1784369104, + "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", "type": "github" }, "original": { @@ -2059,7 +2125,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -2149,7 +2215,7 @@ }, "utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -2165,35 +2231,53 @@ "type": "github" } }, - "xlibre-drivers-overlay-choice": { - "flake": false, + "utils_7": { + "inputs": { + "systems": "systems_10" + }, "locked": { - "path": "./consumer-overridable/drivers-overlay-choice.nix", - "type": "path" + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" }, "original": { - "path": "./consumer-overridable/drivers-overlay-choice.nix", - "type": "path" + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_8": { + "inputs": { + "systems": "systems_11" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" }, - "parent": [ - "xlibre-overlay" - ] + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } }, "xlibre-overlay": { "inputs": { - "fetchurl-sources": "fetchurl-sources", "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_22", - "systems": "systems_10", - "xlibre-drivers-overlay-choice": "xlibre-drivers-overlay-choice", - "xserver-meson-flags": "xserver-meson-flags" + "nixpkgs": "nixpkgs_22" }, "locked": { - "lastModified": 1777909951, - "narHash": "sha256-vDl1AjSwywTSJYOEXh51IhM28CgR9kuK2dHOoIDl8+4=", + "lastModified": 1784482535, + "narHash": "sha256-Ty/hiH/9bQR7HzotwnJpaqfg5xjNXEE+RTNKL/IhRcA=", "ref": "refs/heads/main", - "rev": "ad187240632eec4b315ea93187a5f0e29af25830", - "revCount": 187, + "rev": "ba053472bbe3b0dd3a644ab950df742048fe2260", + "revCount": 234, "type": "git", "url": "https://codeberg.org/takagemacoed/xlibre-overlay" }, @@ -2201,20 +2285,6 @@ "type": "git", "url": "https://codeberg.org/takagemacoed/xlibre-overlay" } - }, - "xserver-meson-flags": { - "flake": false, - "locked": { - "path": "./consumer-overridable/xserver-meson-flags.nix", - "type": "path" - }, - "original": { - "path": "./consumer-overridable/xserver-meson-flags.nix", - "type": "path" - }, - "parent": [ - "xlibre-overlay" - ] } }, "root": "root", diff --git a/flake.nix b/flake.nix index d330277..0bc91ae 100644 --- a/flake.nix +++ b/flake.nix @@ -12,9 +12,10 @@ inputs = { carmelsite.url = "git+https://gitlab.com/mecha-team-zero/carmelsite.git"; deadnix.url = "https://flakehub.com/f/astro/deadnix/1"; + nix-src.url = "github:darthpjb/nix-src/fix/ssh-master-localcommand-protocol-leak"; determinate = { url = "https://flakehub.com/f/DeterminateSystems/determinate/3"; - inputs.nix.url = "github:darthpjb/nix-src/fix/ssh-master-localcommand-protocol-leak"; + inputs.nix.follows = "nix-src"; }; disko = { url = "https://flakehub.com/f/nix-community/disko/1"; inputs.nixpkgs.follows = "nixpkgs_unstable"; }; secrix.url = "github:Platonic-Systems/secrix"; @@ -28,7 +29,7 @@ hype-train-outlaw.url = "git+https://gitlab.com/mecha-team-zero/macha-orchestration"; star-citizen.url = "github:LovingMelody/nix-citizen"; xlibre-overlay.url = "git+https://codeberg.org/takagemacoed/xlibre-overlay"; - ratty.url = "github:DarthPJB/ratty/fix/nix-module-improvements"; + ratty.url = "github:orhun/ratty"; ikbaeb-th = { url = "github:DarthPJB/IKBAEB-th"; }; bargman-assets.url = "git+https://gitlab.com/mecha-team-zero/bargman-assets.git"; denton-glasses.url = "git+https://gitlab.com/mecha-team-zero/denton-glasses.git"; @@ -40,7 +41,7 @@ # See: https://gitlab.com/mecha-team-zero/Malayalam/blob/main/documents/architecture-passthrough.md malayalam.url = "git+https://gitlab.com/mecha-team-zero/Malayalam.git"; }; - outputs = { self, deadnix, determinate, disko, nixinate, nixos-hardware, nixpkgs_stable, nixpkgs_unstable, nixpkgs_llm, hype-train-outlaw, star-citizen, parsecgaming, secrix, hype-train-claw, carmelsite, xlibre-overlay, ratty, ikbaeb-th, bargman-assets, denton-glasses, personal-site, LLM-CORE, malayalam }: + outputs = { self, deadnix, determinate, disko, nixinate, nixos-hardware, nixpkgs_stable, nixpkgs_unstable, nixpkgs_llm, hype-train-outlaw, star-citizen, parsecgaming, secrix, hype-train-claw, carmelsite, xlibre-overlay, ratty, ikbaeb-th, bargman-assets, denton-glasses, personal-site, LLM-CORE, malayalam, nix-src }: let nixpkgs = nixpkgs_stable.legacyPackages.x86_64-linux; lib = nixpkgs_stable.lib; From 1a0542fdd6044aa15b516ab45a728af6ae04de62 Mon Sep 17 00:00:00 2001 From: John Bargman Date: Tue, 4 Aug 2026 14:36:30 +0000 Subject: [PATCH 2/6] fix golden --- goldens/LINDA.json | 100 ++++++++++++++++---------------- goldens/alpha-one.json | 76 ++++++++++++------------ goldens/alpha-three.json | 60 +++++++++---------- goldens/alpha-two.json | 78 ++++++++++++------------- goldens/arm-bootstrap.json | 67 ++++++++++----------- goldens/arm-builder.json | 69 +++++++++++----------- goldens/bargman-greeter-vm.json | 44 +++++++------- goldens/beta-one.json | 61 +++++++++---------- goldens/cortex-alpha.json | 72 +++++++++++------------ goldens/display-0.json | 73 +++++++++++------------ goldens/display-1.json | 87 +++++++++++++-------------- goldens/display-2.json | 87 +++++++++++++-------------- goldens/gaming-host-1.json | 54 ++++++++--------- goldens/local-nas.json | 62 ++++++++++---------- goldens/print-controller.json | 75 ++++++++++++------------ goldens/remote-builder.json | 50 ++++++++-------- goldens/remote-worker.json | 52 ++++++++--------- goldens/storage-array.json | 62 ++++++++++---------- goldens/terminal-nx-01.json | 74 +++++++++++------------ goldens/terminal-zero.json | 66 ++++++++++----------- 20 files changed, 688 insertions(+), 681 deletions(-) diff --git a/goldens/LINDA.json b/goldens/LINDA.json index 84ad90a..254b553 100644 --- a/goldens/LINDA.json +++ b/goldens/LINDA.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -62,14 +62,14 @@ "extraEntries": "menuentry \"Memtest86+\" {\n linux @bootRoot@/memtest.bin \n}\n", "extraEntriesBeforeNixOS": false, "extraFiles": { - "memtest.bin": "/f2iydmpki6v9wda9rvlspk6y6901ygss-memtest86+-8.00/mt86plus.efi" + "memtest.bin": "/bhk295877a2ls4dgqzzpiskl9cw8gxw1-memtest86+-8.00/mt86plus.efi" }, "extraGrubInstallArgs": [], "extraInitrd": "", "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/hnh5fn8q6g7fsb3ivqyj4h1v19m47xxg-grub-2.12/share/grub/unicode.pf2", + "font": "/0vm4bh6d11z1psh54kmvyiiqaq4l562j-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -84,7 +84,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -95,7 +95,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": true }, "gummiboot": { @@ -119,7 +119,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -161,7 +161,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -232,8 +232,8 @@ "", "", "", - "", - "", + "", + "", "", "", "", @@ -250,7 +250,7 @@ "", "", "", - "", + "", "", "", "", @@ -270,14 +270,14 @@ "", "", "", - "", - "", - "", - "", - "", + "", + "", + "", + "", + "", "", "", - "", + "", "", "", "", @@ -289,7 +289,7 @@ "", "", "", - "", + "", "", "", "", @@ -329,7 +329,7 @@ "", "", "", - "", + "", "", "", "", @@ -363,24 +363,24 @@ "", "", "", - "", - "", + "", + "", "", - "", + "", "", - "", + "", "", "", - "", + "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", "", @@ -392,11 +392,11 @@ "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -411,7 +411,7 @@ "", "", "", - "", + "", "", "", "", @@ -419,11 +419,11 @@ "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -431,9 +431,9 @@ "", "", "", - "", + "", "", - "", + "", "", "", "", @@ -527,14 +527,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -542,7 +542,7 @@ "", "", "", - "", + "", "", "", "", @@ -554,7 +554,7 @@ "", "", "", - "", + "", "", "", "", @@ -865,8 +865,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -948,8 +948,8 @@ "publicKey": "7QjUnkXYwYBDDGXGJ4/WsmzkOJJnGAKFa4tEC64N6FE=" } ], - "postSetup": "/qbsvh4fw7lrmkqk870w4sc21kqylph42-iproute2-7.0.0/bin/ip route add 10.75.69.0/24 dev wiregPS0\n", - "postShutdown": "/qbsvh4fw7lrmkqk870w4sc21kqylph42-iproute2-7.0.0/bin/ip route del 10.75.69.0/24 dev wiregPS0\n", + "postSetup": "/86cr8amyzrgrc9ayngi6ghg4abllzqm6-iproute2-7.0.0/bin/ip route add 10.75.69.0/24 dev wiregPS0\n", + "postShutdown": "/86cr8amyzrgrc9ayngi6ghg4abllzqm6-iproute2-7.0.0/bin/ip route del 10.75.69.0/24 dev wiregPS0\n", "preSetup": "", "preShutdown": "", "privateKey": null, @@ -1026,7 +1026,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -1045,7 +1045,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -1173,7 +1173,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.88:1108\nListenAddress 10.88.127.88:22\nXAuthLocation /nix/store/xljjnnfq7fc5dcfvq6ypvqwnv12d2jx0-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.88:1108\nListenAddress 10.88.127.88:22\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1439,9 +1439,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1499,7 +1499,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -3029,7 +3029,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -3055,7 +3055,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/alpha-one.json b/goldens/alpha-one.json index 39d3d56..d5f5950 100644 --- a/goldens/alpha-one.json +++ b/goldens/alpha-one.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -61,7 +61,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/vx3l94jmflz9nfmqngv6gp15hj7z4l0n-grub-2.12/share/grub/unicode.pf2", + "font": "/j3j5mhgy5nbzgdri8vpw6bz093vnlspl-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -76,7 +76,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -87,7 +87,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": false }, "gummiboot": { @@ -111,7 +111,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -153,7 +153,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -221,8 +221,8 @@ "", "", "", - "", - "", + "", + "", "", "", "", @@ -233,7 +233,7 @@ "", "", "", - "", + "", "", "", "", @@ -252,12 +252,12 @@ "", "", "", - "", - "", - "", - "", - "", - "", + "", + "", + "", + "", + "", + "", "", "", "", @@ -269,7 +269,7 @@ "", "", "", - "", + "", "", "", "", @@ -301,7 +301,7 @@ "", "", "", - "", + "", "", "", "", @@ -379,7 +379,7 @@ "", "", "", - "", + "", "", "", "", @@ -403,7 +403,7 @@ "", "", "", - "", + "", "", "", "", @@ -425,7 +425,7 @@ "", "", "", - "", + "", "", "", "", @@ -438,9 +438,9 @@ "", "", "", - "", + "", "", - "", + "", "", "", "", @@ -497,14 +497,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -512,7 +512,7 @@ "", "", "", - "", + "", "", "", "", @@ -524,7 +524,7 @@ "", "", "", - "", + "", "", "", "", @@ -632,8 +632,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -754,7 +754,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -773,7 +773,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -901,7 +901,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.108:1108\nListenAddress 10.88.127.108:22\nXAuthLocation /nix/store/xljjnnfq7fc5dcfvq6ypvqwnv12d2jx0-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.108:1108\nListenAddress 10.88.127.108:22\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1146,9 +1146,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1206,7 +1206,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -2736,7 +2736,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2762,7 +2762,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/alpha-three.json b/goldens/alpha-three.json index ed76b96..716adc0 100644 --- a/goldens/alpha-three.json +++ b/goldens/alpha-three.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -61,7 +61,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/vx3l94jmflz9nfmqngv6gp15hj7z4l0n-grub-2.12/share/grub/unicode.pf2", + "font": "/j3j5mhgy5nbzgdri8vpw6bz093vnlspl-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -76,7 +76,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -87,7 +87,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": false }, "gummiboot": { @@ -111,7 +111,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -153,7 +153,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -228,7 +228,7 @@ "", "", "", - "", + "", "", "", "", @@ -250,8 +250,8 @@ "", "", "", - "", - "", + "", + "", "", "", "", @@ -268,7 +268,7 @@ "", "", "", - "", + "", "", "", "", @@ -301,7 +301,7 @@ "", "", "", - "", + "", "", "", "", @@ -323,7 +323,7 @@ "", "", "", - "", + "", "", "", "", @@ -339,13 +339,13 @@ "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", "", @@ -394,14 +394,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -409,7 +409,7 @@ "", "", "", - "", + "", "", "", "", @@ -421,7 +421,7 @@ "", "", "", - "", + "", "", "", "", @@ -531,8 +531,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -653,7 +653,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -672,7 +672,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -800,7 +800,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.107:1108\nListenAddress 10.88.127.107:22\nXAuthLocation /nix/store/xljjnnfq7fc5dcfvq6ypvqwnv12d2jx0-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.107:1108\nListenAddress 10.88.127.107:22\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1045,9 +1045,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1105,7 +1105,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -2635,7 +2635,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2661,7 +2661,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/alpha-two.json b/goldens/alpha-two.json index b202dc2..d892d21 100644 --- a/goldens/alpha-two.json +++ b/goldens/alpha-two.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -56,14 +56,14 @@ "extraEntries": "menuentry \"Memtest86+\" {\n linux @bootRoot@/memtest.bin \n}\n", "extraEntriesBeforeNixOS": false, "extraFiles": { - "memtest.bin": "/f2iydmpki6v9wda9rvlspk6y6901ygss-memtest86+-8.00/mt86plus.efi" + "memtest.bin": "/bhk295877a2ls4dgqzzpiskl9cw8gxw1-memtest86+-8.00/mt86plus.efi" }, "extraGrubInstallArgs": [], "extraInitrd": "", "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/vx3l94jmflz9nfmqngv6gp15hj7z4l0n-grub-2.12/share/grub/unicode.pf2", + "font": "/j3j5mhgy5nbzgdri8vpw6bz093vnlspl-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -78,7 +78,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -89,7 +89,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": false }, "gummiboot": { @@ -113,7 +113,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -155,7 +155,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -229,7 +229,7 @@ "", "", "", - "", + "", "", "", "", @@ -246,14 +246,14 @@ "", "", "", - "", - "", - "", - "", - "", + "", + "", + "", + "", + "", "", "", - "", + "", "", "", "", @@ -265,7 +265,7 @@ "", "", "", - "", + "", "", "", "", @@ -296,9 +296,9 @@ "", "", "", - "", + "", "", - "", + "", "", "", "", @@ -320,13 +320,13 @@ "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", "", @@ -348,7 +348,7 @@ "", "", "", - "", + "", "", "", "", @@ -365,7 +365,7 @@ "", "", "", - "", + "", "", "", "", @@ -373,9 +373,9 @@ "", "", "", - "", + "", "", - "", + "", "", "", "", @@ -424,14 +424,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -439,7 +439,7 @@ "", "", "", - "", + "", "", "", "", @@ -451,7 +451,7 @@ "", "", "", - "", + "", "", "", "", @@ -556,8 +556,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -638,7 +638,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -657,7 +657,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -785,7 +785,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nXAuthLocation /nix/store/xljjnnfq7fc5dcfvq6ypvqwnv12d2jx0-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", + "extraConfig": "AddressFamily any\nPort 1108\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1042,9 +1042,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1102,7 +1102,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -2632,7 +2632,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2658,7 +2658,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/arm-bootstrap.json b/goldens/arm-bootstrap.json index 9d90ff5..a71b9c2 100644 --- a/goldens/arm-bootstrap.json +++ b/goldens/arm-bootstrap.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/9ngflilcxj67rlks543zxj8am4yqzjgk-systemd-aarch64-unknown-linux-gnu-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/5m3g8wwlqasjgm4jxvnk926n1mj1q5fp-systemd-aarch64-unknown-linux-gnu-261/sbin/poweroff", "kernel.printk": 7, "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -37,7 +37,7 @@ "path": "/boot" } ], - "populateCmd": "/y1f13d3nr5p0wf2krp8nwfgip9jzfv6i-extlinux-conf-builder.sh -g 20 -t 5", + "populateCmd": "/0f66mb5kwf3hc5gg1z9j9fg5j2xdnvqy-extlinux-conf-builder.sh -g 20 -t 5", "useGenerationDeviceTree": true }, "grub": { @@ -63,7 +63,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/0q37babnmvvk6rsyms4wif654g04qcwq-grub-aarch64-unknown-linux-gnu-2.12/share/grub/unicode.pf2", + "font": "/611hj506h0frjl86r7jzm0jg26mkzn1r-grub-aarch64-unknown-linux-gnu-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -78,7 +78,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/dc6pf7p8zrw5aqlshy8wsfqhzh5zbalh-simple-dark-gray-bootloader-aarch64-unknown-linux-gnu-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/b91bxlrkcfdclgqx8wmj1y9nw3xn8c48-simple-dark-gray-bootloader-aarch64-unknown-linux-gnu-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -114,7 +114,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -156,7 +156,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/dc6pf7p8zrw5aqlshy8wsfqhzh5zbalh-simple-dark-gray-bootloader-aarch64-unknown-linux-gnu-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/b91bxlrkcfdclgqx8wmj1y9nw3xn8c48-simple-dark-gray-bootloader-aarch64-unknown-linux-gnu-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -218,16 +218,16 @@ "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", - "", + "", "", "", "", @@ -237,11 +237,11 @@ "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -292,7 +292,7 @@ "", "", "", - "", + "", "", "", "", @@ -301,7 +301,7 @@ "", "", "", - "", + "", "", "", "", @@ -309,25 +309,25 @@ "", "", "", - "", + "", "", "", "", - "", - "", + "", + "", "", "", "", "", "", "", - "", - "", + "", + "", "", "", "", "", - "", + "", "" ], "networking.domain": null, @@ -440,8 +440,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/1nd65jy0pi34gn40cxk7ffqhd5kfgmql-iana-etc-20251215/etc/protocols", - "/etc/services": "/1nd65jy0pi34gn40cxk7ffqhd5kfgmql-iana-etc-20251215/etc/services" + "/etc/protocols": "/ij9mpnzz381da1pblvxfm2ggbakj5c8k-iana-etc-20251215/etc/protocols", + "/etc/services": "/ij9mpnzz381da1pblvxfm2ggbakj5c8k-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -522,7 +522,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/cwb6ibc3mis4ly0i9c4wj75i5qrbzi3g-mailcap-aarch64-unknown-linux-gnu-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/k3lsk1c6ikbh232435mhp84f08ymnkvs-mailcap-aarch64-unknown-linux-gnu-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -537,6 +537,7 @@ "virtualHost": "_" }, "group": "nginx", + "gunicornArgs": "", "httpConfig": "", "logError": "stderr", "lua": { @@ -589,7 +590,7 @@ "enable": false, "expectedTailnet": "", "group": "tailscale-nginx-auth", - "package": "", + "package": "", "socketPath": "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock", "user": "tailscale-nginx-auth", "virtualHosts": [] @@ -672,7 +673,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 22\nListenAddress 0.0.0.0:22\nSubsystem sftp /nix/store/gd9ncm5icb9ki9hqc66k9gfr54xnq8qw-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_rsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", + "extraConfig": "AddressFamily any\nPort 22\nListenAddress 0.0.0.0:22\nSubsystem sftp /nix/store/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_rsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -709,7 +710,7 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/gd9ncm5icb9ki9hqc66k9gfr54xnq8qw-openssh-aarch64-unknown-linux-gnu-10.3p1/etc/ssh/moduli", + "moduliFile": "/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", "passwordAuthentication": false, @@ -764,7 +765,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/gd9ncm5icb9ki9hqc66k9gfr54xnq8qw-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server", "startWhenNeeded": false, "useDns": false }, @@ -782,7 +783,7 @@ "logFormat": null, "logLevel": "warn", "openFirewall": false, - "package": "", + "package": "", "port": 9093, "user": "", "webExternalUrl": null @@ -1505,7 +1506,7 @@ "listenAddress": "0.0.0.0", "moonrakerApiKey": "", "openFirewall": false, - "package": "", + "package": "", "port": 9101, "user": "klipper-exporter" }, @@ -2306,7 +2307,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/f186fvjrjr8q6fz78scgvx623g2db59m-unpoller-loki-default.password", + "pass": "file:///nix/store/yh9mv2h2mg3589iqaq7d1v16aipk986h-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2332,7 +2333,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/f186fvjrjr8q6fz78scgvx623g2db59m-unpoller-loki-default.password", + "pass": "file:///nix/store/yh9mv2h2mg3589iqaq7d1v16aipk986h-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2450,7 +2451,7 @@ "scrape_timeout": null }, "listenAddress": "0.0.0.0", - "package": "", + "package": "", "port": 9090, "pushgateway": { "enable": false, @@ -2505,7 +2506,7 @@ "domain": "", "enable": false, "openFirewall": true, - "package": "", + "package": "", "port": 8010, "stunPort": 3478, "verifyClients": false @@ -2518,7 +2519,7 @@ "extraUpFlags": [], "interfaceName": "tailscale0", "openFirewall": false, - "package": "", + "package": "", "permitCertUid": null, "port": 41641, "serve": { diff --git a/goldens/arm-builder.json b/goldens/arm-builder.json index a516b70..d208d60 100644 --- a/goldens/arm-builder.json +++ b/goldens/arm-builder.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/9ngflilcxj67rlks543zxj8am4yqzjgk-systemd-aarch64-unknown-linux-gnu-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/5m3g8wwlqasjgm4jxvnk926n1mj1q5fp-systemd-aarch64-unknown-linux-gnu-261/sbin/poweroff", "kernel.printk": 7, "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -37,7 +37,7 @@ "path": "/boot" } ], - "populateCmd": "/y1f13d3nr5p0wf2krp8nwfgip9jzfv6i-extlinux-conf-builder.sh -g 20 -t 5", + "populateCmd": "/0f66mb5kwf3hc5gg1z9j9fg5j2xdnvqy-extlinux-conf-builder.sh -g 20 -t 5", "useGenerationDeviceTree": true }, "grub": { @@ -63,7 +63,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/0q37babnmvvk6rsyms4wif654g04qcwq-grub-aarch64-unknown-linux-gnu-2.12/share/grub/unicode.pf2", + "font": "/611hj506h0frjl86r7jzm0jg26mkzn1r-grub-aarch64-unknown-linux-gnu-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -78,7 +78,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/dc6pf7p8zrw5aqlshy8wsfqhzh5zbalh-simple-dark-gray-bootloader-aarch64-unknown-linux-gnu-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/b91bxlrkcfdclgqx8wmj1y9nw3xn8c48-simple-dark-gray-bootloader-aarch64-unknown-linux-gnu-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -114,7 +114,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -156,7 +156,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/dc6pf7p8zrw5aqlshy8wsfqhzh5zbalh-simple-dark-gray-bootloader-aarch64-unknown-linux-gnu-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/b91bxlrkcfdclgqx8wmj1y9nw3xn8c48-simple-dark-gray-bootloader-aarch64-unknown-linux-gnu-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -211,7 +211,7 @@ "vfat": true }, "environment.systemPackages": [ - "", + "", "", "", "", @@ -219,16 +219,16 @@ "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", - "", + "", "", "", "", @@ -238,11 +238,11 @@ "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -294,7 +294,7 @@ "", "", "", - "", + "", "", "", "", @@ -303,7 +303,7 @@ "", "", "", - "", + "", "", "", "", @@ -311,25 +311,25 @@ "", "", "", - "", + "", "", "", "", - "", - "", + "", + "", "", "", "", "", "", "", - "", - "", + "", + "", "", "", "", "", - "", + "", "" ], "networking.domain": null, @@ -465,8 +465,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/1nd65jy0pi34gn40cxk7ffqhd5kfgmql-iana-etc-20251215/etc/protocols", - "/etc/services": "/1nd65jy0pi34gn40cxk7ffqhd5kfgmql-iana-etc-20251215/etc/services" + "/etc/protocols": "/ij9mpnzz381da1pblvxfm2ggbakj5c8k-iana-etc-20251215/etc/protocols", + "/etc/services": "/ij9mpnzz381da1pblvxfm2ggbakj5c8k-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -587,7 +587,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/cwb6ibc3mis4ly0i9c4wj75i5qrbzi3g-mailcap-aarch64-unknown-linux-gnu-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/k3lsk1c6ikbh232435mhp84f08ymnkvs-mailcap-aarch64-unknown-linux-gnu-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -602,6 +602,7 @@ "virtualHost": "_" }, "group": "nginx", + "gunicornArgs": "", "httpConfig": "", "logError": "stderr", "lua": { @@ -654,7 +655,7 @@ "enable": false, "expectedTailnet": "", "group": "tailscale-nginx-auth", - "package": "", + "package": "", "socketPath": "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock", "user": "tailscale-nginx-auth", "virtualHosts": [] @@ -737,7 +738,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.43:1108\nListenAddress 10.88.127.43:22\nSubsystem sftp /nix/store/gd9ncm5icb9ki9hqc66k9gfr54xnq8qw-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.43:1108\nListenAddress 10.88.127.43:22\nSubsystem sftp /nix/store/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -982,7 +983,7 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/gd9ncm5icb9ki9hqc66k9gfr54xnq8qw-openssh-aarch64-unknown-linux-gnu-10.3p1/etc/ssh/moduli", + "moduliFile": "/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", "passwordAuthentication": false, @@ -1042,7 +1043,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/gd9ncm5icb9ki9hqc66k9gfr54xnq8qw-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -1060,7 +1061,7 @@ "logFormat": null, "logLevel": "warn", "openFirewall": false, - "package": "", + "package": "", "port": 9093, "user": "", "webExternalUrl": null @@ -1783,7 +1784,7 @@ "listenAddress": "0.0.0.0", "moonrakerApiKey": "", "openFirewall": false, - "package": "", + "package": "", "port": 9101, "user": "klipper-exporter" }, @@ -2598,7 +2599,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/f186fvjrjr8q6fz78scgvx623g2db59m-unpoller-loki-default.password", + "pass": "file:///nix/store/yh9mv2h2mg3589iqaq7d1v16aipk986h-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2624,7 +2625,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/f186fvjrjr8q6fz78scgvx623g2db59m-unpoller-loki-default.password", + "pass": "file:///nix/store/yh9mv2h2mg3589iqaq7d1v16aipk986h-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2742,7 +2743,7 @@ "scrape_timeout": null }, "listenAddress": "0.0.0.0", - "package": "", + "package": "", "port": 9090, "pushgateway": { "enable": false, @@ -2797,7 +2798,7 @@ "domain": "", "enable": false, "openFirewall": true, - "package": "", + "package": "", "port": 8010, "stunPort": 3478, "verifyClients": false @@ -2810,7 +2811,7 @@ "extraUpFlags": [], "interfaceName": "tailscale0", "openFirewall": false, - "package": "", + "package": "", "permitCertUid": null, "port": 41641, "serve": { diff --git a/goldens/bargman-greeter-vm.json b/goldens/bargman-greeter-vm.json index 9d0ed27..8598ee7 100644 --- a/goldens/bargman-greeter-vm.json +++ b/goldens/bargman-greeter-vm.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": 4, "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -63,7 +63,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/vx3l94jmflz9nfmqngv6gp15hj7z4l0n-grub-2.12/share/grub/unicode.pf2", + "font": "/j3j5mhgy5nbzgdri8vpw6bz093vnlspl-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -87,7 +87,7 @@ "path": "/boot" } ], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -98,7 +98,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": false }, "gummiboot": { @@ -122,7 +122,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -164,7 +164,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -268,7 +268,7 @@ "", "", "", - "", + "", "", "", "", @@ -280,13 +280,13 @@ "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", "", @@ -354,14 +354,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -369,7 +369,7 @@ "", "", "", - "", + "", "", "", "", @@ -381,7 +381,7 @@ "", "", "", - "", + "", "", "", "", @@ -454,8 +454,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -536,7 +536,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -555,7 +555,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -714,7 +714,7 @@ ], "moduliFile": "", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": true, "permitRootLogin": "prohibit-password", "ports": [ @@ -2277,7 +2277,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2303,7 +2303,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/beta-one.json b/goldens/beta-one.json index dd28a17..2e2a988 100644 --- a/goldens/beta-one.json +++ b/goldens/beta-one.json @@ -3,7 +3,7 @@ "fs.inotify.max_user_instances": 524288, "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, - "kernel.poweroff_cmd": "/ilnr8qyjwxf0n9gi05hv6584vvd5di1r-systemd-armv7l-unknown-linux-gnueabihf-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/8yddd47ifx5v12jwr4fi8sagzi66pv4s-systemd-armv7l-unknown-linux-gnueabihf-261/sbin/poweroff", "kernel.printk": 7, "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -34,7 +34,7 @@ "path": "/boot" } ], - "populateCmd": "/y1f13d3nr5p0wf2krp8nwfgip9jzfv6i-extlinux-conf-builder.sh -g 20 -t 5", + "populateCmd": "/0f66mb5kwf3hc5gg1z9j9fg5j2xdnvqy-extlinux-conf-builder.sh -g 20 -t 5", "useGenerationDeviceTree": true }, "grub": { @@ -60,7 +60,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/gpck3ai3k35azbj5mcyi4xd658315y2m-grub-armv7l-unknown-linux-gnueabihf-2.12/share/grub/unicode.pf2", + "font": "/qn0vgkflqih4w800xl50i0h2dc3mkln9-grub-armv7l-unknown-linux-gnueabihf-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -75,7 +75,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/2y9w0mpf1d8bkdf3pyhaap5b6x6xxsf7-simple-dark-gray-bootloader-armv7l-unknown-linux-gnueabihf-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/y3s1ha52jrbf8hrzm56r8nlkmsvsfqj9-simple-dark-gray-bootloader-armv7l-unknown-linux-gnueabihf-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -111,7 +111,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -153,7 +153,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/2y9w0mpf1d8bkdf3pyhaap5b6x6xxsf7-simple-dark-gray-bootloader-armv7l-unknown-linux-gnueabihf-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/y3s1ha52jrbf8hrzm56r8nlkmsvsfqj9-simple-dark-gray-bootloader-armv7l-unknown-linux-gnueabihf-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -215,16 +215,16 @@ "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", - "", + "", "", "", "", @@ -233,11 +233,11 @@ "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -282,7 +282,7 @@ "", "", "", - "", + "", "", "", "", @@ -291,7 +291,7 @@ "", "", "", - "", + "", "", "", "", @@ -299,25 +299,25 @@ "", "", "", - "", + "", "", "", "", - "", - "", + "", + "", "", "", "", "", "", "", - "", - "", + "", + "", "", "", "", "", - "", + "", "" ], "networking.domain": null, @@ -381,8 +381,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/9qxsy9yl1piffvj37n1nbk4glyjx48f5-iana-etc-20251215/etc/protocols", - "/etc/services": "/9qxsy9yl1piffvj37n1nbk4glyjx48f5-iana-etc-20251215/etc/services" + "/etc/protocols": "/6rj16kk3dgli5n8n7xhn2j9cicfdz0qw-iana-etc-20251215/etc/protocols", + "/etc/services": "/6rj16kk3dgli5n8n7xhn2j9cicfdz0qw-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -463,7 +463,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/v9iabw35vg7jrp80ny0rr7qr7zdwjni6-mailcap-armv7l-unknown-linux-gnueabihf-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/50zcxshrdw1cyqh6hnm5g4734c1qvjf8-mailcap-armv7l-unknown-linux-gnueabihf-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -478,6 +478,7 @@ "virtualHost": "_" }, "group": "nginx", + "gunicornArgs": "", "httpConfig": "", "logError": "stderr", "lua": { @@ -530,7 +531,7 @@ "enable": false, "expectedTailnet": "", "group": "tailscale-nginx-auth", - "package": "", + "package": "", "socketPath": "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock", "user": "tailscale-nginx-auth", "virtualHosts": [] @@ -709,7 +710,7 @@ "logFormat": null, "logLevel": "warn", "openFirewall": false, - "package": "", + "package": "", "port": 9093, "user": "", "webExternalUrl": null @@ -1432,7 +1433,7 @@ "listenAddress": "0.0.0.0", "moonrakerApiKey": "", "openFirewall": false, - "package": "", + "package": "", "port": 9101, "user": "klipper-exporter" }, @@ -2233,7 +2234,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/ljbml423jl2ak1fca1w07wh482xsl11x-unpoller-loki-default.password", + "pass": "file:///nix/store/ya9i5x82y19lbvdbyyq5xprqzc74r6vk-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2259,7 +2260,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/ljbml423jl2ak1fca1w07wh482xsl11x-unpoller-loki-default.password", + "pass": "file:///nix/store/ya9i5x82y19lbvdbyyq5xprqzc74r6vk-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2377,7 +2378,7 @@ "scrape_timeout": null }, "listenAddress": "0.0.0.0", - "package": "", + "package": "", "port": 9090, "pushgateway": { "enable": false, @@ -2432,7 +2433,7 @@ "domain": "", "enable": false, "openFirewall": true, - "package": "", + "package": "", "port": 8010, "stunPort": 3478, "verifyClients": false @@ -2445,7 +2446,7 @@ "extraUpFlags": [], "interfaceName": "tailscale0", "openFirewall": false, - "package": "", + "package": "", "permitCertUid": null, "port": 41641, "serve": { diff --git a/goldens/cortex-alpha.json b/goldens/cortex-alpha.json index e191158..c5b8530 100644 --- a/goldens/cortex-alpha.json +++ b/goldens/cortex-alpha.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -67,7 +67,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/hnh5fn8q6g7fsb3ivqyj4h1v19m47xxg-grub-2.12/share/grub/unicode.pf2", + "font": "/0vm4bh6d11z1psh54kmvyiiqaq4l562j-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -82,7 +82,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -93,7 +93,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": true }, "gummiboot": { @@ -117,7 +117,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -159,7 +159,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -223,7 +223,7 @@ "", "", "", - "", + "", "", "", "", @@ -238,20 +238,20 @@ "", "", "", - "", + "", "", - "", + "", "", "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", "", @@ -266,7 +266,7 @@ "", "", "", - "", + "", "", "", "", @@ -306,14 +306,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -321,7 +321,7 @@ "", "", "", - "", + "", "", "", "", @@ -333,7 +333,7 @@ "", "", "", - "", + "", "", "", "", @@ -614,8 +614,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": true, "extraDeletions": "", @@ -1069,7 +1069,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": true, "enableQuicBPF": false, @@ -1088,7 +1088,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -1698,10 +1698,10 @@ }, "children": {}, "includes": [ - "/rlkx75hswvsdw704zhszq3jhpclrlarb-openldap-2.6.13/etc/schema/core.ldif", - "/rlkx75hswvsdw704zhszq3jhpclrlarb-openldap-2.6.13/etc/schema/cosine.ldif", - "/rlkx75hswvsdw704zhszq3jhpclrlarb-openldap-2.6.13/etc/schema/inetorgperson.ldif", - "/rlkx75hswvsdw704zhszq3jhpclrlarb-openldap-2.6.13/etc/schema/nis.ldif" + "/99z5n1y04k2gljm8z39mdrl2ckk602zc-openldap-2.6.13/etc/schema/core.ldif", + "/99z5n1y04k2gljm8z39mdrl2ckk602zc-openldap-2.6.13/etc/schema/cosine.ldif", + "/99z5n1y04k2gljm8z39mdrl2ckk602zc-openldap-2.6.13/etc/schema/inetorgperson.ldif", + "/99z5n1y04k2gljm8z39mdrl2ckk602zc-openldap-2.6.13/etc/schema/nis.ldif" ] }, "olcDatabase={1}mdb": { @@ -1754,7 +1754,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", + "extraConfig": "AddressFamily any\nPort 1108\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1990,9 +1990,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -2049,7 +2049,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -3579,7 +3579,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -3605,7 +3605,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -3794,7 +3794,7 @@ "before": [], "bindsTo": [], "confinement": { - "binSh": "/0641h8qfqaxnwrsw2nzrz6i1wbzyx92l-bash-interactive-5.3p9/bin/sh", + "binSh": "/3wqi41by35ncfmkyjihm6jr12ylwk48k-bash-interactive-5.3p9/bin/sh", "enable": false, "fullUnit": false, "mode": "full-apivfs", @@ -3807,7 +3807,7 @@ "enableDefaultPath": true, "enableStrictShellChecks": false, "environment": { - "PATH": "/sr26flm2nkfa12dkrwj2630kqsfakky4-coreutils-9.11/bin:/nix/store/zjwih3d9rrrw4ixll52wsy0538p7vdfd-findutils-4.10.0/bin:/nix/store/w8xlvapzxcz23ba312q119p57bnc7200-gnugrep-3.12/bin:/nix/store/0hamsiy8hsyfw1hmizbc3bf93ad7fa1v-gnused-4.9/bin:/nix/store/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/bin:/nix/store/sr26flm2nkfa12dkrwj2630kqsfakky4-coreutils-9.11/sbin:/nix/store/zjwih3d9rrrw4ixll52wsy0538p7vdfd-findutils-4.10.0/sbin:/nix/store/w8xlvapzxcz23ba312q119p57bnc7200-gnugrep-3.12/sbin:/nix/store/0hamsiy8hsyfw1hmizbc3bf93ad7fa1v-gnused-4.9/sbin:/nix/store/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin" + "PATH": "/yvzyrsv7fl33zmi2a1nx730hsz7qyyia-coreutils-9.11/bin:/nix/store/9zccmi36wn8g36pvxdg6m7j1gg5ml0xg-findutils-4.10.0/bin:/nix/store/9v1503vs5vnfmk2j26qdqyiqyw6c701w-gnugrep-3.12/bin:/nix/store/ipz8k2pj3k6klkpflrxl3yphvp9vkgrw-gnused-4.10/bin:/nix/store/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/bin:/nix/store/yvzyrsv7fl33zmi2a1nx730hsz7qyyia-coreutils-9.11/sbin:/nix/store/9zccmi36wn8g36pvxdg6m7j1gg5ml0xg-findutils-4.10.0/sbin:/nix/store/9v1503vs5vnfmk2j26qdqyiqyw6c701w-gnugrep-3.12/sbin:/nix/store/ipz8k2pj3k6klkpflrxl3yphvp9vkgrw-gnused-4.10/sbin:/nix/store/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin" }, "jobScripts": [], "name": "tailscale-udp-gro.service", @@ -3820,7 +3820,7 @@ "", "", "", - "", + "", "" ], "postStart": "", @@ -3839,7 +3839,7 @@ "script": "", "scriptArgs": "", "serviceConfig": { - "ExecStart": "/s86f58vh4jly8w9ngsk8s3xk4zwjfnms-ethtool-7.0/bin/ethtool -K enp2s0 rx-udp-gro-forwarding on", + "ExecStart": "/i7iglmfk5fkmrynlj6dvdn77cvfcmibs-ethtool-7.0/bin/ethtool -K enp2s0 rx-udp-gro-forwarding on", "RemainAfterExit": true, "Type": "oneshot" }, diff --git a/goldens/display-0.json b/goldens/display-0.json index 1ddbbd1..059fcfc 100644 --- a/goldens/display-0.json +++ b/goldens/display-0.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/k2s978i7i26km4cr56fvm64p2q6mpl02-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/99bh37dhcwpwqmr8lvqjf3409skrrg31-systemd-261/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -37,7 +37,7 @@ "path": "/boot" } ], - "populateCmd": "/asm0fgcbzvcprxrx84j4pl876v0al2vl-extlinux-conf-builder.sh -g 20 -t 5", + "populateCmd": "/hx6qza8zhsfahx01bvwzn5z6z590hmph-extlinux-conf-builder.sh -g 20 -t 5", "useGenerationDeviceTree": true }, "grub": { @@ -63,7 +63,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/isz8ngvrfq8fgx7lqsyr26iga00pxb0y-grub-2.12/share/grub/unicode.pf2", + "font": "/n8rccmjfmlyhb9gxb7zhwnsbs3gi4wan-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -78,7 +78,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/l0hgi1928j7j7ansspvrjmrvawsqxfqw-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/n3cp8s9zzchkpqjxf3w04sdcc5zyy77s-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -114,7 +114,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -156,7 +156,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/l0hgi1928j7j7ansspvrjmrvawsqxfqw-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/n3cp8s9zzchkpqjxf3w04sdcc5zyy77s-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -224,12 +224,12 @@ "", "", "", - "", + "", "", - "", + "", "", "", - "", + "", "", "", "", @@ -237,18 +237,18 @@ "", "", "", - "", + "", "", "", "", "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -258,11 +258,11 @@ "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -282,7 +282,7 @@ "", "", "", - "", + "", "", "", "", @@ -291,7 +291,7 @@ "", "", "", - "", + "", "", "", "", @@ -299,25 +299,25 @@ "", "", "", - "", + "", "", "", "", - "", - "", + "", + "", "", "", "", "", "", "", - "", - "", + "", + "", "", "", "", "", - "", + "", "" ], "networking.domain": null, @@ -447,8 +447,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/bjwcdygzs2gsbxqh9jyisisafqw7xlpd-iana-etc-20251215/etc/protocols", - "/etc/services": "/bjwcdygzs2gsbxqh9jyisisafqw7xlpd-iana-etc-20251215/etc/services" + "/etc/protocols": "/s99fl7mncpqd7vfv3w5vq63j8l6m3kkq-iana-etc-20251215/etc/protocols", + "/etc/services": "/s99fl7mncpqd7vfv3w5vq63j8l6m3kkq-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -529,7 +529,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/7n510fjz9cxpqgp30b519gdrafcfk0fr-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/jp0m0n6fgnpwrisppg9rr72mvg4k7xg5-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -544,6 +544,7 @@ "virtualHost": "_" }, "group": "nginx", + "gunicornArgs": "", "httpConfig": "", "logError": "stderr", "lua": { @@ -596,7 +597,7 @@ "enable": false, "expectedTailnet": "", "group": "tailscale-nginx-auth", - "package": "", + "package": "", "socketPath": "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock", "user": "tailscale-nginx-auth", "virtualHosts": [] @@ -679,7 +680,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nSubsystem sftp /nix/store/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", + "extraConfig": "AddressFamily any\nPort 1108\nSubsystem sftp /nix/store/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -915,7 +916,7 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", "passwordAuthentication": false, @@ -974,7 +975,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -992,7 +993,7 @@ "logFormat": null, "logLevel": "warn", "openFirewall": false, - "package": "", + "package": "", "port": 9093, "user": "", "webExternalUrl": null @@ -1715,7 +1716,7 @@ "listenAddress": "0.0.0.0", "moonrakerApiKey": "", "openFirewall": false, - "package": "", + "package": "", "port": 9101, "user": "klipper-exporter" }, @@ -2530,7 +2531,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/sq7dvsysi26r6wjyxs3bqj6c96f9r0mf-unpoller-loki-default.password", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2556,7 +2557,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/sq7dvsysi26r6wjyxs3bqj6c96f9r0mf-unpoller-loki-default.password", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2674,7 +2675,7 @@ "scrape_timeout": null }, "listenAddress": "0.0.0.0", - "package": "", + "package": "", "port": 9090, "pushgateway": { "enable": false, @@ -2729,7 +2730,7 @@ "domain": "", "enable": false, "openFirewall": true, - "package": "", + "package": "", "port": 8010, "stunPort": 3478, "verifyClients": false @@ -2742,7 +2743,7 @@ "extraUpFlags": [], "interfaceName": "tailscale0", "openFirewall": false, - "package": "", + "package": "", "permitCertUid": null, "port": 41641, "serve": { diff --git a/goldens/display-1.json b/goldens/display-1.json index 4e63582..e90b3b3 100644 --- a/goldens/display-1.json +++ b/goldens/display-1.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/k2s978i7i26km4cr56fvm64p2q6mpl02-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/99bh37dhcwpwqmr8lvqjf3409skrrg31-systemd-261/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -37,7 +37,7 @@ "path": "/boot" } ], - "populateCmd": "/asm0fgcbzvcprxrx84j4pl876v0al2vl-extlinux-conf-builder.sh -g 20 -t 5", + "populateCmd": "/hx6qza8zhsfahx01bvwzn5z6z590hmph-extlinux-conf-builder.sh -g 20 -t 5", "useGenerationDeviceTree": true }, "grub": { @@ -63,7 +63,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/isz8ngvrfq8fgx7lqsyr26iga00pxb0y-grub-2.12/share/grub/unicode.pf2", + "font": "/n8rccmjfmlyhb9gxb7zhwnsbs3gi4wan-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -78,7 +78,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/l0hgi1928j7j7ansspvrjmrvawsqxfqw-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/n3cp8s9zzchkpqjxf3w04sdcc5zyy77s-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -114,7 +114,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -156,7 +156,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/l0hgi1928j7j7ansspvrjmrvawsqxfqw-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/n3cp8s9zzchkpqjxf3w04sdcc5zyy77s-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -212,11 +212,11 @@ }, "environment.systemPackages": [ "", - "", - "", - "", - "", - "", + "", + "", + "", + "", + "", "", "", "", @@ -240,12 +240,12 @@ "", "", "", - "", + "", "", - "", + "", "", "", - "", + "", "", "", "", @@ -261,17 +261,17 @@ "", "", "", - "", + "", "", "", "", "", "", "", - "", + "", "", "", - "", + "", "", "", "", @@ -286,7 +286,7 @@ "", "", "", - "", + "", "", "", "", @@ -300,17 +300,17 @@ "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -339,7 +339,7 @@ "", "", "", - "", + "", "", "", "", @@ -348,7 +348,7 @@ "", "", "", - "", + "", "", "", "", @@ -356,25 +356,25 @@ "", "", "", - "", + "", "", "", "", - "", - "", + "", + "", "", "", "", "", "", "", - "", - "", + "", + "", "", "", "", "", - "", + "", "" ], "networking.domain": null, @@ -512,8 +512,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/bjwcdygzs2gsbxqh9jyisisafqw7xlpd-iana-etc-20251215/etc/protocols", - "/etc/services": "/bjwcdygzs2gsbxqh9jyisisafqw7xlpd-iana-etc-20251215/etc/services" + "/etc/protocols": "/s99fl7mncpqd7vfv3w5vq63j8l6m3kkq-iana-etc-20251215/etc/protocols", + "/etc/services": "/s99fl7mncpqd7vfv3w5vq63j8l6m3kkq-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -634,7 +634,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/7n510fjz9cxpqgp30b519gdrafcfk0fr-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/jp0m0n6fgnpwrisppg9rr72mvg4k7xg5-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -649,6 +649,7 @@ "virtualHost": "_" }, "group": "nginx", + "gunicornArgs": "", "httpConfig": "", "logError": "stderr", "lua": { @@ -701,7 +702,7 @@ "enable": false, "expectedTailnet": "", "group": "tailscale-nginx-auth", - "package": "", + "package": "", "socketPath": "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock", "user": "tailscale-nginx-auth", "virtualHosts": [] @@ -784,7 +785,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.41:1108\nListenAddress 10.88.127.41:22\nXAuthLocation /nix/store/ybfiby0gg65rfvvf5vjm3ms56ffgkjmm-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.41:1108\nListenAddress 10.88.127.41:22\nXAuthLocation /nix/store/mngzgg3vvndd7dy1w4pwckbav0f4fgwf-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1029,7 +1030,7 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", "passwordAuthentication": false, @@ -1089,7 +1090,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -1107,7 +1108,7 @@ "logFormat": null, "logLevel": "warn", "openFirewall": false, - "package": "", + "package": "", "port": 9093, "user": "", "webExternalUrl": null @@ -1830,7 +1831,7 @@ "listenAddress": "0.0.0.0", "moonrakerApiKey": "", "openFirewall": false, - "package": "", + "package": "", "port": 9101, "user": "klipper-exporter" }, @@ -2645,7 +2646,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/sq7dvsysi26r6wjyxs3bqj6c96f9r0mf-unpoller-loki-default.password", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2671,7 +2672,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/sq7dvsysi26r6wjyxs3bqj6c96f9r0mf-unpoller-loki-default.password", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2789,7 +2790,7 @@ "scrape_timeout": null }, "listenAddress": "0.0.0.0", - "package": "", + "package": "", "port": 9090, "pushgateway": { "enable": false, @@ -2844,7 +2845,7 @@ "domain": "", "enable": false, "openFirewall": true, - "package": "", + "package": "", "port": 8010, "stunPort": 3478, "verifyClients": false @@ -2857,7 +2858,7 @@ "extraUpFlags": [], "interfaceName": "tailscale0", "openFirewall": false, - "package": "", + "package": "", "permitCertUid": null, "port": 41641, "serve": { diff --git a/goldens/display-2.json b/goldens/display-2.json index 766ea0b..9dc1239 100644 --- a/goldens/display-2.json +++ b/goldens/display-2.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/k2s978i7i26km4cr56fvm64p2q6mpl02-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/99bh37dhcwpwqmr8lvqjf3409skrrg31-systemd-261/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -37,7 +37,7 @@ "path": "/boot" } ], - "populateCmd": "/asm0fgcbzvcprxrx84j4pl876v0al2vl-extlinux-conf-builder.sh -g 20 -t 5", + "populateCmd": "/hx6qza8zhsfahx01bvwzn5z6z590hmph-extlinux-conf-builder.sh -g 20 -t 5", "useGenerationDeviceTree": true }, "grub": { @@ -63,7 +63,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/isz8ngvrfq8fgx7lqsyr26iga00pxb0y-grub-2.12/share/grub/unicode.pf2", + "font": "/n8rccmjfmlyhb9gxb7zhwnsbs3gi4wan-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -78,7 +78,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/l0hgi1928j7j7ansspvrjmrvawsqxfqw-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/n3cp8s9zzchkpqjxf3w04sdcc5zyy77s-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -114,7 +114,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -156,7 +156,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/l0hgi1928j7j7ansspvrjmrvawsqxfqw-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/n3cp8s9zzchkpqjxf3w04sdcc5zyy77s-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -212,11 +212,11 @@ }, "environment.systemPackages": [ "", - "", - "", - "", - "", - "", + "", + "", + "", + "", + "", "", "", "", @@ -245,12 +245,12 @@ "", "", "", - "", + "", "", - "", + "", "", "", - "", + "", "", "", "", @@ -266,17 +266,17 @@ "", "", "", - "", + "", "", "", "", "", "", "", - "", + "", "", "", - "", + "", "", "", "", @@ -291,7 +291,7 @@ "", "", "", - "", + "", "", "", "", @@ -305,17 +305,17 @@ "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -345,7 +345,7 @@ "", "", "", - "", + "", "", "", "", @@ -354,7 +354,7 @@ "", "", "", - "", + "", "", "", "", @@ -362,25 +362,25 @@ "", "", "", - "", + "", "", "", "", - "", - "", + "", + "", "", "", "", "", "", "", - "", - "", + "", + "", "", "", "", "", - "", + "", "" ], "networking.domain": null, @@ -518,8 +518,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/bjwcdygzs2gsbxqh9jyisisafqw7xlpd-iana-etc-20251215/etc/protocols", - "/etc/services": "/bjwcdygzs2gsbxqh9jyisisafqw7xlpd-iana-etc-20251215/etc/services" + "/etc/protocols": "/s99fl7mncpqd7vfv3w5vq63j8l6m3kkq-iana-etc-20251215/etc/protocols", + "/etc/services": "/s99fl7mncpqd7vfv3w5vq63j8l6m3kkq-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -640,7 +640,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/7n510fjz9cxpqgp30b519gdrafcfk0fr-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/jp0m0n6fgnpwrisppg9rr72mvg4k7xg5-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -655,6 +655,7 @@ "virtualHost": "_" }, "group": "nginx", + "gunicornArgs": "", "httpConfig": "", "logError": "stderr", "lua": { @@ -707,7 +708,7 @@ "enable": false, "expectedTailnet": "", "group": "tailscale-nginx-auth", - "package": "", + "package": "", "socketPath": "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock", "user": "tailscale-nginx-auth", "virtualHosts": [] @@ -790,7 +791,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.42:1108\nListenAddress 10.88.127.42:22\nXAuthLocation /nix/store/ybfiby0gg65rfvvf5vjm3ms56ffgkjmm-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.42:1108\nListenAddress 10.88.127.42:22\nXAuthLocation /nix/store/mngzgg3vvndd7dy1w4pwckbav0f4fgwf-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1035,7 +1036,7 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", "passwordAuthentication": false, @@ -1095,7 +1096,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -1113,7 +1114,7 @@ "logFormat": null, "logLevel": "warn", "openFirewall": false, - "package": "", + "package": "", "port": 9093, "user": "", "webExternalUrl": null @@ -1836,7 +1837,7 @@ "listenAddress": "0.0.0.0", "moonrakerApiKey": "", "openFirewall": false, - "package": "", + "package": "", "port": 9101, "user": "klipper-exporter" }, @@ -2651,7 +2652,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/sq7dvsysi26r6wjyxs3bqj6c96f9r0mf-unpoller-loki-default.password", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2677,7 +2678,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/sq7dvsysi26r6wjyxs3bqj6c96f9r0mf-unpoller-loki-default.password", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2795,7 +2796,7 @@ "scrape_timeout": null }, "listenAddress": "0.0.0.0", - "package": "", + "package": "", "port": 9090, "pushgateway": { "enable": false, @@ -2850,7 +2851,7 @@ "domain": "", "enable": false, "openFirewall": true, - "package": "", + "package": "", "port": 8010, "stunPort": 3478, "verifyClients": false @@ -2863,7 +2864,7 @@ "extraUpFlags": [], "interfaceName": "tailscale0", "openFirewall": false, - "package": "", + "package": "", "permitCertUid": null, "port": 41641, "serve": { diff --git a/goldens/gaming-host-1.json b/goldens/gaming-host-1.json index 708fb7c..68d8e4b 100644 --- a/goldens/gaming-host-1.json +++ b/goldens/gaming-host-1.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -65,7 +65,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/vx3l94jmflz9nfmqngv6gp15hj7z4l0n-grub-2.12/share/grub/unicode.pf2", + "font": "/j3j5mhgy5nbzgdri8vpw6bz093vnlspl-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -89,7 +89,7 @@ "path": "/boot" } ], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -100,7 +100,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": false }, "gummiboot": { @@ -124,7 +124,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -166,7 +166,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -228,7 +228,7 @@ "", "", "", - "", + "", "", "", "", @@ -241,18 +241,18 @@ "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", "", "", "", - "", + "", "", "", "", @@ -263,7 +263,7 @@ "", "", "", - "", + "", "", "", "", @@ -303,14 +303,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -318,7 +318,7 @@ "", "", "", - "", + "", "", "", "", @@ -330,7 +330,7 @@ "", "", "", - "", + "", "", "", "", @@ -448,8 +448,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -607,7 +607,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": true, "enableQuicBPF": false, @@ -626,7 +626,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -775,7 +775,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.52:1108\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.52:1108\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1016,9 +1016,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1075,7 +1075,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -2605,7 +2605,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2631,7 +2631,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/local-nas.json b/goldens/local-nas.json index 2b38ce4..0c224af 100644 --- a/goldens/local-nas.json +++ b/goldens/local-nas.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": "1048576", "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -65,7 +65,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/hnh5fn8q6g7fsb3ivqyj4h1v19m47xxg-grub-2.12/share/grub/unicode.pf2", + "font": "/0vm4bh6d11z1psh54kmvyiiqaq4l562j-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -80,7 +80,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -91,7 +91,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": true }, "gummiboot": { @@ -115,7 +115,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -157,7 +157,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -224,7 +224,7 @@ "", "", "", - "", + "", "", "", "", @@ -238,20 +238,20 @@ "", "", "", - "", + "", "", - "", + "", "", "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", "", @@ -266,7 +266,7 @@ "", "", "", - "", + "", "", "", "", @@ -308,14 +308,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -323,7 +323,7 @@ "", "", "", - "", + "", "", "", "", @@ -335,7 +335,7 @@ "", "", "", - "", + "", "", "", "", @@ -536,8 +536,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -658,7 +658,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": true, "enableQuicBPF": false, @@ -677,7 +677,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -778,7 +778,7 @@ "uwsgiPass": null }, "/cgit-static/": { - "alias": "/p8lf4mmc86gzf4xfi8f7lipphsrfvcqg-cgit-1.3.1/cgit/", + "alias": "/zqp438j615j6h0bh2fbzyqpzjj4jgrb4-cgit-1.3.1/cgit/", "basicAuth": {}, "basicAuthFile": null, "extraConfig": "expires 30d;\nadd_header Cache-Control \"public\";\n", @@ -798,7 +798,7 @@ "alias": null, "basicAuth": {}, "basicAuthFile": null, - "extraConfig": "uwsgi_pass unix:/run/uwsgi/cgit.sock;\ninclude /nix/store/0v4nbipvzz3k7aanvfha7nl66wjnl5vw-nginx-1.30.3/conf/uwsgi_params;\nuwsgi_modifier1 9;\nuwsgi_read_timeout 600;\n", + "extraConfig": "uwsgi_pass unix:/run/uwsgi/cgit.sock;\ninclude /nix/store/m0i6rmb5bra23bmyy3kl3dvmnx4bjxk6-nginx-1.30.4/conf/uwsgi_params;\nuwsgi_modifier1 9;\nuwsgi_read_timeout 600;\n", "fastcgiParams": {}, "index": null, "priority": 1000, @@ -815,7 +815,7 @@ "alias": null, "basicAuth": {}, "basicAuthFile": null, - "extraConfig": "uwsgi_pass unix:/run/uwsgi/cgit.sock;\ninclude /nix/store/0v4nbipvzz3k7aanvfha7nl66wjnl5vw-nginx-1.30.3/conf/uwsgi_params;\nuwsgi_modifier1 9;\n", + "extraConfig": "uwsgi_pass unix:/run/uwsgi/cgit.sock;\ninclude /nix/store/m0i6rmb5bra23bmyy3kl3dvmnx4bjxk6-nginx-1.30.4/conf/uwsgi_params;\nuwsgi_modifier1 9;\n", "fastcgiParams": {}, "index": null, "priority": 1000, @@ -882,7 +882,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.3:1108\nListenAddress 10.88.127.3:22\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\n# Only this block applies to connections on port 22\n Match LocalPort 22\n # Allow only git from the VPN subnet\n AllowUsers git@10.88.127.0/24\n\n # Explicitly reinforce (optional but clearer)\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.3:1108\nListenAddress 10.88.127.3:22\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\n# Only this block applies to connections on port 22\n Match LocalPort 22\n # Allow only git from the VPN subnet\n AllowUsers git@10.88.127.0/24\n\n # Explicitly reinforce (optional but clearer)\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1127,9 +1127,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1186,7 +1186,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -2716,7 +2716,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2742,7 +2742,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/print-controller.json b/goldens/print-controller.json index dcd558e..cf98432 100644 --- a/goldens/print-controller.json +++ b/goldens/print-controller.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/k2s978i7i26km4cr56fvm64p2q6mpl02-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/99bh37dhcwpwqmr8lvqjf3409skrrg31-systemd-261/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -37,7 +37,7 @@ "path": "/boot" } ], - "populateCmd": "/asm0fgcbzvcprxrx84j4pl876v0al2vl-extlinux-conf-builder.sh -g 20 -t 5", + "populateCmd": "/hx6qza8zhsfahx01bvwzn5z6z590hmph-extlinux-conf-builder.sh -g 20 -t 5", "useGenerationDeviceTree": true }, "grub": { @@ -63,7 +63,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/isz8ngvrfq8fgx7lqsyr26iga00pxb0y-grub-2.12/share/grub/unicode.pf2", + "font": "/n8rccmjfmlyhb9gxb7zhwnsbs3gi4wan-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -78,7 +78,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/l0hgi1928j7j7ansspvrjmrvawsqxfqw-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/n3cp8s9zzchkpqjxf3w04sdcc5zyy77s-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -114,7 +114,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -156,7 +156,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/l0hgi1928j7j7ansspvrjmrvawsqxfqw-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/n3cp8s9zzchkpqjxf3w04sdcc5zyy77s-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -222,12 +222,12 @@ "", "", "", - "", + "", "", - "", + "", "", "", - "", + "", "", "", "", @@ -235,18 +235,18 @@ "", "", "", - "", + "", "", "", "", "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -259,11 +259,11 @@ "", "", "", - "", + "", "", "", "", - "", + "", "", "", "", @@ -286,7 +286,7 @@ "", "", "", - "", + "", "", "", "", @@ -295,7 +295,7 @@ "", "", "", - "", + "", "", "", "", @@ -303,25 +303,25 @@ "", "", "", - "", + "", "", "", "", - "", - "", + "", + "", "", "", "", "", "", "", - "", - "", + "", + "", "", "", "", "", - "", + "", "" ], "networking.domain": null, @@ -463,8 +463,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/bjwcdygzs2gsbxqh9jyisisafqw7xlpd-iana-etc-20251215/etc/protocols", - "/etc/services": "/bjwcdygzs2gsbxqh9jyisisafqw7xlpd-iana-etc-20251215/etc/services" + "/etc/protocols": "/s99fl7mncpqd7vfv3w5vq63j8l6m3kkq-iana-etc-20251215/etc/protocols", + "/etc/services": "/s99fl7mncpqd7vfv3w5vq63j8l6m3kkq-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -585,7 +585,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/7n510fjz9cxpqgp30b519gdrafcfk0fr-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/jp0m0n6fgnpwrisppg9rr72mvg4k7xg5-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": true, "enableQuicBPF": false, @@ -600,6 +600,7 @@ "virtualHost": "_" }, "group": "nginx", + "gunicornArgs": "", "httpConfig": "", "logError": "stderr", "lua": { @@ -652,7 +653,7 @@ "enable": false, "expectedTailnet": "", "group": "tailscale-nginx-auth", - "package": "", + "package": "", "socketPath": "/run/tailscale-nginx-auth/tailscale-nginx-auth.sock", "user": "tailscale-nginx-auth", "virtualHosts": [] @@ -765,7 +766,7 @@ "redirectCode": 301, "rejectSSL": false, "reuseport": false, - "root": "/jj9hfk5ya5ps694dpmf65c9s0lvx12cx-fluidd-1.36.2/share/fluidd/htdocs", + "root": "/r0yzxc0fm56rg7sxqcvsjhliddj41p10-fluidd-1.36.2/share/fluidd/htdocs", "serverAliases": [], "serverName": null, "sslCertificate": "", @@ -813,7 +814,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.30:1108\nSubsystem sftp /nix/store/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.30:1108\nSubsystem sftp /nix/store/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1054,7 +1055,7 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", "passwordAuthentication": false, @@ -1113,7 +1114,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/mk6ngc1zz5by9qycq2g187k324s0q3vb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -1131,7 +1132,7 @@ "logFormat": null, "logLevel": "warn", "openFirewall": false, - "package": "", + "package": "", "port": 9093, "user": "", "webExternalUrl": null @@ -1854,7 +1855,7 @@ "listenAddress": "0.0.0.0", "moonrakerApiKey": "", "openFirewall": false, - "package": "", + "package": "", "port": 3104, "user": "klipper-exporter" }, @@ -2669,7 +2670,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/sq7dvsysi26r6wjyxs3bqj6c96f9r0mf-unpoller-loki-default.password", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2695,7 +2696,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/sq7dvsysi26r6wjyxs3bqj6c96f9r0mf-unpoller-loki-default.password", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2813,7 +2814,7 @@ "scrape_timeout": null }, "listenAddress": "0.0.0.0", - "package": "", + "package": "", "port": 9090, "pushgateway": { "enable": false, @@ -2868,7 +2869,7 @@ "domain": "", "enable": false, "openFirewall": true, - "package": "", + "package": "", "port": 8010, "stunPort": 3478, "verifyClients": false @@ -2881,7 +2882,7 @@ "extraUpFlags": [], "interfaceName": "tailscale0", "openFirewall": false, - "package": "", + "package": "", "permitCertUid": null, "port": 41641, "serve": { diff --git a/goldens/remote-builder.json b/goldens/remote-builder.json index dfbe4de..ff49f1d 100644 --- a/goldens/remote-builder.json +++ b/goldens/remote-builder.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -63,7 +63,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/vx3l94jmflz9nfmqngv6gp15hj7z4l0n-grub-2.12/share/grub/unicode.pf2", + "font": "/j3j5mhgy5nbzgdri8vpw6bz093vnlspl-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -98,7 +98,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": false }, "gummiboot": { @@ -122,7 +122,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -164,7 +164,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -225,7 +225,7 @@ "", "", "", - "", + "", "", "", "", @@ -241,14 +241,14 @@ "", "", "", - "", + "", "", "", "", "", "", "", - "", + "", "", "", "", @@ -260,7 +260,7 @@ "", "", "", - "", + "", "", "", "", @@ -296,14 +296,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -311,7 +311,7 @@ "", "", "", - "", + "", "", "", "", @@ -323,7 +323,7 @@ "", "", "", - "", + "", "", "", "", @@ -429,8 +429,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -551,7 +551,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -570,7 +570,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -698,7 +698,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.51:1108\nListenAddress 10.88.127.51:22\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.51:1108\nListenAddress 10.88.127.51:22\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -964,9 +964,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1024,7 +1024,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -2554,7 +2554,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2580,7 +2580,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/remote-worker.json b/goldens/remote-worker.json index a82d516..4cf6737 100644 --- a/goldens/remote-worker.json +++ b/goldens/remote-worker.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -64,7 +64,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/vx3l94jmflz9nfmqngv6gp15hj7z4l0n-grub-2.12/share/grub/unicode.pf2", + "font": "/j3j5mhgy5nbzgdri8vpw6bz093vnlspl-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -99,7 +99,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": false }, "gummiboot": { @@ -123,7 +123,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -165,7 +165,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -226,7 +226,7 @@ "", "", "", - "", + "", "", "", "", @@ -242,7 +242,7 @@ "", "", "", - "", + "", "", "", "", @@ -250,7 +250,7 @@ "", "", "", - "", + "", "", "", "", @@ -262,7 +262,7 @@ "", "", "", - "", + "", "", "", "", @@ -301,14 +301,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -316,7 +316,7 @@ "", "", "", - "", + "", "", "", "", @@ -328,7 +328,7 @@ "", "", "", - "", + "", "", "", "", @@ -442,8 +442,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -713,7 +713,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": true, "enableQuicBPF": false, @@ -732,7 +732,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -1314,7 +1314,7 @@ "alias": null, "basicAuth": {}, "basicAuthFile": null, - "extraConfig": "# legacy support (i.e. static files and directories in cfg.package)\nrewrite ^/(?!index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|.+\\/richdocumentscode(_arm64)?\\/proxy) /index.php$request_uri;\ninclude /nix/store/0v4nbipvzz3k7aanvfha7nl66wjnl5vw-nginx-1.30.3/conf/fastcgi.conf;\nfastcgi_split_path_info ^(.+?\\.php)(\\\\/.*)$;\nset $path_info $fastcgi_path_info;\ntry_files $fastcgi_script_name =404;\nfastcgi_param PATH_INFO $path_info;\nfastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;\nfastcgi_param HTTPS on;\nfastcgi_param modHeadersAvailable true;\nfastcgi_param front_controller_active true;\nfastcgi_pass unix:/run/phpfpm/nextcloud.sock;\nfastcgi_intercept_errors on;\nfastcgi_request_buffering off;\nfastcgi_read_timeout 120s;\n", + "extraConfig": "# legacy support (i.e. static files and directories in cfg.package)\nrewrite ^/(?!index|remote|public|cron|core\\/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|.+\\/richdocumentscode(_arm64)?\\/proxy) /index.php$request_uri;\ninclude /nix/store/m0i6rmb5bra23bmyy3kl3dvmnx4bjxk6-nginx-1.30.4/conf/fastcgi.conf;\nfastcgi_split_path_info ^(.+?\\.php)(\\\\/.*)$;\nset $path_info $fastcgi_path_info;\ntry_files $fastcgi_script_name =404;\nfastcgi_param PATH_INFO $path_info;\nfastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;\nfastcgi_param HTTPS on;\nfastcgi_param modHeadersAvailable true;\nfastcgi_param front_controller_active true;\nfastcgi_pass unix:/run/phpfpm/nextcloud.sock;\nfastcgi_intercept_errors on;\nfastcgi_request_buffering off;\nfastcgi_read_timeout 120s;\n", "fastcgiParams": {}, "index": null, "priority": 500, @@ -1432,7 +1432,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.50:1108\nListenAddress 10.88.127.50:22\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.50:1108\nListenAddress 10.88.127.50:22\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1677,9 +1677,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1737,7 +1737,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -3267,7 +3267,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -3293,7 +3293,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/storage-array.json b/goldens/storage-array.json index 846fe6c..36dea7f 100644 --- a/goldens/storage-array.json +++ b/goldens/storage-array.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -69,7 +69,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/hnh5fn8q6g7fsb3ivqyj4h1v19m47xxg-grub-2.12/share/grub/unicode.pf2", + "font": "/0vm4bh6d11z1psh54kmvyiiqaq4l562j-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -84,7 +84,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -95,7 +95,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": true }, "gummiboot": { @@ -119,7 +119,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -161,7 +161,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -213,7 +213,7 @@ "zfs": true }, "environment.systemPackages": [ - "", + "", "", "", "", @@ -229,7 +229,7 @@ "", "", "", - "", + "", "", "", "", @@ -262,7 +262,7 @@ "", "", "", - "", + "", "", "", "", @@ -276,19 +276,19 @@ "", "", "", - "", + "", "", - "", + "", "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", "", @@ -304,9 +304,9 @@ "", "", "", - "", + "", "", - "", + "", "", "", "", @@ -342,14 +342,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -357,7 +357,7 @@ "", "", "", - "", + "", "", "", "", @@ -369,7 +369,7 @@ "", "", "", - "", + "", "", "", "", @@ -659,8 +659,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -781,7 +781,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -800,7 +800,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -928,7 +928,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.4:1108\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.4:1108\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1169,9 +1169,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1228,7 +1228,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -2758,7 +2758,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2784,7 +2784,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/terminal-nx-01.json b/goldens/terminal-nx-01.json index 51c621e..0c42ea9 100644 --- a/goldens/terminal-nx-01.json +++ b/goldens/terminal-nx-01.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -65,7 +65,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/vx3l94jmflz9nfmqngv6gp15hj7z4l0n-grub-2.12/share/grub/unicode.pf2", + "font": "/j3j5mhgy5nbzgdri8vpw6bz093vnlspl-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -80,7 +80,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -91,7 +91,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": false }, "gummiboot": { @@ -115,7 +115,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -157,7 +157,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -231,7 +231,7 @@ "", "", "", - "", + "", "", "", "", @@ -250,15 +250,15 @@ "", "", "", - "", - "", - "", - "", - "", + "", + "", + "", + "", + "", "", "", - "", - "", + "", + "", "", "", "", @@ -272,10 +272,10 @@ "", "", "", - "", - "", + "", + "", "", - "", + "", "", "", "", @@ -299,7 +299,7 @@ "", "", "", - "", + "", "", "", "", @@ -321,7 +321,7 @@ "", "", "", - "", + "", "", "", "", @@ -339,13 +339,13 @@ "", "", "", - "", + "", "", "", "", "", "", - "", + "", "", "", "", @@ -392,14 +392,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -407,7 +407,7 @@ "", "", "", - "", + "", "", "", "", @@ -419,7 +419,7 @@ "", "", "", - "", + "", "", "", "", @@ -608,8 +608,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -730,7 +730,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -749,7 +749,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -877,7 +877,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.21:1108\nListenAddress 10.88.127.21:22\nXAuthLocation /nix/store/xljjnnfq7fc5dcfvq6ypvqwnv12d2jx0-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.21:1108\nListenAddress 10.88.127.21:22\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1122,9 +1122,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1182,7 +1182,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -2712,7 +2712,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2738,7 +2738,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", diff --git a/goldens/terminal-zero.json b/goldens/terminal-zero.json index 0209a4d..e942c1a 100644 --- a/goldens/terminal-zero.json +++ b/goldens/terminal-zero.json @@ -4,7 +4,7 @@ "fs.inotify.max_user_watches": 524288, "kernel.kptr_restrict": 1, "kernel.pid_max": 4194304, - "kernel.poweroff_cmd": "/rd05syhv5v5999907a2n1r37sgi19vpd-systemd-260.2/sbin/poweroff", + "kernel.poweroff_cmd": "/vv5bna641lxwxm0nqgy20134y7wivsvp-systemd-260.2/sbin/poweroff", "kernel.printk": "7 7 7 7", "net.core.rmem_max": null, "net.core.wmem_max": null, @@ -67,7 +67,7 @@ "extraInstallCommands": "", "extraPerEntryConfig": "", "extraPrepareConfig": "", - "font": "/vx3l94jmflz9nfmqngv6gp15hj7z4l0n-grub-2.12/share/grub/unicode.pf2", + "font": "/j3j5mhgy5nbzgdri8vpw6bz093vnlspl-grub-2.12/share/grub/unicode.pf2", "fontSize": null, "forceInstall": false, "forcei686": false, @@ -82,7 +82,7 @@ "params": [] }, "mirroredBoots": [], - "splashImage": "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", + "splashImage": "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png", "splashMode": "normal", "storePath": "/nix/store", "subEntryOptions": "--class nixos", @@ -93,7 +93,7 @@ "useOSProber": false, "users": {}, "version": "", - "zfsPackage": "", + "zfsPackage": "", "zfsSupport": false }, "gummiboot": { @@ -117,7 +117,7 @@ "force": false, "forceMbr": false, "maxGenerations": null, - "package": "", + "package": "", "panicOnChecksumMismatch": false, "partitionIndex": null, "resolution": null, @@ -159,7 +159,7 @@ }, "wallpaperStyle": "stretched", "wallpapers": [ - "/9qhcl1sms7bxa5pcf9k4fj9wvq7fjh1r-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" + "/z6dhhmy6afwq5mlhhl7m9cjmmyxq9b43-simple-dark-gray-bootloader-2018-08-28/share/backgrounds/nixos/nix-wallpaper-simple-dark-gray_bootloader.png" ] }, "validateChecksums": true @@ -235,7 +235,7 @@ "", "", "", - "", + "", "", "", "", @@ -260,11 +260,11 @@ "", "", "", - "", - "", - "", - "", - "", + "", + "", + "", + "", + "", "", "", "", @@ -277,7 +277,7 @@ "", "", "", - "", + "", "", "", "", @@ -300,7 +300,7 @@ "", "", "", - "", + "", "", "", "", @@ -322,7 +322,7 @@ "", "", "", - "", + "", "", "", "", @@ -342,14 +342,14 @@ "", "", "", - "", + "", "", "", "", "", "", "", - "", + "", "", "", "", @@ -397,14 +397,14 @@ "", "", "", - "", - "", - "", + "", + "", + "", "", "", "", "", - "", + "", "", "", "", @@ -412,7 +412,7 @@ "", "", "", - "", + "", "", "", "", @@ -424,7 +424,7 @@ "", "", "", - "", + "", "", "", "", @@ -651,8 +651,8 @@ "checkRuleset": true, "checkRulesetRedirects": { "/etc/hosts": "", - "/etc/protocols": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/protocols", - "/etc/services": "/d8jrr4rj6827s0d5b9baqxrsyafqk6zd-iana-etc-20251215/etc/services" + "/etc/protocols": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/protocols", + "/etc/services": "/55k5zhs3hsxzbwp0acyh0sw8sslgcqig-iana-etc-20251215/etc/services" }, "enable": false, "extraDeletions": "", @@ -773,7 +773,7 @@ "0.0.0.0", "[::0]" ], - "defaultMimeTypes": "/xakkd7mhg6dindq35ji8smr4j9ypwpn7-mailcap-2.1.54/etc/nginx/mime.types", + "defaultMimeTypes": "/46d8jsib4f3adj7qv0ga8929826wlhy8-mailcap-2.1.54/etc/nginx/mime.types", "defaultSSLListenPort": 443, "enable": false, "enableQuicBPF": false, @@ -792,7 +792,7 @@ "logError": "stderr", "mapHashBucketSize": null, "mapHashMaxSize": null, - "package": "", + "package": "", "preStart": "", "prependConfig": "", "proxyResolveWhileRunning": false, @@ -920,7 +920,7 @@ ], "enable": true, "enableRecommendedAlgorithms": true, - "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.20:1108\nXAuthLocation /nix/store/xljjnnfq7fc5dcfvq6ypvqwnv12d2jx0-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", + "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.20:1108\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", "forwardX11": false, "gatewayPorts": "no", "generateHostKeys": true, @@ -1172,9 +1172,9 @@ "hmac-sha2-256-etm@openssh.com", "umac-128-etm@openssh.com" ], - "moduliFile": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/etc/ssh/moduli", + "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, - "package": "", + "package": "", "passwordAuthentication": false, "permitRootLogin": "no", "ports": [ @@ -1231,7 +1231,7 @@ "X11Forwarding": false }, "sftpFlags": [], - "sftpServerExecutable": "/ww2wf5b928m0b53dp2bdifpgqqyfshvb-openssh-10.3p1/libexec/sftp-server", + "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", "startWhenNeeded": true, "useDns": false }, @@ -2761,7 +2761,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", @@ -2787,7 +2787,7 @@ }, "loki": { "interval": "2m", - "pass": "file:///nix/store/7f6gqg68ki7i05b4n24wvsgfmaf21f47-unpoller-loki-default.password", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", "tenant_id": "", "timeout": "10s", "url": "", From 5c8c71abd6b613958f04aacdd5aeee4a2f40b8c0 Mon Sep 17 00:00:00 2001 From: John Bargman Date: Tue, 4 Aug 2026 19:24:00 +0000 Subject: [PATCH 3/6] fixup --- flake.nix | 77 ++++++++++---------------- goldens/LINDA.json | 97 ++++++++++++++++++--------------- goldens/alpha-one.json | 97 ++++++++++++++++++--------------- goldens/alpha-three.json | 97 ++++++++++++++++++--------------- goldens/alpha-two.json | 97 ++++++++++++++++++--------------- goldens/arm-bootstrap.json | 97 ++++++++++++++++++--------------- goldens/arm-builder.json | 97 ++++++++++++++++++--------------- goldens/bargman-greeter-vm.json | 97 ++++++++++++++++++--------------- goldens/beta-one.json | 97 ++++++++++++++++++--------------- goldens/cortex-alpha.json | 97 ++++++++++++++++++--------------- goldens/display-0.json | 97 ++++++++++++++++++--------------- goldens/display-1.json | 97 ++++++++++++++++++--------------- goldens/display-2.json | 97 ++++++++++++++++++--------------- goldens/gaming-host-1.json | 97 ++++++++++++++++++--------------- goldens/local-nas.json | 97 ++++++++++++++++++--------------- goldens/print-controller.json | 97 ++++++++++++++++++--------------- goldens/remote-builder.json | 97 ++++++++++++++++++--------------- goldens/remote-worker.json | 97 ++++++++++++++++++--------------- goldens/storage-array.json | 97 ++++++++++++++++++--------------- goldens/terminal-nx-01.json | 97 ++++++++++++++++++--------------- goldens/terminal-zero.json | 97 ++++++++++++++++++--------------- 21 files changed, 1069 insertions(+), 948 deletions(-) diff --git a/flake.nix b/flake.nix index 0bc91ae..f02ca36 100644 --- a/flake.nix +++ b/flake.nix @@ -815,56 +815,37 @@ text = ''exec deadnix --fail --no-lambda-arg --no-lambda-pattern-names "${self}"''; }; - # Golden validation for all machines - # Compares serialized NixOS config against golden files at build time. - # This is regression testing — completely separate from topology generation. - golden-validation = - let - machines = builtins.attrNames self.nixosConfigurations; - serializer = import ./lib/serialize-config.nix { inherit lib; }; - # Pre-compute JSON for each machine at eval time - # unsafeDiscardStringContext strips derivation references so builtins.toFile accepts the string - machineJsonFiles = lib.genAttrs machines (machine: - let - config = self.nixosConfigurations.${machine}.config; - json = builtins.unsafeDiscardStringContext ( - builtins.toJSON (serializer.serializeConfig config) - ); - in - builtins.toFile "golden-validation-${machine}.json" json - ); - in - nixpkgs.runCommand "golden-validation" - { - buildInputs = [ nixpkgs.jq nixpkgs.diffutils ]; - goldenSrc = "${self}/goldens"; - } - '' - PASS=true - ${lib.concatMapStringsSep "\n" (machine: '' - if [ -f "$goldenSrc/${machine}.json" ]; then - echo "Validating ${machine}..." - ${lib.getExe nixpkgs.jq} -S . < "${machineJsonFiles.${machine}}" > /tmp/current.json - if ${lib.getExe' nixpkgs.diffutils "diff"} -u "$goldenSrc/${machine}.json" /tmp/current.json; then - echo " ✓ ${machine} matches golden" - else - echo " ✗ ${machine} differs from golden!" - PASS=false - fi - else - echo "Skipping ${machine} (no golden file)" - fi - '') machines} - if [ "$PASS" != "true" ]; then - echo "" - echo "Golden validation failed. If changes are intentional, update with:" - echo " nix run .#dump-config -- > goldens/.json" - exit 1 + golden-validation = nixpkgs.writeShellApplication { + name = "run-golden-validation"; + meta.description = "Validate all machine configs against golden files"; + runtimeInputs = [ nixpkgs.jq nixpkgs.diffutils ]; + text = '' + PASS=true + for machine in ${lib.concatStringsSep " " (builtins.attrNames self.nixosConfigurations)}; do + golden="${self}/goldens/$machine.json" + if [ ! -f "$golden" ]; then + echo "Skipping $machine (no golden file)" + continue + fi + echo "Validating $machine..." + current=$(nix run .#dump-config -- "$machine" | ${lib.getExe nixpkgs.jq} -S .) + if echo "$current" | ${lib.getExe' nixpkgs.diffutils "diff"} -u "$golden" -; then + echo " ✓ $machine matches golden" + else + echo " ✗ $machine differs from golden!" + PASS=false fi + done + if [ "$PASS" != "true" ]; then echo "" - echo "All golden validations passed" - touch $out - ''; + echo "Golden validation failed. If intentional, update with:" + echo " nix run .#dump-config -- > goldens/.json" + exit 1 + fi + echo "" + echo "All golden validations passed" + ''; + }; topology-coverage = let diff --git a/goldens/LINDA.json b/goldens/LINDA.json index 254b553..bdcc6eb 100644 --- a/goldens/LINDA.json +++ b/goldens/LINDA.json @@ -98,10 +98,6 @@ "zfsPackage": "", "zfsSupport": true }, - "gummiboot": { - "enable": true, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -117,7 +113,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -1033,13 +1028,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -1161,21 +1149,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.88:1108\nListenAddress 10.88.127.88:22\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -1183,15 +1159,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1433,17 +1400,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1500,8 +1459,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -2208,7 +2166,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2452,7 +2409,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -3234,6 +3190,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/alpha-one.json b/goldens/alpha-one.json index d5f5950..6fefd51 100644 --- a/goldens/alpha-one.json +++ b/goldens/alpha-one.json @@ -90,10 +90,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": true, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -109,7 +105,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -761,13 +756,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -889,21 +877,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.108:1108\nListenAddress 10.88.127.108:22\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -911,15 +887,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1140,17 +1107,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1207,8 +1166,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1915,7 +1873,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2159,7 +2116,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2941,6 +2897,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/alpha-three.json b/goldens/alpha-three.json index 716adc0..5e65506 100644 --- a/goldens/alpha-three.json +++ b/goldens/alpha-three.json @@ -90,10 +90,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": true, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -109,7 +105,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -660,13 +655,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -788,21 +776,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.107:1108\nListenAddress 10.88.127.107:22\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -810,15 +786,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1039,17 +1006,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1106,8 +1065,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1814,7 +1772,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2058,7 +2015,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2840,6 +2796,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/alpha-two.json b/goldens/alpha-two.json index d892d21..ac1d198 100644 --- a/goldens/alpha-two.json +++ b/goldens/alpha-two.json @@ -92,10 +92,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": true, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -111,7 +107,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -645,13 +640,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -773,21 +761,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -795,15 +771,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1036,17 +1003,9 @@ } }, "listenAddresses": [], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1103,8 +1062,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1811,7 +1769,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2055,7 +2012,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2837,6 +2793,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/arm-bootstrap.json b/goldens/arm-bootstrap.json index a71b9c2..91c88b0 100644 --- a/goldens/arm-bootstrap.json +++ b/goldens/arm-bootstrap.json @@ -92,10 +92,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -112,7 +108,6 @@ "extraEntries": "", "extraInstallCommands": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -529,13 +524,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "gunicornArgs": "", "httpConfig": "", @@ -661,21 +649,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": true, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 22\nListenAddress 0.0.0.0:22\nSubsystem sftp /nix/store/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_rsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -688,15 +664,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": true, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": {}, "listenAddresses": [ { @@ -704,17 +671,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 22 ], @@ -766,8 +725,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server", - "startWhenNeeded": false, - "useDns": false + "startWhenNeeded": false }, "services.prometheus": { "alertmanager": { @@ -1474,7 +1432,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -1756,7 +1713,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2529,6 +2485,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/vajjrz3ypd25m5mdbpzwd2av2qn81y2f-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/yh9mv2h2mg3589iqaq7d1v16aipk986h-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/hp3g792kv2qan7f578f3acx4g0n0jvy3-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/arm-builder.json b/goldens/arm-builder.json index d208d60..998e590 100644 --- a/goldens/arm-builder.json +++ b/goldens/arm-builder.json @@ -92,10 +92,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -112,7 +108,6 @@ "extraEntries": "", "extraInstallCommands": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -594,13 +589,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "gunicornArgs": "", "httpConfig": "", @@ -726,21 +714,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.43:1108\nListenAddress 10.88.127.43:22\nSubsystem sftp /nix/store/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -748,15 +724,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -977,17 +944,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1044,8 +1003,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/80j0197d32hvaw845hskik2500dx32c7-openssh-aarch64-unknown-linux-gnu-10.3p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1752,7 +1710,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2034,7 +1991,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2821,6 +2777,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/vajjrz3ypd25m5mdbpzwd2av2qn81y2f-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/yh9mv2h2mg3589iqaq7d1v16aipk986h-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/hp3g792kv2qan7f578f3acx4g0n0jvy3-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/bargman-greeter-vm.json b/goldens/bargman-greeter-vm.json index 8598ee7..af35356 100644 --- a/goldens/bargman-greeter-vm.json +++ b/goldens/bargman-greeter-vm.json @@ -101,10 +101,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -120,7 +116,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -543,13 +538,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -668,21 +656,9 @@ "authorizedKeysCommandUser": "nobody", "authorizedKeysFiles": [], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": true, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": false, "enableRecommendedAlgorithms": true, "extraConfig": "", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": false, "hostKeys": [ { @@ -695,28 +671,11 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": true, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": {}, "listenAddresses": [], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "", "openFirewall": true, "package": "", - "passwordAuthentication": true, - "permitRootLogin": "prohibit-password", "ports": [ 22 ], @@ -762,8 +721,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "", - "startWhenNeeded": false, - "useDns": false + "startWhenNeeded": false }, "services.prometheus": { "alertmanager": { @@ -1470,7 +1428,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -1714,7 +1671,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2482,6 +2438,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": null } diff --git a/goldens/beta-one.json b/goldens/beta-one.json index 2e2a988..eb3ba0f 100644 --- a/goldens/beta-one.json +++ b/goldens/beta-one.json @@ -89,10 +89,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -109,7 +105,6 @@ "extraEntries": "", "extraInstallCommands": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -470,13 +465,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "gunicornArgs": "", "httpConfig": "", @@ -599,21 +587,9 @@ "authorizedKeysCommandUser": "nobody", "authorizedKeysFiles": [], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": true, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": false, "enableRecommendedAlgorithms": true, "extraConfig": "", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": false, "hostKeys": [ { @@ -626,28 +602,11 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": true, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": {}, "listenAddresses": [], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "", "openFirewall": true, "package": "", - "passwordAuthentication": true, - "permitRootLogin": "prohibit-password", "ports": [ 22 ], @@ -693,8 +652,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "", - "startWhenNeeded": false, - "useDns": false + "startWhenNeeded": false }, "services.prometheus": { "alertmanager": { @@ -1401,7 +1359,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -1683,7 +1640,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2456,6 +2412,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/0a021ii62qrr5w60r2z3ypjinrrhlgdy-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/ya9i5x82y19lbvdbyyq5xprqzc74r6vk-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/48zxrh3v7bnpmyw5cyr5rldgp28zh89y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": null } diff --git a/goldens/cortex-alpha.json b/goldens/cortex-alpha.json index c5b8530..b07d70a 100644 --- a/goldens/cortex-alpha.json +++ b/goldens/cortex-alpha.json @@ -96,10 +96,6 @@ "zfsPackage": "", "zfsSupport": true }, - "gummiboot": { - "enable": true, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -115,7 +111,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -1076,13 +1071,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -1742,21 +1730,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -1764,15 +1740,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1984,17 +1951,9 @@ } }, "listenAddresses": [], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -2050,8 +2009,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -2758,7 +2716,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -3002,7 +2959,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -3786,6 +3742,57 @@ }, "useRoutingFeatures": "server" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": { "after": [ "network.target" diff --git a/goldens/display-0.json b/goldens/display-0.json index 059fcfc..5ffa4b5 100644 --- a/goldens/display-0.json +++ b/goldens/display-0.json @@ -92,10 +92,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -112,7 +108,6 @@ "extraEntries": "", "extraInstallCommands": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -536,13 +531,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "gunicornArgs": "", "httpConfig": "", @@ -668,21 +656,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nSubsystem sftp /nix/store/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -690,15 +666,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -910,17 +877,9 @@ } }, "listenAddresses": [], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -976,8 +935,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1684,7 +1642,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -1966,7 +1923,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2753,6 +2709,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/nlqdmndi06s2rafa3xh22ps7lzb6nlg6-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/d8bfjl96pal7gniv94d4gr13j7bgynss-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/display-1.json b/goldens/display-1.json index e90b3b3..5a1c5d5 100644 --- a/goldens/display-1.json +++ b/goldens/display-1.json @@ -92,10 +92,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -112,7 +108,6 @@ "extraEntries": "", "extraInstallCommands": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -641,13 +636,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "gunicornArgs": "", "httpConfig": "", @@ -773,21 +761,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.41:1108\nListenAddress 10.88.127.41:22\nXAuthLocation /nix/store/mngzgg3vvndd7dy1w4pwckbav0f4fgwf-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -795,15 +771,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1024,17 +991,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1091,8 +1050,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1799,7 +1757,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2081,7 +2038,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2868,6 +2824,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/nlqdmndi06s2rafa3xh22ps7lzb6nlg6-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/d8bfjl96pal7gniv94d4gr13j7bgynss-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/display-2.json b/goldens/display-2.json index 9dc1239..5387104 100644 --- a/goldens/display-2.json +++ b/goldens/display-2.json @@ -92,10 +92,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -112,7 +108,6 @@ "extraEntries": "", "extraInstallCommands": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -647,13 +642,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "gunicornArgs": "", "httpConfig": "", @@ -779,21 +767,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.42:1108\nListenAddress 10.88.127.42:22\nXAuthLocation /nix/store/mngzgg3vvndd7dy1w4pwckbav0f4fgwf-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -801,15 +777,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1030,17 +997,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1097,8 +1056,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1805,7 +1763,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2087,7 +2044,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2874,6 +2830,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/nlqdmndi06s2rafa3xh22ps7lzb6nlg6-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/d8bfjl96pal7gniv94d4gr13j7bgynss-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/gaming-host-1.json b/goldens/gaming-host-1.json index 68d8e4b..f0787ef 100644 --- a/goldens/gaming-host-1.json +++ b/goldens/gaming-host-1.json @@ -103,10 +103,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -122,7 +118,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -614,13 +609,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -763,21 +751,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.52:1108\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -785,15 +761,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1010,17 +977,9 @@ "port": 1108 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1076,8 +1035,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1784,7 +1742,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2028,7 +1985,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2810,6 +2766,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/local-nas.json b/goldens/local-nas.json index 0c224af..b6cffe7 100644 --- a/goldens/local-nas.json +++ b/goldens/local-nas.json @@ -94,10 +94,6 @@ "zfsPackage": "", "zfsSupport": true }, - "gummiboot": { - "enable": true, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -113,7 +109,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -665,13 +660,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -870,21 +858,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.3:1108\nListenAddress 10.88.127.3:22\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\n# Only this block applies to connections on port 22\n Match LocalPort 22\n # Allow only git from the VPN subnet\n AllowUsers git@10.88.127.0/24\n\n # Explicitly reinforce (optional but clearer)\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -892,15 +868,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1121,17 +1088,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1187,8 +1146,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1895,7 +1853,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2139,7 +2096,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -3559,6 +3515,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/print-controller.json b/goldens/print-controller.json index cf98432..ffe032b 100644 --- a/goldens/print-controller.json +++ b/goldens/print-controller.json @@ -92,10 +92,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -112,7 +108,6 @@ "extraEntries": "", "extraInstallCommands": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -592,13 +587,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "gunicornArgs": "", "httpConfig": "", @@ -802,21 +790,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.30:1108\nSubsystem sftp /nix/store/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -824,15 +800,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1049,17 +1016,9 @@ "port": 1108 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1115,8 +1074,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/8h31srdw171lk50kws26pjzzpv5p7h0m-openssh-10.3p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1823,7 +1781,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2105,7 +2062,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2892,6 +2848,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/nlqdmndi06s2rafa3xh22ps7lzb6nlg6-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/2a65q8yhawl0r4nd212pk2srpjpk1s2s-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/d8bfjl96pal7gniv94d4gr13j7bgynss-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/remote-builder.json b/goldens/remote-builder.json index ff49f1d..2a6c608 100644 --- a/goldens/remote-builder.json +++ b/goldens/remote-builder.json @@ -101,10 +101,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 1 - }, "initScript": { "enable": false }, @@ -120,7 +116,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -558,13 +553,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -686,21 +674,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.51:1108\nListenAddress 10.88.127.51:22\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -708,15 +684,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -958,17 +925,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1025,8 +984,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1733,7 +1691,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -1977,7 +1934,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2759,6 +2715,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/remote-worker.json b/goldens/remote-worker.json index 4cf6737..850431b 100644 --- a/goldens/remote-worker.json +++ b/goldens/remote-worker.json @@ -102,10 +102,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": false, - "timeout": 1 - }, "initScript": { "enable": false }, @@ -121,7 +117,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -720,13 +715,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -1420,21 +1408,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.50:1108\nListenAddress 10.88.127.50:22\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -1442,15 +1418,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1671,17 +1638,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1738,8 +1697,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -2446,7 +2404,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2690,7 +2647,6 @@ "port": 3105, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -3472,6 +3428,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/storage-array.json b/goldens/storage-array.json index 36dea7f..23e0d35 100644 --- a/goldens/storage-array.json +++ b/goldens/storage-array.json @@ -98,10 +98,6 @@ "zfsPackage": "", "zfsSupport": true }, - "gummiboot": { - "enable": true, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -117,7 +113,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -788,13 +783,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -916,21 +904,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.4:1108\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -938,15 +914,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1163,17 +1130,9 @@ "port": 1108 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1229,8 +1188,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1937,7 +1895,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2181,7 +2138,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2963,6 +2919,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/terminal-nx-01.json b/goldens/terminal-nx-01.json index 0c42ea9..81b168c 100644 --- a/goldens/terminal-nx-01.json +++ b/goldens/terminal-nx-01.json @@ -94,10 +94,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": true, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -113,7 +109,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -737,13 +732,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -865,21 +853,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.21:1108\nListenAddress 10.88.127.21:22\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22 User build Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n\nMatch LocalPort 22\n AllowUsers build\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -887,15 +863,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1116,17 +1083,9 @@ "port": 22 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1183,8 +1142,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1891,7 +1849,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2135,7 +2092,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2917,6 +2873,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } diff --git a/goldens/terminal-zero.json b/goldens/terminal-zero.json index e942c1a..4e08dd4 100644 --- a/goldens/terminal-zero.json +++ b/goldens/terminal-zero.json @@ -96,10 +96,6 @@ "zfsPackage": "", "zfsSupport": false }, - "gummiboot": { - "enable": true, - "timeout": 5 - }, "initScript": { "enable": false }, @@ -115,7 +111,6 @@ "extraConfig": "", "extraEntries": "", "force": false, - "forceMbr": false, "maxGenerations": null, "package": "", "panicOnChecksumMismatch": false, @@ -780,13 +775,6 @@ "enableReload": false, "eventsConfig": "", "experimentalZstdSettings": false, - "gitweb": { - "enable": false, - "group": "nginx", - "location": "/gitweb", - "user": "nginx", - "virtualHost": "_" - }, "group": "nginx", "httpConfig": "", "logError": "stderr", @@ -908,21 +896,9 @@ "/etc/ssh/authorized_keys.d/%u" ], "authorizedKeysInHomedir": true, - "banner": "", - "challengeResponseAuthentication": false, - "ciphers": [ - "chacha20-poly1305@openssh.com", - "aes256-gcm@openssh.com", - "aes128-gcm@openssh.com", - "aes256-ctr", - "aes192-ctr", - "aes128-ctr" - ], "enable": true, "enableRecommendedAlgorithms": true, "extraConfig": "AddressFamily any\nPort 1108\nListenAddress 10.88.127.20:1108\nXAuthLocation /nix/store/v8g0jrwj694rlh071fvmzhkwyv999k7d-xauth-1.1.5/bin/xauth\nSubsystem sftp /nix/store/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server \nAuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u\nHostKey /etc/ssh/ssh_host_ed25519_key\nMatch LocalPort 1108 User inspect Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication no\n\nMatch LocalPort 1108 User deploy Address 10.88.127.0/24\n PermitRootLogin no\n PasswordAuthentication = no\n", - "forwardX11": false, - "gatewayPorts": "no", "generateHostKeys": true, "hostKeys": [ { @@ -930,15 +906,6 @@ "type": "ed25519" } ], - "kbdInteractiveAuthentication": false, - "kexAlgorithms": [ - "mlkem768x25519-sha256", - "sntrup761x25519-sha512", - "sntrup761x25519-sha512@openssh.com", - "curve25519-sha256", - "curve25519-sha256@libssh.org", - "diffie-hellman-group-exchange-sha256" - ], "knownHosts": { "LINDA": { "certAuthority": false, @@ -1166,17 +1133,9 @@ "port": 1108 } ], - "logLevel": "INFO", - "macs": [ - "hmac-sha2-512-etm@openssh.com", - "hmac-sha2-256-etm@openssh.com", - "umac-128-etm@openssh.com" - ], "moduliFile": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/etc/ssh/moduli", "openFirewall": true, "package": "", - "passwordAuthentication": false, - "permitRootLogin": "no", "ports": [ 1108 ], @@ -1232,8 +1191,7 @@ }, "sftpFlags": [], "sftpServerExecutable": "/hv4l15j1pzpf7qi4ci7fr9k4hfg56mj1-openssh-10.4p1/libexec/sftp-server", - "startWhenNeeded": true, - "useDns": false + "startWhenNeeded": true }, "services.prometheus": { "alertmanager": { @@ -1940,7 +1898,6 @@ "user": "kafka-exporter" }, "kea": { - "controlSocketPaths": [], "enable": false, "extraFlags": [], "firewallFilter": null, @@ -2184,7 +2141,6 @@ "port": 9113, "scrapeUri": "http://localhost/nginx_status", "sslVerify": true, - "telemetryEndpoint": "/metrics", "telemetryPath": "/metrics", "user": "nginx-exporter", "warnings": [] @@ -2966,6 +2922,57 @@ }, "useRoutingFeatures": "none" }, + "services.unifi-poller": { + "enable": false, + "influxdb": { + "db": "unifi", + "disable": false, + "interval": "30s", + "pass": "file:///nix/store/35813biqzdgcrb0aqm562vz8vk4smfgf-unpoller-influxdb-default.password", + "url": "http://127.0.0.1:8086", + "user": "unifipoller", + "verify_ssl": true + }, + "loki": { + "interval": "2m", + "pass": "file:///nix/store/i2cd7qzxicmdxmsagdca5gw1ql118nhj-unpoller-loki-default.password", + "tenant_id": "", + "timeout": "10s", + "url": "", + "user": "", + "verify_ssl": false + }, + "poller": { + "debug": false, + "plugins": [], + "quiet": false + }, + "prometheus": { + "disable": false, + "http_listen": "[::]:9130", + "report_errors": false + }, + "unifi": { + "controllers": [], + "defaults": { + "hash_pii": false, + "pass": "file:///nix/store/8bfrhkb2z7alrcb0vrva7gk7sg0q0x6y-unpoller-unifi-default.password", + "save_alarms": false, + "save_anomalies": false, + "save_dpi": false, + "save_events": false, + "save_ids": false, + "save_sites": true, + "sites": [ + "all" + ], + "url": "https://unifi:8443", + "user": "unifi", + "verify_ssl": true + }, + "dynamic": false + } + }, "systemd.services.tailscale-udp-gro": null, "time.timeZone": "Etc/UTC" } From 05bd81ac39349676ea43a10006256aac18dc28a3 Mon Sep 17 00:00:00 2001 From: John Bargman Date: Wed, 5 Aug 2026 16:50:07 +0000 Subject: [PATCH 4/6] idk --- tests/bargman-greeter-login/resources/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/bargman-greeter-login/resources/.gitkeep diff --git a/tests/bargman-greeter-login/resources/.gitkeep b/tests/bargman-greeter-login/resources/.gitkeep deleted file mode 100644 index e69de29..0000000 From 5372bafaf93e3fe92eedf33f212b2bf0a2ac0d64 Mon Sep 17 00:00:00 2001 From: John Bargman Date: Thu, 13 Aug 2026 13:15:49 +0000 Subject: [PATCH 5/6] correct driver for alpha-one --- machines/alpha-one/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/alpha-one/default.nix b/machines/alpha-one/default.nix index eade993..dda909d 100644 --- a/machines/alpha-one/default.nix +++ b/machines/alpha-one/default.nix @@ -41,6 +41,7 @@ graphics.enable = true; graphics.enable32Bit = true; nvidia = { + package = config.boot.kernelPackages.nvidiaPackages.legacy_580; nvidiaSettings = true; open = false; modesetting.enable = false; From a14657fbea981b9200b0361b9f7f7f846bcde02c Mon Sep 17 00:00:00 2001 From: John Bargman Date: Thu, 13 Aug 2026 15:45:20 +0000 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20GIT=5FASKPASS=20path=20=E2=80=94=20u?= =?UTF-8?q?se=20lib.getExe=20for=20writeShellApplication?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 281e9e8 converted gitlabAskpass from writeShellScript (returns file) to writeShellApplication (returns directory with bin/ inside) but kept "${gitlabAskpass}" which resolves to the directory, not the binary. Git tries to exec the directory → "Is a directory" / "Permission denied" → falls back to terminal prompts (disabled in CI) → fatal auth failure. Root cause of intermittent GitLab flake input fetch failures on hate-filled runners. Cache hits masked the issue. --- services/gitlab-runner.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/gitlab-runner.nix b/services/gitlab-runner.nix index c660471..cfb614d 100644 --- a/services/gitlab-runner.nix +++ b/services/gitlab-runner.nix @@ -91,7 +91,7 @@ in tokenFile = config.secrix.system.secrets.github_org_runner_token.decrypted.path; count = 1; extraLabels = [ "self-hosted" ]; - extraEnvironment = { GIT_ASKPASS = "${gitlabAskpass}"; }; + extraEnvironment = { GIT_ASKPASS = lib.getExe gitlabAskpass; }; gitlabNetrcPath' = gitlabNetrcPath; }) // # hate-filled — DarthPJB/NixOS-Configuration (gitlab-aware + eval cache) @@ -102,7 +102,7 @@ in count = 2; extraLabels = [ "self-hosted" ]; extraEnvironment = { - GIT_ASKPASS = "${gitlabAskpass}"; + GIT_ASKPASS = lib.getExe gitlabAskpass; # Persist eval cache and flake input cache across jobs. # Runner HOME is tmpfs (/run/github-runner/...) — ephemeral. # /nix/cache survives reboots and is on the 295GB store disk.