diff options
Diffstat (limited to 'nixos/doc/manual/installation')
-rw-r--r-- | nixos/doc/manual/installation/changing-config.xml | 8 | ||||
-rw-r--r-- | nixos/doc/manual/installation/installing-uefi.xml | 2 | ||||
-rw-r--r-- | nixos/doc/manual/installation/installing.xml | 38 | ||||
-rw-r--r-- | nixos/doc/manual/installation/upgrading.xml | 12 |
4 files changed, 30 insertions, 30 deletions
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml index aa31742434e4..43b591a1cae9 100644 --- a/nixos/doc/manual/installation/changing-config.xml +++ b/nixos/doc/manual/installation/changing-config.xml @@ -10,7 +10,7 @@ contains the current configuration of your machine. Whenever you’ve changed something to that file, you should do <screen> -$ nixos-rebuild switch</screen> +# nixos-rebuild switch</screen> to build the new configuration, make it the default configuration for booting, and try to realise the configuration in the running system @@ -23,7 +23,7 @@ either run them from a root shell or by prefixing them with <para>You can also do <screen> -$ nixos-rebuild test</screen> +# nixos-rebuild test</screen> to build the configuration and switch the running system to it, but without making it the boot default. So if (say) the configuration @@ -33,7 +33,7 @@ configuration.</para> <para>There is also <screen> -$ nixos-rebuild boot</screen> +# nixos-rebuild boot</screen> to build the configuration and make it the boot default, but not switch to it now (so it will only take effect after the next @@ -44,7 +44,7 @@ of the GRUB 2 boot screen by giving it a different <emphasis>profile name</emphasis>, e.g. <screen> -$ nixos-rebuild switch -p test </screen> +# nixos-rebuild switch -p test </screen> which causes the new configuration (and previous ones created using <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml index 1cb431129448..927648febc50 100644 --- a/nixos/doc/manual/installation/installing-uefi.xml +++ b/nixos/doc/manual/installation/installing-uefi.xml @@ -5,7 +5,7 @@ xml:id="sec-uefi-installation"> <title>UEFI Installation</title> - + <para>NixOS can also be installed on UEFI systems. The procedure is by and large the same as a BIOS installation, with the following changes: diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 3e53062c3e84..2f118d27b1a5 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -54,7 +54,7 @@ changes. For example: <screen> -$ mkfs.ext4 -L nixos /dev/sda1</screen> +# mkfs.ext4 -L nixos /dev/sda1</screen> </para></listitem> @@ -66,10 +66,10 @@ $ mkfs.ext4 -L nixos /dev/sda1</screen> <listitem><para>For creating LVM volumes, the LVM commands, e.g., <screen> -$ pvcreate /dev/sda1 /dev/sdb1 -$ vgcreate MyVolGroup /dev/sda1 /dev/sdb1 -$ lvcreate --size 2G --name bigdisk MyVolGroup -$ lvcreate --size 1G --name smalldisk MyVolGroup</screen> +# pvcreate /dev/sda1 /dev/sdb1 +# vgcreate MyVolGroup /dev/sda1 /dev/sdb1 +# lvcreate --size 2G --name bigdisk MyVolGroup +# lvcreate --size 1G --name smalldisk MyVolGroup</screen> </para></listitem> @@ -84,7 +84,7 @@ $ lvcreate --size 1G --name smalldisk MyVolGroup</screen> be installed on <filename>/mnt</filename>, e.g. <screen> -$ mount /dev/disk/by-label/nixos /mnt +# mount /dev/disk/by-label/nixos /mnt </screen> </para></listitem> @@ -113,14 +113,14 @@ $ mount /dev/disk/by-label/nixos /mnt generate an initial configuration file for you: <screen> -$ nixos-generate-config --root /mnt</screen> +# nixos-generate-config --root /mnt</screen> You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your needs: <screen> -$ nano /mnt/etc/nixos/configuration.nix +# nano /mnt/etc/nixos/configuration.nix </screen> If you’re using the graphical ISO image, other editors may be @@ -162,7 +162,7 @@ $ nano /mnt/etc/nixos/configuration.nix <listitem><para>Do the installation: <screen> -$ nixos-install</screen> +# nixos-install</screen> Cross fingers. If this fails due to a temporary problem (such as a network issue while downloading binaries from the NixOS binary @@ -186,7 +186,7 @@ Retype new UNIX password: *** <listitem><para>If everything went well: <screen> -$ reboot</screen> +# reboot</screen> </para></listitem> @@ -235,15 +235,15 @@ drive (here <filename>/dev/sda</filename>). <xref linkend="ex-config" <example xml:id='ex-install-sequence'><title>Commands for Installing NixOS on <filename>/dev/sda</filename></title> <screen> -$ fdisk /dev/sda # <lineannotation>(or whatever device you want to install on)</lineannotation> -$ mkfs.ext4 -L nixos /dev/sda1 -$ mkswap -L swap /dev/sda2 -$ swapon /dev/sda2 -$ mount /dev/disk/by-label/nixos /mnt -$ nixos-generate-config --root /mnt -$ nano /mnt/etc/nixos/configuration.nix -$ nixos-install -$ reboot</screen> +# fdisk /dev/sda # <lineannotation>(or whatever device you want to install on)</lineannotation> +# mkfs.ext4 -L nixos /dev/sda1 +# mkswap -L swap /dev/sda2 +# swapon /dev/sda2 +# mount /dev/disk/by-label/nixos /mnt +# nixos-generate-config --root /mnt +# nano /mnt/etc/nixos/configuration.nix +# nixos-install +# reboot</screen> </example> <example xml:id='ex-config'><title>NixOS Configuration</title> diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index c4812cc637c3..65d395b0c88e 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -60,33 +60,33 @@ the <literal>nixos-14.12</literal> channel. To see which NixOS channel you’re subscribed to, run the following as root: <screen> -$ nix-channel --list | grep nixos +# nix-channel --list | grep nixos nixos https://nixos.org/channels/nixos-unstable </screen> To switch to a different NixOS channel, do <screen> -$ nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos +# nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos </screen> (Be sure to include the <literal>nixos</literal> parameter at the end.) For instance, to use the NixOS 14.12 stable channel: <screen> -$ nix-channel --add https://nixos.org/channels/nixos-14.12 nixos +# nix-channel --add https://nixos.org/channels/nixos-14.12 nixos </screen> If you have a server, you may want to use the “small” channel instead: <screen> -$ nix-channel --add https://nixos.org/channels/nixos-14.12-small nixos +# nix-channel --add https://nixos.org/channels/nixos-14.12-small nixos </screen> And if you want to live on the bleeding edge: <screen> -$ nix-channel --add https://nixos.org/channels/nixos-unstable nixos +# nix-channel --add https://nixos.org/channels/nixos-unstable nixos </screen> </para> @@ -95,7 +95,7 @@ $ nix-channel --add https://nixos.org/channels/nixos-unstable nixos channel by running <screen> -$ nixos-rebuild switch --upgrade +# nixos-rebuild switch --upgrade </screen> which is equivalent to the more verbose <literal>nix-channel --update |