fix cline-desktop and voxtype
This commit is contained in:
@@ -68,6 +68,7 @@ if [ ! -f "packages.conf" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
source packages.conf
|
source packages.conf
|
||||||
|
source remove-packages.conf
|
||||||
|
|
||||||
echo "Starting full system setup..."
|
echo "Starting full system setup..."
|
||||||
|
|
||||||
@@ -101,6 +102,11 @@ else
|
|||||||
echo "yay is already installed."
|
echo "yay is already installed."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Remove replaced packages first, so their replacements don't conflict with them
|
||||||
|
echo "Removing unwanted packages..."
|
||||||
|
remove_packages "${REMOVE_PACMAN[@]}"
|
||||||
|
remove_flatpaks "${REMOVE_FLATPAKS[@]}"
|
||||||
|
|
||||||
# Install packages grouped by category as defined in packages.conf
|
# Install packages grouped by category as defined in packages.conf
|
||||||
echo "Installing system utilities..."
|
echo "Installing system utilities..."
|
||||||
install_packages "${SYSTEM_UTILS[@]}"
|
install_packages "${SYSTEM_UTILS[@]}"
|
||||||
|
|||||||
+4
-6
@@ -84,10 +84,6 @@ DEV_TOOLS=(
|
|||||||
# The source-built herdr pins an exact zig version that Arch rarely ships
|
# The source-built herdr pins an exact zig version that Arch rarely ships
|
||||||
herdr-bin
|
herdr-bin
|
||||||
hugo
|
hugo
|
||||||
# cline-desktop's build aborts without an appindicator library (its PKGBUILD
|
|
||||||
# only lists one as optional); also its tray icon. Here so it's installed
|
|
||||||
# before DESKTOP builds cline-desktop.
|
|
||||||
libayatana-appindicator
|
|
||||||
neovim
|
neovim
|
||||||
nodejs
|
nodejs
|
||||||
npm
|
npm
|
||||||
@@ -124,7 +120,9 @@ MAINTENANCE=(
|
|||||||
DESKTOP=(
|
DESKTOP=(
|
||||||
bitwarden
|
bitwarden
|
||||||
cliamp
|
cliamp
|
||||||
cline-desktop
|
# Prebuilt: the source builds of cline-desktop and voxtype break whenever
|
||||||
|
# Arch updates rust or the libraries they compile against
|
||||||
|
cline-desktop-bin
|
||||||
element-desktop
|
element-desktop
|
||||||
federated-calendar
|
federated-calendar
|
||||||
gnome
|
gnome
|
||||||
@@ -133,7 +131,7 @@ DESKTOP=(
|
|||||||
kitty
|
kitty
|
||||||
libreoffice-fresh
|
libreoffice-fresh
|
||||||
sonarr-bin
|
sonarr-bin
|
||||||
voxtype
|
voxtype-bin
|
||||||
winboat-bin
|
winboat-bin
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -4,12 +4,15 @@
|
|||||||
# Pacman / AUR packages to remove (works for both pacman and yay packages)
|
# Pacman / AUR packages to remove (works for both pacman and yay packages)
|
||||||
REMOVE_PACMAN=(
|
REMOVE_PACMAN=(
|
||||||
alpaca-ai
|
alpaca-ai
|
||||||
|
# Replaced by cline-desktop-bin, herdr-bin and voxtype-bin, which conflict
|
||||||
|
# with them
|
||||||
|
cline-desktop
|
||||||
conky-cli
|
conky-cli
|
||||||
# Replaced by herdr-bin, which conflicts with it
|
|
||||||
herdr
|
herdr
|
||||||
lmstudio-bin
|
lmstudio-bin
|
||||||
neofetch
|
neofetch
|
||||||
steghide
|
steghide
|
||||||
|
voxtype
|
||||||
)
|
)
|
||||||
|
|
||||||
# Flatpak applications to remove
|
# Flatpak applications to remove
|
||||||
|
|||||||
Reference in New Issue
Block a user