summary refs log tree commit diff
path: root/nixos/doc/manual/configuration
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2015-12-29 10:21:38 +0000
committerRobin Gloster <mail@glob.in>2016-01-06 03:58:39 +0000
commitd03b35f881941f57d5159ae0a58b10f7c3142682 (patch)
treeded7cf2873e869b81eb1fa573b97593ce2dceb82 /nixos/doc/manual/configuration
parent3a5f48844593fc129184d00a1ee32717b42e5e57 (diff)
downloadnixpkgs-d03b35f881941f57d5159ae0a58b10f7c3142682.tar
nixpkgs-d03b35f881941f57d5159ae0a58b10f7c3142682.tar.gz
nixpkgs-d03b35f881941f57d5159ae0a58b10f7c3142682.tar.bz2
nixpkgs-d03b35f881941f57d5159ae0a58b10f7c3142682.tar.lz
nixpkgs-d03b35f881941f57d5159ae0a58b10f7c3142682.tar.xz
nixpkgs-d03b35f881941f57d5159ae0a58b10f7c3142682.tar.zst
nixpkgs-d03b35f881941f57d5159ae0a58b10f7c3142682.zip
wpa_supplicant module: add networks option
Diffstat (limited to 'nixos/doc/manual/configuration')
-rw-r--r--nixos/doc/manual/configuration/wireless.xml14
1 files changed, 12 insertions, 2 deletions
diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
index 373a9168cc8..13e4283d241 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -18,8 +18,18 @@ NixOS will start wpa_supplicant for you if you enable this setting:
 networking.wireless.enable = true;
 </programlisting>
 
-NixOS currently does not generate wpa_supplicant's
-configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
+NixOS lets you specify networks for wpa_supplicant declaratively:
+<programlisting>
+networking.wireless.networks = {
+  echelon = {
+    psk = "abcdefgh";
+  };
+  "free.wifi" = {};
+}
+</programlisting>
+
+When no networks are set it will default to using a configuration file at
+<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
 yourself to define wireless networks, WPA keys and so on (see
 wpa_supplicant.conf(5)).
 </para>