diff options
author | Robin Gloster <mail@glob.in> | 2019-09-13 13:18:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-13 13:18:14 +0200 |
commit | 7782ffb89a0e6704e7994b877af2d7beb420db7c (patch) | |
tree | 656b6dc187a17036f5d18582dabc80e20e765dd9 /nixos/modules/services/networking/networkmanager.nix | |
parent | d7360620ef989da7ca11fddc246eeb4b5175118d (diff) | |
parent | b4044a3f2a56b95e76e8091a8e5d9c52fa24a3b6 (diff) | |
download | nixlib-7782ffb89a0e6704e7994b877af2d7beb420db7c.tar nixlib-7782ffb89a0e6704e7994b877af2d7beb420db7c.tar.gz nixlib-7782ffb89a0e6704e7994b877af2d7beb420db7c.tar.bz2 nixlib-7782ffb89a0e6704e7994b877af2d7beb420db7c.tar.lz nixlib-7782ffb89a0e6704e7994b877af2d7beb420db7c.tar.xz nixlib-7782ffb89a0e6704e7994b877af2d7beb420db7c.tar.zst nixlib-7782ffb89a0e6704e7994b877af2d7beb420db7c.zip |
Merge pull request #64364 from JohnAZoidberg/nm-wireless
Allow NetworkManager and wireless together
Diffstat (limited to 'nixos/modules/services/networking/networkmanager.nix')
-rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 2061c02fffbd..db4d0e328e2d 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -8,6 +8,8 @@ let dynamicHostsEnabled = cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {}; + delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != []; + # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; @@ -177,10 +179,11 @@ in { basePackages = mkOption { type = types.attrsOf types.package; default = { inherit (pkgs) - networkmanager modemmanager wpa_supplicant crda + networkmanager modemmanager crda networkmanager-openvpn networkmanager-vpnc networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-l2tp networkmanager-iodine; }; + networkmanager-l2tp networkmanager-iodine; } + // optionalAttrs (!delegateWireless) { inherit (pkgs) wpa_supplicant; }; internal = true; }; @@ -377,8 +380,11 @@ in { config = mkIf cfg.enable { assertions = [ - { assertion = config.networking.wireless.enable == false; - message = "You can not use networking.networkmanager with networking.wireless"; + { assertion = config.networking.wireless.enable == true -> cfg.unmanaged != []; + message = '' + You can not use networking.networkmanager with networking.wireless. + Except if you mark some interfaces as <literal>unmanaged</literal> by NetworkManager. + ''; } { assertion = !dynamicHostsEnabled || (dynamicHostsEnabled && cfg.dns == "dnsmasq"); message = '' @@ -491,18 +497,17 @@ in { path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ]; }; - # Turn off NixOS' network management - networking = { + # Turn off NixOS' network management when networking is managed entirely by NetworkManager + networking = (mkIf (!delegateWireless) { useDHCP = false; - # use mkDefault to trigger the assertion about the conflict above + # Use mkDefault to trigger the assertion about the conflict above wireless.enable = mkDefault false; - }; + }) // (mkIf cfg.enableStrongSwan { + networkmanager.packages = [ pkgs.networkmanager_strongswan ]; + }); security.polkit.extraConfig = polkitConf; - networking.networkmanager.packages = - mkIf cfg.enableStrongSwan [ pkgs.networkmanager_strongswan ]; - services.dbus.packages = optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages; |