From 21eacb324a63c6d5ee94af667422b013d2b33ce7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 21 Jul 2026 15:27:12 -0700 Subject: [PATCH] Ship quickshell as quickshell-git for synchronous kill quickshell 0.3.0's qs kill returns before the instance exits, forcing restart tooling to babysit pids. Upstream fixed kill to block until the process is gone, but only on master, so the Omarchy repo now carries quickshell-git pinned past that fix. New installs get it from the base packages; existing installs migrate with a single --ask 4 transaction so the conflicting quickshell package is replaced in place, then restart the shell after the update to pick up the new binary. Co-Authored-By: Claude Fable 5 --- install/omarchy-base.packages | 2 +- migrations/1784672586.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 migrations/1784672586.sh diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages index 13505154..ca202fcf 100644 --- a/install/omarchy-base.packages +++ b/install/omarchy-base.packages @@ -106,7 +106,7 @@ python-poetry-core python-terminaltexteffects qemu-user-static-binfmt qt5-wayland -quickshell +quickshell-git ripgrep ruby rust diff --git a/migrations/1784672586.sh b/migrations/1784672586.sh new file mode 100644 index 00000000..dd392889 --- /dev/null +++ b/migrations/1784672586.sh @@ -0,0 +1,9 @@ +echo "Switch to the Omarchy quickshell-git build so shell restarts wait for instance exit" + +if ! omarchy-pkg-present quickshell-git; then + # One transaction with --ask 4 so pacman accepts replacing the conflicting + # quickshell package in place; packages depending on quickshell stay + # satisfied through the provides. + sudo pacman -S --noconfirm --ask 4 quickshell-git + omarchy-state set restart-shell-required +fi