lol

Merge pull request #27143 from florianjacob/networkmanager-support-resolved

networkmanager service: use resolved if enabled

authored by

Michael Raskin and committed by
GitHub
0d2d5e21 98034659

+6 -1
+6 -1
nixos/modules/services/networking/networkmanager.nix
··· 9 9 # /var/lib/misc is for dnsmasq.leases. 10 10 stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; 11 11 12 + dns = 13 + if cfg.useDnsmasq then "dnsmasq" 14 + else if config.services.resolved.enable then "systemd-resolved" 15 + else "default"; 16 + 12 17 configFile = writeText "NetworkManager.conf" '' 13 18 [main] 14 19 plugins=keyfile 15 20 dhcp=${cfg.dhcp} 16 - dns=${if cfg.useDnsmasq then "dnsmasq" else "default"} 21 + dns=${dns} 17 22 18 23 [keyfile] 19 24 ${optionalString (cfg.unmanaged != [])