summary refs log tree commit diff
path: root/nixos/doc/manual/configuration/network-manager.xml
diff options
context:
space:
mode:
authorLangston Barrett <langston.barrett@gmail.com>2016-09-05 02:13:47 -0700
committerRok Garbas <rok@garbas.si>2016-09-05 11:13:47 +0200
commitee501fd49aabc179e1ccbe08f625f49ab2066173 (patch)
tree68ed58d636cd098b896dfcb8c47be5400300107d /nixos/doc/manual/configuration/network-manager.xml
parent07e76b0738d3250bd90daadafd924f1eb1d85d57 (diff)
downloadnixpkgs-ee501fd49aabc179e1ccbe08f625f49ab2066173.tar
nixpkgs-ee501fd49aabc179e1ccbe08f625f49ab2066173.tar.gz
nixpkgs-ee501fd49aabc179e1ccbe08f625f49ab2066173.tar.bz2
nixpkgs-ee501fd49aabc179e1ccbe08f625f49ab2066173.tar.lz
nixpkgs-ee501fd49aabc179e1ccbe08f625f49ab2066173.tar.xz
nixpkgs-ee501fd49aabc179e1ccbe08f625f49ab2066173.tar.zst
nixpkgs-ee501fd49aabc179e1ccbe08f625f49ab2066173.zip
networkmanager: add information from wiki to docs (#18245)
* networkmanager: add information from wiki to docs

Specifically:
 * mention nmcli, nmtui
 * mention gtk and kde applets

fixes #13273
Diffstat (limited to 'nixos/doc/manual/configuration/network-manager.xml')
-rw-r--r--nixos/doc/manual/configuration/network-manager.xml18
1 files changed, 14 insertions, 4 deletions
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
index b7e47b8729f..dafbcfcb1e5 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -16,12 +16,22 @@ networking.networkmanager.enable = true;
 some desktop managers (e.g., GNOME) enable NetworkManager
 automatically for you.</para>
 
-<para>All users that should have permission to change network settings
-must belong to the <code>networkmanager</code> group.</para>
+<para>All users that should have permission to change network settings must
+belong to the <code>networkmanager</code> group:
+
+<programlisting>
+users.extraUsers.youruser.extraGroups = [ "networkmanager" ];
+</programlisting>
+</para>
+
+<para>NetworkManager is controlled using either <command>nmcli</command> or
+<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.</para>
 
 <note><para><code>networking.networkmanager</code> and
-<code>networking.wireless</code> can not be enabled at the same time:
-you can still connect to the wireless networks using
+<code>networking.wireless</code> (WPA Supplicant) cannot be enabled at the same
+time: you can still connect to the wireless networks using
 NetworkManager.</para></note>
 
 </section>