Merge branch 'dev' into rc

This commit is contained in:
David Heinemeier Hansson
2026-05-03 22:02:43 +02:00
10 changed files with 326 additions and 18 deletions
+100 -6
View File
@@ -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
+70
View File
@@ -0,0 +1,70 @@
#!/bin/bash
# omarchy:summary=Install RetroArch with the full libretro core set plus FBNeo and a ~/Games ROM directory.
set -e
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 for BIOS files and ROMs
mkdir -p "$HOME/Games/bios" "$HOME/Games/roms"
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/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"
# 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 &
+3 -3
View File
@@ -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*) 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" ;;
*GeForce*) present_terminal omarchy-install-geforce-now ;;
*Xbox*) present_terminal omarchy-install-xbox-controllers ;;
*) show_install_menu ;;
esac
+6
View File
@@ -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
+1 -1
View File
@@ -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!" \
+3
View File
@@ -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
+5
View File
@@ -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
-7
View File
@@ -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
+137
View File
@@ -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 }}
+1 -1
View File
@@ -21,7 +21,7 @@ color6 = "#b0b0b0"
color7 = "#ececec"
# Bright colors (ANSI 8-15)
color8 = "#fdfdfd"
color8 = "#5c5c5c"
color9 = "#a4a4a4"
color10 = "#b6b6b6"
color11 = "#cecece"