From 6d342f51fee31e739a49cd3c0c314cad02da90df Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 24 Jul 2026 23:01:22 +0200
Subject: [PATCH 1/2] Revert "nixos/resolved: apply transformations to keys
 within resolved section"

This reverts commit 66353ca989dd68b3070f8932c048860e8354bc01.

In the meantime a new option was added that consumes the
`transformSettings` function, which broke by looking at just at the
Resolve section.

(cherry picked from commit 9f42db501a7ed2b7fb6094f335e5b56e9b30816b)
---
 nixos/modules/system/boot/resolved.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index 78863eb82b4d..da2b57285a76 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -30,8 +30,9 @@ let
 
   dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries;
 
-  transformSettings = settings: {
-    Resolve = lib.mapAttrs (
+  transformSettings =
+    settings:
+    lib.mapAttrs (
       key: value:
       # concat lists for options that should result in space-separated values
       if
@@ -45,8 +46,7 @@ let
         concatStringsSep " " value
       else
         value
-    ) settings.Resolve;
-  };
+    ) settings;
 
   resolvedConf = settingsToSections (transformSettings cfg.settings);
 in

From 297c33e8b9049eeaff7ee368b087fe2f1c55ca21 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 24 Jul 2026 23:20:46 +0200
Subject: [PATCH 2/2] nixos/systemd-resolved: apply transformation to resolve
 section

In a previous change the transformSettings function was modified to look
at the Resolve section, but since it got a second consumer in the mean
time this regressed. We now target the resolved.conf explicitly instead.

(cherry picked from commit 4e2415b3c27f305c0b809e8a25f65b2e76d46067)
---
 nixos/modules/system/boot/resolved.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index da2b57285a76..f28e8ac87a1d 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -48,7 +48,7 @@ let
         value
     ) settings;
 
-  resolvedConf = settingsToSections (transformSettings cfg.settings);
+  resolvedConf = settingsToSections { Resolve = transformSettings cfg.settings.Resolve; };
 in
 {
   imports = [