Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 980346592c07
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d2d5e214762
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 4, 2017

  1. networkmanager service: use resolved if enabled

    @florianjacob
    florianjacob committed Jul 4, 2017
    Copy the full SHA
    12f54a5 View commit details

Commits on Jul 8, 2017

  1. Merge pull request #27143 from florianjacob/networkmanager-support-re… 

    …solved

networkmanager service: use resolved if enabled
    @7c6f434c
    7c6f434c authored Jul 8, 2017
    Copy the full SHA
    0d2d5e2 View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 nixos/modules/services/networking/networkmanager.nix
7 changes: 6 additions & 1 deletion nixos/modules/services/networking/networkmanager.nix
View file
Original file line number Diff line number Diff line change
@@ -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 != [])