From 2971a25a4fe56e567f9a1dfd36fb9dd6ae1b353b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kr=C3=BCger?= Date: Mon, 6 Oct 2025 22:03:16 +0200 Subject: [PATCH] fix: change uwsm app to uwsm-app for performance (#1960) * fix: change uwsm app to uwsm-app for performance * Do not run uwsm-app in parallel as it's not supported * Fix comment --------- Co-authored-by: David Heinemeier Hansson --- bin/omarchy-install-dropbox | 2 +- bin/omarchy-launch-about | 2 +- bin/omarchy-launch-browser | 2 +- bin/omarchy-launch-editor | 4 ++-- bin/omarchy-launch-floating-terminal-with-presentation | 2 +- bin/omarchy-launch-or-focus | 2 +- bin/omarchy-launch-webapp | 2 +- bin/omarchy-launch-wifi | 2 +- bin/omarchy-menu-keybindings | 1 + bin/omarchy-restart-app | 2 +- bin/omarchy-restart-walker | 2 +- bin/omarchy-theme-bg-next | 4 ++-- bin/omarchy-toggle-idle | 2 +- bin/omarchy-toggle-nightlight | 2 +- bin/omarchy-toggle-waybar | 2 +- config/hypr/autostart.conf | 2 +- config/hypr/bindings.conf | 10 +++++----- config/walker/config.toml | 2 +- 18 files changed, 24 insertions(+), 23 deletions(-) diff --git a/bin/omarchy-install-dropbox b/bin/omarchy-install-dropbox index ac5710c8..b4c59298 100755 --- a/bin/omarchy-install-dropbox +++ b/bin/omarchy-install-dropbox @@ -4,5 +4,5 @@ echo "Installing all dependencies..." omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox echo "Starting Dropbox..." -uwsm app -- dropbox-cli start &>/dev/null & +uwsm-app -- dropbox-cli start &>/dev/null & echo "See Dropbox icon behind  hover tray in top right and right-click for setup." diff --git a/bin/omarchy-launch-about b/bin/omarchy-launch-about index 00722221..797e340f 100755 --- a/bin/omarchy-launch-about +++ b/bin/omarchy-launch-about @@ -1,3 +1,3 @@ #!/bin/bash -exec setsid uwsm app -- alacritty --class=Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' +exec setsid uwsm-app -- alacritty --class=Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' diff --git a/bin/omarchy-launch-browser b/bin/omarchy-launch-browser index 536e212c..d6ae00cb 100755 --- a/bin/omarchy-launch-browser +++ b/bin/omarchy-launch-browser @@ -9,4 +9,4 @@ else private_flag="--incognito" fi -exec setsid uwsm app -- "$browser_exec" "${@/--private/$private_flag}" +exec setsid uwsm-app -- "$browser_exec" "${@/--private/$private_flag}" diff --git a/bin/omarchy-launch-editor b/bin/omarchy-launch-editor index 157168a8..bf90330b 100755 --- a/bin/omarchy-launch-editor +++ b/bin/omarchy-launch-editor @@ -2,9 +2,9 @@ case "${EDITOR:-nvim}" in nvim | vim | nano | micro | hx) - exec setsid uwsm app -- "$TERMINAL" -e "$EDITOR" "$@" + exec setsid uwsm-app -- "$TERMINAL" -e "$EDITOR" "$@" ;; *) - exec setsid uwsm app -- "$EDITOR" "$@" + exec setsid uwsm-app -- "$EDITOR" "$@" ;; esac diff --git a/bin/omarchy-launch-floating-terminal-with-presentation b/bin/omarchy-launch-floating-terminal-with-presentation index 78e8b2db..b6121705 100755 --- a/bin/omarchy-launch-floating-terminal-with-presentation +++ b/bin/omarchy-launch-floating-terminal-with-presentation @@ -1,4 +1,4 @@ #!/bin/bash cmd="$*" -exec setsid uwsm app -- alacritty -o font.size=9 --class=Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done" +exec setsid uwsm-app -- alacritty -o font.size=9 --class=Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done" \ No newline at end of file diff --git a/bin/omarchy-launch-or-focus b/bin/omarchy-launch-or-focus index a0075632..270b0251 100755 --- a/bin/omarchy-launch-or-focus +++ b/bin/omarchy-launch-or-focus @@ -6,7 +6,7 @@ if (($# == 0)); then fi WINDOW_PATTERN="$1" -LAUNCH_COMMAND="${2:-"uwsm app -- $WINDOW_PATTERN"}" +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) if [[ -n $WINDOW_ADDRESS ]]; then diff --git a/bin/omarchy-launch-webapp b/bin/omarchy-launch-webapp index 441748ea..1de31278 100755 --- a/bin/omarchy-launch-webapp +++ b/bin/omarchy-launch-webapp @@ -7,4 +7,4 @@ google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-b *) browser="chromium.desktop" ;; esac -exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$1" "${@:2}" +exec setsid uwsm-app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$1" "${@:2}" diff --git a/bin/omarchy-launch-wifi b/bin/omarchy-launch-wifi index fe04f846..c9a9b18b 100755 --- a/bin/omarchy-launch-wifi +++ b/bin/omarchy-launch-wifi @@ -1,3 +1,3 @@ #!/bin/bash -exec setsid uwsm app -- "$TERMINAL" --class=Impala -e impala "$@" +exec setsid uwsm-app -- "$TERMINAL" --class=Impala -e impala "$@" diff --git a/bin/omarchy-menu-keybindings b/bin/omarchy-menu-keybindings index cd1a9b54..093f0495 100755 --- a/bin/omarchy-menu-keybindings +++ b/bin/omarchy-menu-keybindings @@ -80,6 +80,7 @@ dynamic_bindings() { -e 's/null//' \ -e 's,~/.local/share/omarchy/bin/,,' \ -e 's,uwsm app -- ,,' \ + -e 's,uwsm-app -- ,,' \ -e 's/@0//' \ -e 's/,@/,code:/' \ -e 's/^0,/,/' \ diff --git a/bin/omarchy-restart-app b/bin/omarchy-restart-app index 8cf2a036..4cc474fa 100755 --- a/bin/omarchy-restart-app +++ b/bin/omarchy-restart-app @@ -1,4 +1,4 @@ #!/bin/bash pkill -x $1 -setsid uwsm app -- $1 >/dev/null 2>&1 & +setsid uwsm-app -- $1 >/dev/null 2>&1 & diff --git a/bin/omarchy-restart-walker b/bin/omarchy-restart-walker index b2dc9a45..7e3396af 100755 --- a/bin/omarchy-restart-walker +++ b/bin/omarchy-restart-walker @@ -3,5 +3,5 @@ pkill walker # FIXME: Just deal with the memory leak for now. # See https://github.com/basecamp/omarchy/issues/698 -setsid uwsm app -- walker --gapplication-service & +setsid uwsm-app -- walker --gapplication-service & echo # Always end in success so we don't terminate further running diff --git a/bin/omarchy-theme-bg-next b/bin/omarchy-theme-bg-next index 21cddf98..94aa4e70 100755 --- a/bin/omarchy-theme-bg-next +++ b/bin/omarchy-theme-bg-next @@ -11,7 +11,7 @@ TOTAL=${#BACKGROUNDS[@]} if [[ $TOTAL -eq 0 ]]; then notify-send "No background was found for theme" -t 2000 pkill -x swaybg - setsid uwsm app -- swaybg --color '#000000' >/dev/null 2>&1 & + setsid uwsm-app -- swaybg --color '#000000' >/dev/null 2>&1 & else # Get current background from symlink if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then @@ -44,5 +44,5 @@ else # Relaunch swaybg pkill -x swaybg - setsid uwsm app -- swaybg -i "$CURRENT_BACKGROUND_LINK" -m fill >/dev/null 2>&1 & + setsid uwsm-app -- swaybg -i "$CURRENT_BACKGROUND_LINK" -m fill >/dev/null 2>&1 & fi diff --git a/bin/omarchy-toggle-idle b/bin/omarchy-toggle-idle index a1954614..aa69cf50 100755 --- a/bin/omarchy-toggle-idle +++ b/bin/omarchy-toggle-idle @@ -4,6 +4,6 @@ if pgrep -x hypridle >/dev/null; then pkill -x hypridle notify-send "Stop locking computer when idle" else - uwsm app -- hypridle >/dev/null 2>&1 & + uwsm-app -- hypridle >/dev/null 2>&1 & notify-send "Now locking computer when idle" fi diff --git a/bin/omarchy-toggle-nightlight b/bin/omarchy-toggle-nightlight index 2ab2deb6..99b0286b 100755 --- a/bin/omarchy-toggle-nightlight +++ b/bin/omarchy-toggle-nightlight @@ -6,7 +6,7 @@ OFF_TEMP=6000 # Ensure hyprsunset is running if ! pgrep -x hyprsunset; then - setsid uwsm app -- hyprsunset & + setsid uwsm-app -- hyprsunset & sleep 1 # Give it time to register fi diff --git a/bin/omarchy-toggle-waybar b/bin/omarchy-toggle-waybar index 9714185f..71387827 100755 --- a/bin/omarchy-toggle-waybar +++ b/bin/omarchy-toggle-waybar @@ -3,5 +3,5 @@ if pgrep -x waybar >/dev/null; then pkill -x waybar else - uwsm app -- waybar >/dev/null 2>&1 & + uwsm-app -- waybar >/dev/null 2>&1 & fi diff --git a/config/hypr/autostart.conf b/config/hypr/autostart.conf index 3b7c62d2..708b3a29 100644 --- a/config/hypr/autostart.conf +++ b/config/hypr/autostart.conf @@ -1,2 +1,2 @@ # Extra autostart processes -# exec-once = uwsm app -- my-service +# exec-once = uwsm-app -- my-service diff --git a/config/hypr/bindings.conf b/config/hypr/bindings.conf index 72e71cc1..3159f781 100644 --- a/config/hypr/bindings.conf +++ b/config/hypr/bindings.conf @@ -1,18 +1,18 @@ # Application bindings -$terminal = uwsm app -- $TERMINAL +$terminal = uwsm-app -- $TERMINAL $browser = omarchy-launch-browser bindd = SUPER, RETURN, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)" -bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window +bindd = SUPER, F, File manager, exec, uwsm-app -- nautilus --new-window bindd = SUPER, B, Browser, exec, $browser bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private bindd = SUPER, M, Music, exec, omarchy-launch-or-focus spotify bindd = SUPER, N, Editor, exec, omarchy-launch-editor bindd = SUPER, T, Activity, exec, $terminal -e btop bindd = SUPER, D, Docker, exec, $terminal -e lazydocker -bindd = SUPER, G, Signal, exec, omarchy-launch-or-focus signal "uwsm app -- signal-desktop" -bindd = SUPER, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm app -- obsidian -disable-gpu --enable-wayland-ime" -bindd = SUPER, SLASH, Passwords, exec, uwsm app -- 1password +bindd = SUPER, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop" +bindd = SUPER, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime" +bindd = SUPER, SLASH, Passwords, exec, uwsm-app -- 1password # If your web app url contains #, type it as ## to prevent hyprland from treating it as a comment bindd = SUPER, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com" diff --git a/config/walker/config.toml b/config/walker/config.toml index cfd79aab..da79b96d 100644 --- a/config/walker/config.toml +++ b/config/walker/config.toml @@ -21,7 +21,7 @@ path = "~/.config/hypr/hyprland.conf" hidden = true [builtins.applications] -launch_prefix = "uwsm app -- " +launch_prefix = "uwsm-app -- " placeholder = " Search..." prioritize_new = false context_aware = false