diff options
author | Reuben D'Netto <rdnetto@gmail.com> | 2018-04-17 09:19:55 +1000 |
---|---|---|
committer | Reuben D'Netto <rdnetto@gmail.com> | 2018-04-17 09:19:55 +1000 |
commit | 7292c5a5701bacc4188a00e0399a92aa748ec6a5 (patch) | |
tree | 3af64eab0636c2aa2f74a1eaca001c3384010302 /nixos | |
parent | 42a84598fb7baacc991c03e228a07a536bc0624a (diff) | |
download | nixpkgs-7292c5a5701bacc4188a00e0399a92aa748ec6a5.tar nixpkgs-7292c5a5701bacc4188a00e0399a92aa748ec6a5.tar.gz nixpkgs-7292c5a5701bacc4188a00e0399a92aa748ec6a5.tar.bz2 nixpkgs-7292c5a5701bacc4188a00e0399a92aa748ec6a5.tar.lz nixpkgs-7292c5a5701bacc4188a00e0399a92aa748ec6a5.tar.xz nixpkgs-7292c5a5701bacc4188a00e0399a92aa748ec6a5.tar.zst nixpkgs-7292c5a5701bacc4188a00e0399a92aa748ec6a5.zip |
Fixed indentation
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/configuration/config-file.xml | 4 | ||||
-rw-r--r-- | nixos/doc/manual/configuration/ipv4-config.xml | 5 | ||||
-rw-r--r-- | nixos/doc/manual/configuration/ipv6-config.xml | 5 | ||||
-rw-r--r-- | nixos/doc/manual/configuration/user-mgmt.xml | 14 | ||||
-rw-r--r-- | nixos/doc/manual/installation/installing-from-other-distro.xml | 10 | ||||
-rw-r--r-- | nixos/doc/manual/installation/installing.xml | 35 |
6 files changed, 41 insertions, 32 deletions
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 60a4dac97d5..d4ca15bb3e7 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -29,8 +29,8 @@ form <literal><replaceable>name</replaceable> = { config, pkgs, ... }: { <xref linkend="opt-services.httpd.enable"/> = true; -<xref linkend="opt-services.httpd.adminAddr"/> = "alice@example.org"; -<xref linkend="opt-services.httpd.documentRoot"/> = "/webroot"; + <xref linkend="opt-services.httpd.adminAddr"/> = "alice@example.org"; + <xref linkend="opt-services.httpd.documentRoot"/> = "/webroot"; } </programlisting> diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index f3ce4af39b9..fbc9695c601 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,7 +12,10 @@ interfaces. However, you can configure an interface manually as follows: <programlisting> -<link linkend="opt-networking.interfaces._name__.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ { address = "192.168.1.2"; prefixLength = 24; } ]; +<link linkend="opt-networking.interfaces._name__.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ { + address = "192.168.1.2"; + prefixLength = 24; +} ]; </programlisting> Typically you’ll also want to set a default gateway and set of name diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index 6b0ba0d48f0..e8960dc8930 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -26,7 +26,10 @@ example, we use interface <varname>eth0</varname>): DHCPv6. You can configure an interface manually: <programlisting> -<link linkend="opt-networking.interfaces._name__.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; +<link linkend="opt-networking.interfaces._name__.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; +} ]; </programlisting> </para> diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 848b221baa7..1456a589411 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -12,13 +12,13 @@ management. In the declarative style, users are specified in states that a user account named <literal>alice</literal> shall exist: <programlisting> -<xref linkend="opt-users.users"/>.alice = - { <link linkend="opt-users.users._name__.isNormalUser">isNormalUser</link> = true; - <link linkend="opt-users.users._name__.home">home</link> = "/home/alice"; - <link linkend="opt-users.users._name__.description">description</link> = "Alice Foobar"; - <link linkend="opt-users.users._name__.extraGroups">extraGroups</link> = [ "wheel" "networkmanager" ]; - <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; - }; +<xref linkend="opt-users.users"/>.alice = { + <link linkend="opt-users.users._name__.isNormalUser">isNormalUser</link> = true; + <link linkend="opt-users.users._name__.home">home</link> = "/home/alice"; + <link linkend="opt-users.users._name__.description">description</link> = "Alice Foobar"; + <link linkend="opt-users.users._name__.extraGroups">extraGroups</link> = [ "wheel" "networkmanager" ]; + <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; +}; </programlisting> Note that <literal>alice</literal> is a member of the diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index 11fcb43732a..7e6ddb05cd6 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -183,7 +183,9 @@ $ sudo groupdel nixbld</screen> account with <literal>sudo passwd -l root</literal> if you use <literal>sudo</literal>)</para> - <programlisting><link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.root.initialHashedPassword</link> = "";</programlisting> + <programlisting> +<link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.root.initialHashedPassword</link> = ""; + </programlisting> </listitem> <listitem> @@ -243,13 +245,15 @@ $ sudo groupdel nixbld</screen> <screen> $ sudo touch /etc/NIXOS -$ sudo touch /etc/NIXOS_LUSTRATE</screen> +$ sudo touch /etc/NIXOS_LUSTRATE + </screen> <para>Let's also make sure the NixOS configuration files are kept once we reboot on NixOS:</para> <screen> -$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE</screen> +$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE + </screen> </listitem> <listitem> diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index f967a7fe268..ba6098d917d 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -273,9 +273,9 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif you to set the password for the <literal>root</literal> user, e.g. <screen> - setting root password... - Enter new UNIX password: *** - Retype new UNIX password: *** +setting root password... +Enter new UNIX password: *** +Retype new UNIX password: *** </screen> <note> @@ -380,25 +380,24 @@ drive (here <filename>/dev/sda</filename>). <xref linkend="ex-config" <example xml:id='ex-config'><title>NixOS Configuration</title> <screen> - { config, pkgs, ... }: - - { - imports = - [ # Include the results of the hardware scan. +{ config, pkgs, ... }: { + imports = [ + # Include the results of the hardware scan. ./hardware-configuration.nix - ]; + ]; - <xref linkend="opt-boot.loader.grub.device"/> = "/dev/sda"; # <lineannotation>(for BIOS systems only)</lineannotation> - <xref linkend="opt-boot.loader.systemd-boot.enable"/> = true; # <lineannotation>(for UEFI systems only)</lineannotation> + <xref linkend="opt-boot.loader.grub.device"/> = "/dev/sda"; # <lineannotation>(for BIOS systems only)</lineannotation> + <xref linkend="opt-boot.loader.systemd-boot.enable"/> = true; # <lineannotation>(for UEFI systems only)</lineannotation> - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #<link linkend="opt-fileSystems._name__.device">fileSystems."/".device</link> = "/dev/disk/by-label/nixos"; + # Note: setting fileSystems is generally not + # necessary, since nixos-generate-config figures them out + # automatically in hardware-configuration.nix. + #<link linkend="opt-fileSystems._name__.device">fileSystems."/".device</link> = "/dev/disk/by-label/nixos"; - # Enable the OpenSSH server. - services.sshd.enable = true; - }</screen> + # Enable the OpenSSH server. + services.sshd.enable = true; +} + </screen> </example> <xi:include href="installing-usb.xml" /> |