moving things around

13 files changed, 48 insertions, 3 deletions

diff --git a/TODO.org b/TODO.org
index b6faebf..d20199a 100644
--- a/TODO.org
+++ b/TODO.org
@@ -515,3 +515,41 @@ sudo mkarchiso -vo ~/iso/out ~/iso
 ** Info on Local Pacman Cache/Mirror
 [[https://bbs.archlinux.org/viewtopic.php?id=242471][Use pacman cache as local package mirror / Pacman & Package Upgrade Issues / Arch Linux Forums]]
 Captured On: [2024-04-13 Sat 12:07]
+* Arch Install Steps
+** References
+[[https://youtu.be/zQQN3Pj4K0Y?list=PLHlcDXHFansDuXdFbU2XZXoNOGQiq1zr3][Stephen's Tech Talks: Arch Linux the Easy Way: Encrypted Wayland KDE, Timeshift, Working Boot from Snapshots]]
+** Arch Install Choices
+These are saved as "user_configuration.json" and "user_credentials.json" in the assets folder
+
+*** Disk Layout
+- Wipe all selected drives and use a best-effort default partition layout
+- Select btrfs
+- Select "yes" to using BTRFS subvolumes with a default structure
+- Select "yes" to BTRFS compression
+*** Encryption password
+This is the LUKS encryption password. Choose whatever password you like.
+*** Bootloader
+- Select "yes" to "use GRUB as bootloader instead of systemd-boot"
+*** Profile
+- Choose minimal
+*** Kernels
+- Choose linux
+*** Additional Packages
+git neovim openssh terminus-font
+*** Optional Repositories
+Select multilib
+** Chroot Activities
+After checking these items, you can exit and reboot
+*** Check /etc/fstab
+change relatime to noatime for SSD performance
+remove space_cache=v2 as it's redundant
+*** Check /etc/default/grub
+check that encryption is setup properly (look for cryptdevice in grub_cmdline_linux)
+add video=1920x1080 in grub_cmdline_linux_default after "loglevel-3 quiet"
+
+if you modify anything, make sure to type
+
+grub-mkconfig -o /boot/grub/grub.cfg
+*** Check /etc/mkinitcpio.conf
+check MODULES=(btrfs)
+ensure that the HOOKS= line has encrypt before filesystems
diff --git a/Vagrantfile b/assets/Vagrantfile
index f84a67a..f84a67a 100644
--- a/Vagrantfile
+++ b/assets/Vagrantfile
diff --git a/assets/user_credentials.json b/assets/user_credentials.json
new file mode 100644
index 0000000..50e1c64
--- /dev/null
+++ b/assets/user_credentials.json
@@ -0,0 +1,5 @@
+{
+    "!root-password": "cmjdase1n",
+    "!users": [],
+    "encryption_password": "cmjdase1n"
+}
diff --git a/zfs_assets/README.org b/assets/zfs/README.org
index 3a46823..3a46823 100644
--- a/zfs_assets/README.org
+++ b/assets/zfs/README.org
diff --git a/zfs_assets/script b/assets/zfs/script
index 0a19346..0a19346 100644
--- a/zfs_assets/script
+++ b/assets/zfs/script
diff --git a/zfs_assets/stage0.sh b/assets/zfs/stage0.sh
index 74132dc..74132dc 100755
--- a/zfs_assets/stage0.sh
+++ b/assets/zfs/stage0.sh
diff --git a/zfs_assets/stage1.sh b/assets/zfs/stage1.sh
index 392ff74..392ff74 100755
--- a/zfs_assets/stage1.sh
+++ b/assets/zfs/stage1.sh
diff --git a/zfs_assets/stage2.sh b/assets/zfs/stage2.sh
index 6ec1a52..6ec1a52 100755
--- a/zfs_assets/stage2.sh
+++ b/assets/zfs/stage2.sh
diff --git a/zfssetup b/assets/zfssetup
index 6bc95ca..6bc95ca 100755
--- a/zfssetup
+++ b/assets/zfssetup
diff --git a/assets/user_configuration.json b/config.json
index 565d7f6..565d7f6 100644
--- a/assets/user_configuration.json
+++ b/config.json
diff --git a/iso/create-archiso-zfs.sh b/scripts/create-archiso-zfs.sh
index cb12ac3..3028468 100644
--- a/iso/create-archiso-zfs.sh
+++ b/scripts/create-archiso-zfs.sh
@@ -5,10 +5,13 @@
 # Creates an arch linux iso with zfs support. 
 # This script must be run as root.
 
-pacman -Sy --noconfirm archiso
+pacman-key -r DDF7DB817396A49B2A2723F7403BD972F75D9D76
+pacman-key --lsign-key DDF7DB817396A49B2A2723F7403BD972F75D9D76
+
+pacman -Syu --noconfirm archiso
 mkdir ~/iso
 
-# copies the releng profile  
+# copies the releng profile
 cp -r /usr/share/archiso/configs/releng/* ~/iso
 
 # add the archzfs repository to the pacman configuration 
@@ -19,7 +22,6 @@ SigLevel = Optional TrustAll' >> ~/iso/pacman.conf
 
 # tell archiso to install the zfs dkms module and zfs utils to resulting iso
 echo -e '
-linux-lts-headers
 linux-headers
 archzfs-dkms
 zfs-utils' >> ~/iso/packages.x86_64
diff --git a/assets/gitrepos.sh b/scripts/gitrepos.sh
index b33c72c..b33c72c 100755
--- a/assets/gitrepos.sh
+++ b/scripts/gitrepos.sh
diff --git a/assets/post-install.sh b/scripts/post-install.sh
index 57825a5..57825a5 100755
--- a/assets/post-install.sh
+++ b/scripts/post-install.sh