nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-22 00:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72951 from jtojnar/nm-prope-merge

Browse Source 
[19.09] nixos/networkmanager: fix merging options
This commit is contained in:
worldofpeace
2019-11-07 00:53:24 +00:00
committed by GitHub
parent 8ed1e7df1f ab7f310079
commit 5b668388bf
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
nixos/modules/services/networking/networkmanager.nix
View File

@@ -515,16 +515,20 @@ in {
aliases = [ "dbus-org.freedesktop.nm-dispatcher.service" ];
};
# Turn off NixOS' network management
networking = {
useDHCP = false;
# use mkDefault to trigger the assertion about the conflict above
wireless.enable = mkDefault false;
} // (mkIf cfg.enableStrongSwan {
networkmanager.packages = [ pkgs.networkmanager_strongswan ];
}) // (mkIf enableIwd {
wireless.iwd.enable = true;
});
# Turn off NixOS' network management when networking is managed entirely by NetworkManager
networking = mkMerge [
{
useDHCP = false;
}
(mkIf cfg.enableStrongSwan {
networkmanager.packages = [ pkgs.networkmanager_strongswan ];
})
(mkIf enableIwd {
wireless.iwd.enable = true;
})
];
security.polkit.extraConfig = polkitConf;