From eeeef3f61b06790ceaf2adcb24bba69916d7b56e Mon Sep 17 00:00:00 2001
From: David Young <david@federated.computer>
Date: Thu, 29 Oct 2026 13:00:55 -0600
Subject: [PATCH] fix cline-desktop and voxtype

---
 install.sh           |  6 ++++++
 packages.conf        | 10 ++++------
 remove-packages.conf |  5 ++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index 42b60e2..5f2850d 100755
--- a/install.sh
+++ b/install.sh
@@ -68,6 +68,7 @@ if [ ! -f "packages.conf" ]; then
   exit 1
 fi
 source packages.conf
+source remove-packages.conf
 
 echo "Starting full system setup..."
 
@@ -101,6 +102,11 @@ else
   echo "yay is already installed."
 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
 echo "Installing system utilities..."
 install_packages "${SYSTEM_UTILS[@]}"
diff --git a/packages.conf b/packages.conf
index 0353b61..2872d9b 100644
--- a/packages.conf
+++ b/packages.conf
@@ -84,10 +84,6 @@ DEV_TOOLS=(
   # The source-built herdr pins an exact zig version that Arch rarely ships
   herdr-bin
   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
   nodejs
   npm
@@ -124,7 +120,9 @@ MAINTENANCE=(
 DESKTOP=(
   bitwarden
   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
   federated-calendar
   gnome
@@ -133,7 +131,7 @@ DESKTOP=(
   kitty
   libreoffice-fresh
   sonarr-bin
-  voxtype
+  voxtype-bin
   winboat-bin
 )
 
diff --git a/remove-packages.conf b/remove-packages.conf
index 3b49c6d..6e33910 100644
--- a/remove-packages.conf
+++ b/remove-packages.conf
@@ -4,12 +4,15 @@
 # Pacman / AUR packages to remove (works for both pacman and yay packages)
 REMOVE_PACMAN=(
     alpaca-ai
+    # Replaced by cline-desktop-bin, herdr-bin and voxtype-bin, which conflict
+    # with them
+    cline-desktop
     conky-cli
-    # Replaced by herdr-bin, which conflicts with it
     herdr
     lmstudio-bin
     neofetch
     steghide
+    voxtype
 )
 
 # Flatpak applications to remove