Fix some typos, correct mount of user home (hard-code UID/GID for now)

Author: Carl Mitchell

Readme.md

@@ -91,7 +91,7 @@ zpool create -f	-m none	-R /mnt \
     -O xattr=sa                 \
     -O normalization=formD      \
     -O secondarycachne=none     \
-    rpool $ZFS
+    rpool "${ZFS:?}"
 ```
 
 Make ZFS datasets for /nix, /persist, and /home/persist. Datasets under `/rpool/safe` should be backed up,
@@ -121,7 +121,10 @@ mkdir -p /mnt/{nix,home,persist,boot}
 
 Replace `USER` with your username in the following:
 
-`mount -t tmpfs tmpfs /mnt/home/USER`
+```
+mkdir -p /mnt/home/USER
+mount -t tmpfs tmpfs /mnt/home/USER
+```
 
 ```
 mkdir -p /mnt/home/persist
@@ -136,6 +139,8 @@ Make persistent subdirectories:
 ```
 mkdir -p /mnt/persist/etc/{ssh,users,nixos,wireguard,NetworkManager/system-connections}
 mkdir -p /mnt/persist/var/{log,lib/bluetooth}
+mkdir -p /mnt/etc/nixos
+mkdir -p /mnt/var/log
 ```
 
 Bind mount the /etc/nixos and /var/log directories:
@@ -181,6 +186,6 @@ Unmount `/mnt`:
 
 Export the ZFS pool (THIS IS MANDATORY, FAILURE TO EXPORT WILL PREVENT BOOT):
 
-`zfs export rpool`
+`zpool export rpool`
 
 Reboot into your new system!

home-manager/home.nix

@@ -121,6 +121,7 @@
       zsh-autosuggestions
       zsh-syntax-highlighting
       zsh-history-substring-search
+      oh-my-zsh
       nix-zsh-completions
       # cod # Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output, broken
       jq # JSON CLI editor
@@ -132,6 +133,7 @@
       nixpkgs-fmt # Format Nix files
       wl-clipboard # Needed for zellilj option `copy_command = "wl-copy";` which is needed for clipboard to work on Wayland
     ];
+  };
 
   xdg = {
     enable = true;

home-manager/sub-configs/xcompose.nix

@@ -70,4 +70,4 @@
       <Multi_key> <z> <space> : "​" U200B # Zero-width space
     '';
   };
-}
+}

home-manager/sub-configs/zsh.nix

@@ -41,29 +41,5 @@
       ll = "${ls} --all --long --header --group";
     };
 
-    ohMyZsh = {
-      enable = true;
-      # TODO: Customize your plugins, themes, etc.
-      plugins = [
-        "colored-man-pages"
-        "colorize"
-        "command-not-found"
-        "emacs"
-        "git"
-        "git-extras"
-        "history"
-        "man"
-        "rsync"
-        "safe-paste"
-        "scd"
-        "screen"
-        "systemd"
-        "tmux"
-        "urltools"
-        "vi-mode"
-        "z"
-        "zsh-interactive-cd"
-      ];
-    }
   };
 }

nixos/configuration.nix

@@ -230,6 +230,7 @@
   # Enable GnuPG Agent
   programs.gnupg.agent = {
     enable = true;
+    pinentryFlavor = "curses";
     enableSSHSupport = true;
   };
 
@@ -303,7 +304,7 @@
         home = "/home/USER"; # TODO: Set to your username. MUST match the `fileSystems."/home/USER" =` value.
         createHome = true; # Does nothing, due to a bug. https://github.com/NixOS/nixpkgs/pull/223932 should resolve it. Harmless here.
         passwordFile = "/persist/etc/users/USER"; # TODO: Set your username. Be sure to create this *before* rebooting during first install!
-        extraGroups = [ "wheel" "networkmanager" "audio" "dialout" ]; # TODO: add any extra groups, e.g. "docker" for Docker or "dumpcap" for Wireshark
+        extraGroups = [ "wheel" "networkmanager" "audio" "dialout" "dumpcap" ]; # TODO: add any extra groups, e.g. "docker" for Docker or "dumpcap" for Wireshark
         #openssh.authorizedKeys.keys = [ "${AUTHORIZED_SSH_KEY}" ]; # TODO: Add keys that can log into *this* user account from _other_ computers.
       };
     };

nixos/hosts/nix-win-dual-example/default.nix

@@ -41,7 +41,7 @@
   fileSystems."/home/USER" = # TODO: Set your username here. Must match the users.users value.
     { device = "tmpfs";
       fsType = "tmpfs";
-      options = [ "defaults" "size=12G" "mode=700" ]; # TODO: Set the size based on how much space you want ephemeral data to take.
+      options = [ "defaults" "size=12G" "mode=700" "uid=1000" "gid=100" "user" ]; # TODO: Set the size based on how much space you want ephemeral data to take.
     };
 
   fileSystems."/home/persist" =
@@ -59,13 +59,15 @@
     { device = "/persist/etc/nixos";
       fsType = "none";
       options = [ "bind" ];
+      depends = [ "/persist" ];
       neededForBoot = true;
     };
 
   fileSystems."/var/log" =
     { device = "/persist/var/log";
       fsType = "none";
       options = [ "bind" ];
+      depends = [ "/persist" ];
       neededForBoot = true;
     };