From 0d92a6028c3777e12e4b18b1be16803fca9c90fc Mon Sep 17 00:00:00 2001 From: atlas Date: Sun, 7 Jun 2026 22:11:54 +0200 Subject: [PATCH] =?UTF-8?q?fix(matrix):=20address=20argus=20review=20?= =?UTF-8?q?=E2=80=94=20drop=20in-code=20issue=20tag=20+=20dead=20nameserve?= =?UTF-8?q?rs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove the (#1500) issue tag from the resolv.conf source comment (no-NNN-in-code rule; context lives in the commit/PR/issue link) - drop networking.nameservers from the network.enable branch: resolvconf is disabled, so nothing reads it to synthesise resolv.conf — the static environment.etc."resolv.conf" is the sole source. eval output unchanged (nameserver + options edns0), confirming it was dead config. --- nix/modules/hive-matrix.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nix/modules/hive-matrix.nix b/nix/modules/hive-matrix.nix index 4e620d79..e510de50 100644 --- a/nix/modules/hive-matrix.nix +++ b/nix/modules/hive-matrix.nix @@ -352,7 +352,7 @@ in # The earlier fix turned host-tracking off and trusted resolvconf # to honour `networking.nameservers` — but that's a RUNTIME # resolvconf behaviour, not verifiable at eval time, and it STILL - # came up empty in practice (#1500). So take resolvconf out of the + # came up empty in practice. So take resolvconf out of the # loop entirely and write a STATIC `/etc/resolv.conf` from # `bridgeIp` that nothing regenerates. Eval-proven: the generated # `environment.etc."resolv.conf".text` is `nameserver `. @@ -362,9 +362,11 @@ in # resolv.conf. See `docs/network.md`. networking = lib.mkMerge [ (lib.mkIf networkCfg.enable { + # resolvconf is taken out of the loop entirely; the static + # `environment.etc."resolv.conf"` below is the sole source of + # the resolver file (no `nameservers` — nothing would read it). useHostResolvConf = lib.mkForce false; resolvconf.enable = lib.mkForce false; - nameservers = [ networkCfg.bridgeIp ]; }) (lib.mkIf (!networkCfg.enable) { useHostResolvConf = true;