pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #34128 from teto/doc_simple

Doc: simple precisions

authored by Graham Christensen and committed by GitHub 931a0b8b d585a320

+8 -4
unified split
+4 -1
nixos/doc/manual/installation/installing.xml
··· 45 using <command>ifconfig</command>.</para> 46 <para>To manually configure the network on the graphical installer, 47 first disable network-manager with 48 - <command>systemctl stop network-manager</command>.</para></listitem> 49 50 <listitem><para>If you would like to continue the installation from a different 51 machine you need to activate the SSH daemon via <literal>systemctl start sshd</literal>.
··· 45 using <command>ifconfig</command>.</para> 46 <para>To manually configure the network on the graphical installer, 47 first disable network-manager with 48 + <command>systemctl stop network-manager</command>.</para> 49 + <para>To manually configure the wifi on the minimal installer, run 50 + <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID' 'key')</command>.</para></listitem> 51 + 52 53 <listitem><para>If you would like to continue the installation from a different 54 machine you need to activate the SSH daemon via <literal>systemctl start sshd</literal>.
+1 -1
nixos/modules/config/shells-environment.nix
··· 36 default = {}; 37 description = '' 38 A set of environment variables used in the global environment. 39 - These variables will be set on shell initialisation. 40 The value of each variable can be either a string or a list of 41 strings. The latter is concatenated, interspersed with colon 42 characters.
··· 36 default = {}; 37 description = '' 38 A set of environment variables used in the global environment. 39 + These variables will be set on shell initialisation (e.g. in /etc/profile). 40 The value of each variable can be either a string or a list of 41 strings. The latter is concatenated, interspersed with colon 42 characters.
+3 -2
nixos/modules/programs/zsh/zsh.nix
··· 36 shellAliases = mkOption { 37 default = config.environment.shellAliases; 38 description = '' 39 - Set of aliases for zsh shell. See <option>environment.shellAliases</option> 40 - for an option format description. 41 ''; 42 type = types.attrs; # types.attrsOf types.stringOrPath; 43 };
··· 36 shellAliases = mkOption { 37 default = config.environment.shellAliases; 38 description = '' 39 + Set of aliases for zsh shell. Overrides the default value taken from 40 + <option>environment.shellAliases</option>. 41 + See <option>environment.shellAliases</option> for an option format description. 42 ''; 43 type = types.attrs; # types.attrsOf types.stringOrPath; 44 };