From cbce59a9cc3500d7376f7317faa9e78991648426 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 30 Jan 2020 05:29:58 -0500 Subject: nixos/doc/network-manager: updates Fixes #71161 --- nixos/doc/manual/configuration/network-manager.xml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'nixos/doc') 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 @@ nmtui (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 - networkmanagerapplet 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 , the + graphical applet will be installed and will launch automatically when the graphical session is started. networking.networkmanager and networking.wireless - (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: + + = [ + "*" "except:type:wwan" "except:type:gsm" +]; + + Refer to the option description for the exact syntax and references to external documentation. -- cgit v1.2.3