Merge pull request #97 from mhwombat/master

Added clarification for NixOS users

pills/02-install-on-your-running.xml

@@ -15,6 +15,9 @@
   <para>
     Now we'll install Nix on our running system and understand what
     changed in our system after the installation.
+    <emphasis role="bold">If you're using NixOS, Nix is already installed;
+    you can skip to the <link
+    linkend="install-on-your-running-system">next</link> pill.</emphasis>
   </para>
 
   <para>

pills/03-enter-environment.xml

@@ -16,6 +16,11 @@
   <section>
     <title>Enter the environment</title>
 
+    <para>
+      <emphasis role="bold">If you're using NixOS, you can skip to the <link
+      linkend="install-something">next</link> step.</emphasis>
+    </para>
+
     <para>
       In the previous article we created a Nix user, so let's start by switching
       to it with <command>su - nix</command>. If your
@@ -36,7 +41,7 @@
     </para>
   </section>
 
-  <section>
+  <section xml:id="install-something">
     <title>Install something</title>
 
     <para>
@@ -325,6 +330,12 @@
 
     <screen><xi:include href="./03/channel-list.txt" parse="text" /></screen>
 
+    <para>
+      If you're using NixOS, you may not see any output from the above command
+      (if you're using the default), or you may see a channel whose
+      name begins with "nixos-" instead of "nixpkgs".
+    </para>
+
     <para>
       That's essentially the contents of <filename>~/.nix-channels</filename>.
     </para>