Extract shared function

Closes #229
Co-authored-by: @jhosdev

applications/nvim.desktop

@@ -2,7 +2,7 @@
 Name=Neovim
 GenericName=Text Editor
 Comment=Edit text files
-Exec=alacritty -e nvim -- %F
+Exec=alacritty --class=nvim --title=nvim -e nvim -- %F
 Terminal=false
 Type=Application
 Keywords=Text;editor;

applications/wiremix.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Audio Settings
+Comment=Using Wiremix
+Exec=alacritty --class=Wiremix --title=Wiremix -e wiremix
+Icon=audio-card
+Type=Application
+Terminal=false

bin/omarchy-menu-power

@@ -1,16 +1,14 @@
 #!/bin/bash
 
-# Power menu for Omarchy
-# Provides power off, restart, and sleep options
-
-# Function to show power menu. The first characters are invisible sort keys.
 show_power_menu() {
+  # The first characters are invisible sort keys.
   local menu_options="\u200B Lock
 \u200C󰤄 Suspend
 \u200D Relaunch
 \u2060󰜉 Restart
 \u2063󰐥 Shutdown"
-  local selection=$(echo -e "$menu_options" | wofi --show dmenu --prompt "Power Options" --width 150 --height 195 -O alphabetical --style ~/.config/wofi/select.css)
+
+  local selection=$(echo -e "$menu_options" | wofi --show dmenu --width 150 --height 195 -O alphabetical --style ~/.config/wofi/select.css)
 
   case "$selection" in
   *Lock*) hyprlock ;;
@@ -21,5 +19,4 @@ show_power_menu() {
   esac
 }
 
-# Main execution
 show_power_menu

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
+  pkill -SIGUSR2 waybar
-  setsid waybar >/dev/null 2>&1 &
 fi

bin/omarchy-screenrecord

@@ -0,0 +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
+  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-menu

@@ -22,7 +22,7 @@ mapfile -t themes < <(
 selection=$(printf '%s\n' "${themes[@]}" | wofi \
   --show dmenu \
   --allow-markup \
-  --width 150 \
+  --width 200 \
   --height 400 \
   -O alphabetical \
   --style ~/.config/wofi/select.css 2>/dev/null)

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
+pkill -SIGUSR2 waybar
-setsid waybar >/dev/null 2>&1 &
 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

bin/omarchy-update

@@ -11,9 +11,8 @@ else
 fi
 
 # Get the latest while trying to preserve any modifications
-git stash
+git pull --autostash
-git pull
+git diff --check || git reset --merge
-git stash pop
 
 # Run any pending migrations
 for file in migrations/*.sh; do

boot.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 ascii_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
 ███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
 ███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███

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

config/waybar/config.jsonc

@@ -96,7 +96,7 @@
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "pavucontrol",
+    "on-click": "alacritty --class=Wiremix -e wiremix",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,

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,9 +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 = , PRINT, exec, omarchy-screenshot
-bind = SHIFT, PRINT, exec, hyprshot -m window
+bind = SHIFT, PRINT, exec, omarchy-screenshot window
-bind = CTRL, PRINT, exec, hyprshot -m output
+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

default/hypr/windows.conf

@@ -5,10 +5,10 @@ windowrule = suppressevent maximize, class:.*
 windowrule = tile, class:^(Chromium)$
 
 # Float and center settings and previews
-windowrule = float, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$
+windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$
-windowrule = size 800 600, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer)$
+windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer)$
 windowrule = size 645 350, class:Omarchy
-windowrule = center, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$
+windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$
 
 # Float and center file pickers
 windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)

install.sh

@@ -1,8 +1,16 @@
+#!/bin/bash
+
 # Exit immediately if a command exits with a non-zero status
 set -e
 
 # Give people a chance to retry running the installation
-trap 'echo "Omarchy installation failed! You can retry by running: source ~/.local/share/omarchy/install.sh"' ERR
+catch_errors() {
+  echo -e "\n\e[31mOmarchy installation failed!\e[0m"
+  echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
+  echo "Get help from the community: https://discord.gg/tXFUdasqhY"
+}
+
+trap catch_errors ERR
 
 # Install everything
 for f in ~/.local/share/omarchy/install/*.sh; do

install/desktop.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
 yay -S --noconfirm --needed \
-  brightnessctl playerctl pamixer pavucontrol wireplumber \
+  brightnessctl playerctl pamixer wiremix wireplumber \
-  fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool wl-clip-persist \
+  fcitx5 fcitx5-gtk fcitx5-qt wl-clip-persist \
   nautilus sushi ffmpegthumbnailer \
+  slurp wl-screenrec satty \
   mpv evince imv \
   chromium

install/docker.sh

@@ -13,6 +13,7 @@ sudo systemctl enable docker
 sudo usermod -aG docker ${USER}
 
 # Prevent Docker from preventing boot for network-online.target
+sudo mkdir -p /etc/systemd/system/docker.service.d
 sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
 [Unit]
 DefaultDependencies=no

install/login.sh

@@ -110,6 +110,7 @@ WantedBy=graphical.target
 EOF
 
 # Make plymouth remain until graphical.target
+sudo mkdir -p /etc/systemd/system/plymouth-quit.service.d
 sudo tee /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf <<'EOF'
 [Unit]
 After=multi-user.target

migrations/1752874371.sh

@@ -0,0 +1,4 @@
+echo "Add Catppuccin Latte light theme"
+if [[ ! -L "~/.config/omarchy/themes/catppuccin-latte" ]]; then
+  ln -snf ~/.local/share/omarchy/themes/catppuccin-latte ~/.config/omarchy/themes/
+fi

migrations/1752885858.sh

@@ -0,0 +1,2 @@
+echo "Install slurp + wl-screenrec for new ALT+PrintScreen screen recorder"
+yay -S --noconfirm --needed slurp wl-screenrec

migrations/1752896442.sh

@@ -0,0 +1,9 @@
+echo "Replace volume control GUI with a TUI"
+
+if ! command -v wiremix &>/dev/null; then
+  yay -S --noconfirm --needed wiremix
+  yay -Rns --noconfirm pavucontrol
+
+  omarchy-refresh-applications
+  omarchy-refresh-waybar
+fi

migrations/1752897642.sh

@@ -0,0 +1,4 @@
+echo "Remove needless fcitx5-configtool package"
+if command -v fcitx5-configtool &>/dev/null; then
+  yay -Rns --noconfirm fcitx5-configtool
+fi

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

themes/catppuccin-latte/alacritty.toml

@@ -0,0 +1,67 @@
+# https://raw.githubusercontent.com/catppuccin/alacritty/main/catppuccin-latte.toml
+
+[colors.primary]
+background = "#eff1f5"
+foreground = "#4c4f69"
+dim_foreground = "#8c8fa1"
+bright_foreground = "#4c4f69"
+
+[colors.cursor]
+text = "#eff1f5"
+cursor = "#dc8a78"
+
+[colors.vi_mode_cursor]
+text = "#eff1f5"
+cursor = "#7287fd"
+
+[colors.search.matches]
+foreground = "#eff1f5"
+background = "#6c6f85"
+
+[colors.search.focused_match]
+foreground = "#eff1f5"
+background = "#40a02b"
+
+[colors.footer_bar]
+foreground = "#eff1f5"
+background = "#6c6f85"
+
+[colors.hints.start]
+foreground = "#eff1f5"
+background = "#df8e1d"
+
+[colors.hints.end]
+foreground = "#eff1f5"
+background = "#6c6f85"
+
+[colors.selection]
+text = "#eff1f5"
+background = "#dc8a78"
+
+[colors.normal]
+black = "#bcc0cc"
+red = "#d20f39"
+green = "#40a02b"
+yellow = "#df8e1d"
+blue = "#1e66f5"
+magenta = "#ea76cb"
+cyan = "#179299"
+white = "#5c5f77"
+
+[colors.bright]
+black = "#acb0be"
+red = "#d20f39"
+green = "#40a02b"
+yellow = "#df8e1d"
+blue = "#1e66f5"
+magenta = "#ea76cb"
+cyan = "#179299"
+white = "#6c6f85"
+
+[[colors.indexed_colors]]
+index = 16
+color = "#fe640b"
+
+[[colors.indexed_colors]]
+index = 17
+color = "#dc8a78"

themes/catppuccin-latte/btop.theme

@@ -0,0 +1,84 @@
+# https://github.com/catppuccin/btop/blob/main/themes/catppuccin_latte.theme
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="#eff1f5"
+
+# Main text color
+theme[main_fg]="#4c4f69"
+
+# Title color for boxes
+theme[title]="#4c4f69"
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#1e66f5"
+
+# Background color of selected item in processes box
+theme[selected_bg]="#bcc0cc"
+
+# Foreground color of selected item in processes box
+theme[selected_fg]="#1e66f5"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#8c8fa1"
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="#dc8a78"
+
+# Background color of the percentage meters
+theme[meter_bg]="#bcc0cc"
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="#dc8a78"
+
+# CPU, Memory, Network, Proc box outline colors
+theme[cpu_box]="#8839ef" #Mauve
+theme[mem_box]="#40a02b" #Green
+theme[net_box]="#e64553" #Maroon
+theme[proc_box]="#1e66f5" #Blue
+
+# Box divider line and small boxes line color
+theme[div_line]="#9ca0b0"
+
+# Temperature graph color (Green -> Yellow -> Red)
+theme[temp_start]="#40a02b"
+theme[temp_mid]="#df8e1d"
+theme[temp_end]="#d20f39"
+
+# CPU graph colors (Teal -> Lavender)
+theme[cpu_start]="#179299"
+theme[cpu_mid]="#209fb5"
+theme[cpu_end]="#7287fd"
+
+# Mem/Disk free meter (Mauve -> Lavender -> Blue)
+theme[free_start]="#8839ef"
+theme[free_mid]="#7287fd"
+theme[free_end]="#1e66f5"
+
+# Mem/Disk cached meter (Sapphire -> Lavender)
+theme[cached_start]="#209fb5"
+theme[cached_mid]="#1e66f5"
+theme[cached_end]="#7287fd"
+
+# Mem/Disk available meter (Peach -> Red)
+theme[available_start]="#fe640b"
+theme[available_mid]="#e64553"
+theme[available_end]="#d20f39"
+
+# Mem/Disk used meter (Green -> Sky)
+theme[used_start]="#40a02b"
+theme[used_mid]="#179299"
+theme[used_end]="#04a5e5"
+
+# Download graph colors (Peach -> Red)
+theme[download_start]="#fe640b"
+theme[download_mid]="#e64553"
+theme[download_end]="#d20f39"
+
+# Upload graph colors (Green -> Sky)
+theme[upload_start]="#40a02b"
+theme[upload_mid]="#179299"
+theme[upload_end]="#04a5e5"
+
+# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
+theme[process_start]="#209fb5"
+theme[process_mid]="#7287fd"
+theme[process_end]="#8839ef"

themes/catppuccin-latte/hyprland.conf

@@ -0,0 +1,8 @@
+# https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
+
+$latte_blue = rgb(1e66f5)
+
+general {
+    col.active_border = $latte_blue
+}
+

themes/catppuccin-latte/hyprlock.conf

@@ -0,0 +1,9 @@
+$color = rgba(239,241,245,1.0)            # base
+$inner_color = rgba(239,241,245,0.8)      # slightly transparent base
+$outer_color = rgba(30,102,245,1.0)       # blue
+
+$font_color = rgba(76,79,105,1.0)         # text
+
+$placeholder_color = rgba(204,208,218,0.6) # overlay0 (muted gray-blue)
+$check_color = rgba(4,165,229,1.0)        # cyan
+

themes/catppuccin-latte/light.mode

@@ -0,0 +1 @@
+# This will set "prefer-light" and use "Adwaita" as the theme

themes/catppuccin-latte/mako.ini

@@ -0,0 +1,24 @@
+# Catppuccin Latte – mako notification theme
+text-color=#4c4f69             # text
+border-color=#dce0e8           # crust
+background-color=#eff1f5       # base
+
+width=420
+height=110
+padding=10
+border-size=2
+font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
+max-icon-size=32
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+

themes/catppuccin-latte/neovim.lua

@@ -0,0 +1,19 @@
+return {
+	{
+		"catppuccin/nvim",
+		name = "catppuccin",
+		priority = 1000,
+		config = function()
+			require("catppuccin").setup({
+				flavour = "latte", -- other options: "mocha", "frappe", "macchiato"
+			})
+			vim.cmd.colorscheme("catppuccin-latte")
+		end,
+	},
+	{
+		"LazyVim/LazyVim",
+		opts = {
+			colorscheme = "catppuccin-latte",
+		},
+	},
+}

themes/catppuccin-latte/waybar.css

@@ -0,0 +1,4 @@
+@define-color foreground #4c4f69; /* text */
+@define-color background #eff1f5; /* base */
+@define-color border     #dce0e8; /* crust */
+@define-color accent     #1e66f5; /* blue */

themes/catppuccin-latte/wofi.css

@@ -0,0 +1,4 @@
+@define-color selected-text  #1e66f5; /* blue */
+@define-color text           #4c4f69; /* text */
+@define-color base           #eff1f5; /* base */
+@define-color border         #dce0e8; /* crust */