From 0bfa4ee1f88bb70ac241e8dfb9fdb2b58eb2145b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= <amy@nualeargais.ie>
Date: Tue, 11 Dec 2018 20:02:41 +0000
Subject: [PATCH] Added clarification for NixOS users

---
 pills/02-install-on-your-running.xml | 11 +++++++----
 pills/03-enter-environment.xml       |  6 ++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pills/02-install-on-your-running.xml b/pills/02-install-on-your-running.xml
index 538c4bb..d85a1eb 100644
--- a/pills/02-install-on-your-running.xml
+++ b/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.
+    If you're using NixOS, Nix is already installed;
+    you can skip to the <link
+    linkend="install-on-your-running-system">next</link> pill.
   </para>
 
   <para>
@@ -66,7 +69,7 @@
 
     <para>
       That's the <filename>/nix/store</filename> we
-      were talking in the first article. We're copying in the 
+      were talking in the first article. We're copying in the
       necessary software to bootstrap a Nix system. You can see bash,
       coreutils, the C compiler toolchain, perl libraries, sqlite and Nix itself
       with its own tools and libnix.
@@ -133,7 +136,7 @@
 
     <para>
       A profile in Nix is a general and convenient concept for
-      realizing rollbacks. Profiles are used to compose 
+      realizing rollbacks. Profiles are used to compose
       components that are spread among multiple paths under a new
       unified path. Not only that, but profiles are made up of multiple
       "generations": they are versioned. Whenever you change a profile,
@@ -152,7 +155,7 @@
     <xi:include href="./02/profile.xml" parse="xml" />
     <para>
      That <package>nix-2.1.3</package> derivation in the Nix store is
-     Nix itself, with binaries and libraries. The process of "installing" 
+     Nix itself, with binaries and libraries. The process of "installing"
      the derivation in the profile basically reproduces the hierarchy of the
      <package>nix-2.1.3</package> store derivation in the profile by means of
      symbolic links.
@@ -239,7 +242,7 @@
       does is simply to add <filename>~/.nix-profile/bin</filename> to
       <varname>PATH</varname> and
       <filename>~/.nix-defexpr/channels/nixpkgs</filename> to
-      <varname>NIX_PATH</varname>. We'll discuss 
+      <varname>NIX_PATH</varname>. We'll discuss
       <varname>NIX_PATH</varname> later.
     </para>
 
diff --git a/pills/03-enter-environment.xml b/pills/03-enter-environment.xml
index 2aac0c2..cf3a878 100644
--- a/pills/03-enter-environment.xml
+++ b/pills/03-enter-environment.xml
@@ -325,6 +325,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>