From d94950e80d049c607b1b803fa1c0a7c42bde289b Mon Sep 17 00:00:00 2001
From: Maurice Zhou <yuchen@apvc.uk>
Date: Wed, 19 Apr 2023 15:29:58 +0200
Subject: [PATCH] Update NixOS index

Co-authored-by: @SuperSandro2000

Closes #424

Signed-off-by: Maurice Zhou <yuchen@apvc.uk>
---
 docs/Getting Started/NixOS/index.rst          | 53 +++++++++++++------
 .../RHEL-based distro/Root on ZFS.rst         |  2 +-
 2 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/docs/Getting Started/NixOS/index.rst b/docs/Getting Started/NixOS/index.rst
index 14341a2..71c75d9 100644
--- a/docs/Getting Started/NixOS/index.rst	
+++ b/docs/Getting Started/NixOS/index.rst	
@@ -28,33 +28,30 @@ Note: this is for installing ZFS on an existing
 NixOS installation. To use ZFS as root file system,
 see below.
 
-Live image ships with ZFS support by default.
+NixOS live image ships with ZFS support by default.
 
 Note that you need to apply these settings even if you don't need
 to boot from ZFS.  The kernel module 'zfs.ko' will not be available
 to modprobe until you make these changes and reboot.
 
-#. Import separate configration file for ZFS options::
+#. Edit ``/etc/nixos/configuration.nix`` and add the following
+   options::
 
-    vim /etc/nixos/configuration.nix
-    ##add './zfs.nix' to 'imports'
-    # imports = [ ./zfs.nix ];
+    boot.supportedFilesystems = [ "zfs" ];
+    boot.zfs.forceImportRoot = false;
+    networking.hostId = "yourHostId";
 
-#. Configure ZFS options::
+   Where hostID can be generated with::
 
-    tee -a /etc/nixos/zfs.nix <<EOF
-    { config, pkgs, ... }:
-
-    {
-      boot.supportedFilesystems = [ "zfs" ];
-      networking.hostId = "$(head -c4 /dev/urandom | od -A none -t x4 | sed 's| ||g')";
-      boot.zfs.forceImportRoot = false;
-    }
-    EOF
+     head -c4 /dev/urandom | od -A none -t x4
 
 #. Apply configuation changes::
 
-    nixos-rebuild switch
+    nixos-rebuild boot
+
+#. Reboot::
+
+     reboot
 
 Root on ZFS
 -----------
@@ -63,3 +60,27 @@ Root on ZFS
    :glob:
 
    *
+
+Contribute
+----------
+
+You can contribute to this documentation.  Fork this repo, edit the
+documentation, then opening a pull request.
+
+#. To test your changes locally, use the devShell in this repo::
+
+    git clone https://github.com/ne9z/nixos-live openzfs-docs-dev
+    cd openzfs-docs-dev
+    nix develop ./openzfs-docs-dev/#docs
+
+#. Inside the openzfs-docs repo, build pages::
+
+     make html
+
+#. Look for errors and warnings in the make output. If there is no
+   errors::
+
+     xdg-open _build/html/index.html
+
+#. ``git commit --signoff`` to a branch, ``git push``, and create a
+   pull request. Mention @ne9z.
diff --git a/docs/Getting Started/RHEL-based distro/Root on ZFS.rst b/docs/Getting Started/RHEL-based distro/Root on ZFS.rst
index e6ee303..743fb2c 100644
--- a/docs/Getting Started/RHEL-based distro/Root on ZFS.rst	
+++ b/docs/Getting Started/RHEL-based distro/Root on ZFS.rst	
@@ -454,7 +454,7 @@ System Configuration
     grub2-pc grub2-pc-modules grub2-efi-x64-modules shim-x64  \
     efibootmgr kernel-core
 
-    .. ifconfig:: zfs_root_test
+   .. ifconfig:: zfs_root_test
 
      # skip installing firmware in test
      dnf -y install --allowerasing --setopt=install_weak_deps=False \