From 9e1ed8f85c36a83846204a7c81e5a4e60801103a Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Wed, 20 May 2026 19:04:09 -0400
Subject: [PATCH] omarchy-dev-pkg-test: install with pacman -U --overwrite=*;
 add plymouth to transition overwrites

Two related fixes for installing package builds onto a system that has
the legacy script-installed Omarchy files already in place:

bin/omarchy-dev-pkg-test: split makepkg -s (build) from sudo pacman -U
(install) so we can pass --overwrite='*' to pacman. makepkg -i forwards
a fixed flag set to pacman and doesn't expose --overwrite, so dev pkg
tests on an existing script-install fail on every conflicting file
(plymouth themes, /etc drop-ins, sudoers). --overwrite='*' is correct
for the dev use case: the build IS the new authoritative state.

bin/omarchy-update-system-pkgs: add /usr/share/plymouth/themes/omarchy/*
to the transition --overwrite list. The old install/login/plymouth.sh
cp -r'd the theme files into that directory, so existing installs
conflict on the omarchy-settings package's plymouth payload.
---
 bin/omarchy-dev-pkg-test       | 14 +++++++++++++-
 bin/omarchy-update-system-pkgs |  3 ++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/bin/omarchy-dev-pkg-test b/bin/omarchy-dev-pkg-test
index d835e167..a82b87de 100755
--- a/bin/omarchy-dev-pkg-test
+++ b/bin/omarchy-dev-pkg-test
@@ -63,4 +63,16 @@ echo "  PKGBUILD : $PKGBUILD_DIR/PKGBUILD"
 echo
 
 cd "$build_dir"
-OMARCHY_SRC="$CHECKOUT" makepkg -si --skipchecksums --noconfirm "${@:3}"
+OMARCHY_SRC="$CHECKOUT" makepkg -s --skipchecksums --noconfirm "${@:3}"
+
+# Install separately so we can pass --overwrite='*' to pacman. In dev mode
+# the package commonly conflicts with files left behind by previous
+# script-installed Omarchy versions (plymouth themes, /etc drop-ins,
+# sudoers, etc.). makepkg -i forwards a fixed set of flags to pacman and
+# doesn't expose --overwrite.
+built_pkg=$(ls -t "$build_dir"/*.pkg.tar.* 2>/dev/null | grep -v '\.sig$' | head -1)
+if [[ -z $built_pkg ]]; then
+  echo "Error: no built package found in $build_dir" >&2
+  exit 1
+fi
+sudo pacman -U --noconfirm --overwrite='*' "$built_pkg"
diff --git a/bin/omarchy-update-system-pkgs b/bin/omarchy-update-system-pkgs
index fbd52f5d..285e0e1b 100755
--- a/bin/omarchy-update-system-pkgs
+++ b/bin/omarchy-update-system-pkgs
@@ -30,4 +30,5 @@ sudo pacman -Syyu --noconfirm \
   --overwrite '/etc/systemd/system/user@.service.d/10-faster-shutdown.conf' \
   --overwrite '/etc/systemd/system/docker.service.d/no-block-boot.conf' \
   --overwrite '/etc/systemd/system/plocate-updatedb.service.d/ac-only.conf' \
-  --overwrite '/usr/lib/systemd/system-sleep/unmount-fuse'
+  --overwrite '/usr/lib/systemd/system-sleep/unmount-fuse' \
+  --overwrite '/usr/share/plymouth/themes/omarchy/*'