From 9cef52ca3f9a758db53a8ccc4a6f2869ba63a92d Mon Sep 17 00:00:00 2001
From: Drew Galbraith <dgalbraith33@gmail.com>
Date: Fri, 17 Nov 2023 19:46:40 -0800
Subject: [PATCH] Update based on lessons from reinstall.

---
 README.md          |  7 ++++++-
 install_desktop.sh | 37 ++++---------------------------------
 install_usr.sh     | 25 +++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 install_usr.sh

diff --git a/README.md b/README.md
index e5c89ad..852e953 100644
--- a/README.md
+++ b/README.md
@@ -54,12 +54,15 @@ Generally follow the configure the system steps in the
 - Enable NetworkManager `systemctl enable NetworkManager.service`
 - Update the initramfs as described 
 [here](https://wiki.archlinux.org/title/Dm-crypt/Encrypting_an_entire_system#Configuring_mkinitcpio)
+- Add `encrypt` after `block` in HOOKS in /etc/mkinitcpio.conf
+- Run `mkinitcpio -P`
 
 - Set the root password
 
 - Run `grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB`
 - Update `/etc/default/grub` to have the line:
 `GRUB_CMDLINE_LINUX="cryptdevice=UUID=device-UUID:root root=/dev/mapper/root"`
+(Get the UUID using blkid /dev/sda2).
 - Run `grub-mkconfig -o /boot/grub/grub.cfg`
 
 - Reboot sucessfully(?) into the new system.
@@ -73,6 +76,7 @@ Connect to wifi
 
 Create a user:
 - `useradd -m -G wheel drew`
+- `passwd drew`
 - `EDITOR=vim visudo` and uncomment the line starting %wheel
 
 Install helpful utilities:
@@ -87,7 +91,8 @@ Reboot and login as the new user.
 
 Clone this git repo at /home/drew/install.
 
-Run `sudo ./install_desktop.sh`
+- Run `sudo ./install_desktop.sh`
+- Run `./install_usr.sh`
 
 # Part 4 - Applications
 
diff --git a/install_desktop.sh b/install_desktop.sh
index 5b9860f..9a2c636 100755
--- a/install_desktop.sh
+++ b/install_desktop.sh
@@ -6,27 +6,16 @@ if [[ $EUID -ne 0 ]]; then
   exit
 fi
 
-
 echo "Installing packages."
 # Base Packages.
-sudo pacman -S which base-devel
+# Go is a dependency of yay
+pacman -S which base-devel go
 
 # Display Elements.
-sudo pacman -S plymouth sddm wayland sway swaybg swaylock swayidle wofi waybar
+pacman -S plymouth sddm wayland sway swaybg swaylock swayidle wofi waybar
 
 # Theming.
-sudo pacman -S ttf-liberation sddm kitty zsh adobe-source-code-pro-fonts ttf-sourcecodepro-nerd ttf-dejavu arc-gtk-theme papirus-icon-theme
-
-
-echo "Installing yay"
-mkdir opt
-pushd opt
-  git clone https://aur.archlinux.org/yay.git
-  pushd yay
-    makepkg -si
-  popd
-popd
-
+pacman -S ttf-liberation sddm kitty zsh adobe-source-code-pro-fonts ttf-sourcecodepro-nerd ttf-dejavu arc-gtk-theme papirus-icon-theme
 
 echo "Installing plymouth"
 # This is likely a bit too brittle.
@@ -35,20 +24,6 @@ mkinitcpio -P
 sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="/GRUB_CMDLINE_LINUX_DEFAULT="splash /' /etc/default/grub
 grub-mkconfig -o /boot/grub/grub.cfg
 
-echo "Installing plymouth theme"
-yay -S plymouth-theme-deus-ex-git
-plymouth-set-default-theme -R deus_ex
-
-echo "Pulling home git config"
-$CONFIG='/usr/bin/git --git-dir=/home/drew/.cfg/ --work-tree=/home/drew'
-git config --global init.defaultBranch main
-mkdir ~/.cfg
-$CONFIG init
-$CONFIG remote add origin https://gitlab.com/dgalbraith33/dotfiles.git
-$CONFIG pull origin main
-$CONFIG submodule update --init
-echo "*" > ~/.gitignore
-
 echo "Enabling SDDM"
 systemctl enable sddm
 yay -S sddm-sugar-dark
@@ -57,13 +32,9 @@ echo "[Theme]\nCurrent=sugar-dark" | tee /etc/sddm.conf.d/theme.conf
 echo "[General]\nDisplayServer=Wayland" | tee /etc/sddm.conf.d/theme.conf
 sed -i 's/ForceHideCompletePassword=false/ForceHideCompletePassword=true/' /usr/share/sddm/themes/sugar-dark/theme.conf
 
-
-
 echo "Giving Sway hardware access."
 usermod -aG seat drew
 systemctl enable seatd.service
 
-
 pacman -S pulseaudio pavucontrol network-manager-applet
 
-echo "3. Add splash to kernel parameters in /etc/default/grub and run grub-mkconfig -o /boot/grub/grub.cfg"
diff --git a/install_usr.sh b/install_usr.sh
new file mode 100644
index 0000000..8f0765e
--- /dev/null
+++ b/install_usr.sh
@@ -0,0 +1,25 @@
+
+echo "Installing yay"
+mkdir opt
+pushd opt
+  git clone https://aur.archlinux.org/yay.git
+  chown -R drew .
+  pushd yay
+    su -c "makepkg -s" drew
+    pacman -U *.tar.zst
+  popd
+popd
+
+echo "Installing plymouth theme"
+su -c "yay -S plymouth-theme-deus-ex-git" drew
+plymouth-set-default-theme -R deus_ex
+
+echo "Pulling home git config"
+$CONFIG='/usr/bin/git --git-dir=/home/drew/.cfg/ --work-tree=/home/drew'
+git config --global init.defaultBranch main
+mkdir ~/.cfg
+$CONFIG init
+$CONFIG remote add origin https://gitlab.com/dgalbraith33/dotfiles.git
+$CONFIG pull origin main
+$CONFIG submodule update --init
+echo "*" > ~/.gitignore