Refactor share menu to remove terminal command

This reverts commit 03cbbd2f7f.

autostart/walker.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Walker
-Comment=Walker Service
-Exec=walker --gapplication-service
-StartupNotify=false
-Terminal=false
-Type=Application

bin/omarchy-cmd-first-run

@@ -12,7 +12,6 @@ if [[ -f "$FIRST_RUN_MODE" ]]; then
   bash "$OMARCHY_PATH/install/first-run/firewall.sh"
   bash "$OMARCHY_PATH/install/first-run/dns-resolver.sh"
   bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
-  bash "$OMARCHY_PATH/install/first-run/elephant.sh"
   sudo rm -f /etc/sudoers.d/first-run
 
   bash "$OMARCHY_PATH/install/first-run/welcome.sh"

bin/omarchy-cmd-screenrecord

@@ -8,17 +8,15 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-DESKTOP_AUDIO="false"
-MICROPHONE_AUDIO="false"
+SCOPE=""
+AUDIO="false"
 WEBCAM="false"
-STOP_RECORDING="false"
 
 for arg in "$@"; do
   case "$arg" in
-    --with-desktop-audio) DESKTOP_AUDIO="true" ;;
-    --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
+    --with-audio) AUDIO="true" ;;
     --with-webcam) WEBCAM="true" ;;
-    --stop-recording) STOP_RECORDING="true"
+    output|region) SCOPE="$arg" ;;
   esac
 done
 
@@ -59,35 +57,27 @@ start_webcam_overlay() {
 
 start_screenrecording() {
   local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
-  local audio_devices=""
   local audio_args=""
 
-  [[ "$DESKTOP_AUDIO" == "true" ]] && audio_devices+="default_output"
+  # Merge audio tracks into one - separate tracks only play one at a time in most players
+  [[ "$AUDIO" == "true" ]] && audio_args="-a default_output|default_input"
 
-  if [[ "$MICROPHONE_AUDIO" == "true" ]]; then
-    # Merge audio tracks into one - separate tracks only play one at a time in most players
-    [[ -n "$audio_devices" ]] && audio_devices+="|"
-    audio_devices+="default_input"
-  fi
-
-  [[ -n "$audio_devices" ]] && audio_args+="-a $audio_devices"
-
-  gpu-screen-recorder -w portal -f 60 -fallback-cpu-encoding yes -o "$filename" $audio_args -ac aac &
+  gpu-screen-recorder -w "$@" -f 60 -c mp4 $audio_args -ac aac -o "$filename" &
   toggle_screenrecording_indicator
 }
 
 stop_screenrecording() {
-  pkill -SIGINT -f "^gpu-screen-recorder"  # SIGINT required to save video properly
+  pkill -SIGINT -f "gpu-screen-recorder"  # SIGINT required to save video properly
 
   # Wait a maximum of 5 seconds to finish before hard killing
   local count=0
-  while pgrep -f "^gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
+  while pgrep -f "gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
     sleep 0.1
     count=$((count + 1))
   done
 
-  if pgrep -f "^gpu-screen-recorder" >/dev/null; then
-    pkill -9 -f "^gpu-screen-recorder"
+  if pgrep -f "gpu-screen-recorder" >/dev/null; then
+    pkill -9 -f "gpu-screen-recorder"
     cleanup_webcam
     notify-send "Screen recording error" "Recording process had to be force-killed. Video may be corrupted." -u critical -t 5000
   else
@@ -102,19 +92,51 @@ toggle_screenrecording_indicator() {
 }
 
 screenrecording_active() {
-  pgrep -f "^gpu-screen-recorder" >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
+  pgrep -f "gpu-screen-recorder" >/dev/null || pgrep -x slurp >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
 }
 
 if screenrecording_active; then
-  if pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "^gpu-screen-recorder" >/dev/null; then
+  if pgrep -x slurp >/dev/null; then
+    pkill -x slurp 2>/dev/null
+  elif pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "gpu-screen-recorder" >/dev/null; then
     cleanup_webcam
   else
     stop_screenrecording
   fi
-elif [[ "$STOP_RECORDING" == "false" ]]; then
+elif [[ "$SCOPE" == "output" ]]; then
   [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
 
-  start_screenrecording || cleanup_webcam
+  if ! output=$(slurp -o -f "%o"); then
+    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
+    exit 1
+  fi
+
+  if [[ -z "$output" ]]; then
+    notify-send "Error" "Could not detect monitor" -u critical
+    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
+    exit 1
+  fi
+
+  start_screenrecording "$output"
 else
-  exit 1
+  [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
+
+  scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
+
+  if ! region=$(slurp -f "%wx%h+%x+%y"); then
+    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
+    exit 1
+  fi
+
+  if [[ "$region" =~ ^([0-9]+)x([0-9]+)\+([0-9]+)\+([0-9]+)$ ]]; then
+    w=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[1]} * $scale}")
+    h=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[2]} * $scale}")
+    x=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[3]} * $scale}")
+    y=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[4]} * $scale}")
+    scaled_region="${w}x${h}+${x}+${y}"
+  else
+    scaled_region="$region"
+  fi
+
+  start_screenrecording region -region "$scaled_region"
 fi

bin/omarchy-cmd-screensaver

@@ -1,26 +1,25 @@
 #!/bin/bash
 
 screensaver_in_focus() {
-  hyprctl activewindow -j | jq -e '.class == "org.omarchy.screensaver"' >/dev/null 2>&1
+  hyprctl activewindow -j | jq -e '.class == "com.omarchy.Screensaver"' >/dev/null 2>&1
 }
 
 exit_screensaver() {
   hyprctl keyword cursor:invisible false
   pkill -x tte 2>/dev/null
-  pkill -f org.omarchy.screensaver 2>/dev/null
+  pkill -f com.omarchy.Screensaver 2>/dev/null
   exit 0
 }
 
 trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
 
-printf '\033]11;rgb:00/00/00\007'  # Set background color to black
-
 hyprctl keyword cursor:invisible true &>/dev/null
 
 while true; do
+  effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
   tte -i ~/.config/omarchy/branding/screensaver.txt \
-    --frame-rate 120 --canvas-width 0 --canvas-height 0 --anchor-canvas c --anchor-text c\
-    --no-eol --no-restore-cursor random_effect &
+    --frame-rate 240 --canvas-width 0 --canvas-height 0 --anchor-canvas c --anchor-text c --no-eol \
+    "$effect" &
 
   while pgrep -x tte >/dev/null; do
     if read -n 1 -t 3 || ! screensaver_in_focus; then

bin/omarchy-cmd-terminal-cwd

@@ -6,10 +6,8 @@ shell_pid=$(pgrep -P "$terminal_pid" | tail -n1)
 
 if [[ -n $shell_pid ]]; then
   cwd=$(readlink -f "/proc/$shell_pid/cwd" 2>/dev/null)
-  shell=$(readlink -f "/proc/$shell_pid/exe" 2>/dev/null)
 
-  # Check if $shell is a valid shell and $cwd is a directory.
-  if grep -qs "$shell" /etc/shells && [[ -d $cwd ]]; then
+  if [[ -d $cwd ]]; then
     echo "$cwd"
   else
     echo "$HOME"

bin/omarchy-font-set

@@ -28,6 +28,7 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
 
     omarchy-restart-waybar
     omarchy-restart-swayosd
+    omarchy-restart-walker
 
     if pgrep -x ghostty; then
       notify-send "    You must restart Ghostty to see font change"

bin/omarchy-hyprland-window-pop

@@ -2,45 +2,21 @@
 
 # Toggle to pop-out a tile to stay fixed on a display basis.
 
-# Usage:
-# omarchy-hyprland-window-pop [width height [x y]]
-#
-# Arguments:
-#   width   Optional. Width of the floating window. Default: 1300
-#   height  Optional. Height of the floating window. Default: 900
-#   x       Optional. X position of the window. Must provide both X and Y to take effect.
-#   y       Optional. Y position of the window. Must provide both X and Y to take effect.
-#
-# Behavior:
-#   - If the window is already pinned, it will be unpinned and removed from the pop layer.
-#   - If the window is not pinned, it will be floated, resized, moved/centered, pinned, brought to top, and popped.
-
-width=${1:-1300}
-height=${2:-900}
-x=${3:-}
-y=${4:-}
-
 active=$(hyprctl activewindow -j)
-pinned=$(echo "$active" | jq ".pinned")
-addr=$(echo "$active" | jq -r ".address")
+pinned=$(echo "$active" | jq .pinned)
+addr=$(echo "$active" | jq -r  ".address")
+[ -z "$addr" ] && { echo "No active window"; exit 0; }
 
-if [[ $pinned == "true" ]]; then
+if [ "$pinned" = "true" ]; then
   hyprctl -q --batch \
-    dispatch pin address:$addr; \
-    dispatch togglefloating address:$addr; \
-    dispatch tagwindow -pop address:$addr;
-elif [[ -n $addr ]]; then
-  hyprctl dispatch togglefloating address:$addr
-  hyprctl dispatch resizeactive exact $width $height address:$addr
-
-  if [[ -n $x && -n $y ]]; then
-    hyprctl dispatch moveactive $x $y address:$addr
-  else
-    hyprctl dispatch centerwindow address:$addr
-  fi
-
+  "dispatch pin address:$addr;" \
+  "dispatch togglefloating address:$addr;" \
+  "dispatch tagwindow -pop address:$addr;"
+else
   hyprctl -q --batch \
-    dispatch pin address:$addr; \
-    dispatch alterzorder top address:$addr; \
-    dispatch tagwindow +pop address:$addr;
+  "dispatch togglefloating address:$addr;" \
+  "dispatch centerwindow address:$addr;" \
+  "dispatch pin address:$addr;" \
+  "dispatch alterzorder top address:$addr;" \
+  "dispatch tagwindow +pop address:$addr;"
 fi

bin/omarchy-install-steam

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 echo "Now pick dependencies matching your graphics card"
-sudo pacman -S --noconfirm steam
+sudo pacman -Syu --noconfirm steam
 setsid gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-install-xbox-controllers

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Install xpadneo to ensure controllers work out of the box
-sudo pacman -S --noconfirm --needed linux-headers
-yay -S --noconfirm xpadneo-dkms
-
-# Prevent xpad/xpadneo driver conflict
-echo blacklist xpad | sudo tee /etc/modprobe.d/blacklist-xpad.conf >/dev/null
-echo hid_xpadneo | sudo tee /etc/modules-load.d/xpadneo.conf >/dev/null
-
-# Give user access to game controllers
-sudo usermod -a -G input $USER
-
-# Modules need to be loaded
-gum confirm "Install requires reboot. Ready?" && sudo reboot now

bin/omarchy-launch-about

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec omarchy-launch-or-focus-tui "bash -c 'fastfetch; read -n 1 -s'"
+exec setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Omarchy -e bash -c 'fastfetch; read -n 1 -s'

bin/omarchy-launch-bluetooth

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-rfkill unblock bluetooth
-exec omarchy-launch-or-focus-tui bluetui

bin/omarchy-launch-editor

@@ -4,7 +4,7 @@ omarchy-cmd-present "$EDITOR" || EDITOR=nvim
 
 case "$EDITOR" in
 nvim | vim | nano | micro | hx | helix)
-  exec omarchy-launch-tui "$EDITOR" "$@"
+  exec setsid uwsm-app -- xdg-terminal-exec "$EDITOR" "$@"
   ;;
 *)
   exec setsid uwsm-app -- "$EDITOR" "$@"

bin/omarchy-launch-floating-terminal-with-presentation

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cmd="$*"
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
+exec setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"

bin/omarchy-launch-or-focus

@@ -7,10 +7,10 @@ fi
 
 WINDOW_PATTERN="$1"
 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
   hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
 else
-  eval exec setsid $LAUNCH_COMMAND
+  eval exec $LAUNCH_COMMAND
 fi

bin/omarchy-launch-or-focus-tui

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-APP_ID="org.omarchy.$(basename $1)"
-LAUNCH_COMMAND="omarchy-launch-tui $@"
-
-exec omarchy-launch-or-focus "$APP_ID" "$LAUNCH_COMMAND"

bin/omarchy-launch-screensaver

@@ -6,7 +6,7 @@ if ! command -v tte &>/dev/null; then
 fi
 
 # Exit early if screensave is already running
-pgrep -f org.omarchy.screensaver && exit 0
+pgrep -f com.omarchy.Screensaver && exit 0
 
 # Allow screensaver to be turned off but also force started
 if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
@@ -22,19 +22,19 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
   case $terminal in
   *Alacritty*)
     hyprctl dispatch exec -- \
-      alacritty --class=org.omarchy.screensaver \
+      alacritty --class=com.omarchy.Screensaver \
       --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
       -e omarchy-cmd-screensaver
     ;;
   *ghostty*)
     hyprctl dispatch exec -- \
-      ghostty --class=org.omarchy.screensaver \
+      ghostty --class=com.omarchy.Screensaver \
       --font-size=18 \
       -e omarchy-cmd-screensaver
     ;;
   *kitty*)
     hyprctl dispatch exec -- \
-      kitty --class=org.omarchy.screensaver \
+      kitty --class=com.omarchy.Screensaver \
       --override font_size=18 \
       -e omarchy-cmd-screensaver
     ;;

bin/omarchy-launch-tui

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.$(basename $1) -e "$1" "${@:2}"

bin/omarchy-launch-wifi

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-rfkill unblock wifi
-omarchy-launch-or-focus-tui impala
+exec setsid omarchy-launch-or-focus com.omarchy.Impala "uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Impala -e impala"

bin/omarchy-lock-screen

@@ -9,4 +9,4 @@ if pgrep -x "1password" >/dev/null; then
 fi
 
 # Avoid running screensaver when locked
-pkill -f org.omarchy.screensaver
+pkill -f com.omarchy.Screensaver

bin/omarchy-menu

@@ -37,7 +37,7 @@ menu() {
 }
 
 terminal() {
-  xdg-terminal-exec --app-id=org.omarchy.terminal "$@"
+  xdg-terminal-exec --app-id=com.omarchy.Omarchy "$@"
 }
 
 present_terminal() {
@@ -112,12 +112,12 @@ show_screenshot_menu() {
 }
 
 show_screenrecord_menu() {
-  omarchy-cmd-screenrecord --stop-recording && exit 0
-
-  case $(menu "Screenrecord" "  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
-  *"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;;
-  *"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;;
-  *"With desktop + microphone audio + webcam") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam ;;
+  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio\n  Display + Webcam") in
+  *"Region + Audio"*) omarchy-cmd-screenrecord region --with-audio ;;
+  *Region*) omarchy-cmd-screenrecord ;;
+  *"Display + Audio"*) omarchy-cmd-screenrecord output --with-audio ;;
+  *"Display + Webcam"*) omarchy-cmd-screenrecord output --with-audio --with-webcam ;;
+  *Display*) omarchy-cmd-screenrecord output ;;
   *) back_to show_capture_menu ;;
   esac
 }
@@ -154,7 +154,12 @@ show_style_menu() {
 }
 
 show_theme_menu() {
-  omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
+  theme=$(menu "Theme" "$(omarchy-theme-list)" "" "$(omarchy-theme-current)")
+  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
+    back_to show_style_menu
+  else
+    omarchy-theme-set "$theme"
+  fi
 }
 
 show_font_menu() {
@@ -173,9 +178,15 @@ show_setup_menu() {
   options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
-  *Audio*) omarchy-launch-or-focus-tui wiremix ;;
-  *Wifi*) omarchy-launch-wifi ;;
-  *Bluetooth*) omarchy-launch-bluetooth ;;
+  *Audio*) xdg-terminal-exec --app-id=com.omarchy.Wiremix -e wiremix ;;
+  *Wifi*)
+    rfkill unblock wifi
+    omarchy-launch-wifi
+    ;;
+  *Bluetooth*)
+    rfkill unblock bluetooth
+    blueberry
+    ;;
   *Power*) show_setup_power_menu ;;
   *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
   *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
@@ -290,11 +301,10 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
+  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
   *Steam*) present_terminal omarchy-install-steam ;;
   *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
   *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
-  *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
   *) show_install_menu ;;
   esac
 }

bin/omarchy-pkg-ignored

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+IGNORED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.ignored"
+
+if [[ -f $IGNORED_PACKAGES_FILE ]]; then
+  tr '\r\n' ',' <"$IGNORED_PACKAGES_FILE" | sed 's/,$//'
+fi

bin/omarchy-refresh-pacman

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
-omarchy-refresh-pacman-mirrorlist

bin/omarchy-refresh-pacman-opr-server

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [[ $1 == "edge" ]]; then
-  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf
-else
-  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf
-fi

bin/omarchy-restart-walker

@@ -12,10 +12,11 @@ if [[ $EUID -eq 0 ]]; then
   # Restart services as the script owner
   systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
     bash -c "
-      systemctl --user restart elephant.service
-      setsid walker --gapplication-service &
+      setsid uwsm-app -- elephant &
+      setsid uwsm-app -- walker --gapplication-service &
     "
 else
-  systemctl --user restart elephant.service
-  setsid walker --gapplication-service &
+  setsid uwsm-app -- elephant &
+  wait 2
+  setsid uwsm-app -- walker --gapplication-service &
 fi

bin/omarchy-theme-set-browser

@@ -23,6 +23,11 @@ if omarchy-cmd-present chromium || omarchy-cmd-present helium-browser || omarchy
     fi
   fi
 
+  if omarchy-cmd-present helium-browser; then
+    echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/chromium/policies/managed/color.json" >/dev/null
+    helium-browser --no-startup-window --refresh-platform-policy
+  fi
+
   if omarchy-cmd-present brave; then
     echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/brave/policies/managed/color.json" >/dev/null
     brave --refresh-platform-policy --no-startup-window

bin/omarchy-update-keyring

@@ -5,8 +5,6 @@ if omarchy-pkg-missing omarchy-keyring || ! sudo pacman-key --list-keys 40DFB630
   sudo pacman-key --recv-keys 40DFB630FF42BCFFB047046CF0134EE680CAC571 --keyserver keys.openpgp.org
   sudo pacman-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571
 
-  # This is generally not a good idea, but this is a special case because we're going to be updating
-  # the full set of packages in omarchy-update-system-pkgs right after this (and it needs latest keyring)!
   sudo pacman -Sy
   omarchy-pkg-add omarchy-keyring
 

bin/omarchy-update-system-pkgs

@@ -2,14 +2,20 @@
 
 set -e
 
+# Used in package emergencies if a bad package has been pushed and we can't revoke.
+# Requires manually installing the good package using sudo pacman -U <url>
+ignored_packages=$(omarchy-pkg-ignored)
+
 echo -e "\e[32m\nUpdate system packages\e[0m"
-sudo pacman -Syu --noconfirm
+[[ -n $ignored_packages ]] && echo "sudo pacman -Syu --noconfirm --ignore \"$ignored_packages\""
+sudo pacman -Syu --noconfirm --ignore "$ignored_packages"
 
 # Update AUR packages if any are installed
 if pacman -Qem >/dev/null; then
   if omarchy-pkg-aur-accessible; then
     echo -e "\e[32m\nUpdate AUR packages\e[0m"
-    yay -Sua --noconfirm
+    [[ -n $ignored_packages ]] && echo "yay -Sua --noconfirm  --ignore \"$ignored_packages\""
+    yay -Sua --noconfirm --ignore "$ignored_packages"
     echo
   else
     echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"

config/ghostty/config

@@ -25,10 +25,6 @@ shell-integration-features = no-cursor,ssh-env
 # Keyboard bindings
 keybind = shift+insert=paste_from_clipboard
 keybind = control+insert=copy_to_clipboard
-keybind = super+control+shift+alt+arrow_down=resize_split:down,100
-keybind = super+control+shift+alt+arrow_up=resize_split:up,100
-keybind = super+control+shift+alt+arrow_left=resize_split:left,100
-keybind = super+control+shift+alt+arrow_right=resize_split:right,100
 
 # Slowdown mouse scrolling
 mouse-scroll-multiplier = 0.95

config/hypr/bindings.conf

@@ -1,14 +1,17 @@
 # Application bindings
-bindd = SUPER, RETURN, Terminal, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)"
+$terminal = uwsm-app -- xdg-terminal-exec
+$browser = omarchy-launch-browser
+
+bindd = SUPER, RETURN, Terminal, exec, $terminal --dir="$(omarchy-cmd-terminal-cwd)"
 bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
-bindd = SUPER SHIFT, B, Browser, exec, omarchy-launch-browser
-bindd = SUPER SHIFT ALT, B, Browser (private), exec, omarchy-launch-browser --private
+bindd = SUPER SHIFT, B, Browser, exec, $browser
+bindd = SUPER SHIFT ALT, B, Browser (private), exec, $browser --private
 bindd = SUPER SHIFT, M, Music, exec, omarchy-launch-or-focus spotify
 bindd = SUPER SHIFT, N, Editor, exec, omarchy-launch-editor
-bindd = SUPER SHIFT, T, Activity, exec, omarchy-launch-tui btop
-bindd = SUPER SHIFT, D, Docker, exec, omarchy-launch-tui lazydocker
-bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus ^signal$ "uwsm-app -- signal-desktop"
-bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus ^obsidian$ "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
+bindd = SUPER SHIFT, T, Activity, exec, $terminal -e btop
+bindd = SUPER SHIFT, D, Docker, exec, $terminal -e lazydocker
+bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop"
+bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
 bindd = SUPER SHIFT, W, Typora, exec, uwsm-app -- typora --enable-wayland-ime
 bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm-app -- 1password
 

config/hypr/monitors.conf

@@ -8,7 +8,7 @@ monitor=,preferred,auto,auto
 
 # Good compromise for 27" or 32" 4K monitors (but fractional!)
 # env = GDK_SCALE,1.75
-# monitor=,preferred,auto,1.6
+# monitor=,preferred,auto,1.666667
 
 # Straight 1x setup for low-resolution displays like 1080p or 1440p
 # env = GDK_SCALE,1

config/hypr/xdph.conf

@@ -1,3 +0,0 @@
-screencopy {
-    allow_token_by_default = true
-}

config/walker/config.toml

@@ -1,8 +1,7 @@
-force_keyboard_focus = true                                                 # forces keyboard forcus to stay in Walker
-selection_wrap = true                                                       # wrap list if at bottom or top
-theme = "omarchy-default"                                                   # theme to use
+force_keyboard_focus = true # forces keyboard forcus to stay in Walker
+selection_wrap = true       # wrap list if at bottom or top
+theme = "omarchy-default"   # theme to use
 additional_theme_location = "~/.local/share/omarchy/default/walker/themes/"
-hide_action_hints = true                                                    # globally hide the action hints
 
 [placeholders]
 "default" = { input = " Search...", list = "No Results" } # placeholders for input and empty list, key is the providers name, so f.e. "desktopapplications" or "menus:other"
@@ -14,6 +13,7 @@ quick_activate = []
 max_results = 256 # 256 should be enough for everyone
 default = [
   "desktopapplications",
+  "menus",
   "websearch",
 ] # providers to be queried by default
 

config/waybar/config.jsonc

@@ -28,7 +28,6 @@
       "7": "7",
       "8": "8",
       "9": "9",
-      "10": "0",
       "active": "󱓻"
     },
     "persistent-workspaces": {
@@ -57,7 +56,7 @@
   "cpu": {
     "interval": 5,
     "format": "󰍛",
-    "on-click": "omarchy-launch-or-focus-tui btop"
+    "on-click": "xdg-terminal-exec btop"
   },
   "clock": {
     "format": "{:L%A %H:%M}",
@@ -100,14 +99,13 @@
   "bluetooth": {
     "format": "",
     "format-disabled": "󰂲",
-    "format-connected": "󰂱",
-    "format-no-controller": "",
+    "format-connected": "",
     "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "omarchy-launch-bluetooth"
+    "on-click": "blueberry"
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "omarchy-launch-or-focus-tui wiremix",
+    "on-click": "xdg-terminal-exec --app-id=com.omarchy.Wiremix -e wiremix",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
@@ -125,7 +123,7 @@
     "modules": ["custom/expand-icon", "tray"]
   },
   "custom/expand-icon": {
-    "format": "",
+    "format": "",
     "tooltip": false
   },
   "custom/screenrecording-indicator": {

config/waybar/style.css

@@ -53,7 +53,7 @@
 }
 
 #custom-expand-icon {
-  margin-right: 18px;
+  margin-right: 20px;
 }
 
 tooltip {

default/bash/functions

@@ -15,7 +15,7 @@ iso2sd() {
   fi
 }
 
-# Format an entire drive for a single partition using exFAT
+# Format an entire drive for a single partition using ext4
 format-drive() {
   if [ $# -ne 2 ]; then
     echo "Usage: format-drive <device> <name>"
@@ -36,6 +36,7 @@ format-drive() {
       sudo partprobe "$1" || true
       sudo udevadm settle || true
 
+      omarchy-pkg-add exfatprogs
       sudo mkfs.exfat -n "$2" "$partition"
 
       echo "Drive $1 formatted as exFAT and labeled '$2'."
@@ -55,28 +56,19 @@ transcode-video-4K() {
 
 # Transcode any image to JPG image that's great for shrinking wallpapers
 img2jpg() {
-  img="$1"
-  shift
-
-  magick "$img" $@ -quality 95 -strip ${img%.*}-optimized.jpg
+  magick $1 -quality 95 -strip ${1%.*}.jpg
 }
 
 # Transcode any image to JPG image that's great for sharing online without being too big
 img2jpg-small() {
-  img="$1"
-  shift
-
-  magick "$img" $@ -resize 1080x\> -quality 95 -strip ${img%.*}-optimized.jpg
+  magick $1 -resize 1080x\> -quality 95 -strip ${1%.*}.jpg
 }
 
 # Transcode any image to compressed-but-lossless PNG
 img2png() {
-  img="$1"
-  shift
-
-  magick "$img" $@ -strip -define png:compression-filter=5 \
+  magick "$1" -strip -define png:compression-filter=5 \
     -define png:compression-level=9 \
     -define png:compression-strategy=1 \
     -define png:exclude-chunk=all \
-    "${img%.*}-optimized.png"
+    "${1%.*}.png"
 }

default/elephant/omarchy_themes.lua

@@ -1,70 +0,0 @@
---
--- Dynamic Omarchy Theme Menu for Elephant/Walker
---
-Name = "omarchythemes"
-NamePretty = "Omarchy Themes"
-
--- The main function elephant will call
-function GetEntries()
-  local entries = {}
-  local theme_dir = os.getenv("HOME") .. "/.config/omarchy/themes"
-
-  -- First, get all theme directories
-  local find_dirs_cmd = "find -L '" .. theme_dir .. "' -mindepth 1 -maxdepth 1 -type d 2>/dev/null"
-
-  local handle = io.popen(find_dirs_cmd)
-  if not handle then
-    return entries
-  end
-
-  for theme_path in handle:lines() do
-    local theme_name = theme_path:match(".*/(.+)$")
-
-    if theme_name then
-      -- find preview image
-      local find_preview_cmd = "find -L '"
-        .. theme_path
-        .. "' -maxdepth 1 -type f \\( -name 'preview.png' -o -name 'preview.jpg' \\) 2>/dev/null | head -n 1"
-      local preview_handle = io.popen(find_preview_cmd)
-      local preview_path = nil
-
-      if preview_handle then
-        preview_path = preview_handle:read("*l")
-        preview_handle:close()
-      end
-
-      -- If no preview found, use first image from backgrounds folder
-      if not preview_path or preview_path == "" then
-        local bg_cmd = "find -L '"
-          .. theme_path
-          .. "/backgrounds' -maxdepth 1 -type f \\( -iname '*.png' -o -iname '*.jpg' -o -iname '*.jpeg' \\) 2>/dev/null | head -n 1"
-        local bg_handle = io.popen(bg_cmd)
-        if bg_handle then
-          preview_path = bg_handle:read("*l")
-          bg_handle:close()
-        end
-      end
-
-      if preview_path and preview_path ~= "" then
-        local display_name = theme_name:gsub("_", " "):gsub("%-", " ")
-        display_name = display_name:gsub("(%a)([%w_']*)", function(first, rest)
-          return first:upper() .. rest:lower()
-        end)
-        display_name = display_name .. "  "
-
-        table.insert(entries, {
-          Text = display_name,
-          Preview = preview_path,
-          PreviewType = "file",
-          Actions = {
-            activate = "omarchy-theme-set " .. theme_name,
-          },
-        })
-      end
-    end
-  end
-
-  handle:close()
-  return entries
-end
-

default/hypr/apps/jetbrains.conf

@@ -17,6 +17,3 @@ windowrule = size >50% >50%, class:^(jetbrains-.*), title:^()$, floating:1
 
 # Disable window flicker when autocomplete or tooltips appear
 windowrule = noinitialfocus, class:^(jetbrains-.*)$, title:^(win.*)$, floating:1
-
-# Disable mouse focus
-windowrule = nofollowmouse, class:^(jetbrains-.*)$

default/hypr/apps/system.conf

@@ -3,12 +3,12 @@ windowrule = float, tag:floating-window
 windowrule = center, tag:floating-window
 windowrule = size 875 600, tag:floating-window
 
-windowrule = tag +floating-window, class:(org.omarchy.bluetui|org.omarchy.impala|org.omarchy.wiremix|org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float|imv|mpv)
+windowrule = tag +floating-window, class:(blueberry.py|com.omarchy.Impala|com.omarchy.Wiremix|com.omarchy.Omarchy|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float)
 windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)
 windowrule = float, class:org.gnome.Calculator
 
 # Fullscreen screensaver
-windowrule = fullscreen, class:org.omarchy.screensaver
+windowrule = fullscreen, class:com.omarchy.Screensaver
 
 # No transparency on media windows
 windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$

default/hypr/autostart.conf

@@ -6,6 +6,8 @@ exec-once = uwsm-app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = uwsm-app -- swayosd-server
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = omarchy-cmd-first-run
+exec-once = uwsm-app -- elephant
+exec-once = uwsm-app -- walker --gapplication-service
 
 # Slow app launch fix -- set systemd vars
 exec-once = systemctl --user import-environment $(env | cut -d'=' -f 1)

default/hypr/bindings/tiling-v2.conf

@@ -27,7 +27,6 @@ bindd = SUPER, code:15, Switch to workspace 6, workspace, 6
 bindd = SUPER, code:16, Switch to workspace 7, workspace, 7
 bindd = SUPER, code:17, Switch to workspace 8, workspace, 8
 bindd = SUPER, code:18, Switch to workspace 9, workspace, 9
-bindd = SUPER, code:19, Switch to workspace 10, workspace, 10
 
 # Move active window to a workspace with SUPER + SHIFT + [1-9]
 bindd = SUPER SHIFT, code:10, Move window to workspace 1, movetoworkspace, 1
@@ -39,7 +38,6 @@ bindd = SUPER SHIFT, code:15, Move window to workspace 6, movetoworkspace, 6
 bindd = SUPER SHIFT, code:16, Move window to workspace 7, movetoworkspace, 7
 bindd = SUPER SHIFT, code:17, Move window to workspace 8, movetoworkspace, 8
 bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9
-bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10
 
 # Control scratchpad
 bindd = SUPER, S, Toggle scratchpad, togglespecialworkspace, scratchpad
@@ -93,12 +91,8 @@ bindd = SUPER ALT, DOWN, Move window to group on bottom, moveintogroup, d
 # Navigate a single set of grouped windows
 bindd = SUPER ALT, TAB, Next window in group, changegroupactive, f
 bindd = SUPER ALT SHIFT, TAB, Previous window in group, changegroupactive, b
-
-# Overload lateral window navigation for grouped windows
-bindd = SUPER ALT, LEFT, Move grouped window focus left, changegroupactive, b
-bindd = SUPER ALT, RIGHT, Move grouped window focus right, changegroupactive, f
-
-# Scroll through a set of grouped windows with SUPER + ALT + scroll
+bindd = SUPER ALT, page_up, Next window in group, changegroupactive, f
+bindd = SUPER ALT, page_down, Previous window in group, changegroupactive, b
 bindd = SUPER ALT, mouse_down, Next window in group, changegroupactive, f
 bindd = SUPER ALT, mouse_up, Previous window in group, changegroupactive, b
 

default/pacman/pacman.conf

@@ -27,4 +27,4 @@ Include = /etc/pacman.d/mirrorlist
 
 [omarchy]
 SigLevel = Optional TrustAll
-Server = https://pkgs.omarchy.org/stable/$arch
+Server = https://pkgs.omarchy.org/$arch

default/walker/themes/omarchy-default/layout.xml

@@ -112,40 +112,13 @@
                 </child>
               </object>
             </child>
-            <child>
-              <object class="GtkBox" id="Keybinds">
-                <property name="hexpand">true</property>
-                <property name="margin-top">10</property>
-                <style>
-                  <class name="keybinds"></class>
-                </style>
-                <child>
-                  <object class="GtkBox" id="GlobalKeybinds">
-                    <property name="spacing">10</property>
-                    <style>
-                      <class name="global-keybinds"></class>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox" id="ItemKeybinds">
-                    <property name="hexpand">true</property>
-                    <property name="halign">end</property>
-                    <property name="spacing">10</property>
-                    <style>
-                      <class name="item-keybinds"></class>
-                    </style>
-                  </object>
-                </child>
-              </object>
-            </child>
             <child>
               <object class="GtkLabel" id="Error">
                 <style>
                   <class name="error"></class>
                 </style>
                 <property name="xalign">0</property>
-                <property name="visible">false</property>
+               <property name="visible">false</property>
               </object>
             </child>
           </object>

default/walker/themes/omarchy-default/style.css

@@ -113,4 +113,5 @@ child:selected .item-box * {
 }
 
 .preview {
+  background: @background;
 }

install/config/walker-elephant.sh

@@ -15,7 +15,3 @@ Description = Restarting Walker services after system update
 When = PostTransaction
 Exec = $OMARCHY_PATH/bin/omarchy-restart-walker
 EOF
-
-# Link the visual theme menu config
-mkdir -p ~/.config/elephant/menus
-ln -snf $OMARCHY_PATH/default/elephant/omarchy_themes.lua ~/.config/elephant/menus/omarchy_themes.lua

install/first-run/elephant.sh

@@ -1,2 +0,0 @@
-elephant service enable
-systemctl --user start elephant.service

install/omarchy-base.packages

@@ -8,7 +8,7 @@ asdcontrol
 avahi
 bash-completion
 bat
-bluetui
+blueberry
 brightnessctl
 btop
 clang
@@ -21,7 +21,6 @@ docker-buildx
 docker-compose
 dust
 evince
-exfatprogs
 expac
 eza
 fastfetch

migrations/1751134560.sh

@@ -9,19 +9,8 @@ export OMARCHY_PATH=$HOME/.local/share/omarchy
 export PATH=$OMARCHY_PATH/bin/:$PATH
 EOF
 
-# Ensure we have the latest repos and are ready to pull
-omarchy-refresh-pacman
-sudo systemctl restart systemd-timesyncd
-sudo pacman -Sy # Normally not advisable, but we'll do a full -Syu before finishing
-
 mkdir -p ~/.local/state/omarchy/migrations
 touch ~/.local/state/omarchy/migrations/1751134560.sh
 
-# Remove old AUR packages to prevent a super lengthy build on old Omarchy installs
-omarchy-pkg-drop zoom qt5-remoteobjects wf-recorder wl-screenrec
-
-# Get rid of old AUR packages
-bash $OMARCHY_PATH/migrations/1756060611.sh
-touch ~/.local/state/omarchy/migrations/1756060611.sh
-
+sudo systemctl restart systemd-timesyncd
 bash omarchy-update-perform

migrations/1751134561.sh

@@ -0,0 +1,9 @@
+echo "Add Omarchy Package Repository"
+
+omarchy-refresh-pacman-mirrorlist
+
+if ! grep -q "omarchy" /etc/pacman.conf; then
+  sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\n' /etc/pacman.conf
+  sudo systemctl restart systemd-timesyncd
+  sudo pacman -Syu --noconfirm
+fi

migrations/1751134562.sh

@@ -1,4 +1,3 @@
 echo "Ensure all indexes and packages are up to date"
 
-omarchy-refresh-pacman
 sudo pacman -Syu --noconfirm

migrations/1751134568.sh

@@ -1,4 +1,4 @@
-# Turn on bluetooth service so blueberry or bluetui works out the box
+# Turn on bluetooth service so blueberry works out the box
 echo "Let's turn on Bluetooth service so the controls work"
 if systemctl is-enabled --quiet bluetooth.service && systemctl is-active --quiet bluetooth.service; then
   # Bluetooth is already enabled, nothing to change

migrations/1754515289.sh

@@ -0,0 +1,4 @@
+echo "Update and restart Walker to resolve stuck Omarchy menu"
+
+sudo pacman -Syu --noconfirm walker-bin
+omarchy-restart-walker

migrations/1754929737.sh

@@ -0,0 +1,3 @@
+echo "Update Walker config to add 60s timeout such that it won't conflict with screensaver"
+
+omarchy-refresh-walker

migrations/1756060611.sh

@@ -13,6 +13,7 @@ reinstall_package_opr yay-bin yay
 reinstall_package_opr obsidian-bin obsidian
 reinstall_package_opr localsend-bin localsend
 reinstall_package_opr omarchy-chromium-bin omarchy-chromium
+reinstall_package_opr walker-bin
 reinstall_package_opr python-terminaltexteffects
 reinstall_package_opr tzupdate
 reinstall_package_opr typora

migrations/1756360552.sh

@@ -1,4 +1,7 @@
 echo "Move Omarchy Package Repository after Arch core/extra/multilib and remove AUR"
 
-omarchy-refresh-pacman
+sudo cp /etc/pacman.conf /etc/pacman.conf.bak
+sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
+sudo sed -i '/\[chaotic-aur\]/,+2 d' /etc/pacman.conf
+sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch" >> /etc/pacman.conf'
 sudo pacman -Syu --noconfirm

migrations/1756372498.sh

@@ -0,0 +1,8 @@
+echo "Add eza themeing"
+
+mkdir -p ~/.config/eza
+
+if [ -f ~/.config/omarchy/current/theme/eza.yml ]; then
+  ln -snf ~/.config/omarchy/current/theme/eza.yml ~/.config/eza/theme.yml
+fi
+

migrations/1758107879.sh

@@ -17,7 +17,6 @@ PACKAGES=(
   "elephant-websearch"
   "elephant-todo"
   "walker"
-  "libqalculate"
 )
 
 for pkg in "${PACKAGES[@]}"; do
@@ -32,10 +31,6 @@ if [[ "$WALKER_MAJOR" -lt 2 ]]; then
   NEEDS_MIGRATION=true
 fi
 
-# Ensure basic config is present
-mkdir -p ~/.config/walker
-cp -r ~/.local/share/omarchy/config/walker/* ~/.config/walker/
-
 if $NEEDS_MIGRATION; then
   kill -9 $(pgrep -x walker) 2>/dev/null || true
 
@@ -46,10 +41,5 @@ if $NEEDS_MIGRATION; then
   source $OMARCHY_PATH/install/config/walker-elephant.sh
 
   rm -rf ~/.config/walker/themes
-
-  omarchy-refresh-config walker/config.toml
-  omarchy-refresh-config elephant/calc.toml
-  omarchy-refresh-config elephant/desktopapplications.toml
+  omarchy-refresh-walker
 fi
-
-echo # Assure final success

migrations/1760724934.sh

@@ -8,6 +8,9 @@ if ! grep -q "map shift+insert paste_from_clipboard" "$KITTY_CONF"; then
   sed -i '/map ctrl+insert copy_to_clipboard/a map shift+insert paste_from_clipboard' "$KITTY_CONF"
 fi
 
+echo "Update Walker configs"
+omarchy-refresh-walker
+
 echo "Copy hooks examples"
 cp -r $OMARCHY_PATH/config/omarchy/* $HOME/.config/omarchy/
 

migrations/1761269603.sh

@@ -4,4 +4,5 @@ WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc"
 
 if [[ -f "$WAYBAR_CONFIG" ]] && ! grep -A5 '"custom/omarchy"' "$WAYBAR_CONFIG" | grep -q '"on-click-right"'; then
   sed -i '/"on-click": "omarchy-menu",/a\    "on-click-right": "omarchy-launch-terminal",' "$WAYBAR_CONFIG"
+  omarchy-state set restart-waybar-required
 fi

migrations/1762417304.sh

@@ -1,8 +0,0 @@
-echo "Replace bluetooth GUI with TUI"
-
-omarchy-pkg-add bluetui
-omarchy-pkg-drop blueberry
-
-if ! grep -q "omarchy-launch-bluetooth" ~/.config/waybar/config.jsonc; then
-  sed -i 's/blueberry/omarchy-launch-bluetooth/' ~/.config/waybar/config.jsonc
-fi

migrations/1762770815.sh

@@ -1,4 +1,3 @@
 echo "Pull packages from stable Arch mirror"
 
 omarchy-refresh-pacman-mirrorlist stable
-sudo pacman -Syu

migrations/1762873545.sh

@@ -1,10 +0,0 @@
-echo "Switch Elephant to run as a systemd service and walker to be autostarted on login"
-
-pkill elephant
-elephant service enable
-systemctl --user start elephant.service
-
-pkill walker
-mkdir -p ~/.config/autostart/
-cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/
-setsid walker --gapplication-service &

migrations/1763386443.sh

@@ -1,8 +0,0 @@
-echo "Uniquely identify terminal apps with custom app-ids using omarchy-launch-tui"
-
-# Replace terminal -e calls with omarchy-launch-tui in bindings
-sed -i 's/\$terminal -e \([^ ]*\)/omarchy-launch-tui \1/g' ~/.config/hypr/bindings.conf
-
-# Update waybar to use omarchy-launch-or-focus with omarchy-launch-tui for TUI apps
-sed -i 's|xdg-terminal-exec btop|omarchy-launch-or-focus-tui btop|' ~/.config/waybar/config.jsonc
-sed -i 's|xdg-terminal-exec --app-id=com\.omarchy\.Wiremix -e wiremix|omarchy-launch-or-focus-tui wiremix|' ~/.config/waybar/config.jsonc

migrations/1763393133.sh

@@ -1,6 +0,0 @@
-echo "Link new theme picker config"
-
-mkdir -p ~/.config/elephant/menus
-ln -snf $OMARCHY_PATH/default/elephant/omarchy_themes.lua ~/.config/elephant/menus/omarchy_themes.lua
-sed -i '/"menus",/d' ~/.config/walker/config.toml
-omarchy-restart-walker

migrations/1763409182.sh

@@ -1,3 +0,0 @@
-echo "Install exfatprogs to support exfat in format-drive"
-
-omarchy-pkg-add exfatprogs

migrations/1763409505.sh

@@ -1,5 +0,0 @@
-echo "Add 10th workspace option to waybar config"
-
-if ! grep -q '"10": "0",' ~/.config/waybar/config.jsonc; then
-  sed -i '/"9": "9",/a\      "10": "0",' ~/.config/waybar/config.jsonc
-fi

migrations/1763478660.sh

@@ -1,4 +0,0 @@
-echo "Configure XDPH config for screensharing to remember token selection"
-
-cp $OMARCHY_PATH/config/hypr/xdph.conf ~/.config/hypr/
-systemctl --user restart xdg-desktop-portal-hyprland

migrations/1763558828.sh

@@ -1,28 +0,0 @@
-echo "Make Alacritty compatible with X-TerminalArgs"
-
-if omarchy-pkg-present alacritty; then
-  mkdir -p ~/.local/share/applications
-  cat > ~/.local/share/applications/Alacritty.desktop << EOF
-[Desktop Entry]
-Type=Application
-TryExec=alacritty
-Exec=alacritty
-Icon=Alacritty
-Terminal=false
-Categories=System;TerminalEmulator;
-Name=Alacritty
-GenericName=Terminal
-Comment=A fast, cross-platform, OpenGL terminal emulator
-StartupNotify=true
-StartupWMClass=Alacritty
-Actions=New;
-X-TerminalArgExec=-e
-X-TerminalArgAppId=--class=
-X-TerminalArgTitle=--title=
-X-TerminalArgDir=--working-directory=
-
-[Desktop Action New]
-Name=New Terminal
-Exec=alacritty
-EOF
-fi

migrations/1763560161.sh

@@ -1,3 +0,0 @@
-echo "Hide Bluetooth module in waybar if there's no BT controller"
-
-sed -i '/format-connected": "",/a\    "format-no-controller": "",' ~/.config/waybar/config.jsonc

migrations/1763561396.sh

@@ -1,4 +0,0 @@
-echo "Switch to stable Omarchy Package Repository builds"
-
-omarchy-refresh-pacman
-sudo pacman -Syu --noconfirm

migrations/1763583093.sh

@@ -1,6 +0,0 @@
-echo "Make ethereal available as new theme"
-
-if [[ ! -L ~/.config/omarchy/themes/ethereal ]]; then
-  rm -rf ~/.config/omarchy/themes/ethereal
-  ln -nfs ~/.local/share/omarchy/themes/ethereal ~/.config/omarchy/themes/
-fi

migrations/1763626772.sh

@@ -1,6 +0,0 @@
-echo "Make hackerman available as new theme"
-
-if [[ ! -L ~/.config/omarchy/themes/hackerman ]]; then
-  rm -rf ~/.config/omarchy/themes/hackerman
-  ln -nfs ~/.local/share/omarchy/themes/hackerman ~/.config/omarchy/themes/
-fi

migrations/1763633307.sh

@@ -1,5 +0,0 @@
-echo "Add 100-line split resizing keybindings to Ghostty"
-
-if ! grep -q "resize_split:down,100" ~/.config/ghostty/config; then
-  sed -i "/keybind = control+insert=copy_to_clipboard/a\keybind = super+control+shift+alt+arrow_down=resize_split:down,100\nkeybind = super+control+shift+alt+arrow_up=resize_split:up,100\nkeybind = super+control+shift+alt+arrow_left=resize_split:left,100\nkeybind = super+control+shift+alt+arrow_right=resize_split:right,100" ~/.config/ghostty/config
-fi

migrations/1763634099.sh

@@ -1,3 +0,0 @@
-echo "Using 󰂱 icon for bluetooth when connected"
-
-sed -i 's/"format-connected": "",/"format-connected": "󰂱",/' ~/.config/waybar/config.jsonc

migrations/1763653692.sh

@@ -1,5 +0,0 @@
-echo "Replace Waybar dock icon with something more obvious"
-
-sed -i 's/"format": ""/"format": ""/' ~/.config/waybar/config.jsonc
-sed -i '/#custom-expand-icon {/,/}/ s/margin-right: 20px;/margin-right: 18px;/' ~/.config/waybar/style.css
-omarchy-restart-waybar

migrations/1763743755.sh

@@ -1,3 +0,0 @@
-echo "Refresh Walker config to ensure compatibility with latest version"
-
-omarchy-refresh-walker

themes/catppuccin/btop.theme

@@ -1,5 +1,5 @@
 # Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#1E1E2E"
+theme[main_bg]="#24273a"
 
 # Main text color
 theme[main_fg]="#c6d0f5"

themes/ethereal/alacritty.toml

@@ -1,28 +0,0 @@
-[colors]
-[colors.primary]
-background = "#060B1E"
-foreground = "#ffcead"
-
-[colors.normal]
-black   = "#060B1E"
-red     = "#ED5B5A"
-green   = "#92a593"
-yellow  = "#E9BB4F"
-blue    = "#7d82d9"
-magenta = "#c89dc1"
-cyan    = "#a3bfd1"
-white   = "#F99957"
-
-[colors.bright]
-black   = "#6d7db6"
-red     = "#faaaa9"
-green   = "#c4cfc4"
-yellow  = "#f7dc9c"
-blue    = "#c2c4f0"
-magenta = "#ead7e7"
-cyan    = "#dfeaf0"
-white   = "#ffcead"
-
-[colors.cursor]
-text   = "#060B1E"
-cursor = "#ffcead"

themes/ethereal/btop.theme

@@ -1,70 +0,0 @@
-# Main background, empty for terminal default, need to be empty if you want transparent background
-theme[main_bg]="#060B1E"
-
-# Main text color
-theme[main_fg]="#ffcead"
-
-# Title color for boxes
-theme[title]="#c89dc1"
-
-# Highlight color for keyboard shortcuts
-theme[hi_fg]="#a3bfd1"
-
-# Background color of selected item in processes box
-theme[selected_bg]="#6d7db6"
-
-# Foreground color of selected item in processes box
-theme[selected_fg]="#ffcead"
-
-# Color of inactive/disabled text
-theme[inactive_fg]="#6d7db6"
-
-# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-theme[proc_misc]="#c89dc1"
-
-# Box outline and divider line color
-theme[cpu_box]="#92a593"
-theme[mem_box]="#92a593"
-theme[net_box]="#92a593"
-theme[proc_box]="#92a593"
-theme[div_line]="#6d7db6"
-
-# Gradient for all meters and graphs
-theme[temp_start]="#a3bfd1"
-theme[temp_mid]="#7d82d9"
-theme[temp_end]="#92a593"
-
-
-theme[cpu_start]="#a3bfd1"
-theme[cpu_mid]="#7d82d9"
-theme[cpu_end]="#92a593"
-
-
-theme[free_start]="#7d82d9"
-theme[free_mid]="#E9BB4F"
-theme[free_end]="#E9BB4F"
-
-
-theme[cached_start]="#E9BB4F"
-theme[cached_mid]="#E9BB4F"
-theme[cached_end]="#E9BB4F"
-
-
-theme[available_start]="#a3bfd1"
-theme[available_mid]="#a3bfd1"
-theme[available_end]="#a3bfd1"
-
-
-theme[used_start]="#92a593"
-theme[used_mid]="#92a593"
-theme[used_end]="#92a593"
-
-
-theme[download_start]="#E9BB4F"
-theme[download_mid]="#a3bfd1"
-theme[download_end]="#7d82d9"
-
-
-theme[upload_start]="#E9BB4F"
-theme[upload_mid]="#a3bfd1"
-theme[upload_end]="#7d82d9"

themes/ethereal/chromium.theme

@@ -1 +0,0 @@
-6,11,30

themes/ethereal/ghostty.conf

@@ -1,23 +0,0 @@
-# Background and foreground colors
-background = #060B1E
-foreground = #ffcead
-
-# Standard colors
-palette = 0=#060B1E
-palette = 1=#ED5B5A
-palette = 2=#92a593
-palette = 3=#E9BB4F
-palette = 4=#7d82d9
-palette = 5=#c89dc1
-palette = 6=#a3bfd1
-palette = 7=#F99957
-
-# Bright colors
-palette = 8=#6d7db6
-palette = 9=#faaaa9
-palette = 10=#c4cfc4
-palette = 11=#f7dc9c
-palette = 12=#c2c4f0
-palette = 13=#ead7e7
-palette = 14=#dfeaf0
-palette = 15=#ffcead

themes/ethereal/hyprland.conf

@@ -1,12 +0,0 @@
-# This file is not a full hyprland configuration.
-# It is intended to be included in your main hyprland.conf.
-
-$activeBorderColor = rgb(4E85D8)
-
-general {
-    col.active_border = $activeBorderColor
-}
-
-group {
-    col.border_active = $activeBorderColor
-}

themes/ethereal/hyprlock.conf

@@ -1,6 +0,0 @@
-$color = rgba(6, 11, 30, 1)
-$inner_color = rgba(6, 11, 30, 0.66)
-$outer_color = rgba(200, 157, 193, 1)
-$font_color = rgba(255, 206, 173, 1)
-$placeholder_color = rgba(255, 206, 173, 0.7)
-$check_color = rgba(163, 191, 209, 1)

themes/ethereal/icons.theme

@@ -1 +0,0 @@
-Yaru-blue

themes/ethereal/kitty.conf

@@ -1,34 +0,0 @@
-background #060B1E
-foreground #ffcead
-
-# black
-color0  #060B1E
-color8  #6d7db6
-
-# red
-color1  #ED5B5A
-color9  #faaaa9
-
-# green
-color2  #92a593
-color10 #c4cfc4
-
-# yellow
-color3  #E9BB4F
-color11 #f7dc9c
-
-# blue
-color4  #7d82d9
-color12 #c2c4f0
-
-# magenta
-color5  #c89dc1
-color13 #ead7e7
-
-#cyan
-color6  #a3bfd1
-color14 #dfeaf0
-
-#white
-color7  #F99957
-color15 #ffcead

themes/ethereal/mako.ini

@@ -1,21 +0,0 @@
-text-color=#ffcead
-border-color=#c89dc1
-background-color=#060B1E
-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/ethereal/neovim.lua

@@ -1,12 +0,0 @@
-return {
-  {
-    "bjarneo/ethereal.nvim",
-    priority = 1000,
-  },
-  {
-    "LazyVim/LazyVim",
-    opts = {
-      colorscheme = "ethereal",
-    },
-  },
-}

themes/ethereal/swayosd.css

@@ -1,5 +0,0 @@
-@define-color background-color #060B1E;
-@define-color border-color #6d7db6;
-@define-color label #ffcead;
-@define-color image #ffcead;
-@define-color progress #E9BB4F;

themes/ethereal/vscode.json

@@ -1,4 +0,0 @@
-{
-  "name": "Ethereal",
-  "extension": "Bjarne.ethereal-omarchy"
-}

themes/ethereal/walker.css

@@ -1,6 +0,0 @@
-@define-color selected-text #7d82d9;
-@define-color text #ffcead;
-@define-color base #060B1E;
-@define-color border #6d7db6;
-@define-color foreground #ffcead;
-@define-color background #060B1E;

themes/ethereal/waybar.css

@@ -1,2 +0,0 @@
-@define-color background #060B1E;
-@define-color foreground #ffcead;

themes/everforest/btop.theme

@@ -22,7 +22,7 @@ theme[selected_bg]="#3d484d"
 theme[selected_fg]="#dbbc7f"
 
 # Color of inactive/disabled text
-theme[inactive_fg]="#2d353b"
+theme[inactive_fg]="#2d353b"  
 
 # Color of text appearing on top of graphs, i.e uptime and current network graph scaling
 theme[graph_text]="#d3c6aa"

themes/everforest/ghostty.conf

@@ -1,20 +1 @@
-background = #2d353b
-foreground = #d3c6aa
-
-palette = 0=#475258
-palette = 1=#e67e80
-palette = 2=#a7c080
-palette = 3=#dbbc7f
-palette = 4=#7fbbb3
-palette = 5=#d699b6
-palette = 6=#83c092
-palette = 7=#d3c6aa
-
-palette = 8=#475258
-palette = 9=#e67e80
-palette = 10=#a7c080
-palette = 11=#dbbc7f
-palette = 12=#7fbbb3
-palette = 13=#d699b6
-palette = 14=#83c092
-palette = 15=#d3c6aa
+theme = Everforest Dark Hard

themes/everforest/kitty.conf

@@ -4,25 +4,66 @@
 ## upstream: https://github.com/ewal/kitty-everforest/blob/master/themes/everforest_dark_hard.conf
 ## blurb: A green based color scheme designed to be warm and soft
 
-background            #2d353b
-foreground            #d3c6aa
+foreground                      #d3c6aa
+background                      #272e33
+selection_foreground            #9da9a0
+selection_background            #464e53
 
-# Normal colors
-color0                #475258
-color1                #e67e80
-color2                #a7c080
-color3                #dbbc7f
-color4                #7fbbb3
-color5                #d699b6
-color6                #83c092
-color7                #d3c6aa
+cursor                          #d3c6aa
+cursor_text_color               #2e383c
 
-# Bright colors
-color8                #475258
-color9                #e67e80
-color10               #a7c080
-color11               #dbbc7f
-color12               #7fbbb3
-color13               #d699b6
-color14               #83c092
-color15               #d3c6aa
+url_color                       #7fbbb3
+
+active_border_color             #a7c080
+inactive_border_color           #4f5b58
+bell_border_color               #e69875
+visual_bell_color               none
+
+wayland_titlebar_color          system
+macos_titlebar_color            system
+
+active_tab_background           #272e33
+active_tab_foreground           #d3c6aa
+inactive_tab_background         #374145
+inactive_tab_foreground         #9da9a0
+tab_bar_background              #2e383c
+tab_bar_margin_color            none
+
+mark1_foreground                #272e33
+mark1_background                #7fbbb3
+mark2_foreground                #272e33
+mark2_background                #d3c6aa
+mark3_foreground                #272e33
+mark3_background                #d699b6
+
+#: black
+color0                          #343f44
+color8                          #868d80
+
+#: red
+color1                          #e67e80
+color9                          #e67e80
+
+#: green
+color2                          #a7c080
+color10                         #a7c080
+
+#: yellow
+color3                          #dbbc7f
+color11                         #dbbc7f
+
+#: blue
+color4                          #7fbbb3
+color12                         #7fbbb3
+
+#: magenta
+color5                          #d699b6
+color13                         #d699b6
+
+#: cyan
+color6                          #83c092
+color14                         #83c092
+
+#: white
+color7                          #859289
+color15                         #9da9a0