From d904ed3afe127bd5319ca7da1fdea88ed1c50404 Mon Sep 17 00:00:00 2001
From: Severin Richner <79863534+severin-richner@users.noreply.github.com>
Date: Sun, 3 May 2026 20:26:03 +0200
Subject: [PATCH 1/9] Add dynamic theming for gum (#4467)

* Add dynamic theming for gum.

* Add migration.

* Fix migration script.

* Add omarchy-theme-reset utility.

* Move env variables into seperate file and update migration script.

* Migration adds the new hyprland config file to the users hyprland.conf.

* Add gum.env.conf to default env.conf instead.

* Reuse new omarchy-theme-refresh and update migration.

* Ensure no errors are thrown if the file can't be loaded

* Just apply this on the next theme selection

So it's not disruptive

---------

Co-authored-by: David Heinemeier Hansson <david@hey.com>
---
 bin/omarchy-update-confirm      |   2 +-
 default/hypr/envs.conf          |   5 ++
 default/hypr/looknfeel.conf     |   7 --
 default/themed/gum.env.conf.tpl | 137 ++++++++++++++++++++++++++++++++
 4 files changed, 143 insertions(+), 8 deletions(-)
 create mode 100644 default/themed/gum.env.conf.tpl

diff --git a/bin/omarchy-update-confirm b/bin/omarchy-update-confirm
index 6cdddaaf..4ec37e85 100755
--- a/bin/omarchy-update-confirm
+++ b/bin/omarchy-update-confirm
@@ -2,7 +2,7 @@
 
 # omarchy:summary=Prompt for confirmation before starting an update
 
-gum style --border normal --border-foreground 6 --padding "1 2" \
+gum style --border normal --padding "1 2" \
   "Ready to update?" \
   "" \
   "• You cannot stop the update once you start!" \
diff --git a/default/hypr/envs.conf b/default/hypr/envs.conf
index 436c38cd..9210f594 100644
--- a/default/hypr/envs.conf
+++ b/default/hypr/envs.conf
@@ -1,3 +1,8 @@
+# GUM environment variables for styling purposes
+# hyprlang noerror true
+source = ~/.config/omarchy/current/theme/gum.env.conf
+# hyprlang noerror false
+
 # Cursor size
 env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24
diff --git a/default/hypr/looknfeel.conf b/default/hypr/looknfeel.conf
index 0bdd6dee..ab2567c9 100644
--- a/default/hypr/looknfeel.conf
+++ b/default/hypr/looknfeel.conf
@@ -138,10 +138,3 @@ cursor {
 binds {
     hide_special_on_workspace_change = true
 }
-
-# Style Gum confirm to match terminal theme
-env = GUM_CONFIRM_PROMPT_FOREGROUND,6       # Cyan
-env = GUM_CONFIRM_SELECTED_FOREGROUND,0     # Black
-env = GUM_CONFIRM_SELECTED_BACKGROUND,2     # Green
-env = GUM_CONFIRM_UNSELECTED_FOREGROUND,7   # White
-env = GUM_CONFIRM_UNSELECTED_BACKGROUND,8   # Dark grey
diff --git a/default/themed/gum.env.conf.tpl b/default/themed/gum.env.conf.tpl
new file mode 100644
index 00000000..179c08ff
--- /dev/null
+++ b/default/themed/gum.env.conf.tpl
@@ -0,0 +1,137 @@
+# Gum Style (generic) Variables
+env = FOREGROUND,#{{ foreground }}
+env = BACKGROUND,#{{ background }}
+env = BORDER_FOREGROUND,#{{ accent }}
+env = BORDER_BACKGROUND,#{{ background }}
+
+# Gum Confirm Style Variables
+env = GUM_CONFIRM_PROMPT_FOREGROUND,#{{ accent }}
+env = GUM_CONFIRM_PROMPT_BACKGROUND,#{{ background }}
+env = GUM_CONFIRM_SELECTED_FOREGROUND,#{{ selection_foreground }}
+env = GUM_CONFIRM_SELECTED_BACKGROUND,#{{ selection_background }}
+env = GUM_CONFIRM_UNSELECTED_FOREGROUND,#{{ foreground }}
+env = GUM_CONFIRM_UNSELECTED_BACKGROUND,#{{ background }}
+
+# Gum Input Style Variables
+env = GUM_INPUT_PROMPT_FOREGROUND,#{{ accent }}
+env = GUM_INPUT_PROMPT_BACKGROUND,#{{ background }}
+env = GUM_INPUT_PLACEHOLDER_FOREGROUND,#{{ color8 }}
+env = GUM_INPUT_PLACEHOLDER_BACKGROUND,#{{ background }}
+env = GUM_INPUT_CURSOR_FOREGROUND,#{{ cursor }}
+env = GUM_INPUT_CURSOR_BACKGROUND,#{{ background }}
+env = GUM_INPUT_HEADER_FOREGROUND,#{{ foreground }}
+env = GUM_INPUT_HEADER_BACKGROUND,#{{ background }}
+
+# Gum Choose Style Variables
+env = GUM_CHOOSE_CURSOR_FOREGROUND,#{{ cursor }}
+env = GUM_CHOOSE_CURSOR_BACKGROUND,#{{ background }}
+env = GUM_CHOOSE_HEADER_FOREGROUND,#{{ foreground }}
+env = GUM_CHOOSE_HEADER_BACKGROUND,#{{ background }}
+env = GUM_CHOOSE_ITEM_FOREGROUND,#{{ foreground }}
+env = GUM_CHOOSE_ITEM_BACKGROUND,#{{ background }}
+env = GUM_CHOOSE_SELECTED_FOREGROUND,#{{ selection_foreground }}
+env = GUM_CHOOSE_SELECTED_BACKGROUND,#{{ selection_background }}
+
+# Gum Filter Style Variables
+env = GUM_FILTER_PROMPT_FOREGROUND,#{{ accent }}
+env = GUM_FILTER_PROMPT_BACKGROUND,#{{ background }}
+env = GUM_FILTER_TEXT_FOREGROUND,#{{ foreground }}
+env = GUM_FILTER_TEXT_BACKGROUND,#{{ background }}
+env = GUM_FILTER_MATCH_FOREGROUND,#{{ accent }}
+env = GUM_FILTER_CURSOR_TEXT_FOREGROUND,#{{ cursor }}
+env = GUM_FILTER_CURSOR_TEXT_BACKGROUND,#{{ background }}
+env = GUM_FILTER_SELECTED_FOREGROUND,#{{ selection_foreground }}
+env = GUM_FILTER_SELECTED_BACKGROUND,#{{ selection_background }}
+env = GUM_FILTER_INDICATOR_FOREGROUND,#{{ accent }}
+env = GUM_FILTER_HEADER_FOREGROUND,#{{ foreground }}
+env = GUM_FILTER_MATCH_BACKGROUND,#{{ background }}
+env = GUM_FILTER_HEADER_BACKGROUND,#{{ background }}
+env = GUM_FILTER_PLACEHOLDER_FOREGROUND,#{{ color8 }}
+env = GUM_FILTER_PLACEHOLDER_BACKGROUND,#{{ background }}
+env = GUM_FILTER_INDICATOR_BACKGROUND,#{{ background }}
+env = GUM_FILTER_SELECTED_PREFIX_FOREGROUND,#{{ selection_foreground }}
+env = GUM_FILTER_SELECTED_PREFIX_BACKGROUND,#{{ selection_background }}
+env = GUM_FILTER_UNSELECTED_PREFIX_FOREGROUND,#{{ color8 }}
+env = GUM_FILTER_UNSELECTED_PREFIX_BACKGROUND,#{{ background }}
+
+# Gum Table Style Variables
+env = GUM_TABLE_HEADER_FOREGROUND,#{{ foreground }}
+env = GUM_TABLE_HEADER_BACKGROUND,#{{ background }}
+env = GUM_TABLE_CELL_FOREGROUND,#{{ foreground }}
+env = GUM_TABLE_CELL_BACKGROUND,#{{ background }}
+env = GUM_TABLE_BORDER_FOREGROUND,#{{ color8 }}
+env = GUM_TABLE_BORDER_BACKGROUND,#{{ background }}
+env = GUM_TABLE_SELECTED_FOREGROUND,#{{ selection_foreground }}
+env = GUM_TABLE_SELECTED_BACKGROUND,#{{ selection_background }}
+
+# Gum Spin Style Variables
+env = GUM_SPIN_SPINNER_FOREGROUND,#{{ accent }}
+env = GUM_SPIN_SPINNER_BACKGROUND,#{{ background }}
+env = GUM_SPIN_TITLE_FOREGROUND,#{{ foreground }}
+env = GUM_SPIN_TITLE_BACKGROUND,#{{ background }}
+
+# Gum File Style Variables
+env = GUM_FILE_CURSOR_FOREGROUND,#{{ cursor }}
+env = GUM_FILE_CURSOR_BACKGROUND,#{{ background }}
+env = GUM_FILE_SYMLINK_FOREGROUND,#{{ foreground }}
+env = GUM_FILE_SYMLINK_BACKGROUND,#{{ background }}
+env = GUM_FILE_DIRECTORY_FOREGROUND,#{{ foreground }}
+env = GUM_FILE_DIRECTORY_BACKGROUND,#{{ background }}
+env = GUM_FILE_FILE_FOREGROUND,#{{ foreground }}
+env = GUM_FILE_FILE_BACKGROUND,#{{ background }}
+env = GUM_FILE_PERMISSIONS_FOREGROUND,#{{ color8 }}
+env = GUM_FILE_PERMISSIONS_BACKGROUND,#{{ background }}
+env = GUM_FILE_SELECTED_FOREGROUND,#{{ selection_foreground }}
+env = GUM_FILE_SELECTED_BACKGROUND,#{{ selection_background }}
+env = GUM_FILE_FILE_SIZE_FOREGROUND,#{{ color8 }}
+env = GUM_FILE_FILE_SIZE_BACKGROUND,#{{ background }}
+env = GUM_FILE_HEADER_FOREGROUND,#{{ foreground }}
+env = GUM_FILE_HEADER_BACKGROUND,#{{ background }}
+
+# Gum Pager Style Variables
+env = GUM_PAGER_FOREGROUND,#{{ foreground }}
+env = GUM_PAGER_BACKGROUND,#{{ background }}
+env = GUM_PAGER_LINE_NUMBER_FOREGROUND,#{{ color8 }}
+env = GUM_PAGER_LINE_NUMBER_BACKGROUND,#{{ background }}
+env = GUM_PAGER_MATCH_FOREGROUND,#{{ accent }}
+env = GUM_PAGER_MATCH_BACKGROUND,#{{ background }}
+env = GUM_PAGER_MATCH_HIGH_FOREGROUND,#{{ accent }}
+env = GUM_PAGER_MATCH_HIGH_BACKGROUND,#{{ background }}
+env = GUM_PAGER_HELP_FOREGROUND,#{{ color8 }}
+env = GUM_PAGER_HELP_BACKGROUND,#{{ background }}
+
+# Gum Write Style Variables
+env = GUM_WRITE_BASE_FOREGROUND,#{{ foreground }}
+env = GUM_WRITE_BASE_BACKGROUND,#{{ background }}
+env = GUM_WRITE_CURSOR_LINE_NUMBER_FOREGROUND,#{{ color8 }}
+env = GUM_WRITE_CURSOR_LINE_NUMBER_BACKGROUND,#{{ background }}
+env = GUM_WRITE_CURSOR_LINE_FOREGROUND,#{{ foreground }}
+env = GUM_WRITE_CURSOR_LINE_BACKGROUND,#{{ selection_background }}
+env = GUM_WRITE_CURSOR_FOREGROUND,#{{ cursor }}
+env = GUM_WRITE_CURSOR_BACKGROUND,#{{ background }}
+env = GUM_WRITE_END_OF_BUFFER_FOREGROUND,#{{ color8 }}
+env = GUM_WRITE_END_OF_BUFFER_BACKGROUND,#{{ background }}
+env = GUM_WRITE_LINE_NUMBER_FOREGROUND,#{{ color8 }}
+env = GUM_WRITE_LINE_NUMBER_BACKGROUND,#{{ background }}
+env = GUM_WRITE_HEADER_FOREGROUND,#{{ foreground }}
+env = GUM_WRITE_HEADER_BACKGROUND,#{{ background }}
+env = GUM_WRITE_PLACEHOLDER_FOREGROUND,#{{ color8 }}
+env = GUM_WRITE_PLACEHOLDER_BACKGROUND,#{{ background }}
+env = GUM_WRITE_PROMPT_FOREGROUND,#{{ foreground }}
+env = GUM_WRITE_PROMPT_BACKGROUND,#{{ background }}
+
+# Gum Log Style Variables
+env = GUM_LOG_LEVEL_FOREGROUND,#{{ accent }}
+env = GUM_LOG_LEVEL_BACKGROUND,#{{ background }}
+env = GUM_LOG_TIME_FOREGROUND,#{{ color8 }}
+env = GUM_LOG_TIME_BACKGROUND,#{{ background }}
+env = GUM_LOG_PREFIX_FOREGROUND,#{{ foreground }}
+env = GUM_LOG_PREFIX_BACKGROUND,#{{ background }}
+env = GUM_LOG_MESSAGE_FOREGROUND,#{{ foreground }}
+env = GUM_LOG_MESSAGE_BACKGROUND,#{{ background }}
+env = GUM_LOG_KEY_FOREGROUND,#{{ foreground }}
+env = GUM_LOG_KEY_BACKGROUND,#{{ background }}
+env = GUM_LOG_VALUE_FOREGROUND,#{{ foreground }}
+env = GUM_LOG_VALUE_BACKGROUND,#{{ background }}
+env = GUM_LOG_SEPARATOR_FOREGROUND,#{{ color8 }}
+env = GUM_LOG_SEPARATOR_BACKGROUND,#{{ background }}
\ No newline at end of file

From 6a5e53784f030b2e52436445473122b2431a1c16 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Sun, 3 May 2026 14:42:31 -0400
Subject: [PATCH 2/9] Bypass portal by default for screenrecording due to
 portal bug

---
 bin/omarchy-capture-screenrecording | 106 ++++++++++++++++++++++++++--
 1 file changed, 100 insertions(+), 6 deletions(-)

diff --git a/bin/omarchy-capture-screenrecording b/bin/omarchy-capture-screenrecording
index 8c047650..5636bb9e 100755
--- a/bin/omarchy-capture-screenrecording
+++ b/bin/omarchy-capture-screenrecording
@@ -5,6 +5,18 @@
 # omarchy:args=[--with-desktop-audio] [--with-microphone-audio] [--with-webcam] [--webcam-device=<device>] [--resolution=<size>] [--stop-recording]
 # omarchy:examples=omarchy screenrecord | omarchy capture screenrecord --with-desktop-audio
 # omarchy:aliases=omarchy screenrecord
+#
+# Env: OMARCHY_SCREENRECORD_USE_PORTAL=true skips the built-in slurp picker and
+# uses gpu-screen-recorder's xdg-desktop-portal capture backend instead. The
+# portal backend was originally added (PR #3401) for HDR-aware capture, support
+# for monitors driven by external GPUs, and window capture — enable it if any
+# of those matter to you. Off by default because the portal path can fail EGL
+# DMA-BUF modifier import on some configurations, leaving recording unable to
+# start.
+#
+# Env: OMARCHY_SCREENRECORD_DEBUG=true appends gpu-screen-recorder's stderr (and
+# the picker target it was launched with) to /tmp/omarchy-screenrecord.log so
+# users can attach a log when reporting capture failures.
 
 [[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
 OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-${XDG_VIDEOS_DIR:-$HOME/Videos}}"
@@ -21,6 +33,7 @@ WEBCAM_DEVICE=""
 RESOLUTION=""
 STOP_RECORDING="false"
 RECORDING_FILE="/tmp/omarchy-screenrecord-filename"
+LOG_FILE=$([[ ${OMARCHY_SCREENRECORD_DEBUG:-false} == "true" ]] && echo "/tmp/omarchy-screenrecord.log" || echo "/dev/null")
 
 for arg in "$@"; do
   case "$arg" in
@@ -87,7 +100,92 @@ default_resolution() {
   fi
 }
 
+# Monitor + window rectangles on the focused workspace, in slurp's "X,Y WxH" format.
+# Mirrors omarchy-capture-screenshot so the picker UX is identical.
+get_rectangles() {
+  local active_workspace=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .activeWorkspace.id')
+  hyprctl monitors -j | jq -r --arg ws "$active_workspace" '
+    .[] | select(.activeWorkspace.id == ($ws | tonumber)) |
+    "\(.x),\(.y) \(.width / .scale | floor)x\(.height / .scale | floor)"'
+  hyprctl clients -j | jq -r --arg ws "$active_workspace" '
+    .[] | select(.workspace.id == ($ws | tonumber)) |
+    "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"'
+}
+
+# Echoes "monitor:NAME" when the selection matches an entire monitor, otherwise
+# "region:WxH+X+Y" with physical-pixel coordinates ready for gpu-screen-recorder.
+# Returns non-zero if the user cancelled the picker.
+select_capture_target() {
+  local rects=$(get_rectangles)
+  hyprpicker -r -z >/dev/null 2>&1 &
+  local picker_pid=$!
+  sleep .1
+  local selection=$(echo "$rects" | slurp 2>/dev/null)
+  kill $picker_pid 2>/dev/null
+
+  # X and Y can be negative (Hyprland monitor positions in multi-display layouts);
+  # widths and heights are always positive.
+  [[ $selection =~ ^(-?[0-9]+),(-?[0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]] || return 1
+  local sx=${BASH_REMATCH[1]} sy=${BASH_REMATCH[2]}
+  local sw=${BASH_REMATCH[3]} sh=${BASH_REMATCH[4]}
+
+  # A bare click (area < 20px²) snaps to whichever rectangle the click landed
+  # inside, so users don't end up with accidental 2px recordings.
+  if ((sw * sh < 20)); then
+    while IFS= read -r rect; do
+      [[ $rect =~ ^(-?[0-9]+),(-?[0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]] || continue
+      local rx=${BASH_REMATCH[1]} ry=${BASH_REMATCH[2]}
+      local rw=${BASH_REMATCH[3]} rh=${BASH_REMATCH[4]}
+      if ((sx >= rx && sx < rx + rw && sy >= ry && sy < ry + rh)); then
+        sx=$rx sy=$ry sw=$rw sh=$rh
+        break
+      fi
+    done <<<"$rects"
+  fi
+
+  # When the selection exactly matches a monitor, prefer -w <monitor> over a
+  # region capture — same kms backend, but no scaling math and full native res.
+  local monitor=$(hyprctl monitors -j | jq -r --argjson x "$sx" --argjson y "$sy" --argjson w "$sw" --argjson h "$sh" '
+    .[] | select(.x == $x and .y == $y and (.width / .scale | floor) == $w and (.height / .scale | floor) == $h) | .name' | head -1)
+
+  if [[ -n $monitor ]]; then
+    echo "monitor:$monitor"
+    return
+  fi
+
+  # gpu-screen-recorder wants region geometry in the compositor's logical
+  # coordinate space — same space slurp returns — so pass the values through
+  # untouched. (gsr scales to physical pixels itself based on the monitor.)
+  echo "region:${sw}x${sh}+${sx}+${sy}"
+}
+
 start_screenrecording() {
+  local capture_args=()
+  local target
+
+  # Opt-in path for HDR, external-GPU monitors, and window capture (all things
+  # the portal backend supports and the kms backend doesn't). Default flow uses
+  # slurp + the kms backend, which avoids the EGL DMA-BUF modifier import
+  # failures the portal path can hit on some configurations.
+  if [[ ${OMARCHY_SCREENRECORD_USE_PORTAL:-false} == "true" ]]; then
+    target="portal"
+    capture_args=(-w portal -s "${RESOLUTION:-$(default_resolution)}")
+  else
+    target=$(select_capture_target) || return 1
+
+    case $target in
+    monitor:*)
+      capture_args=(-w "${target#monitor:}" -s "${RESOLUTION:-$(default_resolution)}")
+      ;;
+    region:*)
+      capture_args=(-w "${target#region:}")
+      [[ -n $RESOLUTION ]] && capture_args+=(-s "$RESOLUTION")
+      ;;
+    esac
+  fi
+
+  [[ $WEBCAM == "true" ]] && start_webcam_overlay
+
   local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
   local audio_devices=""
   local audio_args=()
@@ -102,12 +200,10 @@ start_screenrecording() {
 
   [[ -n $audio_devices ]] && audio_args+=(-a "$audio_devices" -ac aac)
 
-  local resolution="${RESOLUTION:-$(default_resolution)}"
-
-  gpu-screen-recorder -w portal -k auto -s "$resolution" -f 60 -fm cfr -fallback-cpu-encoding yes -o "$filename" "${audio_args[@]}" &
+  echo "===== $(date '+%F %T') args: $* target: $target =====" >>"$LOG_FILE"
+  gpu-screen-recorder "${capture_args[@]}" -k auto -f 60 -fm cfr -fallback-cpu-encoding yes -o "$filename" "${audio_args[@]}" 2>>"$LOG_FILE" &
   local pid=$!
 
-  # Wait for recording to actually start (file appears after portal selection)
   while kill -0 $pid 2>/dev/null && [[ ! -f $filename ]]; do
     sleep 0.2
   done
@@ -194,7 +290,5 @@ if screenrecording_active; then
 elif [[ $STOP_RECORDING == "true" ]]; then
   exit 1
 else
-  [[ $WEBCAM == "true" ]] && start_webcam_overlay
-
   start_screenrecording || cleanup_webcam
 fi

From 301ea3ecc652a19fbeae3e6178c8b2eec57fa646 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 3 May 2026 20:38:17 +0200
Subject: [PATCH 3/9] Fix hard to see color

---
 themes/vantablack/colors.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/vantablack/colors.toml b/themes/vantablack/colors.toml
index 06addcc1..45b8213e 100644
--- a/themes/vantablack/colors.toml
+++ b/themes/vantablack/colors.toml
@@ -21,7 +21,7 @@ color6 = "#b0b0b0"
 color7 = "#ececec"
 
 # Bright colors (ANSI 8-15)
-color8 = "#fdfdfd"
+color8 = "#5c5c5c"
 color9 = "#a4a4a4"
 color10 = "#b6b6b6"
 color11 = "#cecece"

From 9c944e89f6d9ad2c75c7130ee0fb9640bbcb96da Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 3 May 2026 20:54:11 +0200
Subject: [PATCH 4/9] Better install of retroarch

---
 bin/omarchy-install-retroarch | 27 +++++++++++++++++++++++++++
 bin/omarchy-menu              |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100755 bin/omarchy-install-retroarch

diff --git a/bin/omarchy-install-retroarch b/bin/omarchy-install-retroarch
new file mode 100755
index 00000000..fa5b3c4f
--- /dev/null
+++ b/bin/omarchy-install-retroarch
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# omarchy:summary=Install RetroArch with the full libretro core set plus FBNeo and a ~/Games ROM directory.
+
+set -e
+
+omarchy-pkg-aur-add retroarch retroarch-assets libretro libretro-fbneo
+
+# Set up ~/Games as the default ROM directory
+mkdir -p "$HOME/Games"
+
+CFG="$HOME/.config/retroarch/retroarch.cfg"
+mkdir -p "$(dirname "$CFG")"
+touch "$CFG"
+
+set_cfg() {
+  local key=$1 value=$2
+  if grep -q "^$key = " "$CFG"; then
+    sed -i "s|^$key = .*|$key = \"$value\"|" "$CFG"
+  else
+    echo "$key = \"$value\"" >>"$CFG"
+  fi
+}
+
+set_cfg rgui_browser_directory "$HOME/Games"
+
+setsid gtk-launch com.libretro.RetroArch.desktop >/dev/null 2>&1 &
diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index e92585cf..343d2794 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -389,7 +389,7 @@ show_install_gaming_menu() {
   case $(menu "Install" "  Steam\n󰢹  NVIDIA GeForce NOW\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
   *Steam*) present_terminal omarchy-install-steam ;;
   *GeForce*) present_terminal omarchy-install-geforce-now ;;
-  *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
+  *RetroArch*) present_terminal omarchy-install-retroarch ;;
   *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
   *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
   *) show_install_menu ;;

From dfc6eab8db8ae684e880c6540eea3ef54d6d777b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 3 May 2026 21:01:27 +0200
Subject: [PATCH 5/9] Ensure the elephant menus are always linked on a refresh

Closes #4717
---
 bin/omarchy-refresh-walker | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/omarchy-refresh-walker b/bin/omarchy-refresh-walker
index 4e834b7f..2354144f 100755
--- a/bin/omarchy-refresh-walker
+++ b/bin/omarchy-refresh-walker
@@ -16,5 +16,11 @@ omarchy-refresh-config walker/config.toml
 omarchy-refresh-config elephant/calc.toml
 omarchy-refresh-config elephant/desktopapplications.toml
 
+# Link all elephant menus
+mkdir -p ~/.config/elephant/menus
+for menu in $OMARCHY_PATH/default/elephant/*.lua; do
+  ln -snf "$menu" ~/.config/elephant/menus/"$(basename "$menu")"
+done
+
 # Restart service
 omarchy-restart-walker

From c7a9d2b34558fcb8c6d5ea35c2e28d45d4de1680 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Sun, 3 May 2026 15:33:49 -0400
Subject: [PATCH 6/9] Add push-to-talk keybind for voxtype

---
 default/hypr/bindings/utilities.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/default/hypr/bindings/utilities.conf b/default/hypr/bindings/utilities.conf
index b2cf33ce..d5f966f2 100644
--- a/default/hypr/bindings/utilities.conf
+++ b/default/hypr/bindings/utilities.conf
@@ -56,6 +56,9 @@ bindd = SUPER CTRL, T, Activity, exec, omarchy-launch-tui btop
 # Dictation
 bindd = SUPER CTRL, X, Toggle dictation, exec, voxtype record toggle
 
+bindd  = , F5, Start dictation (push-to-talk), exec, voxtype record start
+binddr = , F5, Stop dictation (push-to-talk),  exec, voxtype record stop
+
 # Zoom
 bindd = SUPER CTRL, Z, Zoom in, exec, hyprctl keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor -j | jq '.float + 1')
 bindd = SUPER CTRL ALT, Z, Reset zoom, exec, hyprctl keyword cursor:zoom_factor 1

From ec0bcb3014fa90037d3049cbeb432bac515913fd Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 3 May 2026 21:35:02 +0200
Subject: [PATCH 7/9] Better retroarch install with config setup and no AUR

---
 bin/omarchy-install-retroarch | 32 ++++++++++++++++++++++++++++----
 bin/omarchy-menu              |  4 ++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/bin/omarchy-install-retroarch b/bin/omarchy-install-retroarch
index fa5b3c4f..76e976bc 100755
--- a/bin/omarchy-install-retroarch
+++ b/bin/omarchy-install-retroarch
@@ -4,10 +4,26 @@
 
 set -e
 
-omarchy-pkg-aur-add retroarch retroarch-assets libretro libretro-fbneo
+omarchy-pkg-add \
+  retroarch \
+  retroarch-assets-glui retroarch-assets-ozone retroarch-assets-xmb \
+  libretro-beetle-pce libretro-beetle-pce-fast libretro-beetle-psx libretro-beetle-psx-hw libretro-beetle-supergrafx \
+  libretro-blastem \
+  libretro-bsnes libretro-bsnes-hd libretro-bsnes2014 \
+  libretro-core-info \
+  libretro-desmume libretro-dolphin libretro-flycast \
+  libretro-gambatte libretro-genesis-plus-gx \
+  libretro-kronos \
+  libretro-mame libretro-mame2016 libretro-melonds libretro-mesen libretro-mesen-s libretro-mgba libretro-mupen64plus-next \
+  libretro-nestopia \
+  libretro-overlays \
+  libretro-parallel-n64 libretro-picodrive libretro-play libretro-ppsspp \
+  libretro-sameboy libretro-scummvm libretro-shaders-slang libretro-snes9x \
+  libretro-yabause \
+  libretro-fbneo-git
 
-# Set up ~/Games as the default ROM directory
-mkdir -p "$HOME/Games"
+# Set up ~/Games for BIOS files and ROMs
+mkdir -p "$HOME/Games/bios" "$HOME/Games/roms"
 
 CFG="$HOME/.config/retroarch/retroarch.cfg"
 mkdir -p "$(dirname "$CFG")"
@@ -22,6 +38,14 @@ set_cfg() {
   fi
 }
 
-set_cfg rgui_browser_directory "$HOME/Games"
+set_cfg rgui_browser_directory "$HOME/Games/roms"
+set_cfg system_directory "$HOME/Games/bios"
+
+# Point at the cores and assets installed by pacman
+set_cfg libretro_directory "/usr/lib/libretro"
+set_cfg libretro_info_path "/usr/share/libretro/info"
+set_cfg overlay_directory "/usr/share/libretro/overlays"
+set_cfg osk_overlay_directory "/usr/share/libretro/overlays/keyboards"
+set_cfg video_shader_dir "/usr/share/libretro/shaders/shaders_slang"
 
 setsid gtk-launch com.libretro.RetroArch.desktop >/dev/null 2>&1 &
diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index 343d2794..9933b5da 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -386,11 +386,11 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n󰢹  NVIDIA GeForce NOW\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
+  case $(menu "Install" "  Steam\n  RetroArch\n󰍳  Minecraft\n󰢹  NVIDIA GeForce NOW\n󰖺  Xbox Controller [AUR]") in
   *Steam*) present_terminal omarchy-install-steam ;;
-  *GeForce*) present_terminal omarchy-install-geforce-now ;;
   *RetroArch*) present_terminal omarchy-install-retroarch ;;
   *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
+  *GeForce*) present_terminal omarchy-install-geforce-now ;;
   *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
   *) show_install_menu ;;
   esac

From fb6f1d816b3fb65370cfe174b0177c898c27b8b4 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 3 May 2026 21:35:33 +0200
Subject: [PATCH 8/9] Set vulkan video driver

---
 bin/omarchy-install-retroarch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/omarchy-install-retroarch b/bin/omarchy-install-retroarch
index 76e976bc..51fa7ce9 100755
--- a/bin/omarchy-install-retroarch
+++ b/bin/omarchy-install-retroarch
@@ -48,4 +48,7 @@ set_cfg overlay_directory "/usr/share/libretro/overlays"
 set_cfg osk_overlay_directory "/usr/share/libretro/overlays/keyboards"
 set_cfg video_shader_dir "/usr/share/libretro/shaders/shaders_slang"
 
+# Vulkan is required for slang shaders and unlocks hardware renderers in beetle-psx-hw, parallel-n64, dolphin
+set_cfg video_driver "vulkan"
+
 setsid gtk-launch com.libretro.RetroArch.desktop >/dev/null 2>&1 &

From 25701813c987cdf410b1a9fb332349120064e8ae Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 3 May 2026 21:48:06 +0200
Subject: [PATCH 9/9] More preconfigging

---
 bin/omarchy-install-retroarch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/bin/omarchy-install-retroarch b/bin/omarchy-install-retroarch
index 51fa7ce9..7957d973 100755
--- a/bin/omarchy-install-retroarch
+++ b/bin/omarchy-install-retroarch
@@ -51,4 +51,20 @@ set_cfg video_shader_dir "/usr/share/libretro/shaders/shaders_slang"
 # Vulkan is required for slang shaders and unlocks hardware renderers in beetle-psx-hw, parallel-n64, dolphin
 set_cfg video_driver "vulkan"
 
+# XMB is the classic PS3-style menu (vs. ozone/rgui/glui)
+set_cfg menu_driver "xmb"
+
+# Default to crt-royale shader for that classic CRT look. The global preset is
+# auto-loaded by RetroArch when auto_shaders_enable is true and no per-core/per-game
+# preset takes precedence — setting video_shader alone in retroarch.cfg is not enough.
+set_cfg video_shader_enable "true"
+set_cfg auto_shaders_enable "true"
+mkdir -p ~/.config/retroarch/config
+echo '#reference "/usr/share/libretro/shaders/shaders_slang/crt/crt-royale.slangp"' \
+  > ~/.config/retroarch/config/global.slangp
+
+# Hide Images and Video tabs in the main menu sidebar
+set_cfg content_show_images "false"
+set_cfg content_show_video "false"
+
 setsid gtk-launch com.libretro.RetroArch.desktop >/dev/null 2>&1 &