Extract shared function

Closes #229
Co-authored-by: @jhosdev

bin/omarchy-refresh-hyprlock

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Overwrite local Hyprlock settings with the latest in Omarchy, but create a backup
+cp -f ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak 2>/dev/null
+cp -f ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/ 2>/dev/null

bin/omarchy-refresh-waybar

@@ -6,6 +6,5 @@ if gum confirm "Refresh Waybar config? This will replace your current settings w
   cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
 
   # Restart waybar
-  pkill waybar
-  setsid waybar >/dev/null 2>&1 &
+  pkill -SIGUSR2 waybar
 fi

bin/omarchy-screenrecord

@@ -1,14 +1,21 @@
 #!/bin/bash
 
+screenrecording() {
+  wl-screenrec \
+    -f "$HOME/Videos/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4" \
+    --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart"
+}
+
 if pgrep -x wl-screenrec >/dev/null; then
   pkill -x wl-screenrec
   notify-send "Screen recording saved to ~/Videos" -t 2000
+elif [[ $1 == "output" ]]; then
+  notify-send "Screen recording starting..." -t 1000
+  sleep 1
+  screenrecording -o ""
 else
   region=$(slurp) || exit 1
   notify-send "Screen recording starting..." -t 1000
   sleep 1
-  wl-screenrec \
-    -g "$region" \
-    -f "$HOME/Videos/screen-recording-$(date +'%Y-%m-%d_%H-%M-%S').mp4" \
-    --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart"
+  screenrecording -g "$region"
 fi

bin/omarchy-screenshot

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+hyprshot -m ${1:-region} --raw |
+  satty --filename - \
+    --output-filename ~/Pictures/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png \
+    --early-exit \
+    --actions-on-enter save-to-clipboard \
+    --save-after-copy \
+    --copy-command 'wl-copy'

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 swaybg --color '#000000' >/dev/null 2>&2 &
+  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 swaybg -i "$NEW_BACKGROUND" -m fill >/dev/null 2>&2 &
+  uwsm app -- swaybg -i "$NEW_BACKGROUND" -m fill >/dev/null 2>&1 &
 fi

bin/omarchy-theme-set

@@ -46,8 +46,7 @@ touch "$HOME/.config/alacritty/alacritty.toml"
 pkill -SIGUSR2 btop
 
 # Restart components to apply new theme
-pkill waybar
-setsid waybar >/dev/null 2>&1 &
+pkill -SIGUSR2 waybar
 makoctl reload
 hyprctl reload
 

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
-  setsid hypridle &>/dev/null &
+  uwsm app -- hypridle >/dev/null 2>&1 &
   notify-send "Now locking computer when idle"
 fi

config/hypr/hyprlock.conf

@@ -1,7 +1,3 @@
-# ────────────────────────────────────────────────────────────
-#  Hyprlock — minimal blur with ringed input
-# ────────────────────────────────────────────────────────────
-
 source = ~/.config/omarchy/current/theme/hyprlock.conf
 
 general {
@@ -36,7 +32,7 @@ input-field {
     placeholder_color = $placeholder_color
     placeholder_text =   Enter Password 󰈷 
     check_color = $check_color
-    fail_text = Wrong
+    fail_text = <i>$PAMFAIL ($ATTEMPTS)</i>
 
     rounding = 0
     shadow_passes = 0

default/bash/functions

@@ -69,5 +69,5 @@ web2app-remove() {
 # Ensure changes to ~/.XCompose are immediately available
 refresh-xcompose() {
   pkill fcitx5
-  setsid fcitx5 &>/dev/null &
+  uwsm app -- fcitx5 >/dev/null 2>&1 &
 }

default/hypr/bindings/utilities.conf

@@ -24,12 +24,13 @@ bind = CTRL, F2, exec, ~/.local/share/omarchy/bin/omarchy-apple-display-brightne
 bind = SHIFT CTRL, F2, exec, ~/.local/share/omarchy/bin/omarchy-apple-display-brightness +60000
 
 # Screenshots
-bind = , PRINT, exec, hyprshot -m region
-bind = SHIFT, PRINT, exec, hyprshot -m window
-bind = CTRL, PRINT, exec, hyprshot -m output
+bind = , PRINT, exec, omarchy-screenshot
+bind = SHIFT, PRINT, exec, omarchy-screenshot window
+bind = CTRL, PRINT, exec, omarchy-screenshot output
 
 # Screenshots
 bind = ALT, PRINT, exec, omarchy-screenrecord
+bind = CTRL ALT, PRINT, exec, omarchy-screenrecord output
 
 # Color picker
 bind = SUPER, PRINT, exec, hyprpicker -a

install/desktop.sh

@@ -4,6 +4,6 @@ yay -S --noconfirm --needed \
   brightnessctl playerctl pamixer wiremix wireplumber \
   fcitx5 fcitx5-gtk fcitx5-qt wl-clip-persist \
   nautilus sushi ffmpegthumbnailer \
-  slurp wl-screenrec \
+  slurp wl-screenrec satty \
   mpv evince imv \
   chromium

migrations/1752899588.sh

@@ -0,0 +1,2 @@
+echo "Update .config/hypr/hyprlock.conf to include failed attempt counter"
+omarchy-refresh-hyprlock

migrations/1752955912.sh

@@ -0,0 +1,2 @@
+echo "Install satty for the new screenshot flow"
+yay -S --noconfirm --needed satty