summaryrefslogtreecommitdiffstats
path: root/nixos/doc
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-01-30 05:29:58 -0500
committerworldofpeace <worldofpeace@protonmail.ch>2020-02-01 18:07:10 -0500
commitcbce59a9cc3500d7376f7317faa9e78991648426 (patch)
tree0262ca0c23bfdacdb2b9fa059298a98991c18576 /nixos/doc
parent8539d5f48f9de4ba428d2ca6687712db1d9cb2b7 (diff)
nixos/doc/network-manager: updates
Fixes #71161
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/configuration/network-manager.xml16
1 files changed, 10 insertions, 6 deletions
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
index d103ee249783..3953e0ffe851 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -28,17 +28,21 @@
<command>nmtui</command> (curses-based terminal user interface). See their
manual pages for details on their usage. Some desktop environments (GNOME,
KDE) have their own configuration tools for NetworkManager. On XFCE, there is
- no configuration tool for NetworkManager by default: by adding
- <code>networkmanagerapplet</code> to the list of system packages, the
- graphical applet will be installed and will launch automatically when XFCE is
- starting (and will show in the status tray).
+ no configuration tool for NetworkManager by default: by enabling <xref linkend="opt-programs.nm-applet.enable"/>, the
+ graphical applet will be installed and will launch automatically when the graphical session is started.
</para>
<note>
<para>
<code>networking.networkmanager</code> and <code>networking.wireless</code>
- (WPA Supplicant) cannot be enabled at the same time: you can still connect
- to the wireless networks using NetworkManager.
+ (WPA Supplicant) can be used together if desired. To do this you need to instruct
+ NetworkManager to ignore those interfaces like:
+<programlisting>
+<xref linkend="opt-networking.networkmanager.unmanaged"/> = [
+ "*" "except:type:wwan" "except:type:gsm"
+];
+</programlisting>
+ Refer to the option description for the exact syntax and references to external documentation.
</para>
</note>
</section>