From db03ae6cb6b781f5ed1593d2c8dfa23962bd9aef Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 27 Feb 2026 02:16:38 -0500
Subject: [PATCH 1/4] Merge pull request #4766 from
 garethson/fix-omarchy-launch-or-focus

Fix recently broken jq reference to "$p" value in omarchy-launch-or-focus
---
 bin/omarchy-launch-or-focus | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/omarchy-launch-or-focus b/bin/omarchy-launch-or-focus
index 1654c844..85ab3d6c 100755
--- a/bin/omarchy-launch-or-focus
+++ b/bin/omarchy-launch-or-focus
@@ -10,7 +10,7 @@ fi
 
 WINDOW_PATTERN="$1"
 LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
-WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
+WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
 
 if [[ -n $WINDOW_ADDRESS ]]; then
   hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"

From d0084ff10d95a4dbe498a568d3d3cfc5528459ba Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 26 Feb 2026 22:40:57 +0100
Subject: [PATCH 2/4] Ensure OMARCHY_PATH + bin PATH are set for SSH access

Closes #4757
---
 default/bash/envs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/default/bash/envs b/default/bash/envs
index 932ad3ec..ff08817a 100644
--- a/default/bash/envs
+++ b/default/bash/envs
@@ -1,3 +1,7 @@
 # Editor used by CLI
 export SUDO_EDITOR="$EDITOR"
 export BAT_THEME=ansi
+
+# Duplicated from .config/uwsm/env so SSH works too
+export OMARCHY_PATH=$HOME/.local/share/omarchy
+export PATH=$OMARCHY_PATH/bin:$PATH

From 39792246d2580db5badb9d06b089c733c66f4433 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 27 Feb 2026 11:31:11 -0500
Subject: [PATCH 3/4] Merge pull request #4782 from alexpgates/dev

Update bash rc source order
---
 default/bash/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default/bash/rc b/default/bash/rc
index 487bdd40..3042e427 100644
--- a/default/bash/rc
+++ b/default/bash/rc
@@ -1,6 +1,6 @@
+source ~/.local/share/omarchy/default/bash/envs
 source ~/.local/share/omarchy/default/bash/shell
 source ~/.local/share/omarchy/default/bash/aliases
 source ~/.local/share/omarchy/default/bash/functions
 source ~/.local/share/omarchy/default/bash/init
-source ~/.local/share/omarchy/default/bash/envs
 [[ $- == *i* ]] && bind -f ~/.local/share/omarchy/default/bash/inputrc

From c585fec9cfd4813fb61a1adfe6b3f14a975b2140 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Fri, 27 Feb 2026 17:44:44 +0100
Subject: [PATCH 4/4] Stop erasing output without a newline

Closes #4783
References #4269
---
 default/bash/init | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/default/bash/init b/default/bash/init
index 6ae94284..1c40f6c1 100644
--- a/default/bash/init
+++ b/default/bash/init
@@ -3,9 +3,6 @@ if command -v mise &> /dev/null; then
 fi
 
 if command -v starship &> /dev/null; then
-  # clear stale readline state before rendering prompt (prevents artifacts in prompt after abnormal exits like SIGQUIT)
-  __sanitize_prompt() { printf '\r\033[K'; }
-  PROMPT_COMMAND="__sanitize_prompt${PROMPT_COMMAND:+;$PROMPT_COMMAND}"
   eval "$(starship init bash)"
 fi