diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-03 01:57:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-03 01:57:22 +0000 |
commit | c76a1ea594e81fc6cc0afa401354790147ad8741 (patch) | |
tree | 24c7cca49b8f0eef1b52500f64c1b3ef004ee165 | |
parent | 5edb20533d1bfcf002582193459df2150d19769a (diff) | |
parent | 86dea5559fca96d9d4d96a485027b7f4cd253e77 (diff) | |
download | nixlib-c76a1ea594e81fc6cc0afa401354790147ad8741.tar nixlib-c76a1ea594e81fc6cc0afa401354790147ad8741.tar.gz nixlib-c76a1ea594e81fc6cc0afa401354790147ad8741.tar.bz2 nixlib-c76a1ea594e81fc6cc0afa401354790147ad8741.tar.lz nixlib-c76a1ea594e81fc6cc0afa401354790147ad8741.tar.xz nixlib-c76a1ea594e81fc6cc0afa401354790147ad8741.tar.zst nixlib-c76a1ea594e81fc6cc0afa401354790147ad8741.zip |
Merge pull request #68147 from colemickens/nixpkgs-nm-iwd
nixos/networkmanager: allow iwd as Wi-Fi backend
-rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 09f36aaf8b32..176d26e07b04 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -15,13 +15,15 @@ let networkmanager-openconnect networkmanager-openvpn networkmanager-vpnc - ] ++ optional (!delegateWireless) wpa_supplicant; + ] ++ optional (!delegateWireless && !enableIwd) wpa_supplicant; dynamicHostsEnabled = cfg.dynamicHosts.enable && cfg.dynamicHosts.hostsDirs != {}; delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != []; + enableIwd = cfg.wifi.backend == "iwd"; + # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; @@ -50,6 +52,7 @@ let [device] wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"} + wifi.backend=${cfg.wifi.backend} ${cfg.extraConfig} ''; @@ -236,6 +239,15 @@ in { wifi = { macAddress = macAddressOpt; + backend = mkOption { + type = types.enum [ "wpa_supplicant" "iwd" ]; + default = "wpa_supplicant"; + description = '' + Specify the Wi-Fi backend used for the device. + Currently supported are <option>wpa_supplicant</option> or <option>iwd</option> (experimental). + ''; + }; + powersave = mkOption { type = types.nullOr types.bool; default = null; @@ -390,7 +402,7 @@ in { { assertion = !dynamicHostsEnabled || (dynamicHostsEnabled && cfg.dns == "dnsmasq"); message = '' To use networking.networkmanager.dynamicHosts you also need to set - networking.networkmanager.dns = "dnsmasq" + `networking.networkmanager.dns = "dnsmasq"` ''; } ]; @@ -510,6 +522,8 @@ in { wireless.enable = mkDefault false; }) // (mkIf cfg.enableStrongSwan { networkmanager.packages = [ pkgs.networkmanager_strongswan ]; + }) // (mkIf enableIwd { + wireless.iwd.enable = true; }); security.polkit.extraConfig = polkitConf; |