summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2018-08-10 09:38:23 +0000
committerGitHub <noreply@github.com>2018-08-10 09:38:23 +0000
commitf167e8879478a59211cb65085ce8bde099527eba (patch)
tree3e233915a3b42defb436fc1a8cb2680f7db3bacd
parentRevert "scallion: use mono4 (#44744)" (diff)
parentnixos/wireless: add `extraConfig` section to `networking.wireless` (diff)
downloadnixpkgs-f167e8879478a59211cb65085ce8bde099527eba.tar.gz
Merge pull request #44658 from dlahoti/patch-2
add `extraConfig` section to `networking.wireless`
-rw-r--r--nixos/modules/services/networking/wpa_supplicant.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 4bae05b6dd30..c788528fa47b 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -8,6 +8,7 @@ let
${optionalString cfg.userControlled.enable ''
ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
update_config=1''}
+ ${cfg.extraConfig}
${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let
key = if psk != null
then ''"${psk}"''
@@ -165,6 +166,17 @@ in {
description = "Members of this group can control wpa_supplicant.";
};
};
+ extraConfig = mkOption {
+ type = types.str;
+ default = "";
+ example = ''
+ p2p_disabled=1
+ '';
+ description = ''
+ Extra lines appended to the configuration file.
+ See wpa_supplicant.conf(5) for available options.
+ '';
+ };
};
};