Merge pull request #182 from abenz1267/uwsm

use uwsm to properly wrap applications as systemd units

bin/omarchy

@@ -126,7 +126,8 @@ setup_menu() {
 }
 
 open_manual() {
-  xdg-open "https://manuals.omamix.org/2/the-omarchy-manual"
+  setsid chromium --new-window --ozone-platform=wayland --app="https://manuals.omamix.org/2/the-omarchy-manual" >/dev/null 2>&1 &
+  clear
 }
 
 ack_command() {
@@ -134,4 +135,3 @@ ack_command() {
 }
 
 main_menu
-

bin/omarchy-power-menu

@@ -10,7 +10,7 @@ show_power_menu() {
 \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 ~/.local/share/omarchy/default/wofi/select.css)
+  local selection=$(echo -e "$menu_options" | wofi --show dmenu --prompt "Power Options" --width 150 --height 195 -O alphabetical --style ~/.config/wofi/select.css)
 
   case "$selection" in
   *Lock*) hyprlock ;;

bin/omarchy-refresh-plymouth

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
+if [[ "$1" == "-y" ]] || gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
   sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
   sudo plymouth-set-default-theme -R omarchy
 fi

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

bin/omarchy-refresh-wofi

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-if gum confirm "Refresh Wofi config? This will replace your current settings with Omarchy defaults."; then
+if [[ "$1" == "-y" ]] || gum confirm "Refresh Wofi config? This will replace your current settings with Omarchy defaults."; then
   # Overwrite local waybar settings with the latest in Omarchy
   cp -f ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/ 2>/dev/null
   cp -f ~/.local/share/omarchy/config/wofi/style.css ~/.config/wofi/ 2>/dev/null
+  cp -f ~/.local/share/omarchy/config/wofi/select.css ~/.config/wofi/ 2>/dev/null
 fi

bin/omarchy-show-keybindings

@@ -56,4 +56,4 @@ grep -h '^[[:space:]]*bind' $USER_HYPRLAND_CONF $OMARCHY_BINDINGS_CONF |
         printf "%-35s → %s\n", key_combo, action;
     }
 }' |
-  flock --nonblock /tmp/.wofi.lock -c "wofi -dmenu -i --width 60% --height 70% -p 'Hyprland Keybindings' -O alphabetical  --style=\"$HOME/.local/share/omarchy/default/wofi/search.css\""
+  wofi -dmenu -i --width 60% --height 70% -p 'Hyprland Keybindings' -O alphabetical

bin/omarchy-theme-bg-next

@@ -5,7 +5,7 @@
 BACKGROUNDS_DIR="$HOME/.config/omarchy/current/backgrounds/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-BACKGROUNDS=($(find "$BACKGROUNDS_DIR" -type f | sort))
+mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
 TOTAL=${#BACKGROUNDS[@]}
 
 # Get current background from symlink
@@ -13,7 +13,7 @@ if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
   CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
 else
   # Default to first background if no symlink exists
-  CURRENT_BACKGROUND=${BACKGROUNDS[0]}
+  CURRENT_BACKGROUND="${BACKGROUNDS[0]}"
 fi
 
 # Find current background index
@@ -27,7 +27,7 @@ done
 
 # Get next background (wrap around)
 NEXT_INDEX=$(((INDEX + 1) % TOTAL))
-NEW_BACKGROUND=${BACKGROUNDS[$NEXT_INDEX]}
+NEW_BACKGROUND="${BACKGROUNDS[$NEXT_INDEX]}"
 
 # Set new background symlink
 ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"

bin/omarchy-theme-install

@@ -10,7 +10,7 @@ fi
 
 REPO_URL="$1"
 THEMES_DIR="$HOME/.config/omarchy/themes"
-THEME_NAME=$(basename "$REPO_URL" .git)
+THEME_NAME=$(basename "$REPO_URL" .git | sed -E 's/^omarchy-//; s/-theme$//')
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
 THEME_BACKGROUND_PATH="$THEME_PATH/backgrounds"
 BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds"
@@ -27,12 +27,10 @@ if ! git clone "$REPO_URL" "$THEME_PATH"; then
   exit 1
 fi
 
-# Copy backgrounds if present
+# Link backgrounds if present
 if [ -d $THEME_BACKGROUND_PATH ]; then
-  mkdir -p $BACKGROUNDS_THEME_PATH
-  cp $THEME_BACKGROUND_PATH/* $BACKGROUNDS_THEME_PATH/
+  ln -snf $THEME_BACKGROUND_PATH $BACKGROUNDS_THEME_PATH
 fi
 
 # Apply the new theme with omarchy-theme-set
 omarchy-theme-set $THEME_NAME
-

bin/omarchy-theme-menu

@@ -25,7 +25,7 @@ selection=$(printf '%s\n' "${themes[@]}" | wofi \
   --width 150 \
   --height 300 \
   -O alphabetical \
-  --style ~/.local/share/omarchy/default/wofi/select.css)
+  --style ~/.config/wofi/select.css 2>/dev/null)
 
 # Remove any Pango markup before converting back to filename
 clean_selection=$(echo "$selection" | sed -E 's/<[^>]+>//g')
@@ -35,4 +35,3 @@ selected_theme=$(echo "$clean_selection" | tr '[:upper:]' '[:lower:]' | tr ' ' '
 
 # Apply the selected theme
 "$HOME/.local/share/omarchy/bin/omarchy-theme-set" "$selected_theme"
-

config/hypr/hyprland.conf

@@ -19,20 +19,20 @@ source = ~/.local/share/omarchy/default/hypr/windows.conf
 source = ~/.config/omarchy/current/theme/hyprland.conf
 
 # Application bindings
-$terminal = alacritty
-$browser = chromium --new-window --ozone-platform=wayland
+$terminal = uwsm app -- alacritty
+$browser = uwsm app -- chromium --new-window --ozone-platform=wayland
 $webapp = $browser --app
 
 bind = SUPER, return, exec, $terminal
-bind = SUPER, F, exec, nautilus --new-window
+bind = SUPER, F, exec, uwsm app -- nautilus --new-window
 bind = SUPER, B, exec, $browser
-bind = SUPER, M, exec, spotify
+bind = SUPER, M, exec, uwsm app -- spotify
 bind = SUPER, N, exec, $terminal -e nvim
 bind = SUPER, T, exec, $terminal -e btop
 bind = SUPER, D, exec, $terminal -e lazydocker
-bind = SUPER, G, exec, signal-desktop
-bind = SUPER, O, exec, obsidian -disable-gpu
-bind = SUPER, slash, exec, 1password
+bind = SUPER, G, exec, uwsm app -- signal-desktop
+bind = SUPER, O, exec, uwsm app -- obsidian -disable-gpu
+bind = SUPER, slash, exec, uwsm app -- 1password
 
 bind = SUPER, A, exec, $webapp="https://chatgpt.com"
 bind = SUPER SHIFT, A, exec, $webapp="https://grok.com"

config/waybar/config

@@ -124,66 +124,4 @@
     "icon-size": 12,
     "spacing": 12
   }
-},
-  "cpu": {
-    "interval": 5,
-    "format": "󰍛",
-    "on-click": "alacritty -e btop"
-  },
-  "clock": {
-    "format": "{:%A %H:%M}",
-    "format-alt": "{:%d %B W%V %Y}",
-    "tooltip": false
-  },
-  "network": {
-    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
-    "format" : "{icon}",
-    "format-wifi" : "{icon}",
-    "format-ethernet" : "󰀂",
-    "format-disconnected" : "󰖪",
-    "tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
-    "tooltip-format-ethernet": "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
-    "tooltip-format-disconnected": "Disconnected",
-    "interval": 3,
-    "nospacing": 1,
-    "on-click": "alacritty --class=Impala -e impala"
-  },
-  "battery": {
-    "format": "{capacity}% {icon}",
-    "format-discharging": "{icon}",
-    "format-charging":    "{icon}",
-    "format-plugged":     "",
-    "format-icons": {
-      "charging": [
-        "󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"
-      ],
-      "default": [
-        "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
-      ]
-    },
-    "format-full": "󰂅",
-    "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
-    "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
-    "interval": 5,
-    "states": {
-      "warning": 20,
-      "critical": 10
-    }
-  },
-  "bluetooth": {
-    "format": "",
-    "format-disabled": "󰂲",
-    "format-connected": "",
-    "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "GTK_THEME=Adwaita-dark blueberry"
-  },
-  "pulseaudio": {
-    "format": "",
-    "format-muted": "󰝟",
-    "scroll-step": 5,
-    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
-    "tooltip-format": "Playing at {volume}%",
-    "on-click-right": "pamixer -t",
-    "ignored-sinks": ["Easy Effects Sink"]
-  }
 }

config/wofi/select.css

@@ -1,8 +1,11 @@
-@import ".config/omarchy/current/theme/wofi.css";
-@import ".local/share/omarchy/default/wofi/search.css";
+/* Use by power menu, theme selector, and other menus without visible search bar */
+
+@import ".config/wofi/style.css";
 
 #input {
     display: none;
     opacity: 0;
     margin-top: -200px;
 }
+
+@import ".config/omarchy/current/theme/wofi.css";

config/wofi/style.css

@@ -1,4 +1,4 @@
-/* Colors are defined by theme files and can be referenced via @base, @text, @selected-text, and @border */
+/* Colors are defined by theme file and can be referenced via @base, @text, @selected-text, and @border */
 
 * {
   font-family: 'CaskaydiaMono Nerd Font', monospace;
@@ -71,3 +71,4 @@ window {
   -gtk-icon-transform: scale(0.7);
 }
 
+@import ".config/omarchy/current/theme/wofi.css";

default/bash/aliases

@@ -15,7 +15,7 @@ zd() {
   fi
 }
 open() {
-  xdg-open "$@" >/dev/null 2>&1
+  xdg-open "$@" >/dev/null 2>&1 &
 }
 
 # Directories

default/hypr/autostart.conf

@@ -1,4 +1,7 @@
-exec-once = hypridle & mako & waybar & fcitx5
-exec-once = swaybg -i ~/.config/omarchy/current/background -m fill
+exec-once = uwsm app -- hypridle
+exec-once = uwsm app -- mako
+exec-once = uwsm app -- waybar
+exec-once = uwsm app -- fcitx5
+exec-once = uwsm app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = wl-clip-persist --clipboard regular --all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'

default/hypr/bindings/utilities.conf

@@ -1,11 +1,11 @@
 # Launching
-bind = SUPER, space, exec, pkill wofi || wofi --show drun --sort-order=alphabetical --style="$HOME/.local/share/omarchy/default/wofi/search.css"
-bind = SUPER, K, exec, ~/.local/share/omarchy/bin/omarchy-show-keybindings
+bind = SUPER, space, exec, pkill wofi || uwsm app -- "$(wofi --show drun -O alphabetical --define=drun-print_desktop_file=true | sed -E "s/(\.desktop) /\1:/")"
+bind = SUPER, K, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-show-keybindings
 
 # Aesthetics
 bind = SUPER SHIFT, SPACE, exec, pkill -SIGUSR1 waybar
 bind = SUPER CTRL, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-theme-bg-next
-bind = SUPER SHIFT CTRL, SPACE, exec, ~/.local/share/omarchy/bin/omarchy-theme-menu
+bind = SUPER SHIFT CTRL, SPACE, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-theme-menu
 
 # Notifications
 bind = SUPER, comma, exec, makoctl dismiss
@@ -13,7 +13,7 @@ bind = SUPER SHIFT, comma, exec, makoctl dismiss --all
 bind = SUPER CTRL, comma, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"
 
 # Power menu controls lock, suspend, relaunch, restart, shutdown
-bind = SUPER, ESCAPE, exec, ~/.local/share/omarchy/bin/omarchy-power-menu
+bind = SUPER, ESCAPE, exec, pkill wofi || ~/.local/share/omarchy/bin/omarchy-power-menu
 
 # Toggle idling
 bind = SUPER CTRL, I, exec, ~/.local/share/omarchy/bin/omarchy-toggle-idle

default/hypr/windows.conf

@@ -22,7 +22,7 @@ windowrule = fullscreen, class:^(com.libretro.RetroArch)$
 windowrule = opacity 0.97 0.9, class:.*
 windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$
 windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube
-windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv)$
+windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
 windowrule = opacity 1 1, class:^(com.libretro.RetroArch|steam)$
 
 # Fix some dragging issues with XWayland

default/wofi/search.css

@@ -1,73 +0,0 @@
-@import ".config/omarchy/current/theme/wofi.css";
-@import ".config/wofi/style.css";
-
-* {
-  font-family: 'CaskaydiaMono Nerd Font', monospace;
-  font-size: 18px;
-}
-
-window {
-  margin: 0px;
-  padding: 20px;
-  background-color: @base;
-  opacity: 0.95;
-}
-
-#inner-box {
-  margin: 0;
-  padding: 0;
-  border: none;
-  background-color: @base;
-}
-
-#outer-box {
-  margin: 0;
-  padding: 20px;
-  border: none;
-  background-color: @base;
-  border: 2px solid @border;
-}
-
-#scroll {
-  margin: 0;
-  padding: 0;
-  border: none;
-  background-color: @base;
-}
-
-#input {
-  margin: 0;
-  padding: 10px;
-  border: none;
-  background-color: @base;
-  color: @text;
-}
-
-#input:focus {
-  outline: none;
-  box-shadow: none;
-  border: none;
-}
-
-#text {
-  margin: 5px;
-  border: none;
-  color: @text;
-}
-
-#entry {
-  background-color: @base;
-}
-
-#entry:selected {
-  outline: none;
-  border: none;
-}
-
-#entry:selected #text {
-  color: @selected-text;
-}
-
-#entry image {
-  -gtk-icon-transform: scale(0.7);
-}

install/1-yay.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 sudo pacman -S --needed --noconfirm base-devel
 
 if ! command -v yay &>/dev/null; then

install/2-identification.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Need gum to query for input
 yay -S --noconfirm --needed gum
 

install/3-terminal.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 yay -S --noconfirm --needed \
   wget curl unzip inetutils impala \
   fd eza fzf ripgrep zoxide bat \

install/4-config.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Copy over Omarchy configs
 cp -R ~/.local/share/omarchy/config/* ~/.config/
 

install/asdcontrol.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Install asdcontrol for controlling brightness on Apple Displays
 if [ -z "$OMARCHY_BARE" ] && ! command -v asdcontrol &>/dev/null; then
   git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol

install/backgrounds.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 BACKGROUNDS_DIR=~/.config/omarchy/backgrounds/
 
 download_background_image() {

install/bluetooth.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Install bluetooth controls
 yay -S --noconfirm --needed blueberry
 

install/desktop.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 yay -S --noconfirm --needed \
   brightnessctl playerctl pamixer pavucontrol wireplumber \
   fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool wl-clip-persist \

install/development.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 yay -S --noconfirm --needed \
   cargo clang llvm mise \
   imagemagick \

install/docker.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 yay -S --noconfirm --needed docker docker-compose
 
 # Limit log size to avoid running out of disk

install/fix-fkeys.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [[ ! -f /etc/modprobe.d/hid_apple.conf ]]; then
   echo "options hid_apple fnmode=2" | sudo tee /etc/modprobe.d/hid_apple.conf
 

install/fonts.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ -z "$OMARCHY_BARE" ]; then
   yay -Sy --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
 else

install/hyprlandia.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 yay -S --noconfirm --needed \
   hyprland hyprshot hyprpicker hyprlock hypridle polkit-gnome hyprland-qtutils \
   wofi waybar mako swaybg \

install/login.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 # Hyprland launched via UWSM and login directly as user, rely on disk encryption + hyprlock for security
 yay -S --noconfirm --needed uwsm
 

install/mimetypes.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 update-desktop-database ~/.local/share/applications
 
 # Open all images with imv

install/network.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Install iwd explicitly if it wasn't included in archinstall
 # This can happen if archinstall used ethernet
 if ! command -v iwd &>/dev/null; then

install/nvidia.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # ==============================================================================
 # Hyprland NVIDIA Setup Script for Arch Linux
 # ==============================================================================

install/nvim.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if ! command -v nvim &>/dev/null; then
   yay -S --noconfirm --needed nvim luarocks tree-sitter-cli
 

install/plymouth.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 if ! command -v plymouth &>/dev/null; then
   yay -S --noconfirm --needed plymouth

install/power.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Setting the performance profile can make a big difference. By default, most systems seem to start in balanced mode,
 # even if they're not running off a battery. So let's make sure that's changed to performance.
 yay -S --noconfirm power-profiles-daemon

install/printer.sh

@@ -1,2 +1,4 @@
+#!/bin/bash
+
 sudo pacman -S --noconfirm cups cups-pdf cups-filters system-config-printer
 sudo systemctl enable --now cups.service

install/ruby.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Install Ruby using gcc-14 for compatibility
 yay -S --noconfirm --needed gcc14
 mise settings set ruby.ruby_build_opts "CC=gcc-14 CXX=g++-14"

install/theme.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # Use dark mode for QT apps too (like kdenlive)
 sudo pacman -S --noconfirm kvantum-qt5
 

install/webapps.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ -z "$OMARCHY_BARE" ]; then
   source ~/.local/share/omarchy/default/bash/functions
   web2app "HEY" https://app.hey.com https://www.hey.com/assets/images/general/hey.png

install/xtras.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 if [ -z "$OMARCHY_BARE" ]; then
   yay -S --noconfirm --needed \
     gnome-calculator gnome-keyring signal-desktop \
@@ -12,4 +14,4 @@ if [ -z "$OMARCHY_BARE" ]; then
 fi
 
 # Copy over Omarchy applications
-source ~/.local/share/omarchy/bin/omarchy-sync-applications || true
+source ~/.local/share/omarchy/bin/omarchy-refresh-applications || true

migrations/1752292967.sh

@@ -13,6 +13,6 @@ if [ -f "$HOME/.config/environment.d/fcitx.conf" ]; then
   sed -i 's/^GTK_IM_MODULE=fcitx$//' "$HOME/.config/environment.d/fcitx.conf"
 fi
 
-omarchy-refresh-plymouth
+omarchy-refresh-plymouth -y
 
 source ~/.local/share/omarchy/install/login.sh

migrations/1752551006.sh

@@ -2,4 +2,5 @@ echo "Make wofi stylesheet user editable"
 if [[ -L "$HOME/.config/wofi/style.css" ]]; then
   rm "$HOME/.config/wofi/style.css"
   cp ~/.local/share/omarchy/config/wofi/style.css ~/.config/wofi/
+  cp ~/.local/share/omarchy/config/wofi/search.css ~/.config/wofi/
 fi

migrations/1752673060.sh

@@ -0,0 +1,2 @@
+echo "Make all wofi stylesheets user editable"
+omarchy-refresh-wofi -y

migrations/1752676402.sh

@@ -0,0 +1,2 @@
+echo "Use latest Omarchy Waybar configuration"
+omarchy-refresh-waybar