diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-02-01 18:08:48 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-01 18:08:48 -0500 |
commit | 9cb395a4e779adc92332ffe5fae93353f99a6065 (patch) | |
tree | 04bb1ae926a0d27953aeae1a0e7f38375001af21 /nixos | |
parent | 22c56b847e6c86c3e8ef442e7e05c0fcd775f5f5 (diff) | |
parent | cbce59a9cc3500d7376f7317faa9e78991648426 (diff) | |
download | nixpkgs-9cb395a4e779adc92332ffe5fae93353f99a6065.tar nixpkgs-9cb395a4e779adc92332ffe5fae93353f99a6065.tar.gz nixpkgs-9cb395a4e779adc92332ffe5fae93353f99a6065.tar.bz2 nixpkgs-9cb395a4e779adc92332ffe5fae93353f99a6065.tar.lz nixpkgs-9cb395a4e779adc92332ffe5fae93353f99a6065.tar.xz nixpkgs-9cb395a4e779adc92332ffe5fae93353f99a6065.tar.zst nixpkgs-9cb395a4e779adc92332ffe5fae93353f99a6065.zip |
Merge pull request #78838 from worldofpeace/nm-doc-update
nixos/doc/network-manager: updates
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/configuration/network-manager.xml | 16 |
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 d103ee24978..3953e0ffe85 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> |