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

pyrox.dev / nixpkgs

fork atom

lol

fork atom

networkmanager service: use resolved if enabled

authored by

Michael Raskin and committed by

GitHub 8 years ago 0d2d5e21 98034659

+6 -1

1 changed file

expand all

unified split

nixos

modules

services

networking

networkmanager.nix

+6 -1

nixos/modules/services/networking/networkmanager.nix

··· 9 # /var/lib/misc is for dnsmasq.leases. 10 stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; 11 12 configFile = writeText "NetworkManager.conf" '' 13 [main] 14 plugins=keyfile 15 dhcp=${cfg.dhcp} 16 - dns=${if cfg.useDnsmasq then "dnsmasq" else "default"} 17 18 [keyfile] 19 ${optionalString (cfg.unmanaged != [])

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