diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index fa670b41116..f1f8c9722e0 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -91,11 +91,29 @@ let default = "preserve"; example = "00:11:22:33:44:55"; description = '' - "XX:XX:XX:XX:XX:XX": MAC address of the interface. - permanent: use the permanent MAC address of the device. - preserve: don’t change the MAC address of the device upon activation. - random: generate a randomized value upon each connect. - stable: generate a stable, hashed MAC address. + Set the MAC address of the interface. + + + "XX:XX:XX:XX:XX:XX" + MAC address of the interface + + + "permanent" + Use the permanent MAC address of the device + + + "preserve" + Don’t change the MAC address of the device upon activation + + + "random" + Generate a randomized value upon each connect + + + "stable" + Generate a stable, hashed MAC address + + ''; }; @@ -124,6 +142,16 @@ in { default = ""; description = '' Configuration appended to the generated NetworkManager.conf. + Refer to + + https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html + + or + + NetworkManager.conf + 5 + + for more information. ''; }; @@ -132,8 +160,16 @@ in { default = []; description = '' List of interfaces that will not be managed by NetworkManager. - Interface name can be specified here, but if you need more fidelity - see "Device List Format" in NetworkManager.conf man page. + Interface name can be specified here, but if you need more fidelity, + refer to + + https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html#device-spec + + or the "Device List Format" Appendix of + + NetworkManager.conf + 5 + . ''; }; @@ -220,67 +256,15 @@ in { Set the DNS (resolv.conf) processing mode. - Options: - - - "default" - - NetworkManager will update /etc/resolv.conf to - reflect the nameservers provided by currently active connections. - - - - "dnsmasq" - - - Enable NetworkManager's dnsmasq integration. NetworkManager will - run dnsmasq as a local caching nameserver, using a "split DNS" - configuration if you are connected to a VPN, and then update - resolv.conf to point to the local nameserver. - - - It is possible to pass custom options to the dnsmasq instance by - adding them to files in the - /etc/NetworkManager/dnsmasq.d/ directory. - - - When multiple upstream servers are available, dnsmasq will - initially contact them in parallel and then use the fastest to - respond, probing again other servers after some time. This - behavior can be modified passing the - all-servers or strict-order - options to dnsmasq (see the manual page for more details). - - - Note that this option causes NetworkManager to launch and manage - its own instance of the dnsmasq daemon, which is - not the same as setting - services.dnsmasq.enable = true;. - - - - - "unbound" - - NetworkManager will talk to unbound and dnssec-triggerd, - providing a "split DNS" configuration with DNSSEC support. - /etc/resolv.conf will be managed by - dnssec-trigger daemon. - - - - "systemd-resolved" - - NetworkManager will push the DNS configuration to systemd-resolved. - - - - "none" - - NetworkManager will not modify resolv.conf. - - - + A description of these modes can be found in the main section of + + https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html + + or in + + NetworkManager.conf + 5 + . ''; };