Fixed a bit in install.sh and swapped to yay instead of paru

This commit is contained in:
2026-01-08 23:56:10 +01:00
parent d1a696386d
commit bab49aa5d3
2 changed files with 31 additions and 30 deletions

View File

@@ -7,6 +7,7 @@ set -e
######################### #########################
GUM_SPIN_SPINNER="minidot" GUM_SPIN_SPINNER="minidot"
GUM_SPIN_SHOW_OUTPUT="true"
sudo -v sudo -v
@@ -19,34 +20,26 @@ if ! command -v gum &>/dev/null; then
sudo pacman -S gum sudo pacman -S gum
fi fi
#################################### ###################################
## Installing paru & dependencies ## ## Installing yay & dependencies ##
#################################### ###################################
if ! command -v paru &>/dev/null; then if ! command -v yay &>/dev/null; then
sudo -v sudo -v
gum spin --title "Installing paru dependencies" -- \ gum spin --title "Installing yay dependencies" -- \
sudo pacman -S base-devel git --needed --noconfirm sudo pacman -S base-devel git --needed --noconfirm
TEMP_DIR=$(mktemp -d) TEMP_DIR=$(mktemp -d)
gum spin --title "Cloning paru-bin from AUR" -- \ gum spin --title "Cloning yay-bin from AUR" -- \
git clone https://aur.archlinux.org/paru-bin.git $TEMP_DIR/paru-bin git clone https://aur.archlinux.org/yay-bin.git $TEMP_DIR/yay
cd $TEMP_DIR/paru-bin cd $TEMP_DIR/yay
gum spin --title "Installing paru"
sudo -v sudo -v
gum spin --title "Installing yay" -- \
makepkg -si --noconfirm makepkg -si --noconfirm
fi fi
#####################
## Installing stow ##
#####################
sudo -v
gum spin --title "Installing GNU Stow" -- \
paru -S --needed --noconfirm stow
############################# #############################
## Configuration Selection ## ## Configuration Selection ##
############################# #############################
@@ -80,6 +73,14 @@ mapfile -t extratools < <(
"Tailscale" "Tailscale"
) )
#####################
## Installing stow ##
#####################
sudo -v
gum spin --title "Installing GNU Stow" -- \
yay -S --needed --noconfirm stow
###################### ######################
## Applying configs ## ## Applying configs ##
###################### ######################
@@ -89,7 +90,7 @@ for choice in "${desktop[@]}"; do
"Niri") "Niri")
sudo -v sudo -v
gum spin --title "Installing niri alongside required packages" --show-error -- \ gum spin --title "Installing niri alongside required packages" --show-error -- \
paru -S --needed --noconfirm \ yay -S --needed --noconfirm \
niri \ niri \
ly \ ly \
nautilus \ nautilus \
@@ -124,7 +125,7 @@ for choice in "${tools[@]}"; do
"Terminal") "Terminal")
sudo -v sudo -v
gum spin --title "Installing Terminal packages..." -- \ gum spin --title "Installing Terminal packages..." -- \
paru -S --needed --noconfirm \ yay -S --needed --noconfirm \
fastfetch \ fastfetch \
hyfetch \ hyfetch \
neovim \ neovim \
@@ -145,7 +146,7 @@ for choice in "${tools[@]}"; do
"Terminal Emulator") "Terminal Emulator")
sudo -v sudo -v
gum spin --title "Installing Terminal Emulator..." -- \ gum spin --title "Installing Terminal Emulator..." -- \
paru -S --needed --noconfirm \ yay -S --needed --noconfirm \
ghostty ghostty
stow ghostty stow ghostty
;; ;;
@@ -153,7 +154,7 @@ for choice in "${tools[@]}"; do
"Gaming") "Gaming")
sudo -v sudo -v
gum spin --title "Installing Gaming Packages..." -- \ gum spin --title "Installing Gaming Packages..." -- \
paru -S --needed --noconfirm \ yay -S --needed --noconfirm \
mangohud \ mangohud \
gamemode \ gamemode \
steam \ steam \
@@ -171,7 +172,7 @@ for choice in "${tools[@]}"; do
"VR Gaming") "VR Gaming")
sudo -v sudo -v
gum spin --title "Installing VR Gaming Packages..." -- \ gum spin --title "Installing VR Gaming Packages..." -- \
paru -S --needed --noconfirm \ yay -S --needed --noconfirm \
alvr-launcher-bin \ alvr-launcher-bin \
wlx-overlay-s-bin wlx-overlay-s-bin
;; ;;
@@ -179,7 +180,7 @@ for choice in "${tools[@]}"; do
"Hamr Sticker Picker") "Hamr Sticker Picker")
sudo -v sudo -v
gum spin --title "Installing hamr..." -- \ gum spin --title "Installing hamr..." -- \
paru -S --needed --noconfirm \ yay -S --needed --noconfirm \
hamr hamr
stow hamr-sticker-picker stow hamr-sticker-picker
@@ -222,4 +223,4 @@ extpkgstr=$(
sudo -v sudo -v
gum spin --title "Installing extra packages" -- \ gum spin --title "Installing extra packages" -- \
paru -S --needed --noconfirm "$extpkgstr" yay -S --needed --noconfirm "$extpkgstr"

View File

@@ -4,21 +4,21 @@ set -e
DOTFILES_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" DOTFILES_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
if ! command -v paru &>/dev/null; then if ! command -v yay &>/dev/null; then
echo "Installing paru" echo "Installing yay"
sudo pacman -S base-devel git --needed --noconfirm sudo pacman -S base-devel git --needed --noconfirm
TEMP_DIR=$(mktemp -d) TEMP_DIR=$(mktemp -d)
git clone https://aur.archlinux.org/paru-bin.git $TEMP_DIR/paru-bin git clone https://aur.archlinux.org/yay-bin.git $TEMP_DIR/yay-bin
cd $TEMP_DIR/paru-bin cd $TEMP_DIR/yay-bin
makepkg -si --noconfirm makepkg -si --noconfirm
fi fi
echo "Installing packages" echo "Installing packages"
sudo -v sudo -v
paru -S --noconfirm --needed - <$DOTFILES_DIR/packages.txt yay -S --noconfirm --needed - <$DOTFILES_DIR/packages.txt
echo "Changing default shell" echo "Changing default shell"
sudo chsh -s /bin/zsh $USER sudo chsh -s /bin/zsh $USER