From 4a22d7f9af7b6184f5bfff860f791b8e2353dbdf Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Fri, 16 Oct 2020 15:31:37 +0200
Subject: [PATCH] Update installation instructions

---
 README.md | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index bc603dd..338b916 100644
--- a/README.md
+++ b/README.md
@@ -55,37 +55,32 @@ repository to your new home directory (e.g. `/mnt/home/simon/nixos`).
 Add a symlink as the global configuration
 
     sudo mkdir -p /mnt/etc/nixos/
-    sudo ln -s /mnt/home/simon/nixos/machines/nunotaba/configuration.nix /mnt/etc/nixos/configuration.nix
+    sudo ln -s ../../home/simon/nixos/machines/nunotaba/configuration.nix /mnt/etc/nixos/configuration.nix
 
 Generate hardware configuration and copy hardware configuration to machine
 configuration
 
     sudo nixos-generate-config --root /mnt/
-    sudo cp /mnt/etc/nixos/hardware-configuration.nix /mnt/home/simon/nixos/machines/nunotaba/hardware-configuration.nix
-
-Install NixOS and reboot (if you do not have another machine, omit
-`--no-root-passwd`)
+    sudo mv /mnt/etc/nixos/hardware-configuration.nix /mnt/home/simon/nixos/machines/nunotaba/hardware-configuration.nix
+    sudo ln -s ../../home/simon/nixos/machines/nunotaba/hardware-configuration.nix /mnt/etc/nixos/hardware-configuration.nix
 
+Install NixOS
     sudo nixos-install --no-root-passwd
-    sudo reboot
 
-**Hint**: If you need to reboot to the installation system because something
-didn’t work, first open the luks partition like in the setup script, run `sudo
-vgchange -ay` to scan for LVM VGs and then mount the other filesystems like in
-the script.
+Enter the target as a container, set a user password and clone the dotfiles
 
-SSH into the machine (or login locally if you set a root password), set a user
-password and clone the dotfiles
-
-    ssh root@machine
-    rm /etc/nixos/configuration.nix
+    sudo cp /etc/resolv.conf /mnt/etc/ # see https://github.com/NixOS/nixpkgs/issues/39665
+    nixos-enter
     passwd simon
-    ^D
-    ssh simon@machine
+    su simon
     # press “q” to get rid of zsh-newuser-install
     git clone https://github.com/andsens/homeshick.git $HOME/.homesick/repos/homeshick
     source $HOME/.homesick/repos/homeshick/homeshick.sh
     homeshick clone https://git.sbruder.de/simon/dotfiles
+    ^D # user
+    ^D # nixos-enter
+    sudo rm /mnt/etc/resolv.conf
+    reboot
 
 ## How to add new device