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 f5c1354cb4
commit 83126e504a
2 changed files with 31 additions and 30 deletions

View File

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