diff --git a/install.sh b/install.sh index d6b3495..00bb2b0 100755 --- a/install.sh +++ b/install.sh @@ -4,47 +4,31 @@ set -e DOTSDIR=$(pwd) -######################### -## gum style variables ## -######################### - -# GUM_SPIN_SPINNER="minidot" -# GUM_SPIN_SHOW_OUTPUT="true" - sudo -v || exit 1 -#################### -## Updating Repos ## -#################### +##################### +## Updating System ## +##################### -sudo pacman -Syy +sudo pacman -Syyu --noconfirm -#################### -## Installing gum ## -#################### +############################# +## Installing dependencies ## +############################# -if ! command -v gum &>/dev/null; then - echo "Installing gum" - sudo pacman -S --needed --noconfirm gum -fi +sudo pacman -S --noconfirm --needed gum stow base-devel git ################################### ## Installing yay & dependencies ## ################################### if ! command -v yay &>/dev/null; then - sudo -v || exit 1 - # gum spin --title "Installing yay dependencies" -- \ - sudo pacman -S base-devel git --needed --noconfirm - 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 sudo -v || exit 1 - # gum spin --title "Installing yay" -- \ makepkg -si --noconfirm fi @@ -89,14 +73,6 @@ mapfile -t extratools < <( "MPV" ) -##################### -## Installing stow ## -##################### - -sudo -v || exit 1 -# gum spin --title "Installing GNU Stow" -- \ -yay -S --needed --noconfirm stow - ###################### ## Applying configs ## ###################### @@ -105,7 +81,6 @@ for choice in "${desktop[@]}"; do case "$choice" in "Niri") sudo -v || exit 1 - # gum spin --title "Installing niri alongside required packages" -- \ yay -S --needed --noconfirm \ niri \ nautilus \ @@ -192,7 +167,6 @@ for choice in "${desktop[@]}"; do ;; "KDE Plasma") sudo -v || exit 1 - # gum spin --title "Installing KDE Plasma" -- \ pacman -S --needed --noconfirm plasma kde-applications sudo systemctl enable sddm ;; @@ -203,7 +177,6 @@ for choice in "${tools[@]}"; do case "$choice" in "Terminal") sudo -v || exit 1 - # gum spin --title "Installing Terminal packages..." -- \ yay -S --needed --noconfirm \ fastfetch \ hyfetch \ @@ -221,11 +194,8 @@ for choice in "${tools[@]}"; do imagemagick \ tree - # sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" - # git clone https://github.com/ohmyzsh/ohmyzsh "$HOME"/.oh-my-zsh stow fastfetch hyfetch nvim zsh --adopt - # gum spin --title "Updating Tealdeer database" -- \ tldr --update chsh -s /bin/zsh "$USER" @@ -233,7 +203,6 @@ for choice in "${tools[@]}"; do "Terminal Emulator") sudo -v || exit 1 - # gum spin --title "Installing Terminal Emulator..." -- \ yay -S --needed --noconfirm \ ghostty stow ghostty --adopt @@ -241,7 +210,6 @@ for choice in "${tools[@]}"; do "Gaming") sudo -v || exit 1 - # gum spin --title "Installing Gaming Packages..." -- \ yay -S --needed --noconfirm \ mangohud \ gamemode \ @@ -261,14 +229,12 @@ for choice in "${tools[@]}"; do sudo -v || exit 1 - # gum spin --spinner minidot --title "Applying arrpy systemd fix..." -- \ sudo cp /usr/lib/systemd/user/arrpc.service /etc/systemd/system/arrpc.service sudo systemctl enable arrpc --now ;; "VR Gaming") sudo -v || exit 1 - # gum spin --title "Installing VR Gaming Packages..." -- \ yay -S --needed --noconfirm \ alvr-launcher-bin \ wayvr @@ -276,7 +242,6 @@ for choice in "${tools[@]}"; do "Hamr Sticker Picker") sudo -v || exit 1 - # gum spin --title "Installing hamr..." -- \ yay -S --needed --noconfirm \ hamr