From bc6b58687e7f84f8a604dd04fe00a104e9c5bde7 Mon Sep 17 00:00:00 2001 From: Philip Munksgaard Date: Fri, 20 Oct 2017 11:00:19 +0200 Subject: [PATCH 1/6] Fix installation section ordering --- pills/02-install-on-your-running.xml | 43 ++++++++++++---------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/pills/02-install-on-your-running.xml b/pills/02-install-on-your-running.xml index 01edcea..fdffabc 100644 --- a/pills/02-install-on-your-running.xml +++ b/pills/02-install-on-your-running.xml @@ -26,7 +26,25 @@
- Download + Download and Installation + + + To ensure we don't mess with the system, we can create a + custom user, called nix, to let him own the Nix store. + It is possible to follow the pills without creating this user, but we + recommend doing so. + + + + As root: + + + + + + From now on, all the operations we do on the shell are done from + this nix user. + You can grab the nix installation script (nix 1.11.5 during this @@ -41,29 +59,6 @@ here: https://nixos.org/nix/download.html. -
- -
- Installation - - - To ensure we don't mess with the system, you could create a - custom user to let him own the Nix store, let's call it - nix. - - - - As root: - - - - - - From now on, all the operations we do on the shell are done from - this nix user: - - - My pills are not a simple tutorial, there's are several articles From 17be5e65335f15eb2dda31b0817c4805a495601d Mon Sep 17 00:00:00 2001 From: Philip Munksgaard Date: Fri, 20 Oct 2017 13:56:37 +0200 Subject: [PATCH 2/6] Remove unnecessary paragraph --- pills/02-install-on-your-running.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pills/02-install-on-your-running.xml b/pills/02-install-on-your-running.xml index fdffabc..374cc68 100644 --- a/pills/02-install-on-your-running.xml +++ b/pills/02-install-on-your-running.xml @@ -46,12 +46,6 @@ this nix user. - - You can grab the nix installation script (nix 1.11.5 during this - writing) here: https://nixos.org/nix/install. - - One way to install is simply to run curl https://nixos.org/nix/install | sh as a non-root user. You may prefer to download the installation script and verify its integrity From 0adec7659d0670d8375c64dc3cd2cec4ee279294 Mon Sep 17 00:00:00 2001 From: Philip Munksgaard Date: Fri, 20 Oct 2017 13:58:28 +0200 Subject: [PATCH 3/6] Slight rewording of installation paragraph --- pills/02-install-on-your-running.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pills/02-install-on-your-running.xml b/pills/02-install-on-your-running.xml index 374cc68..8bedd8f 100644 --- a/pills/02-install-on-your-running.xml +++ b/pills/02-install-on-your-running.xml @@ -47,11 +47,11 @@ - One way to install is simply to run curl https://nixos.org/nix/install | sh as a non-root user. You may prefer - to download the installation script and verify its integrity - using GPG signatures, instructions for doing that can be found - here: https://nixos.org/nix/download.html. + To install Nix, run curl https://nixos.org/nix/install | sh + as a non-root user and follow the instructions. Alternatively, you may + prefer to download the installation script and verify its integrity using + GPG signatures. Instructions for doing so can be found here: https://nixos.org/nix/download.html. From 859b063cdf7d3ba4e7eda9e8b907f6107cfe63a3 Mon Sep 17 00:00:00 2001 From: Philip Munksgaard Date: Fri, 20 Oct 2017 14:00:15 +0200 Subject: [PATCH 4/6] Remove part about creating a separate nix user --- pills/02-install-on-your-running.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pills/02-install-on-your-running.xml b/pills/02-install-on-your-running.xml index 8bedd8f..4baf9a5 100644 --- a/pills/02-install-on-your-running.xml +++ b/pills/02-install-on-your-running.xml @@ -28,24 +28,6 @@
Download and Installation - - To ensure we don't mess with the system, we can create a - custom user, called nix, to let him own the Nix store. - It is possible to follow the pills without creating this user, but we - recommend doing so. - - - - As root: - - - - - - From now on, all the operations we do on the shell are done from - this nix user. - - To install Nix, run curl https://nixos.org/nix/install | sh as a non-root user and follow the instructions. Alternatively, you may From 92b10d06dfb90ab6da2877e976263f30209b5b3f Mon Sep 17 00:00:00 2001 From: Philip Munksgaard Date: Fri, 20 Oct 2017 14:05:20 +0200 Subject: [PATCH 5/6] Remove obsolete files These files are obsolete as of 859b063 --- pills/02/add-user-chown.txt | 2 -- pills/02/extract-as-nix.txt | 4 ---- 2 files changed, 6 deletions(-) delete mode 100644 pills/02/add-user-chown.txt delete mode 100644 pills/02/extract-as-nix.txt diff --git a/pills/02/add-user-chown.txt b/pills/02/add-user-chown.txt deleted file mode 100644 index eaf5b80..0000000 --- a/pills/02/add-user-chown.txt +++ /dev/null @@ -1,2 +0,0 @@ -# adduser nix -# mkdir -m 0755 /nix && chown nix /nix diff --git a/pills/02/extract-as-nix.txt b/pills/02/extract-as-nix.txt deleted file mode 100644 index 115eb9c..0000000 --- a/pills/02/extract-as-nix.txt +++ /dev/null @@ -1,4 +0,0 @@ -# su - nix -$ tar -xf nix-1.7-x86_64-linux.tar.bz2 -$ cd nix-1.7-x86_64-linux -$ ./install From 322cc3ac1ff3e0bb82f57a504d522f8ab707350c Mon Sep 17 00:00:00 2001 From: Philip Munksgaard Date: Fri, 20 Oct 2017 14:08:52 +0200 Subject: [PATCH 6/6] Rename Download and Installation -> Installation --- pills/02-install-on-your-running.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pills/02-install-on-your-running.xml b/pills/02-install-on-your-running.xml index 4baf9a5..b3ede9b 100644 --- a/pills/02-install-on-your-running.xml +++ b/pills/02-install-on-your-running.xml @@ -26,7 +26,7 @@
- Download and Installation + Installation To install Nix, run curl https://nixos.org/nix/install | sh