summary refs log tree commit diff
path: root/nixos/modules/system/boot/resolved.nix
diff options
context:
space:
mode:
authorBenjamin Staffin <benley@gmail.com>2018-06-29 13:41:46 -0400
committerGitHub <noreply@github.com>2018-06-29 13:41:46 -0400
commitdca7e24a11940477f6a3568fc49bade96ca59514 (patch)
treee59eb29e5bf05e7dbaf62c4539ca9d19a6725383 /nixos/modules/system/boot/resolved.nix
parent25342cd6bd46f12e7e3eda17845615870dc74ee5 (diff)
downloadnixlib-dca7e24a11940477f6a3568fc49bade96ca59514.tar
nixlib-dca7e24a11940477f6a3568fc49bade96ca59514.tar.gz
nixlib-dca7e24a11940477f6a3568fc49bade96ca59514.tar.bz2
nixlib-dca7e24a11940477f6a3568fc49bade96ca59514.tar.lz
nixlib-dca7e24a11940477f6a3568fc49bade96ca59514.tar.xz
nixlib-dca7e24a11940477f6a3568fc49bade96ca59514.tar.zst
nixlib-dca7e24a11940477f6a3568fc49bade96ca59514.zip
networkmanager: Expand dns description, integrate with other services (#41898)
Rather than special-casing the dns options in networkmanager.nix, use
the module system to let unbound and systemd-resolved contribute to
the newtorkmanager config.
Diffstat (limited to 'nixos/modules/system/boot/resolved.nix')
-rw-r--r--nixos/modules/system/boot/resolved.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index 4d9de020c84e..e1095fb988eb 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -147,6 +147,8 @@ in
       ${config.services.resolved.extraConfig}
     '';
 
+    # If networkmanager is enabled, ask it to interface with resolved.
+    networking.networkmanager.dns = "systemd-resolved";
   };
 
 }