diff options
author | Graham Christensen <graham@grahamc.com> | 2018-01-21 22:40:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-21 22:40:36 -0500 |
commit | 931a0b8be80661902baefb3e7d55403be893e0e6 (patch) | |
tree | a9a97aef9aa3d8871f7d9126fe630158a9a0a772 /nixos | |
parent | d585a3207b4cf83279b12e80d4aed3a21b475de2 (diff) | |
parent | 8b9429008e370a075f6736e10273a0252937e258 (diff) | |
download | nixlib-931a0b8be80661902baefb3e7d55403be893e0e6.tar nixlib-931a0b8be80661902baefb3e7d55403be893e0e6.tar.gz nixlib-931a0b8be80661902baefb3e7d55403be893e0e6.tar.bz2 nixlib-931a0b8be80661902baefb3e7d55403be893e0e6.tar.lz nixlib-931a0b8be80661902baefb3e7d55403be893e0e6.tar.xz nixlib-931a0b8be80661902baefb3e7d55403be893e0e6.tar.zst nixlib-931a0b8be80661902baefb3e7d55403be893e0e6.zip |
Merge pull request #34128 from teto/doc_simple
Doc: simple precisions
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/installation/installing.xml | 5 | ||||
-rw-r--r-- | nixos/modules/config/shells-environment.nix | 2 | ||||
-rw-r--r-- | nixos/modules/programs/zsh/zsh.nix | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index ab9108c30a71..d4746f2eb3a8 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -45,7 +45,10 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif using <command>ifconfig</command>.</para> <para>To manually configure the network on the graphical installer, first disable network-manager with - <command>systemctl stop network-manager</command>.</para></listitem> + <command>systemctl stop network-manager</command>.</para> + <para>To manually configure the wifi on the minimal installer, run + <command>wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' 'key')</command>.</para></listitem> + <listitem><para>If you would like to continue the installation from a different machine you need to activate the SSH daemon via <literal>systemctl start sshd</literal>. diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 65f2e5d7af99..398660967c52 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -36,7 +36,7 @@ in default = {}; description = '' A set of environment variables used in the global environment. - These variables will be set on shell initialisation. + These variables will be set on shell initialisation (e.g. in /etc/profile). The value of each variable can be either a string or a list of strings. The latter is concatenated, interspersed with colon characters. diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 6fb1346bbb33..5102bfef0325 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -36,8 +36,9 @@ in shellAliases = mkOption { default = config.environment.shellAliases; description = '' - Set of aliases for zsh shell. See <option>environment.shellAliases</option> - for an option format description. + Set of aliases for zsh shell. Overrides the default value taken from + <option>environment.shellAliases</option>. + See <option>environment.shellAliases</option> for an option format description. ''; type = types.attrs; # types.attrsOf types.stringOrPath; }; |