diff options
author | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-08-04 16:51:47 +0200 |
commit | 2d326e5032fda2210ff84118a526195f0a68bd24 (patch) | |
tree | d3af676b9948c865f1e942e1db51862da5e19ad5 /nixos/doc/manual | |
parent | 9253a95f6b3f65ecc701ebb10620acfb6d251f17 (diff) | |
parent | b35770818d70924b2b71ae41ead270fe0be8c826 (diff) | |
download | nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.gz nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.bz2 nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.lz nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.xz nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.tar.zst nixlib-2d326e5032fda2210ff84118a526195f0a68bd24.zip |
Merge remote-tracking branch 'origin/master' into staging.
Conflicts: pkgs/desktops/e18/enlightenment.nix
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r-- | nixos/doc/manual/configuration.xml | 46 |
1 files changed, 37 insertions, 9 deletions
diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml index 98686a19f1eb..051f0fb8c1e0 100644 --- a/nixos/doc/manual/configuration.xml +++ b/nixos/doc/manual/configuration.xml @@ -1036,21 +1036,22 @@ users.extraUsers.alice = { createHome = true; home = "/home/alice"; description = "Alice Foobar"; - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "networkmanager" ]; useDefaultShell = true; openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; }; </programlisting> Note that <literal>alice</literal> is a member of the -<literal>wheel</literal> group, which allows her to use -<command>sudo</command> to execute commands as -<literal>root</literal>. Also note the SSH public key that allows -remote logins with the corresponding private key. Users created in -this way do not have a password by default, so they cannot log in via -mechanisms that require a password. However, you can use the -<command>passwd</command> program to set a password, which is retained -across invocations of <command>nixos-rebuild</command>.</para> +<literal>wheel</literal> and <literal>networkmanager</literal> groups, +which allows her to use <command>sudo</command> to execute commands as +<literal>root</literal> and to configure the network, respectively. +Also note the SSH public key that allows remote logins with the +corresponding private key. Users created in this way do not have a +password by default, so they cannot log in via mechanisms that require +a password. However, you can use the <command>passwd</command> program +to set a password, which is retained across invocations of +<command>nixos-rebuild</command>.</para> <para>A user ID (uid) is assigned automatically. You can also specify a uid manually by adding @@ -1277,6 +1278,28 @@ services.xserver.synaptics.twoFingerScroll = true; <section xml:id="sec-networking"><title>Networking</title> +<section xml:id="sec-networkmanager"><title>NetworkManager</title> + +<para>To facilitate network configuration, some desktop environments +use NetworkManager. You can enable NetworkManager by setting: + +<programlisting> +services.networkmanager.enable = true; +</programlisting> + +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> + +<note><para><code>services.networkmanager</code> and +<code>services.wireless</code> can not be enabled at the same time: +you can still connect to the wireless networks using +NetworkManager.</para></note> + +</section> + <section xml:id="sec-ssh"><title>Secure shell access</title> <para>Secure shell (SSH) access to your machine can be enabled by @@ -1399,6 +1422,11 @@ always allowed.)</para> <section xml:id="sec-wireless"><title>Wireless networks</title> +<para>For a desktop installation using NetworkManager (e.g., GNOME), +you just have to make sure the user is in the +<code>networkmanager</code> group and you can skip the rest of this +section on wireless networks.</para> + <para> NixOS will start wpa_supplicant for you if you enable this setting: |