mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
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 <david@hey.com>
This commit is contained in:
@@ -4,5 +4,5 @@ echo "Installing all dependencies..."
|
|||||||
omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
|
omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
|
||||||
|
|
||||||
echo "Starting 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."
|
echo "See Dropbox icon behind hover tray in top right and right-click for setup."
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/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'
|
||||||
|
|||||||
@@ -9,4 +9,4 @@ else
|
|||||||
private_flag="--incognito"
|
private_flag="--incognito"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec setsid uwsm app -- "$browser_exec" "${@/--private/$private_flag}"
|
exec setsid uwsm-app -- "$browser_exec" "${@/--private/$private_flag}"
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
case "${EDITOR:-nvim}" in
|
case "${EDITOR:-nvim}" in
|
||||||
nvim | vim | nano | micro | hx)
|
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
|
esac
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
cmd="$*"
|
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"
|
||||||
@@ -6,7 +6,7 @@ if (($# == 0)); then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
WINDOW_PATTERN="$1"
|
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)
|
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
|
if [[ -n $WINDOW_ADDRESS ]]; then
|
||||||
|
|||||||
@@ -7,4 +7,4 @@ google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-b
|
|||||||
*) browser="chromium.desktop" ;;
|
*) browser="chromium.desktop" ;;
|
||||||
esac
|
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}"
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
exec setsid uwsm app -- "$TERMINAL" --class=Impala -e impala "$@"
|
exec setsid uwsm-app -- "$TERMINAL" --class=Impala -e impala "$@"
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ dynamic_bindings() {
|
|||||||
-e 's/null//' \
|
-e 's/null//' \
|
||||||
-e 's,~/.local/share/omarchy/bin/,,' \
|
-e 's,~/.local/share/omarchy/bin/,,' \
|
||||||
-e 's,uwsm app -- ,,' \
|
-e 's,uwsm app -- ,,' \
|
||||||
|
-e 's,uwsm-app -- ,,' \
|
||||||
-e 's/@0//' \
|
-e 's/@0//' \
|
||||||
-e 's/,@/,code:/' \
|
-e 's/,@/,code:/' \
|
||||||
-e 's/^0,/,/' \
|
-e 's/^0,/,/' \
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
pkill -x $1
|
pkill -x $1
|
||||||
setsid uwsm app -- $1 >/dev/null 2>&1 &
|
setsid uwsm-app -- $1 >/dev/null 2>&1 &
|
||||||
|
|||||||
@@ -3,5 +3,5 @@
|
|||||||
pkill walker
|
pkill walker
|
||||||
# FIXME: Just deal with the memory leak for now.
|
# FIXME: Just deal with the memory leak for now.
|
||||||
# See https://github.com/basecamp/omarchy/issues/698
|
# 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
|
echo # Always end in success so we don't terminate further running
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ TOTAL=${#BACKGROUNDS[@]}
|
|||||||
if [[ $TOTAL -eq 0 ]]; then
|
if [[ $TOTAL -eq 0 ]]; then
|
||||||
notify-send "No background was found for theme" -t 2000
|
notify-send "No background was found for theme" -t 2000
|
||||||
pkill -x swaybg
|
pkill -x swaybg
|
||||||
setsid uwsm app -- swaybg --color '#000000' >/dev/null 2>&1 &
|
setsid uwsm-app -- swaybg --color '#000000' >/dev/null 2>&1 &
|
||||||
else
|
else
|
||||||
# Get current background from symlink
|
# Get current background from symlink
|
||||||
if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
|
if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
|
||||||
@@ -44,5 +44,5 @@ else
|
|||||||
|
|
||||||
# Relaunch swaybg
|
# Relaunch swaybg
|
||||||
pkill -x 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
|
fi
|
||||||
|
|||||||
@@ -4,6 +4,6 @@ if pgrep -x hypridle >/dev/null; then
|
|||||||
pkill -x hypridle
|
pkill -x hypridle
|
||||||
notify-send "Stop locking computer when idle"
|
notify-send "Stop locking computer when idle"
|
||||||
else
|
else
|
||||||
uwsm app -- hypridle >/dev/null 2>&1 &
|
uwsm-app -- hypridle >/dev/null 2>&1 &
|
||||||
notify-send "Now locking computer when idle"
|
notify-send "Now locking computer when idle"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ OFF_TEMP=6000
|
|||||||
|
|
||||||
# Ensure hyprsunset is running
|
# Ensure hyprsunset is running
|
||||||
if ! pgrep -x hyprsunset; then
|
if ! pgrep -x hyprsunset; then
|
||||||
setsid uwsm app -- hyprsunset &
|
setsid uwsm-app -- hyprsunset &
|
||||||
sleep 1 # Give it time to register
|
sleep 1 # Give it time to register
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -3,5 +3,5 @@
|
|||||||
if pgrep -x waybar >/dev/null; then
|
if pgrep -x waybar >/dev/null; then
|
||||||
pkill -x waybar
|
pkill -x waybar
|
||||||
else
|
else
|
||||||
uwsm app -- waybar >/dev/null 2>&1 &
|
uwsm-app -- waybar >/dev/null 2>&1 &
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
# Extra autostart processes
|
# Extra autostart processes
|
||||||
# exec-once = uwsm app -- my-service
|
# exec-once = uwsm-app -- my-service
|
||||||
|
|||||||
@@ -1,18 +1,18 @@
|
|||||||
# Application bindings
|
# Application bindings
|
||||||
$terminal = uwsm app -- $TERMINAL
|
$terminal = uwsm-app -- $TERMINAL
|
||||||
$browser = omarchy-launch-browser
|
$browser = omarchy-launch-browser
|
||||||
|
|
||||||
bindd = SUPER, RETURN, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
|
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, B, Browser, exec, $browser
|
||||||
bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private
|
bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private
|
||||||
bindd = SUPER, M, Music, exec, omarchy-launch-or-focus spotify
|
bindd = SUPER, M, Music, exec, omarchy-launch-or-focus spotify
|
||||||
bindd = SUPER, N, Editor, exec, omarchy-launch-editor
|
bindd = SUPER, N, Editor, exec, omarchy-launch-editor
|
||||||
bindd = SUPER, T, Activity, exec, $terminal -e btop
|
bindd = SUPER, T, Activity, exec, $terminal -e btop
|
||||||
bindd = SUPER, D, Docker, exec, $terminal -e lazydocker
|
bindd = SUPER, D, Docker, exec, $terminal -e lazydocker
|
||||||
bindd = SUPER, G, Signal, exec, omarchy-launch-or-focus signal "uwsm app -- signal-desktop"
|
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, 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, SLASH, Passwords, exec, uwsm-app -- 1password
|
||||||
|
|
||||||
# If your web app url contains #, type it as ## to prevent hyprland from treating it as a comment
|
# 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"
|
bindd = SUPER, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com"
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ path = "~/.config/hypr/hyprland.conf"
|
|||||||
hidden = true
|
hidden = true
|
||||||
|
|
||||||
[builtins.applications]
|
[builtins.applications]
|
||||||
launch_prefix = "uwsm app -- "
|
launch_prefix = "uwsm-app -- "
|
||||||
placeholder = " Search..."
|
placeholder = " Search..."
|
||||||
prioritize_new = false
|
prioritize_new = false
|
||||||
context_aware = false
|
context_aware = false
|
||||||
|
|||||||
Reference in New Issue
Block a user