Merge branch 'main' into rotom

install.sh

@@ -2,12 +2,14 @@
 
 set -e
 
+DOTSDIR=$(pwd)
+
 #########################
 ## gum style variables ##
 #########################
 
-GUM_SPIN_SPINNER="minidot"
-GUM_SPIN_SHOW_OUTPUT="true"
+# GUM_SPIN_SPINNER="minidot"
+# GUM_SPIN_SHOW_OUTPUT="true"
 
 sudo -v || exit 1
 
@@ -32,16 +34,16 @@ if ! command -v yay &>/dev/null; then
   TEMP_DIR=$(mktemp -d)
 
   # gum spin --title "Cloning yay-bin from AUR" -- \
-  git clone https://aur.archlinux.org/yay-bin.git $TEMP_DIR/yay
-  cd $TEMP_DIR/yay
+  git clone https://aur.archlinux.org/yay-bin.git "$TEMP_DIR"/yay
+  cd "$TEMP_DIR"/yay
 
   sudo -v || exit 1
   # gum spin --title "Installing yay" -- \
   makepkg -si --noconfirm
-
-  cd -
 fi
 
+cd "$DOTSDIR"
+
 #############################
 ## Configuration Selection ##
 #############################
@@ -104,10 +106,10 @@ for choice in "${desktop[@]}"; do
       qt6ct-kde \
       xdg-desktop-portal-gnome
 
-    stow niri qt6ct --adopt
-
     curl -fsSL https://install.danklinux.com | sh
 
+    stow niri qt6ct --adopt
+
     xdg-mime default org.gnome.nautilus.desktop inode/directory
 
     sudo systemctl enable ly@tty1
@@ -144,6 +146,8 @@ for choice in "${tools[@]}"; do
 
     # gum spin --title "Updating Tealdeer database" -- \
     tldr --update
+
+    chsh -S /bin/zsh "$USER"
     ;;
 
   "Terminal Emulator")
@@ -225,7 +229,7 @@ extpkgstr=$(
 )
 
 sudo -v || exit 1
-# gum spin --title "Installing extra packages" -- \
 yay -S --needed --noconfirm "$extpkgstr"
 
+git add .
 git reset --hard HEAD