From 2a5db9ed781bd9f009280b997807ffdfef98a354 Mon Sep 17 00:00:00 2001 From: Luke Hsiao Date: Wed, 6 May 2026 12:38:08 -0600 Subject: [PATCH 1/3] Fix helix theme's word selection colors (#5630) * Fix helix theme's word selection colors Without this fix, if users enabled `editor.cursorline`, the word selection would not be visually distinct from the cursorline selection. Closes: https://github.com/basecamp/omarchy/issues/5580 Signed-off-by: Luke Hsiao * Make Retro-82 color0 visually distinct from background Signed-off-by: Luke Hsiao * Make matte-black selection background distinct from color0 Signed-off-by: Luke Hsiao --------- Signed-off-by: Luke Hsiao --- default/themed/helix.toml.tpl | 2 +- themes/matte-black/colors.toml | 2 +- themes/retro-82/colors.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default/themed/helix.toml.tpl b/default/themed/helix.toml.tpl index 90ba441c..3cbe3067 100644 --- a/default/themed/helix.toml.tpl +++ b/default/themed/helix.toml.tpl @@ -87,7 +87,7 @@ "ui.virtual.jump-label" = { fg = "color1", modifiers = ["bold"] } "ui.virtual.whitespace" = "color8" -"ui.selection" = { bg = "color0" } +"ui.selection" = { bg = "selection_background", fg = "selection_foreground" } "ui.cursor" = { fg = "background", bg = "cursor" } "ui.cursor.primary" = { fg = "background", bg = "cursor" } diff --git a/themes/matte-black/colors.toml b/themes/matte-black/colors.toml index f0f1d3a6..5e1a8cca 100644 --- a/themes/matte-black/colors.toml +++ b/themes/matte-black/colors.toml @@ -3,7 +3,7 @@ cursor = "#eaeaea" foreground = "#bebebe" background = "#121212" selection_foreground = "#bebebe" -selection_background = "#333333" +selection_background = "#515151" color0 = "#333333" color1 = "#D35F5F" diff --git a/themes/retro-82/colors.toml b/themes/retro-82/colors.toml index 21cf8103..1b5285d1 100644 --- a/themes/retro-82/colors.toml +++ b/themes/retro-82/colors.toml @@ -15,7 +15,7 @@ selection_foreground = "#00172e" selection_background = "#faa968" # Normal colors (ANSI 0-7) -color0 = "#00172e" +color0 = "#303442" color1 = "#f85525" color2 = "#028391" color3 = "#e97b3c" From f838cbb63f85e98226b9c328acb9a342a22709f2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 6 May 2026 21:03:43 +0200 Subject: [PATCH 2/3] Use proper .desktop files --- applications/foot-server.desktop | 4 ---- applications/footclient.desktop | 4 ---- applications/hidden/foot-server.desktop | 2 ++ applications/hidden/footclient.desktop | 2 ++ bin/omarchy-install-terminal | 5 ++++- bin/omarchy-refresh-applications | 4 ++++ {applications => default/foot}/foot.desktop | 0 migrations/1778008689.sh | 6 +++--- 8 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 applications/foot-server.desktop delete mode 100644 applications/footclient.desktop create mode 100644 applications/hidden/foot-server.desktop create mode 100644 applications/hidden/footclient.desktop rename {applications => default/foot}/foot.desktop (100%) diff --git a/applications/foot-server.desktop b/applications/foot-server.desktop deleted file mode 100644 index 0ab86d65..00000000 --- a/applications/foot-server.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Foot Server -NoDisplay=true diff --git a/applications/footclient.desktop b/applications/footclient.desktop deleted file mode 100644 index e4590087..00000000 --- a/applications/footclient.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Foot Client -NoDisplay=true diff --git a/applications/hidden/foot-server.desktop b/applications/hidden/foot-server.desktop new file mode 100644 index 00000000..e1e3e173 --- /dev/null +++ b/applications/hidden/foot-server.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Hidden=true diff --git a/applications/hidden/footclient.desktop b/applications/hidden/footclient.desktop new file mode 100644 index 00000000..e1e3e173 --- /dev/null +++ b/applications/hidden/footclient.desktop @@ -0,0 +1,2 @@ +[Desktop Entry] +Hidden=true diff --git a/bin/omarchy-install-terminal b/bin/omarchy-install-terminal index 15a869d1..2fb040dd 100755 --- a/bin/omarchy-install-terminal +++ b/bin/omarchy-install-terminal @@ -28,9 +28,12 @@ echo "Installing $package..." # Install package if omarchy-pkg-add $package; then # Copy custom desktop entries with X-TerminalArg* keys - if [[ $package == "alacritty" || $package == "foot" ]]; then + if [[ $package == "alacritty" ]]; then mkdir -p ~/.local/share/applications cp "$OMARCHY_PATH/applications/$desktop_id" ~/.local/share/applications/ + elif [[ $package == "foot" ]]; then + mkdir -p ~/.local/share/applications + cp "$OMARCHY_PATH/default/foot/$desktop_id" ~/.local/share/applications/ fi # Copy default config for optional terminals when missing diff --git a/bin/omarchy-refresh-applications b/bin/omarchy-refresh-applications index 50c55ed2..9eb4e9de 100755 --- a/bin/omarchy-refresh-applications +++ b/bin/omarchy-refresh-applications @@ -11,6 +11,10 @@ mkdir -p ~/.local/share/applications cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/ cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/ +if omarchy-cmd-present foot; then + cp ~/.local/share/omarchy/default/foot/foot.desktop ~/.local/share/applications/ +fi + # Refresh the webapps, TUIs, and npx wrappers bash $OMARCHY_PATH/install/packaging/icons.sh bash $OMARCHY_PATH/install/packaging/webapps.sh diff --git a/applications/foot.desktop b/default/foot/foot.desktop similarity index 100% rename from applications/foot.desktop rename to default/foot/foot.desktop diff --git a/migrations/1778008689.sh b/migrations/1778008689.sh index dbe97743..de066e72 100644 --- a/migrations/1778008689.sh +++ b/migrations/1778008689.sh @@ -31,9 +31,9 @@ fi if omarchy-cmd-present foot; then mkdir -p ~/.local/share/applications rm -f ~/.local/share/applications/org.codeberg.dnkl.foot.desktop - cp -Rpf "$OMARCHY_PATH/applications/foot.desktop" ~/.local/share/applications/ - cp -Rpf "$OMARCHY_PATH/applications/footclient.desktop" ~/.local/share/applications/ - cp -Rpf "$OMARCHY_PATH/applications/foot-server.desktop" ~/.local/share/applications/ + cp -Rpf "$OMARCHY_PATH/default/foot/foot.desktop" ~/.local/share/applications/ + cp -Rpf "$OMARCHY_PATH/applications/hidden/footclient.desktop" ~/.local/share/applications/ + cp -Rpf "$OMARCHY_PATH/applications/hidden/foot-server.desktop" ~/.local/share/applications/ fi if [[ -f ~/.config/hypr/input.conf ]]; then From ec428fa549d8fbf238aadbf29e7bfbc23f8e2ca0 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 6 May 2026 21:05:24 +0200 Subject: [PATCH 3/3] Just focus on the window rules --- migrations/1778008689.sh | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/migrations/1778008689.sh b/migrations/1778008689.sh index de066e72..2baefc54 100644 --- a/migrations/1778008689.sh +++ b/migrations/1778008689.sh @@ -1,40 +1,4 @@ -echo "Add Foot terminal config and theme support" - -if [[ ! -f ~/.config/foot/foot.ini ]]; then - mkdir -p ~/.config/foot - cp -Rpf "$OMARCHY_PATH/config/foot/foot.ini" ~/.config/foot/foot.ini -elif ! grep -q "^primary-paste=none" ~/.config/foot/foot.ini; then - sed -i '/^clipboard-copy=Control+Insert/a primary-paste=none' ~/.config/foot/foot.ini -fi - -if [[ -f ~/.config/omarchy/current/theme/foot.ini ]]; then - sed -i 's/^\[colors\]$/[colors-dark]/' ~/.config/omarchy/current/theme/foot.ini -fi - -if [[ ! -f ~/.config/omarchy/current/theme/foot.ini && -f ~/.config/omarchy/current/theme/colors.toml ]]; then - sed_script=$(mktemp) - - while IFS='=' read -r key value; do - key="${key//[\"\' ]/}" - [[ $key && $key != \#* ]] || continue - value="${value#*[\"\']}" - value="${value%%[\"\']*}" - - printf 's|{{ %s }}|%s|g\n' "$key" "$value" - printf 's|{{ %s_strip }}|%s|g\n' "$key" "${value#\#}" - done <~/.config/omarchy/current/theme/colors.toml >"$sed_script" - - sed -f "$sed_script" "$OMARCHY_PATH/default/themed/foot.ini.tpl" >~/.config/omarchy/current/theme/foot.ini - rm "$sed_script" -fi - -if omarchy-cmd-present foot; then - mkdir -p ~/.local/share/applications - rm -f ~/.local/share/applications/org.codeberg.dnkl.foot.desktop - cp -Rpf "$OMARCHY_PATH/default/foot/foot.desktop" ~/.local/share/applications/ - cp -Rpf "$OMARCHY_PATH/applications/hidden/footclient.desktop" ~/.local/share/applications/ - cp -Rpf "$OMARCHY_PATH/applications/hidden/foot-server.desktop" ~/.local/share/applications/ -fi +echo "Add Foot terminal window rules where terminals are described" if [[ -f ~/.config/hypr/input.conf ]]; then sed -Ei 's/match:class \(Alacritty\|kitty\)/match:class (Alacritty|kitty|foot)/' ~/.config/hypr/input.conf