diff options
| author | Florian Jacob <projects+git@florianjacob.de> | 2017-06-30 15:55:40 +0200 |
|---|---|---|
| committer | Florian Jacob <projects+git@florianjacob.de> | 2017-07-04 23:50:56 +0200 |
| commit | 12f54a57467acb9f3a44cd0959a4e32c591856e1 (patch) | |
| tree | f25faf421c6c5859a0f11393a6e69367b84b8590 /nixos/modules/services/networking/networkmanager.nix | |
| parent | a5a98f98a05ed73d45e52b9409b8a494d9ce072a (diff) | |
| download | nixlib-12f54a57467acb9f3a44cd0959a4e32c591856e1.tar nixlib-12f54a57467acb9f3a44cd0959a4e32c591856e1.tar.gz nixlib-12f54a57467acb9f3a44cd0959a4e32c591856e1.tar.bz2 nixlib-12f54a57467acb9f3a44cd0959a4e32c591856e1.tar.lz nixlib-12f54a57467acb9f3a44cd0959a4e32c591856e1.tar.xz nixlib-12f54a57467acb9f3a44cd0959a4e32c591856e1.tar.zst nixlib-12f54a57467acb9f3a44cd0959a4e32c591856e1.zip | |
networkmanager service: use resolved if enabled
Diffstat (limited to 'nixos/modules/services/networking/networkmanager.nix')
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 58c93d8e2ac3..cbe8d059c840 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -9,11 +9,16 @@ let # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; + dns = + if cfg.useDnsmasq then "dnsmasq" + else if config.services.resolved.enable then "systemd-resolved" + else "default"; + configFile = writeText "NetworkManager.conf" '' [main] plugins=keyfile dhcp=${cfg.dhcp} - dns=${if cfg.useDnsmasq then "dnsmasq" else "default"} + dns=${dns} [keyfile] ${optionalString (cfg.unmanaged != []) |