diff --git a/nixos/doc/manual/configuration/network-manager.section.md b/nixos/doc/manual/configuration/network-manager.section.md new file mode 100644 index 00000000000..f269d5bbd17 --- /dev/null +++ b/nixos/doc/manual/configuration/network-manager.section.md @@ -0,0 +1,42 @@ +# NetworkManager {#sec-networkmanager} + +To facilitate network configuration, some desktop environments use +NetworkManager. You can enable NetworkManager by setting: + +```nix +networking.networkmanager.enable = true; +``` + +some desktop managers (e.g., GNOME) enable NetworkManager automatically +for you. + +All users that should have permission to change network settings must +belong to the `networkmanager` group: + +```nix +users.users.alice.extraGroups = [ "networkmanager" ]; +``` + +NetworkManager is controlled using either `nmcli` or `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 enabling +[`programs.nm-applet.enable`](options.html#opt-programs.nm-applet.enable), the graphical applet will be +installed and will launch automatically when the graphical session is +started. + +::: {.note} +`networking.networkmanager` and `networking.wireless` (WPA Supplicant) +can be used together if desired. To do this you need to instruct +NetworkManager to ignore those interfaces like: + +```nix +networking.networkmanager.unmanaged = [ + "*" "except:type:wwan" "except:type:gsm" +]; +``` + +Refer to the option description for the exact syntax and references to +external documentation. +::: diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml deleted file mode 100644 index 94d229fd803..00000000000 --- a/nixos/doc/manual/configuration/network-manager.xml +++ /dev/null @@ -1,48 +0,0 @@ -
- NetworkManager - - - To facilitate network configuration, some desktop environments use - NetworkManager. You can enable NetworkManager by setting: - - = true; - - some desktop managers (e.g., GNOME) enable NetworkManager automatically for - you. - - - - All users that should have permission to change network settings must belong - to the networkmanager group: - -users.users.alice.extraGroups = [ "networkmanager" ]; - - - - - NetworkManager is controlled using either nmcli or - 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 enabling , the - graphical applet will be installed and will launch automatically when the graphical session is started. - - - - - networking.networkmanager and networking.wireless - (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. - - -
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml index 8369e9c9c85..6b078bb3b6c 100644 --- a/nixos/doc/manual/configuration/networking.xml +++ b/nixos/doc/manual/configuration/networking.xml @@ -8,7 +8,7 @@ This section describes how to configure networking components on your NixOS machine. - + diff --git a/nixos/doc/manual/from_md/configuration/network-manager.section.xml b/nixos/doc/manual/from_md/configuration/network-manager.section.xml new file mode 100644 index 00000000000..fd3f26ab621 --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/network-manager.section.xml @@ -0,0 +1,49 @@ +
+ NetworkManager + + To facilitate network configuration, some desktop environments use + NetworkManager. You can enable NetworkManager by setting: + + +networking.networkmanager.enable = true; + + + some desktop managers (e.g., GNOME) enable NetworkManager + automatically for you. + + + All users that should have permission to change network settings + must belong to the networkmanager group: + + +users.users.alice.extraGroups = [ "networkmanager" ]; + + + NetworkManager is controlled using either nmcli + or 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 enabling + programs.nm-applet.enable, + the graphical applet will be installed and will launch automatically + when the graphical session is started. + + + + networking.networkmanager and + networking.wireless (WPA Supplicant) can be + used together if desired. To do this you need to instruct + NetworkManager to ignore those interfaces like: + + +networking.networkmanager.unmanaged = [ + "*" "except:type:wwan" "except:type:gsm" +]; + + + Refer to the option description for the exact syntax and + references to external documentation. + + +