Fixup the migration to reuse config logic

applications/nvim.desktop

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

bin/omarchy-cmd-audio-switch

@@ -2,7 +2,7 @@
 
 focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
 
-sinks=$(pactl -f json list sinks | jq '[.[] | select((.ports | length == 0) or ([.ports[]? | .availability != "not available"] | any))]')
+sinks=$(pactl -f json list sinks | jq '[.[] | select([.ports[]? | .availability == "available"] | any)]')
 sinks_count=$(echo "$sinks" | jq '. | length')
 
 if [ "$sinks_count" -eq 0 ]; then

bin/omarchy-cmd-first-run

@@ -6,12 +6,8 @@ FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode
 
 if [[ -f "$FIRST_RUN_MODE" ]]; then
   rm -f "$FIRST_RUN_MODE"
-
   bash "$OMARCHY_PATH/install/first-run/battery-monitor.sh"
   bash "$OMARCHY_PATH/install/first-run/firewall.sh"
   bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
   sudo rm -f /etc/sudoers.d/first-run
-
-  bash "$OMARCHY_PATH/install/first-run/wifi.sh"
-  bash "$OMARCHY_PATH/install/first-run/welcome.sh"
 fi

bin/omarchy-cmd-screenrecord

@@ -17,7 +17,7 @@ AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
 start_screenrecording() {
   filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
 
-  if lspci | grep -qi 'nvidia'; then
+  if lspci | grep -Eqi 'nvidia|intel.*graphics'; then
     wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
   else
     wl-screenrec $AUDIO -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@" &

bin/omarchy-cmd-screensaver

@@ -1,10 +1,6 @@
 #!/bin/bash
 
-screensaver_in_focus() {
+function exit_screensaver {
-  hyprctl activewindow -j | jq -e '.class == "Screensaver"' >/dev/null 2>&1
-}
-
-exit_screensaver() {
   hyprctl keyword cursor:invisible false
   pkill -x tte 2>/dev/null
   pkill -f "alacritty --class Screensaver" 2>/dev/null
@@ -22,7 +18,7 @@ while true; do
     "$effect" &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 3 || ! screensaver_in_focus; then
+    if read -n 1 -t 3; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-screenshot

@@ -8,7 +8,7 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-pkill slurp || hyprshot -m ${1:-region} --raw |
+pkill slurp || hyprshot -m ${1:-region} --raw --freeze |
   satty --filename - \
     --output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
     --early-exit \

bin/omarchy-cmd-share

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-cmd-share [clipboard|file|folder]"
-  exit 1
-fi
-
-MODE="$1"
-shift
-
-if [[ $MODE == "clipboard" ]]; then
-  TEMP_FILE=$(mktemp --suffix=.txt)
-  wl-paste >"$TEMP_FILE"
-  FILES="$TEMP_FILE"
-else
-  if (($# > 0)); then
-    FILES="$*"
-  else
-    if [[ $MODE == "folder" ]]; then
-      # Pick a single folder from home directory
-      FILES=$(find "$HOME" -type d 2>/dev/null | fzf)
-    else
-      # Pick one or more files from home directory
-      FILES=$(find "$HOME" -type f 2>/dev/null | fzf --multi)
-    fi
-    [ -z "$FILES" ] && exit 0
-  fi
-fi
-
-# Run LocalSend in its own systemd service (detached from terminal)
-# Convert newline-separated files to space-separated arguments
-if [[ $MODE != "clipboard" ]] && echo "$FILES" | grep -q $'\n'; then
-  # Multiple files selected - convert newlines to array
-  readarray -t FILE_ARRAY <<<"$FILES"
-  systemd-run --user --quiet --collect localsend --headless send "${FILE_ARRAY[@]}"
-else
-  # Single file or clipboard mode
-  systemd-run --user --quiet --collect localsend --headless send "$FILES"
-fi
-
-# Note: Temporary file will remain until system cleanup for clipboard mode
-# This ensures the file content is available for the LocalSend GUI
-
-exit 0

bin/omarchy-cmd-tzupdate

@@ -1,8 +1,7 @@
 #!/bin/bash
 
-notify-send "   Updating time and timezone..."
 sudo systemctl restart systemd-timesyncd
 sudo tzupdate
 new_timezone=$(timedatectl show -p Timezone --value)
 omarchy-restart-waybar
-notify-send "   Time updated and timezone set to $new_timezone"
+notify-send "Time synced and timezone set to $new_timezone"

bin/omarchy-font-current

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-grep -oP 'font-family:\s*["'\'']?\K[^;"'\'']+' ~/.config/waybar/style.css | head -n1
+grep -oP 'family\s*=\s*"\K[^"]+' ~/.config/alacritty/alacritty.toml | head -n1

bin/omarchy-font-set

@@ -4,20 +4,7 @@ font_name="$1"
 
 if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
   if fc-list | grep -iq "$font_name"; then
-    if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
     sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
-    fi
-
-    if [[ -f ~/.config/kitty/kitty.conf ]]; then
-      sed -i "s/^font_family .*/font_family $font_name/g" ~/.config/kitty/kitty.conf
-      pkill -USR1 kitty
-    fi
-
-    if [[ -f ~/.config/ghostty/config ]]; then
-      sed -i "s/font-family = \".*\"/font-family = \"$font_name\"/g" ~/.config/ghostty/config
-      pkill -SIGUSR2 ghostty
-    fi
-
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
     xmlstarlet ed -L \

bin/omarchy-install-dev-env

@@ -119,7 +119,6 @@ java)
 zig)
   echo -e "Installing Zig...\n"
   mise use --global zig@latest
-  mise use -g zls@latest
   ;;
 ocaml)
   echo -e "Installing OCaml...\n"

bin/omarchy-install-terminal

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-install-terminal [alacritty|ghostty|kitty]"
-  exit 1
-fi
-
-package="$1"
-
-# Install package
-omarchy-pkg-add $package
-
-# Set as default terminal
-echo "Setting $package as new default terminal..."
-sed -i "/export TERMINAL=/ c\export TERMINAL=$package" ~/.config/uwsm/default
-
-# Relaunch is needed for new default to take effect
-echo
-gum confirm "Relaunch Hyprland to use new terminal?" && uwsm stop

bin/omarchy-launch-about

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec setsid uwsm app -- alacritty --class=Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s'

bin/omarchy-launch-browser

@@ -1,12 +1,3 @@
 #!/bin/bash
 
-default_browser=$(xdg-settings get default-web-browser)
+exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$(xdg-settings get default-web-browser) 2>/dev/null | head -1) ${args[@]} $@
-browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)
-
-if [[ $browser_exec =~ (firefox|zen|librewolf) ]]; then
-  private_flag="--private-window"
-else
-  private_flag="--incognito"
-fi
-
-exec setsid uwsm app -- "$browser_exec" "${@/--private/$private_flag}"

bin/omarchy-launch-editor

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-case "${EDITOR:-nvim}" in
-nvim | vim | nano | micro | hx)
-  exec setsid uwsm app -- "$TERMINAL" -e "$EDITOR" "$@"
-  ;;
-*)
-  exec setsid uwsm app -- "$EDITOR" "$@"
-  ;;
-esac

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

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cmd="$*"
-exec setsid uwsm app -- alacritty --class=Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
+setsid alacritty --class Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"

bin/omarchy-launch-or-focus

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-launch-or-focus [window-pattern] [launch-command]"
-  exit 1
-fi
-
-WINDOW_PATTERN="$1"
-LAUNCH_COMMAND="${2:-"uwsm app -- $WINDOW_PATTERN"}"
-WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class+" "+.title)|test($p;"i"))|.address' | head -n1)
-
-if [[ -n $WINDOW_ADDRESS ]]; then
-  hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
-else
-  eval exec $LAUNCH_COMMAND
-fi

bin/omarchy-launch-or-focus-webapp

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-launch-or-focus-webapp [window-pattern] [url]"
-  exit 1
-fi
-
-exec omarchy-launch-or-focus "$1" "omarchy-launch-webapp '$2'"

bin/omarchy-launch-screensaver

@@ -17,8 +17,6 @@ focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
 
 for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
   hyprctl dispatch focusmonitor $m
-
-  # FIXME: Find a way to make this generic where we it can work for kitty + ghostty
   hyprctl dispatch exec -- \
     alacritty --class Screensaver \
     --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \

bin/omarchy-launch-wifi

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec setsid uwsm app -- "$TERMINAL" --class=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 "$TERMINAL --class Screensaver"
+pkill -f "alacritty --class Screensaver"

bin/omarchy-menu

@@ -37,16 +37,16 @@ menu() {
 }
 
 terminal() {
-  alacritty --class=Omarchy -e "$@"
+  alacritty --class Omarchy -e "$@"
 }
 
 present_terminal() {
   omarchy-launch-floating-terminal-with-presentation $1
 }
 
-open_in_editor() {
+edit_in_nvim() {
   notify-send "Editing config file" "$1"
-  omarchy-launch-editor "$1"
+  alacritty -e nvim "$1"
 }
 
 install() {
@@ -61,10 +61,6 @@ install_font() {
   present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
 }
 
-install_terminal() {
-  present_terminal "omarchy-install-terminal $1"
-}
-
 aur_install() {
   present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
 }
@@ -85,70 +81,13 @@ show_learn_menu() {
   esac
 }
 
-show_trigger_menu() {
-  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle") in
-  *Capture*) show_capture_menu ;;
-  *Share*) show_share_menu ;;
-  *Toggle*) show_toggle_menu ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_capture_menu() {
-  case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰃉  Color") in
-  *Screenshot*) show_screenshot_menu ;;
-  *Screenrecord*) show_screenrecord_menu ;;
-  *Color*) pkill hyprpicker || hyprpicker -a ;;
-  *) show_trigger_menu ;;
-  esac
-}
-
-show_screenshot_menu() {
-  case $(menu "Screenshot" "  Region\n  Window\n  Display") in
-  *Region*) omarchy-cmd-screenshot ;;
-  *Window*) omarchy-cmd-screenshot window ;;
-  *Display*) omarchy-cmd-screenshot output ;;
-  *) show_capture_menu ;;
-  esac
-}
-
-show_screenrecord_menu() {
-  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio") in
-  *"Region + Audio"*) omarchy-cmd-screenrecord region audio ;;
-  *Region*) omarchy-cmd-screenrecord ;;
-  *"Display + Audio"*) omarchy-cmd-screenrecord output audio ;;
-  *Display*) omarchy-cmd-screenrecord output ;;
-  *) show_capture_menu ;;
-  esac
-}
-
-show_share_menu() {
-  case $(menu "Share" "  Clipboard\n  File \n  Folder") in
-  *Clipboard*) terminal bash -c "omarchy-cmd-share clipboard" ;;
-  *File*) terminal bash -c "omarchy-cmd-share file" ;;
-  *Folder*) terminal bash -c "omarchy-cmd-share folder" ;;
-  *) back_to show_trigger_menu ;;
-  esac
-}
-
-show_toggle_menu() {
-  case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar") in
-  *Screensaver*) omarchy-toggle-screensaver ;;
-  *Nightlight*) omarchy-toggle-nightlight ;;
-  *Idle*) omarchy-toggle-idle ;;
-  *Bar*) omarchy-toggle-waybar ;;
-  *) show_trigger_menu ;;
-  esac
-}
-
 show_style_menu() {
-  case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n  Hyprland\n󱄄  Screensaver\n  About") in
+  case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n󱄄  Screensaver\n  About") in
   *Theme*) show_theme_menu ;;
   *Font*) show_font_menu ;;
   *Background*) omarchy-theme-bg-next ;;
-  *Hyprland*) open_in_editor ~/.config/hypr/looknfeel.conf ;;
+  *Screensaver*) edit_in_nvim ~/.config/omarchy/branding/screensaver.txt ;;
-  *Screensaver*) open_in_editor ~/.config/omarchy/branding/screensaver.txt ;;
+  *About*) edit_in_nvim ~/.config/omarchy/branding/about.txt ;;
-  *About*) open_in_editor ~/.config/omarchy/branding/about.txt ;;
   *) show_main_menu ;;
   esac
 }
@@ -171,30 +110,68 @@ show_font_menu() {
   fi
 }
 
+show_capture_menu() {
+  case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰃉  Color") in
+  *Screenshot*) show_screenshot_menu ;;
+  *Screenrecord*) show_screenrecord_menu ;;
+  *Color*) pkill hyprpicker || hyprpicker -a ;;
+  *) show_main_menu ;;
+  esac
+}
+
+show_screenshot_menu() {
+  case $(menu "Screenshot" "  Region\n  Window\n  Display") in
+  *Region*) omarchy-cmd-screenshot ;;
+  *Window*) omarchy-cmd-screenshot window ;;
+  *Display*) omarchy-cmd-screenshot output ;;
+  *) show_capture_menu ;;
+  esac
+}
+
+show_screenrecord_menu() {
+  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio") in
+  *"Region + Audio"*) omarchy-cmd-screenrecord region audio ;;
+  *Region*) omarchy-cmd-screenrecord ;;
+  *"Display + Audio"*) omarchy-cmd-screenrecord output audio ;;
+  *Display*) omarchy-cmd-screenrecord output ;;
+  *) show_capture_menu ;;
+  esac
+}
+
+show_toggle_menu() {
+  case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar") in
+  *Screensaver*) omarchy-toggle-screensaver ;;
+  *Nightlight*) omarchy-toggle-nightlight ;;
+  *Idle*) omarchy-toggle-idle ;;
+  *Bar*) omarchy-toggle-waybar ;;
+  *) show_main_menu ;;
+  esac
+}
+
 show_setup_menu() {
   local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n󰍹  Monitors"
   [ -f ~/.config/hypr/bindings.conf ] && options="$options\n  Keybindings"
   [ -f ~/.config/hypr/input.conf ] && options="$options\n  Input"
-  options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
+  options="$options\n󰱔  DNS\n  Config\n󰈷  Fingerprint\n  Fido2"
 
   case $(menu "Setup" "$options") in
-  *Audio*) $TERMINAL --class=Wiremix -e wiremix ;;
+  *Audio*) alacritty --class=Wiremix -e wiremix ;;
   *Wifi*)
     rfkill unblock wifi
-    omarchy-launch-wifi
+    alacritty --class=Impala -e impala
     ;;
   *Bluetooth*)
     rfkill unblock bluetooth
     blueberry
     ;;
   *Power*) show_setup_power_menu ;;
-  *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
+  *Monitors*) edit_in_nvim ~/.config/hypr/monitors.conf ;;
-  *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
+  *Keybindings*) edit_in_nvim ~/.config/hypr/bindings.conf ;;
-  *Input*) open_in_editor ~/.config/hypr/input.conf ;;
+  *Input*) edit_in_nvim ~/.config/hypr/input.conf ;;
-  *Defaults*) open_in_editor ~/.config/uwsm/default ;;
   *DNS*) present_terminal omarchy-setup-dns ;;
-  *Security*) show_setup_security_menu ;;
   *Config*) show_setup_config_menu ;;
+  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
+  *Fido2*) present_terminal omarchy-setup-fido2 ;;
   *) show_main_menu ;;
   esac
 }
@@ -211,28 +188,20 @@ show_setup_power_menu() {
 
 show_setup_config_menu() {
   case $(menu "Setup" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar\n󰞅  XCompose") in
-  *Hyprland*) open_in_editor ~/.config/hypr/hyprland.conf ;;
+  *Hyprland*) edit_in_nvim ~/.config/hypr/hyprland.conf ;;
-  *Hypridle*) open_in_editor ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
+  *Hypridle*) edit_in_nvim ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
-  *Hyprlock*) open_in_editor ~/.config/hypr/hyprlock.conf ;;
+  *Hyprlock*) edit_in_nvim ~/.config/hypr/hyprlock.conf ;;
-  *Hyprsunset*) open_in_editor ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
+  *Hyprsunset*) edit_in_nvim ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
-  *Swayosd*) open_in_editor ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
+  *Swayosd*) edit_in_nvim ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
-  *Walker*) open_in_editor ~/.config/walker/config.toml && omarchy-restart-walker ;;
+  *Walker*) edit_in_nvim ~/.config/walker/config.toml && omarchy-restart-walker ;;
-  *Waybar*) open_in_editor ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
+  *Waybar*) edit_in_nvim ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
-  *XCompose*) open_in_editor ~/.XCompose && omarchy-restart-xcompose ;;
+  *XCompose*) edit_in_nvim ~/.XCompose && omarchy-restart-xcompose ;;
   *) show_main_menu ;;
   esac
 }
 
-show_setup_security_menu() {
-  case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
-  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
-  *Fido2*) present_terminal omarchy-setup-fido2 ;;
-  *) show_setup_menu ;;
-  esac
-}
-
 show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n  Terminal\n󱚤  AI\n  Gaming") in
+  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n󱚤  AI\n  Gaming") in
   *Package*) terminal omarchy-pkg-install ;;
   *AUR*) terminal omarchy-pkg-aur-install ;;
   *Web*) present_terminal omarchy-webapp-install ;;
@@ -241,7 +210,6 @@ show_install_menu() {
   *Style*) show_install_style_menu ;;
   *Development*) show_install_development_menu ;;
   *Editor*) show_install_editor_menu ;;
-  *Terminal*) show_install_terminal_menu ;;
   *AI*) show_install_ai_menu ;;
   *Gaming*) show_install_gaming_menu ;;
   *) show_main_menu ;;
@@ -269,15 +237,6 @@ show_install_editor_menu() {
   esac
 }
 
-show_install_terminal_menu() {
-  case $(menu "Install" "  Alacritty\n  Ghostty\n  Kitty") in
-  *Alacritty*) install_terminal "alacritty" ;;
-  *Ghostty*) install_terminal "ghostty" ;;
-  *Kitty*) install_terminal "kitty" ;;
-  *) show_install_menu ;;
-  esac
-}
-
 show_install_ai_menu() {
   ollama_pkg=$(
     (command -v nvidia-smi &>/dev/null && echo ollama-cuda) ||
@@ -383,9 +342,8 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n Branch\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Password\n  Timezone") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n󰇅  Hardware\n  Password\n  Timezone") in
   *Omarchy*) present_terminal omarchy-update ;;
-  *Branch*) show_update_branch_menu ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
@@ -396,13 +354,6 @@ show_update_menu() {
   esac
 }
 
-show_update_branch_menu() {
-  case $(menu "Branch" "master\ndev" "" "$(omarchy-version-branch)") in
-  *master*) present_terminal "omarchy-update-branch master" ;;
-  *dev*) present_terminal "omarchy-update-branch dev" ;;
-  *) show_update_menu ;;
-  esac
-}
 show_update_process_menu() {
   case $(menu "Restart" "  Hypridle\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
   *Hypridle*) omarchy-restart-hypridle ;;
@@ -457,25 +408,25 @@ show_system_menu() {
 }
 
 show_main_menu() {
-  go_to_menu "$(menu "Go" "󰀻  Apps\n󰧑  Learn\n󱓞  Trigger\n  Style\n  Setup\n󰉉  Install\n󰭌  Remove\n  Update\n  About\n  System")"
+  go_to_menu "$(menu "Go" "󰀻  Apps\n󰧑  Learn\n  Capture\n󰔎  Toggle\n  Style\n  Setup\n󰉉  Install\n󰭌  Remove\n  Update\n  About\n  System")"
 }
 
 go_to_menu() {
   case "${1,,}" in
   *apps*) walker -p "Launch…" ;;
   *learn*) show_learn_menu ;;
-  *trigger*) show_trigger_menu ;;
-  *share*) show_share_menu ;;
   *style*) show_style_menu ;;
   *theme*) show_theme_menu ;;
+  *capture*) show_capture_menu ;;
   *screenshot*) show_screenshot_menu ;;
   *screenrecord*) show_screenrecord_menu ;;
+  *toggle*) show_toggle_menu ;;
   *setup*) show_setup_menu ;;
   *power*) show_setup_power_menu ;;
   *install*) show_install_menu ;;
   *remove*) show_remove_menu ;;
   *update*) show_update_menu ;;
-  *about*) omarchy-launch-about ;;
+  *about*) alacritty --class Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' ;;
   *system*) show_system_menu ;;
   esac
 }

bin/omarchy-notification-dismiss

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-notification-dismiss <summary>"
-  exit 1
-fi
-
-# Find the first notification whose 'summary' matches the regex in $1
-notification_id=$(makoctl list | grep -F "$1" | head -n1 | sed -E 's/^Notification ([0-9]+):.*/\1/')
-
-if [[ -n $notification_id ]]; then
-  makoctl dismiss -n $notification_id
-fi

bin/omarchy-pkg-aur-install

@@ -2,15 +2,13 @@
 
 fzf_args=(
   --multi
-  --preview 'yay -Siia {1}'
+  --preview 'yay -Sii {1}'
-  --preview-label='alt-p: toggle description, alt-b/B: toggle PKGBUILD, alt-j/k: scroll, tab: multi-select, F11: maximize'
+  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
   --preview-label-pos='bottom'
   --preview-window 'down:65%:wrap'
   --bind 'alt-p:toggle-preview'
   --bind 'alt-d:preview-half-page-down,alt-u:preview-half-page-up'
   --bind 'alt-k:preview-up,alt-j:preview-down'
-  --bind 'alt-b:change-preview:yay -Gpa {1} | tail -n +5'
-  --bind 'alt-B:change-preview:yay -Siia {1}'
   --color 'pointer:green,marker:green'
 )
 

bin/omarchy-restart-walker

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 pkill walker
-# FIXME: Just deal with the memory leak for now.
+# FIXME: Reenable the walker service once the memory leak has been fixed
 # See https://github.com/basecamp/omarchy/issues/698
-setsid uwsm app -- walker --gapplication-service &
+# setsid uwsm app -- walker --gapplication-service &
 echo # Always end in success so we don't terminate further running

bin/omarchy-theme-set

@@ -1,7 +1,10 @@
 #!/bin/bash
 
-if [[ -z $1 && $1 != "CNCLD" ]]; then
+# omarchy-theme-set: Set a theme, specified by its name.
-  echo "Usage: omarchy-theme-set <theme-name>"
+# Usage: omarchy-theme-set <theme-name>
+
+if [[ -z "$1" && "$1" != "CNCLD" ]]; then
+  echo "Usage: omarchy-theme-set <theme-name>" >&2
   exit 1
 fi
 
@@ -13,26 +16,54 @@ THEME_PATH="$THEMES_DIR/$THEME_NAME"
 
 # Check if the theme entered exists
 if [[ ! -d "$THEME_PATH" ]]; then
-  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR"
+  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR" >&2
-  exit 1
+  exit 2
 fi
 
 # Update theme symlinks
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 
-# Change background with theme
+# Change gnome modes
-omarchy-theme-bg-next
+if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
+else
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
+fi
+
+# Change gnome icon theme color
+if [[ -f ~/.config/omarchy/current/theme/icons.theme ]]; then
+  gsettings set org.gnome.desktop.interface icon-theme "$(<~/.config/omarchy/current/theme/icons.theme)"
+else
+  gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
+fi
+
+# Change Chromium colors
+if command -v chromium &>/dev/null; then
+  if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+    chromium --no-startup-window --set-color-scheme="light"
+  else
+    chromium --no-startup-window --set-color-scheme="dark"
+  fi
+
+  if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]]; then
+    chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
+  else
+    # Use a default, neutral grey if theme doesn't have a color
+    chromium --no-startup-window --set-theme-color="28,32,39"
+  fi
+fi
+
+# Trigger alacritty config reload
+touch "$HOME/.config/alacritty/alacritty.toml"
 
 # Restart components to apply new theme
+pkill -SIGUSR2 btop
 omarchy-restart-waybar
 omarchy-restart-swayosd
-hyprctl reload
-pkill -SIGUSR2 btop
 makoctl reload
+hyprctl reload
 
-# Change gnome, browser, vscode themes
+# Set new background
-omarchy-theme-set-terminal
+omarchy-theme-bg-next
-omarchy-theme-set-gnome
-omarchy-theme-set-eza
-omarchy-theme-set-browser
-omarchy-theme-set-vscode

bin/omarchy-theme-set-browser

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-CHROMIUM_THEME=~/.config/omarchy/current/theme/chromium.theme
-
-if omarchy-cmd-present chromium || omarchy-cmd-present brave; then
-  if [[ -f $CHROMIUM_THEME ]]; then
-    rgb=$(<$CHROMIUM_THEME)
-    THEME_HEX_COLOR=$(printf '#%02x%02x%02x' ${rgb//,/ })
-  else
-    # Use a default, neutral grey if theme doesn't have a color
-    THEME_HEX_COLOR="#1c2027"
-  fi
-
-  if omarchy-cmd-present chromium; then
-    echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/chromium/policies/managed/color.json" >/dev/null
-    chromium --refresh-platform-policy --no-startup-window
-  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
-  fi
-fi

bin/omarchy-theme-set-eza

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [ -f ~/.config/omarchy/current/theme/eza.yml ]; then
-  ln -snf ~/.config/omarchy/current/theme/eza.yml ~/.config/eza/theme.yml
-else
-  rm -f ~/.config/eza/theme.yml
-fi

bin/omarchy-theme-set-gnome

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Change gnome modes
-if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
-else
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
-fi
-
-# Change gnome icon theme color
-GNOME_ICONS_THEME=~/.config/omarchy/current/theme/icons.theme
-if [[ -f $GNOME_ICONS_THEME ]]; then
-  gsettings set org.gnome.desktop.interface icon-theme "$(<$GNOME_ICONS_THEME)"
-else
-  gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
-fi

bin/omarchy-theme-set-terminal

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-case "$TERMINAL" in
-"alacritty") touch ~/.config/alacritty/alacritty.toml ;;
-"kitty") killall -SIGUSR1 kitty ;;
-"ghostty")
-  # Use a default theme if none exists
-  if [[ ! -f ~/.config/omarchy/current/theme/ghostty.conf ]]; then
-    echo "theme = Spacegray" >~/.config/omarchy/current/theme/ghostty.conf
-  fi
-
-  killall -USRSIG2 ghostty
-  ;;
-esac

bin/omarchy-theme-set-vscode

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json"
-VS_CODE_SETTINGS="$HOME/.config/Code/User/settings.json"
-VS_CODE_SKIP_FLAG="$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes"
-
-if omarchy-cmd-present code && [[ ! -f "$VS_CODE_SKIP_FLAG" ]]; then
-  if [[ -f "$VS_CODE_THEME" ]]; then
-    theme_name=$(jq -r '.name' "$VS_CODE_THEME")
-    extension=$(jq -r '.extension' "$VS_CODE_THEME")
-
-    # Install VS Code theme extension
-    if [[ -n "$extension" ]] && ! code --list-extensions | grep -Fxq "$extension"; then
-      notify-send "   Installing VS Code theme for $theme_name"
-      code --install-extension "$extension" >/dev/null
-    fi
-
-    # Update theme in settings.json
-    jq -n --arg t "$theme_name" '(input? // {}) | .["workbench.colorTheme"] = $t' "$VS_CODE_SETTINGS" >"${VS_CODE_SETTINGS}.new"
-  else
-    # Remove theme from settings.json when the theme doesn't have vscode support
-    jq 'del(.["workbench.colorTheme"])' "$VS_CODE_SETTINGS" >"${VS_CODE_SETTINGS}.new"
-  fi
-
-  mv "${VS_CODE_SETTINGS}.new" "$VS_CODE_SETTINGS"
-fi

bin/omarchy-tui-install

@@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=$TERMINAL --class $APP_CLASS -e $APP_EXEC
+Exec=alacritty --class $APP_CLASS -e $APP_EXEC
 Terminal=false
 Type=Application
 Icon=$ICON_PATH

bin/omarchy-tui-remove

@@ -6,7 +6,7 @@ DESKTOP_DIR="$HOME/.local/share/applications/"
 if [ "$#" -eq 0 ]; then
   # Find all TUIs
   while IFS= read -r -d '' file; do
-    if grep -q '^Exec=.*$TERMINAL.*-e' "$file"; then
+    if grep -q '^Exec=.*alacritty.*-e' "$file"; then
       TUIS+=("$(basename "${file%.desktop}")")
     fi
   done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)

bin/omarchy-update

@@ -4,4 +4,7 @@ set -e
 
 omarchy-snapshot create || [ $? -eq 127 ]
 omarchy-update-git
-omarchy-update-perform
+omarchy-migrate
+omarchy-update-system-pkgs
+omarchy-update-restart
+omarchy-update-available-reset

bin/omarchy-update-branch

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if (($# == 0)); then
-  echo "Usage: omarchy-verion-branch-set [master|dev]"
-  exit 1
-fi
-
-branch="$1"
-
-# Snapshot before switching branch
-omarchy-snapshot create || [ $? -eq 127 ]
-
-if ! git -C "$OMARCHY_PATH" diff --quiet || ! git -C "$OMARCHY_PATH" diff --cached --quiet; then
-  stashed=true
-  git -C "$OMARCHY_PATH" stash push -u -m "Autostash before switching to $branch"
-else
-  stashed=false
-fi
-
-# Switch branches
-git -C "$OMARCHY_PATH" switch "$branch"
-
-# Reapply stash if we made one
-if [[ $stashed == true ]]; then
-  if ! git -C "$OMARCHY_PATH" stash pop; then
-    echo "⚠️ Conflicts when applying stash — stash kept"
-  fi
-fi
-
-# Update the system from the new branch
-omarchy-update-perform

bin/omarchy-update-perform

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-omarchy-update-available-reset
-omarchy-update-system-pkgs
-omarchy-migrate
-omarchy-update-restart

bin/omarchy-webapp-handler-zoom

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-url="$1"
-web_url="https://app.zoom.us/wc/home"
-
-if [[ $url =~ ^zoom(mtg|us):// ]]; then
-  confno=$(echo "$url" | sed -n 's/.*[?&]confno=\([^&]*\).*/\1/p')
-
-  if [[ -n $confno ]]; then
-    pwd=$(echo "$url" | sed -n 's/.*[?&]pwd=\([^&]*\).*/\1/p')
-
-    if [[ -n $pwd ]]; then
-      web_url="https://app.zoom.us/wc/join/$confno?pwd=$pwd"
-    else
-      web_url="https://app.zoom.us/wc/join/$confno"
-    fi
-  fi
-fi
-
-exec omarchy-launch-webapp "$web_url"

bin/omarchy-webapp-install

@@ -1,71 +1,49 @@
 #!/bin/bash
 
-if [ "$#" -lt 3 ]; then
+if [ "$#" -ne 3 ]; then
   echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
   APP_NAME=$(gum input --prompt "Name> " --placeholder "My favorite web app")
   APP_URL=$(gum input --prompt "URL> " --placeholder "https://example.com")
-  ICON_REF=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
+  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
-  CUSTOM_EXEC=""
-  MIME_TYPES=""
-  INTERACTIVE_MODE=true
 else
   APP_NAME="$1"
   APP_URL="$2"
-  ICON_REF="$3"
+  ICON_URL="$3"
-  CUSTOM_EXEC="$4" # Optional custom exec command
-  MIME_TYPES="$5"  # Optional mime types
-  INTERACTIVE_MODE=false
 fi
 
-# Ensure valid execution
+if [[ -z "$APP_NAME" || -z "$APP_URL" || -z "$ICON_URL" ]]; then
-if [[ -z "$APP_NAME" || -z "$APP_URL" || -z "$ICON_REF" ]]; then
   echo "You must set app name, app URL, and icon URL!"
   exit 1
 fi
 
-# Refer to local icon or fetch remotely from URL
 ICON_DIR="$HOME/.local/share/applications/icons"
-if [[ $ICON_REF =~ ^https?:// ]]; then
+DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
-  ICON_PATH="$ICON_DIR/$APP_NAME.png"
+
-  if curl -sL -o "$ICON_PATH" "$ICON_REF"; then
+if [[ ! "$ICON_URL" =~ ^https?:// ]] && [ -f "$ICON_URL" ]; then
-    ICON_PATH="$ICON_DIR/$APP_NAME.png"
+  ICON_PATH="$ICON_URL"
 else
+  ICON_PATH="$ICON_DIR/$APP_NAME.png"
+  mkdir -p "$ICON_DIR"
+  if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
     echo "Error: Failed to download icon."
     exit 1
   fi
-else
-  ICON_PATH="$ICON_DIR/$ICON_REF"
 fi
 
-# Use custom exec if provided, otherwise default behavior
-if [[ -n $CUSTOM_EXEC ]]; then
-  EXEC_COMMAND="$CUSTOM_EXEC"
-else
-  EXEC_COMMAND="omarchy-launch-webapp $APP_URL"
-fi
-
-# Create application .desktop file
-DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
-
 cat >"$DESKTOP_FILE" <<EOF
 [Desktop Entry]
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=$EXEC_COMMAND
+Exec=omarchy-launch-webapp $APP_URL
 Terminal=false
 Type=Application
 Icon=$ICON_PATH
 StartupNotify=true
 EOF
 
-# Add mime types if provided
-if [[ -n $MIME_TYPES ]]; then
-  echo "MimeType=$MIME_TYPES" >>"$DESKTOP_FILE"
-fi
-
 chmod +x "$DESKTOP_FILE"
 
-if [[ $INTERACTIVE_MODE == true ]]; then
+if [ "$#" -ne 3 ]; then
   echo -e "You can now find $APP_NAME using the app launcher (SUPER + SPACE)\n"
 fi

boot.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Set install mode to online since boot.sh is used for curl installations
-export OMARCHY_ONLINE_INSTALL=true
+export OMARCHY_INSTALL_MODE="online"
 
 ansi_art='                 ▄▄▄                                                   
  ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄ 
@@ -29,7 +29,7 @@ git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/
 # Use custom branch if instructed, otherwise default to master
 OMARCHY_REF="${OMARCHY_REF:-master}"
 if [[ $OMARCHY_REF != "master" ]]; then
-  echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
+  echo -e "\eUsing branch: $OMARCHY_REF"
   cd ~/.local/share/omarchy
   git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
   cd -

config/chromium-flags.conf

@@ -1,6 +1,3 @@
 --ozone-platform=wayland
 --ozone-platform-hint=wayland
 --enable-features=TouchpadOverscrollHistoryNavigation
---load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url
---oauth2-client-id=77185425430.apps.googleusercontent.com
---oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT

config/ghostty/config

@@ -1,21 +0,0 @@
-# Dynamic theme colors
-config-file = "~/.config/omarchy/current/theme/ghostty.conf"
-
-# Font
-font-family = "CaskaydiaMono Nerd Font"
-font-style = Regular
-font-size = 9
-
-# Window
-window-padding-x = 14
-window-padding-y = 14
-confirm-close-surface=false
-resize-overlay = never
-
-# Cursor stlying
-cursor-style = "block"
-cursor-style-blink = false
-shell-integration-features = no-cursor
-
-# Keyboard bindings
-keybind = f11=toggle_fullscreen

config/hypr/bindings.conf

@@ -1,17 +1,16 @@
 # Application bindings
-$terminal = uwsm app -- $TERMINAL
+$terminal = uwsm app -- alacritty
 $browser = omarchy-launch-browser
 
 bindd = SUPER, return, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
 bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
 bindd = SUPER, B, Browser, exec, $browser
-bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private
+bindd = SUPER, M, Music, exec, uwsm app -- spotify
-bindd = SUPER, M, Music, exec, omarchy-launch-or-focus spotify
+bindd = SUPER, N, Neovim, exec, $terminal -e nvim
-bindd = SUPER, N, Editor, exec, omarchy-launch-editor
 bindd = SUPER, T, Activity, exec, $terminal -e btop
 bindd = SUPER, D, Docker, exec, $terminal -e lazydocker
-bindd = SUPER, G, Signal, exec, omarchy-launch-or-focus signal "uwsm app -- signal-desktop"
+bindd = SUPER, G, Signal, exec, uwsm app -- signal-desktop
-bindd = SUPER, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm app -- obsidian -disable-gpu --enable-wayland-ime"
+bindd = SUPER, O, Obsidian, exec, uwsm app -- obsidian -disable-gpu
 bindd = SUPER, slash, Passwords, exec, uwsm app -- 1password
 
 # If your web app url contains #, type it as ## to prevent hyperland treat it as comments
@@ -19,9 +18,9 @@ bindd = SUPER, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com"
 bindd = SUPER SHIFT, A, Grok, exec, omarchy-launch-webapp "https://grok.com"
 bindd = SUPER, C, Calendar, exec, omarchy-launch-webapp "https://app.hey.com/calendar/weeks/"
 bindd = SUPER, E, Email, exec, omarchy-launch-webapp "https://app.hey.com"
-bindd = SUPER, Y, YouTube, exec, omarchy-launch-or-focus-webapp YouTube "https://youtube.com/"
+bindd = SUPER, Y, YouTube, exec, omarchy-launch-webapp "https://youtube.com/"
-bindd = SUPER SHIFT, G, WhatsApp, exec, omarchy-launch-or-focus-webapp WhatsApp "https://web.whatsapp.com/"
+bindd = SUPER SHIFT, G, WhatsApp, exec, omarchy-launch-webapp "https://web.whatsapp.com/"
-bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-or-focus-webapp "Google Messages" "https://messages.google.com/web/conversations"
+bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-webapp "https://messages.google.com/web/conversations"
 bindd = SUPER, X, X, exec, omarchy-launch-webapp "https://x.com/"
 bindd = SUPER SHIFT, X, X Post, exec, omarchy-launch-webapp "https://x.com/compose/post"
 

config/hypr/envs.conf

@@ -1,2 +1,3 @@
 # Extra env variables
+# Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)
 # env = MY_GLOBAL_ENV,setting

config/hypr/hyprlock.conf

@@ -3,8 +3,6 @@ source = ~/.config/omarchy/current/theme/hyprlock.conf
 background {
     monitor =
     color = $color
-    path = ~/.config/omarchy/current/background
-    blur_passes = 3
 }
 
 animations {

config/hypr/input.conf

@@ -28,7 +28,7 @@ input {
 }
 
 # Scroll faster in the terminal
-windowrule = scrolltouchpad 1.5, tag:terminal
+windowrule = scrolltouchpad 1.5, class:Alacritty
 
 # Enable touchpad gestures for changing workspaces
 # See https://wiki.hyprland.org/Configuring/Gestures/

config/kitty/kitty.conf

@@ -1,30 +0,0 @@
-include ~/.config/omarchy/current/theme/kitty.conf
-
-# Font
-font_family CaskaydiaMono Nerd Font
-bold_italic_font auto
-font_size        9.0
-
-# Window
-window_padding_width 14
-window_padding_height 14
-hide_window_decorations yes
-show_window_resize_notification no
-confirm_os_window_close 0
-
-# Keybindings
-map F11 toggle_fullscreen
-
-# Allow remote access
-single_instance yes
-allow_remote_control yes
-
-# Aesthetics
-cursor_shape block
-enable_audio_bell no
-
-# Minimal Tab bar styling 
-tab_bar_edge                bottom
-tab_bar_style               powerline
-tab_powerline_style         slanted
-tab_title_template          {title}{' :{}:'.format(num_windows) if num_windows > 1 else ''}

config/uwsm/default

@@ -1,4 +0,0 @@
-# Changes require a relaunch of Hyprland to take effect.
-
-export TERMINAL=alacritty
-export EDITOR=nvim

config/uwsm/env

@@ -1,11 +1,7 @@
-# Changes require a relaunch of Hyprland to take effect.
-
-# Ensure Omarchy bins are in the path
 export OMARCHY_PATH=$HOME/.local/share/omarchy
 export PATH=$OMARCHY_PATH/bin/:$PATH
+export TERMINAL=alacritty
 
-# Set default terminal and editor
+if command -v mise &> /dev/null; then
-source ~/.config/uwsm/default
+  eval "$(mise activate bash)"
-
+fi
-# Activate mise if present on the system
-omarchy-cmd-present mise && eval "$(mise activate bash)"

config/waybar/config.jsonc

@@ -55,7 +55,7 @@
   "cpu": {
     "interval": 5,
     "format": "󰍛",
-    "on-click": "$TERMINAL -e btop"
+    "on-click": "alacritty -e btop"
   },
   "clock": {
     "format": "{:L%A %H:%M}",
@@ -68,13 +68,13 @@
     "format": "{icon}",
     "format-wifi": "{icon}",
     "format-ethernet": "󰀂",
-    "format-disconnected": "󰤮",
+    "format-disconnected": "󰖪",
     "tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
     "tooltip-format-ethernet": "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
     "tooltip-format-disconnected": "Disconnected",
     "interval": 3,
     "spacing": 1,
-    "on-click": "omarchy-launch-wifi"
+    "on-click": "alacritty --class=Impala -e impala"
   },
   "battery": {
     "format": "{capacity}% {icon}",
@@ -104,11 +104,11 @@
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "$TERMINAL --class=Wiremix -e wiremix",
+    "on-click": "alacritty --class=Wiremix -e wiremix",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
-    "format-muted": "",
+    "format-muted": "󰝟",
     "format-icons": {
       "default": ["", "", ""]
     }

default/bash/envs

@@ -1,3 +1,4 @@
 # Editor used by CLI
+export EDITOR="nvim"
 export SUDO_EDITOR="$EDITOR"
 export BAT_THEME=ansi

default/bashrc

@@ -6,3 +6,9 @@ source ~/.local/share/omarchy/default/bash/rc
 #
 # Make an alias for invoking commands you use constantly
 # alias p='python'
+#
+# Use VSCode instead of neovim as your default editor
+# export EDITOR="code"
+#
+# Set a custom prompt with the directory revealed (alternatively use https://starship.rs)
+# PS1="\W \[\e]0;\w\a\]$PS1"

default/chromium/extensions/copy-url/background.js

@@ -1,21 +0,0 @@
-chrome.commands.onCommand.addListener((command) => {
-  if (command === 'copy-url') {
-    chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
-      const currentTab = tabs[0];
-
-      chrome.scripting.executeScript({
-        target: { tabId: currentTab.id },
-        func: () => {
-          navigator.clipboard.writeText(window.location.href);
-        }
-      }).then(() => {
-        chrome.notifications.create({
-          type: 'basic',
-          iconUrl: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8/5+hHgAHggJ/PchI7wAAAABJRU5ErkJggg==',
-          title: '   URL copied to clipboard',
-          message: ''
-        });
-      });
-    });
-  }
-});

default/chromium/extensions/copy-url/icon.png

@@ -1 +0,0 @@
-../../../../icon.png

default/chromium/extensions/copy-url/manifest.json

@@ -1,19 +0,0 @@
-{
-  "manifest_version": 4,
-  "name": "Copy URL",
-  "version": "1.0",
-  "description": "Copy current URL to clipboard, this extension is installed by Omarchy",
-  "permissions": ["activeTab", "scripting", "notifications"],
-  "icons": {
-    "16": "icon.png",
-    "48": "icon.png",
-    "128": "icon.png"
-  },
-  "commands": {
-    "copy-url": {
-      "suggested_key": {"default": "Alt+Shift+L"},
-      "description": "Copy URL"
-    }
-  },
-  "background": {"service_worker": "background.js"}
-}

default/hypr/apps.conf

@@ -4,11 +4,9 @@ source = ~/.local/share/omarchy/default/hypr/apps/bitwarden.conf
 source = ~/.local/share/omarchy/default/hypr/apps/browser.conf
 source = ~/.local/share/omarchy/default/hypr/apps/hyprshot.conf
 source = ~/.local/share/omarchy/default/hypr/apps/jetbrains.conf
-source = ~/.local/share/omarchy/default/hypr/apps/localsend.conf
 source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
 source = ~/.local/share/omarchy/default/hypr/apps/qemu.conf
 source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf
 source = ~/.local/share/omarchy/default/hypr/apps/steam.conf
 source = ~/.local/share/omarchy/default/hypr/apps/system.conf
-source = ~/.local/share/omarchy/default/hypr/apps/terminals.conf
 source = ~/.local/share/omarchy/default/hypr/apps/walker.conf

default/hypr/apps/localsend.conf

@@ -1,3 +0,0 @@
-# Float LocalSend and fzf file picker
-windowrule = float, class:(Share|localsend)
-windowrule = center, class:(Share|localsend)

default/hypr/apps/terminals.conf

@@ -1,2 +0,0 @@
-# Define terminal tag to style them uniformly
-windowrule = tag +terminal, class:(Alacritty|kitty|com.mitchellh.ghostty)

default/hypr/autostart.conf

@@ -4,7 +4,6 @@ exec-once = uwsm app -- waybar
 exec-once = uwsm app -- fcitx5
 exec-once = uwsm app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = uwsm app -- swayosd-server
-exec-once = uwsm app -- walker --gapplication-service &
 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).+'
 exec-once = omarchy-cmd-first-run

default/hypr/bindings/tiling.conf

@@ -7,7 +7,6 @@ bindd = SUPER, J, Toggle split, togglesplit, # dwindle
 bindd = SUPER, P, Pseudo window, pseudo, # dwindle
 bindd = SUPER, V, Toggle floating, togglefloating,
 bindd = SHIFT, F11, Force full screen, fullscreen, 0
-bindd = ALT, F11, Full width, fullscreen, 1
 
 # Move focus with SUPER + arrow keys
 bindd = SUPER, left, Move focus left, movefocus, l
@@ -42,7 +41,6 @@ bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10
 # Tab between workspaces
 bindd = SUPER, TAB, Next workspace, workspace, e+1
 bindd = SUPER SHIFT, TAB, Previous workspace, workspace, e-1
-bindd = SUPER CTRL, TAB, Former workspace, workspace, previous
 
 # Swap active window with the one next to it with SUPER + SHIFT + arrow keys
 bindd = SUPER SHIFT, left, Swap window to the left, swapwindow, l

default/hypr/bindings/utilities.conf

@@ -5,13 +5,11 @@ bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu
 bindd = SUPER, ESCAPE, Power menu, exec, omarchy-menu system
 bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system
 bindd = SUPER, K, Show key bindings, exec, omarchy-menu-keybindings
-bindd = , XF86Calculator, Calculator, exec, gnome-calculator
 
 # Aesthetics
 bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, omarchy-toggle-waybar
 bindd = SUPER CTRL, SPACE, Next background in theme, exec, omarchy-theme-bg-next
 bindd = SUPER SHIFT CTRL, SPACE, Pick new theme, exec, omarchy-menu theme
-bindd = SUPER, BACKSPACE, Toggle window transparency, exec, hyprctl dispatch setprop "address:$(hyprctl activewindow -j | jq -r '.address')" opaque toggle
 
 # Notifications
 bindd = SUPER, COMMA, Dismiss last notification, exec, makoctl dismiss
@@ -42,6 +40,3 @@ bindd = CTRL ALT SHIFT, PRINT, Screen record display with audio, exec, omarchy-c
 
 # Color picker
 bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a
-
-# File sharing
-bindd = CTRL SUPER, S, Share, exec, omarchy-menu share

default/mako/core.ini

@@ -14,9 +14,3 @@ invisible=false
 
 [urgency=critical]
 default-timeout=0
-
-[summary~="Setup Wi-Fi"]
-on-button-left=exec sh -c 'omarchy-notification-dismiss "Setup Wi-Fi"; omarchy-launch-wifi'
-
-[summary~="Update System"]
-on-button-left=exec sh -c 'omarchy-notification-dismiss "Update System"; omarchy-launch-floating-terminal-with-presentation omarchy-update'

install/config/all.sh

@@ -9,8 +9,8 @@ run_logged $OMARCHY_INSTALL/config/increase-lockout-limit.sh
 run_logged $OMARCHY_INSTALL/config/ssh-flakiness.sh
 run_logged $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
 run_logged $OMARCHY_INSTALL/config/xcompose.sh
+run_logged $OMARCHY_INSTALL/config/mise-ruby.sh
 run_logged $OMARCHY_INSTALL/config/mise-work.sh
-run_logged $OMARCHY_INSTALL/config/fix-powerprofilesctl-shebang.sh
 run_logged $OMARCHY_INSTALL/config/docker.sh
 run_logged $OMARCHY_INSTALL/config/mimetypes.sh
 run_logged $OMARCHY_INSTALL/config/localdb.sh
@@ -25,5 +25,3 @@ run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
 run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh
-run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh
-run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-t2.sh

install/config/fix-powerprofilesctl-shebang.sh

@@ -1,2 +0,0 @@
-# Ensure we use system python3 and not mise's python3
-sudo sed -i '/env python3/ c\#!/bin/python3' /usr/bin/powerprofilesctl

install/config/hardware/fix-apple-spi-keyboard.sh

@@ -1,7 +0,0 @@
-# Detect MacBook models that need SPI keyboard modules
-if [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook12,1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
-  echo "Detected MacBook with SPI keyboard"
-
-  sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms
-  echo "MODULES=(applespi intel_lpss_pci spi_pxa2xx_platform)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null
-fi

install/config/hardware/fix-apple-t2.sh

@@ -1,28 +0,0 @@
-# Detect T2 MacBook models using PCI IDs
-# Vendor: 106b (Apple), Device IDs: 1801 or 1802 (T2 Security Chip)
-if lspci -nn | grep -q "106b:180[12]"; then
-  echo "Detected MacBook with T2 chip. Installing support items..."
-
-  sudo pacman -S --noconfirm --needed \
-    linux-t2 \
-    linux-t2-headers \
-    apple-t2-audio-config \
-    apple-bcm-firmware \
-    t2fanrd \
-    tiny-dfr
-
-  echo "apple-bce" | sudo tee /etc/modules-load.d/t2.conf >/dev/null
-
-  echo "MODULES+=(apple-bce usbhid hid_apple hid_generic xhci_pci xhci_hcd)" | sudo tee /etc/mkinitcpio.conf.d/apple-t2.conf >/dev/null
-
-  cat <<EOF | sudo tee /etc/modprobe.d/brcmfmac.conf >/dev/null
-# Fix for T2 MacBook WiFi connectivity issues
-options brcmfmac feature_disable=0x82000
-EOF
-
-  sudo mkdir -p /etc/limine-entry-tool.d
-  cat <<EOF | sudo tee /etc/limine-entry-tool.d/t2-mac.conf >/dev/null
-# Generated by Omarchy installer for T2 Mac support
-KERNEL_CMDLINE[default]+="intel_iommu=on iommu=pt pcie_ports=compat"
-EOF
-fi

install/config/mise-ruby.sh

@@ -0,0 +1,26 @@
+# Install Ruby using gcc-14 for compatibility
+mise settings set ruby.ruby_build_opts "CC=gcc-14 CXX=g++-14"
+
+# Trust .ruby-version
+mise settings add idiomatic_version_file_enable_tools ruby
+
+# Install pre-built Ruby + Rails for x86_64
+if [[ $(uname -m) == "x86_64" ]]; then
+  RUBY_VERSION="3.4.5"
+  RUBY_TARBALL="ruby-${RUBY_VERSION}-rails-8.0.2.1-x86_64.tar.gz"
+  RUBY_URL="https://pkgs.omarchy.org/ruby/${RUBY_TARBALL}"
+  MISE_RUBY_DIR="$HOME/.local/share/mise/installs/ruby"
+  OFFLINE_CACHE="/var/cache/omarchy/ruby"
+
+  mkdir -p "$MISE_RUBY_DIR"
+
+  if [[ ${OMARCHY_INSTALL_MODE:-offline} == "offline" ]]; then
+    echo "Installing Ruby from offline cache..."
+    tar -xzf "${OFFLINE_CACHE}/${RUBY_TARBALL}" -C "$MISE_RUBY_DIR"
+  else
+    echo "Downloading pre-built Ruby ${RUBY_VERSION}..."
+    curl -fsSL "$RUBY_URL" | tar -xz -C "$MISE_RUBY_DIR"
+  fi
+
+  mise use --global "ruby@${RUBY_VERSION}"
+fi

install/config/theme.sh

@@ -19,13 +19,3 @@ ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current
 
 mkdir -p ~/.config/mako
 ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config
-
-mkdir -p ~/.config/eza
-ln -snf ~/.config/omarchy/current/theme/eza.yml ~/.config/eza/theme.yml
-
-# Add managed policy directories for Chromium and Brave for theme changes
-sudo mkdir -p /etc/chromium/policies/managed
-sudo chmod a+rw /etc/chromium/policies/managed
-
-sudo mkdir -p /etc/brave/policies/managed
-sudo chmod a+rw /etc/brave/policies/managed

install/first-run/welcome.sh

@@ -1,2 +0,0 @@
-notify-send "    Update System" "When you have internet, click to update the system." -t 30000
-notify-send "👋  Welcome to Omarchy" "You're in for a great computing adventure. Have fun!" -t 30000

install/first-run/wifi.sh

@@ -1,3 +0,0 @@
-if ! ping -c3 -W1 1.1.1.1 >/dev/null 2>&1; then
-  notify-send "󰖩    Click to Setup Wi-Fi" "Tab between sections, space selects, ? for help." -u critical -t 30000
-fi

install/helpers/errors.sh

@@ -105,7 +105,7 @@ catch_errors() {
     options=()
 
     # If online install, show retry first
-    if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
+    if [[ ${OMARCHY_INSTALL_MODE:-offline} == "online" ]]; then
       options+=("Retry installation")
     fi
 
@@ -126,11 +126,7 @@ catch_errors() {
       break
       ;;
     "View full log")
-      if command -v less &>/dev/null; then
       less "$OMARCHY_INSTALL_LOG_FILE"
-      else
-        tail "$OMARCHY_INSTALL_LOG_FILE"
-      fi
       ;;
     "Upload log for support")
       omarchy-upload-install-log

install/login/limine-snapper.sh

@@ -98,8 +98,7 @@ fi
 
 # Add UKI entry to UEFI machines to skip bootloader showing on normal boot
 if [[ -n $EFI ]] && efibootmgr &>/dev/null && ! efibootmgr | grep -q Omarchy &&
-  ! cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "American Megatrends" &&
+  ! cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "American Megatrends"; then
-  ! cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "Apple"; then
   sudo efibootmgr --create \
     --disk "$(findmnt -n -o SOURCE /boot | sed 's/p\?[0-9]*$//')" \
     --part "$(findmnt -n -o SOURCE /boot | grep -o 'p\?[0-9]*$' | sed 's/^p//')" \

install/omarchy-base.packages

@@ -57,7 +57,6 @@ kvantum-qt5
 lazydocker
 lazygit
 less
-libyaml
 libqalculate
 libreoffice
 llvm

install/omarchy-other.packages

@@ -8,17 +8,25 @@ broadcom-wl
 btrfs-progs
 dart
 dkms
+efibootmgr
 egl-wayland
 git
+git
 gst-plugin-pipewire
 gtk4-layer-shell
+gum
 htop
+intel-media-driver
 intltool
 iwd
 jdk-openjdk
+jq
+lib32-nvidia-utils
 libpulse
 libsass
 libva-intel-driver
+libva-intel-driver
+libva-mesa-driver
 libva-nvidia-driver
 limine
 limine-mkinitcpio-hook
@@ -26,28 +34,26 @@ limine-snapper-sync
 linux
 linux-firmware
 linux-headers
-macbook12-spi-driver-dkms
+mesa
 nvidia-dkms
 nvidia-open-dkms
 nvidia-utils
-lib32-nvidia-utils
+openssl
 pipewire
 pipewire-alsa
 pipewire-jack
 pipewire-pulse
+plymouth
 qt5-remoteobjects
 qt6-wayland
 sassc
 snapper
+sof-firmware
+tzupdate
 webp-pixbuf-loader
 wget
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-nouveau
 yay-debug
 zram-generator
-
-# T2 MacBook support packages
-apple-bcm-firmware
-apple-t2-audio-config
-linux-t2
-linux-t2-headers
-t2fanrd
-tiny-dfr

install/packaging/webapps.sh

@@ -1,13 +1,15 @@
-omarchy-webapp-install "HEY" https://app.hey.com HEY.png
+ICON_DIR="$HOME/.local/share/applications/icons"
-omarchy-webapp-install "Basecamp" https://launchpad.37signals.com Basecamp.png
+
-omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ WhatsApp.png
+omarchy-webapp-install "HEY" https://app.hey.com "$ICON_DIR/HEY.png"
-omarchy-webapp-install "Google Photos" https://photos.google.com/ "Google Photos.png"
+omarchy-webapp-install "Basecamp" https://launchpad.37signals.com "$ICON_DIR/Basecamp.png"
-omarchy-webapp-install "Google Contacts" https://contacts.google.com/ "Google Contacts.png"
+omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ "$ICON_DIR/WhatsApp.png"
-omarchy-webapp-install "Google Messages" https://messages.google.com/web/conversations "Google Messages.png"
+omarchy-webapp-install "Google Photos" https://photos.google.com/ "$ICON_DIR/Google Photos.png"
-omarchy-webapp-install "ChatGPT" https://chatgpt.com/ ChatGPT.png
+omarchy-webapp-install "Google Contacts" https://contacts.google.com/ "$ICON_DIR/Google Contacts.png"
-omarchy-webapp-install "YouTube" https://youtube.com/ YouTube.png
+omarchy-webapp-install "Google Messages" https://messages.google.com/web/conversations "$ICON_DIR/Google Messages.png"
-omarchy-webapp-install "GitHub" https://github.com/ GitHub.png
+omarchy-webapp-install "ChatGPT" https://chatgpt.com/ "$ICON_DIR/ChatGPT.png"
-omarchy-webapp-install "X" https://x.com/ X.png
+omarchy-webapp-install "YouTube" https://youtube.com/ "$ICON_DIR/YouTube.png"
-omarchy-webapp-install "Figma" https://figma.com/ Figma.png
+omarchy-webapp-install "GitHub" https://github.com/ "$ICON_DIR/GitHub.png"
-omarchy-webapp-install "Discord" https://discord.com/channels/@me Discord.png
+omarchy-webapp-install "X" https://x.com/ "$ICON_DIR/X.png"
-omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home Zoom.png "omarchy-webapp-handler-zoom %u" "x-scheme-handler/zoommtg;x-scheme-handler/zoomus"
+omarchy-webapp-install "Figma" https://figma.com/ "$ICON_DIR/Figma.png"
+omarchy-webapp-install "Discord" https://discord.com/channels/@me "$ICON_DIR/Discord.png"
+omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home "$ICON_DIR/Zoom.png"

install/post-install/finished.sh

@@ -5,7 +5,6 @@ echo_in_style() {
 }
 
 clear
-echo
 tte -i ~/.local/share/omarchy/logo.txt --canvas-width 0 --anchor-text c --frame-rate 920 laseretch
 echo
 
@@ -16,8 +15,6 @@ if [[ -f $OMARCHY_INSTALL_LOG_FILE ]] && grep -q "Total:" "$OMARCHY_INSTALL_LOG_
   if [ -n "$TOTAL_TIME" ]; then
     echo_in_style "Installed in $TOTAL_TIME"
   fi
-else
-  echo_in_style "Finished installing"
 fi
 
 if sudo test -f /etc/sudoers.d/99-omarchy-installer; then

install/post-install/pacman.sh

@@ -1,12 +1,3 @@
 # Configure pacman
 sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
 sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
-
-if lspci -nn | grep -q "106b:180[12]"; then
-  cat <<EOF | sudo tee -a /etc/pacman.conf >/dev/null
-
-[arch-mact2]
-Server = https://github.com/NoaHimesaka1873/arch-mact2-mirror/releases/download/release
-SigLevel = Never
-EOF
-fi

install/preflight/begin.sh

@@ -1,4 +1,3 @@
 clear_logo
-gum style --foreground 3 --padding "1 0 0 $PADDING_LEFT" "Installing..."
+gum style --foreground 3 --padding "1 0 0 $PADDING_LEFT" "Installing Omarchy..."
-echo
 start_install_log

install/preflight/first-run-mode.sh

@@ -7,7 +7,6 @@ sudo tee /etc/sudoers.d/first-run >/dev/null <<EOF
 Cmnd_Alias FIRST_RUN_CLEANUP = /bin/rm -f /etc/sudoers.d/first-run
 $USER ALL=(ALL) NOPASSWD: /usr/bin/ufw
 $USER ALL=(ALL) NOPASSWD: /usr/bin/ufw-docker
-$USER ALL=(ALL) NOPASSWD: /usr/bin/gtk-update-icon-cache
 $USER ALL=(ALL) NOPASSWD: FIRST_RUN_CLEANUP
 EOF
 sudo chmod 440 /etc/sudoers.d/first-run

install/preflight/pacman.sh

@@ -1,4 +1,4 @@
-if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
+if [[ ${OMARCHY_INSTALL_MODE:-offline} == "online" ]]; then
   # Install build tools
   sudo pacman -S --needed --noconfirm base-devel
 

install/preflight/show-env.sh

@@ -1,6 +1,6 @@
 # Show installation environment variables
 gum log --level info "Installation Environment:"
 
-env | grep -E "^(OMARCHY_CHROOT_INSTALL|OMARCHY_ONLINE_INSTALL|OMARCHY_USER_NAME|OMARCHY_USER_EMAIL|USER|HOME|OMARCHY_REPO|OMARCHY_REF|OMARCHY_PATH)=" | sort | while IFS= read -r var; do
+env | grep -E "^(OMARCHY_CHROOT_INSTALL|OMARCHY_INSTALL_MODE|OMARCHY_USER_NAME|OMARCHY_USER_EMAIL|USER|HOME|OMARCHY_REPO|OMARCHY_REF|OMARCHY_PATH)=" | sort | while IFS= read -r var; do
   gum log --level info "  $var"
 done

migrations/1754265453.sh

@@ -0,0 +1,3 @@
+echo "Add chromium-flags.conf"
+
+omarchy-refresh-config chromium-flags.conf

migrations/1756372498.sh

@@ -1,8 +0,0 @@
-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/1756494998.sh

@@ -1,5 +1,3 @@
 echo "Remove opacity from alacritty.toml so Hyprland can control fully"
 
-if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
 sed -i '/opacity = 0.98/d' ~/.config/alacritty/alacritty.toml
-fi

migrations/1757021485.sh

@@ -1,3 +0,0 @@
-echo "Install Copy URL extension for Chromium"
-
-omarchy-refresh-config chromium-flags.conf

migrations/1757147211.sh

@@ -1,7 +0,0 @@
-echo "Create managed policy directories for Chromium and Brave for theme switching"
-
-sudo mkdir -p /etc/chromium/policies/managed
-sudo chmod a+rw /etc/chromium/policies/managed
-
-sudo mkdir -p /etc/brave/policies/managed
-sudo chmod a+rw /etc/brave/policies/managed

migrations/1757435811.sh

@@ -1,3 +0,0 @@
-echo "Copy Omarchy default app icons to .local/share/icons"
-
-source $OMARCHY_PATH/install/packaging/icons.sh

migrations/1757435812.sh

@@ -1,6 +0,0 @@
-echo "Update Zoom webapp to handle zoommtg:// and zoomus:// protocol links"
-
-if [[ -f ~/.local/share/applications/Zoom.desktop ]]; then
-  omarchy-webapp-remove Zoom
-  omarchy-webapp-install Zoom https://app.zoom.us/wc/home Zoom.png "omarchy-webapp-handler-zoom %u" "x-scheme-handler/zoommtg;x-scheme-handler/zoomus"
-fi

migrations/1757861484.sh

@@ -1,3 +0,0 @@
-echo "Add a blurred background to the lock screen"
-
-omarchy-refresh-hyprlock

migrations/1757866485.sh

@@ -1,6 +0,0 @@
-echo "Add SUPER + SHIFT + B to start browser in private mode"
-
-if [[ -f ~/.config/hypr/bindings.conf ]] && grep -q "SUPER, B, Browser, exec" ~/.config/hypr/bindings.conf; then
-  sed -i '/^bindd = SUPER, B, Browser, exec, \$browser$/a\
-bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private' ~/.config/hypr/bindings.conf
-fi

migrations/1757871769.sh

@@ -1,3 +0,0 @@
-echo "Refresh chromium-flags.conf to add option of logging in to Google account for settings sync"
-
-omarchy-refresh-config chromium-flags.conf

migrations/1757877123.sh

@@ -1,7 +0,0 @@
-echo "Obsidian should be using Wayland IME for better compatibility with fcitx5 and other languages"
-
-if [[ -f ~/.config/hypr/bindings.conf ]]; then
-  sed -i '/^bindd = SUPER, O, Obsidian, exec, uwsm app -- obsidian -disable-gpu/{
-    /--enable-wayland-ime/! s/$/ --enable-wayland-ime/
-  }' ~/.config/hypr/bindings.conf
-fi

migrations/1757877852.sh

@@ -1,10 +0,0 @@
-echo "Switch select bindings to launch or focus mode"
-
-if [[ -f ~/.config/hypr/bindings.conf ]]; then
-  sed -i '/SUPER, M, Music, exec/ c\bindd = SUPER, M, Music, exec, omarchy-launch-or-focus spotify' ~/.config/hypr/bindings.conf
-  sed -i '/SUPER, O, Obsidian, exec/ c\bindd = SUPER, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm app -- obsidian -disable-gpu --enable-wayland-ime"' ~/.config/hypr/bindings.conf
-
-  sed -i '/SUPER, G, Signal, exec/ c\bindd = SUPER, G, Signal, exec, omarchy-launch-or-focus signal "uwsm app -- signal-desktop"' ~/.config/hypr/bindings.conf
-  sed -i '/SUPER SHIFT, G, WhatsApp, exec/ c\bindd = SUPER SHIFT, G, WhatsApp, exec, omarchy-launch-or-focus-webapp WhatsApp "https://web.whatsapp.com/"' ~/.config/hypr/bindings.conf
-  sed -i '/SUPER ALT, G, Google Messages, exec/ c\bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-or-focus-webapp "Google Messages" "https://messages.google.com/web/conversations"' ~/.config/hypr/bindings.conf
-fi

migrations/1757879836.sh

@@ -1,10 +0,0 @@
-echo "Ensure .config/hypr/looknfeel.conf is available and included"
-
-if [[ ! -f ~/.config/hypr/looknfeel.conf ]]; then
-  cp $OMARCHY_PATH/config/hypr/looknfeel.conf ~/.config/hypr/looknfeel.conf
-fi
-
-if [[ -f ~/.config/hypr/hyprland.conf ]]; then
-  grep -qx 'source = ~/.config/hypr/looknfeel.conf' ~/.config/hypr/hyprland.conf ||
-    sed -i '/^source = ~\/.config\/hypr\/envs\.conf$/a source = ~/.config/hypr/looknfeel.conf' ~/.config/hypr/hyprland.conf
-fi

migrations/1758019332.sh

@@ -1,21 +0,0 @@
-echo "Set \$TERMINAL and \$EDITOR in ~/.config/uwsm/default so entire system can rely on it"
-
-# Set terminal and editor default in uwsm
-omarchy-refresh-config uwsm/default
-omarchy-refresh-config uwsm/env
-omarchy-state set relaunch-required
-
-# Ensure scrolltouchpad setting applies to all terminals
-if grep -q "scrolltouchpad 1.5, class:Alacritty" ~/.config/hypr/input.conf; then
-  sed -i 's/windowrule = scrolltouchpad 1\.5, class:Alacritty/windowrule = scrolltouchpad 1.5, tag:terminal/' ~/.config/hypr/input.conf
-fi
-
-# Use default editor for keybinding
-if grep -q "bindd = SUPER, N, Neovim" ~/.config/hypr/bindings.conf; then
-  sed -i '/SUPER, N, Neovim, exec/ c\bindd = SUPER, N, Editor, exec, omarchy-launch-editor' ~/.config/hypr/bindings.conf
-fi
-
-# Use default terminal for keybinding
-if grep -q "terminal = uwsm app" ~/.config/hypr/bindings.conf; then
-  sed -i '/terminal = uwsm app -- alacritty/ c\$terminal = uwsm app -- $TERMINAL' ~/.config/hypr/bindings.conf
-fi

migrations/1758051607.sh

@@ -1,11 +0,0 @@
-echo "Copy configs for ghostty + kitty so they're available as alternative terminal options"
-
-if [[ ! -f ~/.config/ghostty/config ]]; then
-  mkdir -p ~/.config/ghostty
-  cp -Rpf $OMARCHY_PATH/config/ghostty/config ~/.config/ghostty/config
-fi
-
-if [[ ! -f ~/.config/kitty/kitty.conf ]]; then
-  mkdir -p ~/.config/kitty
-  cp -Rpf $OMARCHY_PATH/config/kitty/kitty.conf ~/.config/kitty/kitty.conf
-fi

migrations/1758104201.sh

@@ -1,3 +0,0 @@
-echo "Prevent powerprofilesctl from using Mise python and not working"
-
-bash $OMARCHY_PATH/install/config/fix-powerprofilesctl-shebang.sh

migrations/1758111304.sh

@@ -1,3 +0,0 @@
-echo "Remove Ruby build options to force GCC14 now that GCC15 is compatible"
-
-mise settings unset ruby.ruby_build_opts

themes/catppuccin-latte/ghostty.conf

@@ -1 +0,0 @@
-theme = Catppuccin Latte