Add omarchy-doctor checks

* Install libyaml before attempting to install ruby

* Use omarchy helper

And unsafe -Sy

---------

Co-authored-by: David Heinemeier Hansson <david@hey.com>

applications/imv.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Image Viewer
-Exec=sh -c 'imv -n "$1" "$(dirname "$1")"' sh %f
+Exec=imv %F
 Icon=imv
 Type=Application
 MimeType=image/png;image/jpeg;image/jpg;image/gif;image/bmp;image/webp;image/tiff;image/x-xcf;image/x-portable-pixmap;image/x-xbitmap;

applications/nvim.desktop

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

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 -Eqi 'nvidia|intel.*graphics'; then
+  if lspci | grep -qi 'nvidia'; 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,6 +1,10 @@
 #!/bin/bash
 
-function exit_screensaver {
+screensaver_in_focus() {
+  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
@@ -18,7 +22,7 @@ while true; do
     "$effect" &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 3; then
+    if read -n 1 -t 3 || ! screensaver_in_focus; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-share

@@ -0,0 +1,44 @@
+#!/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-doctor

@@ -0,0 +1,161 @@
+#!/bin/bash
+
+# Request sudo upfront to avoid prompts during checks
+sudo -v
+
+# Keep sudo alive during the script
+(while true; do sudo -v; sleep 50; done) &
+SUDO_REFRESH_PID=$!
+trap "kill $SUDO_REFRESH_PID 2>/dev/null" EXIT
+
+# Define Omarchy locations
+export OMARCHY_PATH="/home/ryan/Work/omarchy/omarchy-installer"
+export OMARCHY_INSTALL="$OMARCHY_PATH/install"
+
+# Track results
+failed_checks=0
+passed_checks=0
+skipped_checks=0
+total_checks=0
+
+# Function to display a message with icon
+show_message() {
+  local type="$1"
+  local msg="$2"
+  case "$type" in
+    error)   printf "  ❌ ERROR %s\n" "$msg" ;;
+    warning) printf "  ⚠️ WARNING %s\n" "$msg" ;;
+    info)    printf "  ✅ OK %s\n" "$msg" ;;
+  esac
+}
+
+# Function to check a single script
+check_script() {
+  local script="$1"
+  local script_name="${script#$OMARCHY_INSTALL/}"
+
+  # Check if script has verify function
+  if ! bash -c "source '$script' && declare -f omarchy_verify" >/dev/null 2>&1; then
+    ((skipped_checks++))
+    return
+  fi
+
+  ((total_checks++))
+
+  # Get friendly name
+  local friendly_name=$(bash -c "source '$script' 2>/dev/null; echo \"\${OMARCHY_DESCRIPTION:-$script_name}\"")
+
+  # Run verification in subshell and capture output
+  local output
+  output=$(
+    errors=()
+    warnings=()
+    infos=()
+
+    add_error()   { errors+=("$1"); }
+    add_warning() { warnings+=("$1"); }
+    add_info()    { infos+=("$1"); }
+
+    source "$script"
+    omarchy_verify
+    exit_code=$?
+
+    # Output results with delimiters
+    echo "EXIT:$exit_code"
+    for e in "${errors[@]}"; do echo "ERROR:$e"; done
+    for w in "${warnings[@]}"; do echo "WARNING:$w"; done
+    for i in "${infos[@]}"; do echo "INFO:$i"; done
+  )
+
+  # Parse output
+  local exit_code errors=() warnings=() infos=()
+  while IFS= read -r line; do
+    case "$line" in
+      EXIT:*) exit_code="${line#EXIT:}" ;;
+      ERROR:*) errors+=("${line#ERROR:}") ;;
+      WARNING:*) warnings+=("${line#WARNING:}") ;;
+      INFO:*) infos+=("${line#INFO:}") ;;
+    esac
+  done <<< "$output"
+
+  # Handle skipped (return code 2)
+  if [[ $exit_code -eq 2 ]]; then
+    ((skipped_checks++))
+    return
+  fi
+
+  # Count messages
+  local error_count=${#errors[@]}
+  local warning_count=${#warnings[@]}
+
+  # Determine status
+  local status_icon status_color
+  if [[ $error_count -gt 0 ]]; then
+    status_icon="❌"
+    status_color="1"  # Red
+    ((failed_checks++))
+  elif [[ $warning_count -gt 0 ]]; then
+    status_icon="⚠️"
+    status_color="3"  # Yellow
+    ((passed_checks++))
+  else
+    status_icon="✅"
+    status_color="2"  # Green
+    ((passed_checks++))
+  fi
+
+  # Display result
+  printf "%s %s\n" "$status_icon" "$(gum style --foreground "$status_color" --bold "$friendly_name")"
+
+  # Display messages if any errors or warnings
+  if [[ $error_count -gt 0 || $warning_count -gt 0 ]]; then
+    for msg in "${errors[@]}"; do
+      show_message error "$msg"
+    done
+
+    for msg in "${warnings[@]}"; do
+      show_message warning "$msg"
+    done
+
+    for msg in "${infos[@]}"; do
+      show_message info "$msg"
+    done
+  fi
+
+  echo
+}
+
+# Main execution
+echo
+gum style --italic --foreground 7 "Running health checks..."
+echo
+
+# Process all scripts
+while IFS= read -r script; do
+  # Skip certain directories
+  if [[ "$script" == */all.sh ]] ||
+     [[ "$script" == */helpers/* ]] ||
+     [[ "$script" == */preflight/* ]] ||
+     [[ "$script" == */first-run/* ]] ||
+     [[ "$script" == */post-install/* ]]; then
+    continue
+  fi
+
+  check_script "$script"
+done < <(find "$OMARCHY_INSTALL" -type f -name "*.sh" | sort)
+
+# Display summary
+echo
+echo "Summary:"
+echo "  Passed:  $passed_checks/$total_checks"
+[[ $failed_checks -gt 0 ]] && echo "  Failed:  $failed_checks/$total_checks"
+[[ $skipped_checks -gt 0 ]] && echo "  Skipped: $skipped_checks"
+
+echo
+
+if [[ $failed_checks -gt 0 ]]; then
+  echo "❌ Some checks failed. Please review the errors above."
+  exit 1
+else
+  echo "✅ All checks passed!"
+fi

bin/omarchy-font-current

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

bin/omarchy-font-set

@@ -4,7 +4,20 @@ font_name="$1"
 
 if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
   if fc-list | grep -iq "$font_name"; then
-    sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
+    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-chromium-google-account

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [[ -f ~/.config/chromium-flags.conf ]]; then
+  CONF=~/.config/chromium-flags.conf
+
+  grep -qxF -- "--oauth2-client-id=77185425430.apps.googleusercontent.com" "$CONF" ||
+    echo "--oauth2-client-id=77185425430.apps.googleusercontent.com" >>"$CONF"
+
+  grep -qxF -- "--oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT" "$CONF" ||
+    echo "--oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT" >>"$CONF"
+
+  echo "Now you can login to your Google Account in Chromium."
+fi

bin/omarchy-install-dev-env

@@ -47,6 +47,7 @@ install_node() {
 case "$1" in
 ruby)
   echo -e "Installing Ruby on Rails...\n"
+  omarchy-pkg-add libyaml
   mise use --global ruby@latest
   mise settings add idiomatic_version_file_enable_tools ruby
   mise x ruby -- gem install rails --no-document
@@ -119,6 +120,7 @@ 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

@@ -0,0 +1,19 @@
+#!/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-install-vscode

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+echo "Installing VSCode..."
+omarchy-pkg-add visual-studio-code-bin
+
+mkdir -p ~/.vscode
+
+cat > ~/.vscode/argv.json << 'EOF'
+// This configuration file allows you to pass permanent command line arguments to VS Code.
+// Only a subset of arguments is currently supported to reduce the likelihood of breaking
+// the installation.
+//
+// PLEASE DO NOT CHANGE WITHOUT UNDERSTANDING THE IMPACT
+//
+// NOTE: Changing this file requires a restart of VS Code.
+{
+  "password-store":"gnome-libsecret"
+}
+EOF
+
+setsid gtk-launch code

bin/omarchy-launch-about

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

bin/omarchy-launch-editor

@@ -0,0 +1,10 @@
+#!/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="$*"
-setsid alacritty --class Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
+exec setsid uwsm app -- alacritty --class=Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"

bin/omarchy-launch-or-focus

@@ -0,0 +1,16 @@
+#!/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|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 $LAUNCH_COMMAND
+fi

bin/omarchy-launch-or-focus-webapp

@@ -0,0 +1,8 @@
+#!/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,6 +17,8 @@ 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

@@ -0,0 +1,3 @@
+#!/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 "alacritty --class Screensaver"
+pkill -f "$TERMINAL --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
 }
 
-edit_in_nvim() {
+open_in_editor() {
   notify-send "Editing config file" "$1"
-  alacritty -e nvim "$1"
+  omarchy-launch-editor "$1"
 }
 
 install() {
@@ -61,6 +61,10 @@ 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"
 }
@@ -81,41 +85,21 @@ show_learn_menu() {
   esac
 }
 
-show_style_menu() {
-  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 ;;
-  *Screensaver*) edit_in_nvim ~/.config/omarchy/branding/screensaver.txt ;;
-  *About*) edit_in_nvim ~/.config/omarchy/branding/about.txt ;;
+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_theme_menu() {
-  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() {
-  theme=$(menu "Font" "$(omarchy-font-list)" "-w 350" "$(omarchy-font-current)")
-  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    back_to show_style_menu
-  else
-    omarchy-font-set "$theme"
-  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 ;;
+  *) show_trigger_menu ;;
   esac
 }
 
@@ -138,40 +122,79 @@ show_screenrecord_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
+  *Theme*) show_theme_menu ;;
+  *Font*) show_font_menu ;;
+  *Background*) omarchy-theme-bg-next ;;
+  *Hyprland*) open_in_editor ~/.config/hypr/looknfeel.conf ;;
+  *Screensaver*) open_in_editor ~/.config/omarchy/branding/screensaver.txt ;;
+  *About*) open_in_editor ~/.config/omarchy/branding/about.txt ;;
   *) show_main_menu ;;
   esac
 }
 
+show_theme_menu() {
+  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() {
+  theme=$(menu "Font" "$(omarchy-font-list)" "-w 350" "$(omarchy-font-current)")
+  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
+    back_to show_style_menu
+  else
+    omarchy-font-set "$theme"
+  fi
+}
+
 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󰱔  DNS\n  Config\n󰈷  Fingerprint\n  Fido2"
+  options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
-  *Audio*) alacritty --class=Wiremix -e wiremix ;;
+  *Audio*) $TERMINAL --class=Wiremix -e wiremix ;;
   *Wifi*)
     rfkill unblock wifi
-    alacritty --class=Impala -e impala
+    omarchy-launch-wifi
     ;;
   *Bluetooth*)
     rfkill unblock bluetooth
     blueberry
     ;;
   *Power*) show_setup_power_menu ;;
-  *Monitors*) edit_in_nvim ~/.config/hypr/monitors.conf ;;
-  *Keybindings*) edit_in_nvim ~/.config/hypr/bindings.conf ;;
-  *Input*) edit_in_nvim ~/.config/hypr/input.conf ;;
+  *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
+  *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
+  *Input*) open_in_editor ~/.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
 }
@@ -188,20 +211,28 @@ 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*) edit_in_nvim ~/.config/hypr/hyprland.conf ;;
-  *Hypridle*) edit_in_nvim ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
-  *Hyprlock*) edit_in_nvim ~/.config/hypr/hyprlock.conf ;;
-  *Hyprsunset*) edit_in_nvim ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
-  *Swayosd*) edit_in_nvim ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
-  *Walker*) edit_in_nvim ~/.config/walker/config.toml && omarchy-restart-walker ;;
-  *Waybar*) edit_in_nvim ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
-  *XCompose*) edit_in_nvim ~/.XCompose && omarchy-restart-xcompose ;;
+  *Hyprland*) open_in_editor ~/.config/hypr/hyprland.conf ;;
+  *Hypridle*) open_in_editor ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
+  *Hyprlock*) open_in_editor ~/.config/hypr/hyprlock.conf ;;
+  *Hyprsunset*) open_in_editor ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
+  *Swayosd*) open_in_editor ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
+  *Walker*) open_in_editor ~/.config/walker/config.toml && omarchy-restart-walker ;;
+  *Waybar*) open_in_editor ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
+  *XCompose*) open_in_editor ~/.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󱚤  AI\n  Gaming") in
+  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
   *Package*) terminal omarchy-pkg-install ;;
   *AUR*) terminal omarchy-pkg-aur-install ;;
   *Web*) present_terminal omarchy-webapp-install ;;
@@ -210,6 +241,7 @@ 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 ;;
@@ -217,17 +249,18 @@ show_install_menu() {
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden") in
+  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden\n  Chromium Account") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
   *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
+  *Chromium*) present_terminal omarchy-install-chromium-google-account ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_editor_menu() {
   case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
-  *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
+  *VSCode*) present_terminal omarchy-install-vscode ;;
   *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
   *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
   *Sublime*) aur_install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
@@ -237,6 +270,15 @@ 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) ||
@@ -342,8 +384,9 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n󰇅  Hardware\n  Password\n  Timezone") in
+  case $(menu "Update" " Omarchy\n Branch\n  Config\n󰸌  Extra 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 ;;
@@ -354,6 +397,13 @@ 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 ;;
@@ -380,7 +430,8 @@ show_update_config_menu() {
 }
 
 show_update_hardware_menu() {
-  case $(menu "Restart" "󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  case $(menu "Restart" "  Audio\n󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  *Audio*) present_terminal omarchy-restart-pipewire ;;
   *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
   *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
   *) show_update_menu ;;
@@ -408,25 +459,25 @@ show_system_menu() {
 }
 
 show_main_menu() {
-  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 "$(menu "Go" "󰀻  Apps\n󰧑  Learn\n󱓞  Trigger\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*) alacritty --class Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' ;;
+  *about*) omarchy-launch-about ;;
   *system*) show_system_menu ;;
   esac
 }

bin/omarchy-notification-dismiss

@@ -0,0 +1,13 @@
+#!/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,13 +2,15 @@
 
 fzf_args=(
   --multi
-  --preview 'yay -Sii {1}'
-  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
+  --preview 'yay -Siia {1}'
+  --preview-label='alt-p: toggle description, alt-b/B: toggle PKGBUILD, 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-bluetooth

@@ -1,4 +1,5 @@
 #!/bin/bash
 
+echo -e "Unblocking bluetooth...\n"
 rfkill unblock bluetooth
 rfkill list bluetooth

bin/omarchy-restart-pipewire

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo -e "Restarting pirewire audio service...\n"
+systemctl --user restart pipewire.service

bin/omarchy-restart-walker

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 pkill walker
-# FIXME: Reenable the walker service once the memory leak has been fixed
+# FIXME: Just deal with the memory leak for now.
 # 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-restart-wifi

@@ -1,4 +1,5 @@
 #!/bin/bash
 
+echo -e "Unblocking wifi...\n"
 rfkill unblock wifi
 rfkill list wifi

bin/omarchy-theme-set

@@ -20,52 +20,19 @@ fi
 # Update theme symlinks
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 
-# 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
-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 browser colors via policies
-if omarchy-cmd-present chromium || omarchy-cmd-present brave; then
-  if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]]; then
-    rgb=$(<~/.config/omarchy/current/theme/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
-
-# Trigger alacritty config reload
-touch "$HOME/.config/alacritty/alacritty.toml"
+# Change background with theme
+omarchy-theme-bg-next
 
 # Restart components to apply new theme
-pkill -SIGUSR2 btop
 omarchy-restart-waybar
 omarchy-restart-swayosd
-makoctl reload
 hyprctl reload
+pkill -SIGUSR2 btop
+makoctl reload
 
-# Set new background
-omarchy-theme-bg-next
+# Change gnome, browser, vscode themes
+omarchy-theme-set-terminal
+omarchy-theme-set-gnome
+omarchy-theme-set-eza
+omarchy-theme-set-browser
+omarchy-theme-set-vscode

bin/omarchy-theme-set-browser

@@ -0,0 +1,23 @@
+#!/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

@@ -0,0 +1,7 @@
+#!/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

@@ -0,0 +1,18 @@
+#!/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

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+case "$TERMINAL" in
+"alacritty") touch ~/.config/alacritty/alacritty.toml ;;
+"kitty") killall -SIGUSR1 kitty ;;
+"ghostty") killall -SIGUSR2 ghostty ;;
+esac

bin/omarchy-theme-set-vscode

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Note: We cannot use `jq` to update settings.json because it’s JSONC (allows comments),
+# which jq doesn’t support.
+
+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
+
+    # Create config file if there isn't already one
+    mkdir -p "$(dirname "$VS_CODE_SETTINGS")"
+    if [[ ! -f "$VS_CODE_SETTINGS" ]]; then
+      printf '{\n}\n' > "$VS_CODE_SETTINGS"
+    fi
+
+    # Create a `workbench.colorTheme` entry in settings.  
+    if ! grep -q '"workbench.colorTheme"' "$VS_CODE_SETTINGS"; then
+      # Insert `"workbench.colorTheme": "",` immediately after the first `{`
+      # Use sed's first-match range (0,/{/) to only replace the first `{`
+      sed -i --follow-symlinks -E '0,/\{/{s/\{/{\
+  "workbench.colorTheme": "",/}' "$VS_CODE_SETTINGS"
+    fi
+
+    # Update theme
+    sed -i --follow-symlinks -E \
+      "s/(\"workbench.colorTheme\"[[:space:]]*:[[:space:]]*\")[^\"]*(\")/\1$theme_name\2/" \
+      "$VS_CODE_SETTINGS"
+  else
+    # Remove theme from settings.json when the theme doesn't have vscode support
+    if [[ -f "$VS_CODE_SETTINGS" ]]; then
+      sed -i --follow-symlinks -E '/"workbench\.colorTheme"[[:space:]]*:[^,}]*,?/d' "$VS_CODE_SETTINGS"
+
+    fi
+  fi
+fi

bin/omarchy-tui-install

@@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=alacritty --class $APP_CLASS -e $APP_EXEC
+Exec=$TERMINAL --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=.*alacritty.*-e' "$file"; then
+    if grep -q '^Exec=.*$TERMINAL.*-e' "$file"; then
       TUIS+=("$(basename "${file%.desktop}")")
     fi
   done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)

bin/omarchy-update

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

bin/omarchy-update-branch

@@ -0,0 +1,33 @@
+#!/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

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

bin/omarchy-webapp-install

@@ -24,7 +24,9 @@ if [[ -z "$APP_NAME" || -z "$APP_URL" || -z "$ICON_REF" ]]; then
 fi
 
 # Refer to local icon or fetch remotely from URL
+ICON_DIR="$HOME/.local/share/applications/icons"
 if [[ $ICON_REF =~ ^https?:// ]]; then
+  ICON_PATH="$ICON_DIR/$APP_NAME.png"
   if curl -sL -o "$ICON_PATH" "$ICON_REF"; then
     ICON_PATH="$ICON_DIR/$APP_NAME.png"
   else
@@ -32,7 +34,7 @@ if [[ $ICON_REF =~ ^https?:// ]]; then
     exit 1
   fi
 else
-  ICON_PATH="$HOME/.local/share/applications/icons/$ICON_REF"
+  ICON_PATH="$ICON_DIR/$ICON_REF"
 fi
 
 # Use custom exec if provided, otherwise default behavior

boot.sh

@@ -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 "\eUsing branch: $OMARCHY_REF"
+  echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
   cd ~/.local/share/omarchy
   git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
   cd -

config/chromium-flags.conf

@@ -1,3 +1,4 @@
 --ozone-platform=wayland
 --ozone-platform-hint=wayland
 --enable-features=TouchpadOverscrollHistoryNavigation
+--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url

config/ghostty/config

@@ -0,0 +1,21 @@
+# 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 styling
+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,17 @@
 # Application bindings
-$terminal = uwsm app -- alacritty
+$terminal = uwsm app -- $TERMINAL
 $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, N, Neovim, exec, $terminal -e nvim
+bindd = SUPER, M, Music, exec, omarchy-launch-or-focus spotify
+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, uwsm app -- signal-desktop
-bindd = SUPER, O, Obsidian, exec, uwsm app -- obsidian -disable-gpu
+bindd = SUPER, G, Signal, exec, omarchy-launch-or-focus signal "uwsm app -- signal-desktop"
+bindd = SUPER, O, Obsidian, exec, omarchy-launch-or-focus obsidian "uwsm app -- obsidian -disable-gpu --enable-wayland-ime"
 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 +19,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-webapp "https://youtube.com/"
-bindd = SUPER SHIFT, G, WhatsApp, exec, omarchy-launch-webapp "https://web.whatsapp.com/"
-bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-webapp "https://messages.google.com/web/conversations"
+bindd = SUPER, Y, YouTube, exec, omarchy-launch-or-focus-webapp YouTube "https://youtube.com/"
+bindd = SUPER SHIFT, G, WhatsApp, exec, omarchy-launch-or-focus-webapp WhatsApp "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, 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,3 +1,2 @@
 # Extra env variables
-# Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)
 # env = MY_GLOBAL_ENV,setting

config/hypr/input.conf

@@ -27,8 +27,9 @@ input {
   }
 }
 
-# Scroll faster in the terminal
-windowrule = scrolltouchpad 1.5, class:Alacritty
+# Scroll nicely in the terminal
+windowrule = scrolltouchpad 1.5, class:(Alacritty|kitty)
+windowrule = scrolltouchpad 0.2, class:com.mitchellh.ghostty
 
 # Enable touchpad gestures for changing workspaces
 # See https://wiki.hyprland.org/Configuring/Gestures/

config/kitty/kitty.conf

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

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

config/uwsm/env

@@ -1,7 +1,11 @@
+# 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
 
-if command -v mise &> /dev/null; then
-  eval "$(mise activate bash)"
-fi
+# Set default terminal and editor
+source ~/.config/uwsm/default
+
+# 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": "alacritty -e btop"
+    "on-click": "$TERMINAL -e btop"
   },
   "clock": {
     "format": "{:L%A %H:%M}",
@@ -74,7 +74,7 @@
     "tooltip-format-disconnected": "Disconnected",
     "interval": 3,
     "spacing": 1,
-    "on-click": "alacritty --class=Impala -e impala"
+    "on-click": "omarchy-launch-wifi"
   },
   "battery": {
     "format": "{capacity}% {icon}",
@@ -104,7 +104,7 @@
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "alacritty --class=Wiremix -e wiremix",
+    "on-click": "$TERMINAL --class=Wiremix -e wiremix",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,

default/bash/envs

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

default/bashrc

@@ -6,9 +6,3 @@ 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

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

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

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

@@ -0,0 +1,19 @@
+{
+  "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,9 +4,11 @@ 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

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

default/hypr/apps/system.conf

@@ -4,7 +4,7 @@ windowrule = center, tag:floating-window
 windowrule = size 800 600, tag:floating-window
 
 windowrule = tag +floating-window, class:(blueberry.py|Impala|Wiremix|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 Folder|Save.*Files?|Save.*As|Save|All Files)
+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)
 
 # Fullscreen screensaver
 windowrule = fullscreen, class:Screensaver

default/hypr/apps/terminals.conf

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

default/hypr/autostart.conf

@@ -4,6 +4,7 @@ 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,6 +7,7 @@ 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
@@ -41,6 +42,7 @@ 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

@@ -42,3 +42,6 @@ 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/hypr/looknfeel.conf

@@ -87,3 +87,8 @@ misc {
     disable_splash_rendering  = true
     focus_on_activate = true
 }
+
+# https://wiki.hypr.land/Configuring/Variables/#cursor
+cursor {
+    hide_on_key_press = true
+}

default/mako/core.ini

@@ -16,4 +16,7 @@ invisible=false
 default-timeout=0
 
 [summary~="Setup Wi-Fi"]
-on-button-left=exec sh -c 'alacritty --class=Impala -e impala & makoctl dismiss -n "$id"'
+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/checks/firewall.sh

@@ -0,0 +1,21 @@
+OMARCHY_DESCRIPTION="Firewall Configuration"
+
+omarchy_verify() {
+  # Check if UFW is enabled
+  sudo ufw status | grep -q "Status: active" || add_error "UFW firewall not active"
+
+  # Check if UFW service is enabled
+  systemctl is-enabled ufw &>/dev/null || add_error "UFW service not enabled"
+
+  # Check default policies - they're on one line as "Default: deny (incoming), allow (outgoing), deny (routed)"
+  sudo ufw status verbose | grep -q "Default:.*deny (incoming)" || add_error "UFW default incoming policy not set to deny"
+  sudo ufw status verbose | grep -q "Default:.*allow (outgoing)" || add_error "UFW default outgoing policy not set to allow"
+
+  # Check specific rules are present
+  sudo ufw status numbered | grep -q "53317/udp" || add_error "LocalSend UDP port 53317 not allowed"
+  sudo ufw status numbered | grep -q "53317/tcp" || add_error "LocalSend TCP port 53317 not allowed"
+  sudo ufw status numbered | grep -q "22/tcp" || add_error "SSH port 22 not allowed"
+
+  # Check Docker DNS rule
+  sudo ufw status numbered | grep -q "allow-docker-dns" || add_error "Docker DNS rule not configured"
+}

install/checks/gnome-theme.sh

@@ -0,0 +1,9 @@
+OMARCHY_DESCRIPTION="GNOME Theme Settings"
+
+omarchy_verify() {
+  gsettings get org.gnome.desktop.interface gtk-theme &>/dev/null || add_error "Cannot access GTK theme setting"
+  gsettings get org.gnome.desktop.interface color-scheme &>/dev/null || add_error "Cannot access color scheme setting"
+  gsettings get org.gnome.desktop.interface icon-theme &>/dev/null || add_error "Cannot access icon theme setting"
+
+  [[ -d /usr/share/icons ]] || add_error "Icon themes directory missing"
+}

install/checks/power-profiles.sh

@@ -0,0 +1,13 @@
+OMARCHY_DESCRIPTION="Power Profile & Battery Settings"
+
+omarchy_verify() {
+  if ls /sys/class/power_supply/BAT* &>/dev/null; then
+    current_profile=$(powerprofilesctl get 2>/dev/null)
+    [[ "$current_profile" == "balanced" ]] || add_error "Power profile not set to balanced for battery device"
+
+    systemctl --user is-enabled omarchy-battery-monitor.timer &>/dev/null || add_error "Battery monitor timer not enabled"
+  else
+    current_profile=$(powerprofilesctl get 2>/dev/null)
+    [[ "$current_profile" == "performance" ]] || add_error "Power profile not set to performance for AC device"
+  fi
+}

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
@@ -26,3 +26,4 @@ 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/branding.sh

@@ -1,4 +1,13 @@
-# Allow the user to change the branding for fastfetch and screensaver
-mkdir -p ~/.config/omarchy/branding
-cp ~/.local/share/omarchy/icon.txt ~/.config/omarchy/branding/about.txt
-cp ~/.local/share/omarchy/logo.txt ~/.config/omarchy/branding/screensaver.txt
+OMARCHY_DESCRIPTION="Branding Config"
+
+omarchy_install() {
+  mkdir -p ~/.config/omarchy/branding
+  cp ~/.local/share/omarchy/icon.txt ~/.config/omarchy/branding/about.txt
+  cp ~/.local/share/omarchy/logo.txt ~/.config/omarchy/branding/screensaver.txt
+}
+
+omarchy_verify() {
+  [[ -d ~/.config/omarchy/branding ]] || add_error "Branding directory missing"
+  [[ -f ~/.config/omarchy/branding/about.txt ]] || add_error "About branding file missing"
+  [[ -f ~/.config/omarchy/branding/screensaver.txt ]] || add_error "Screensaver branding file missing"
+}

install/config/config.sh

@@ -1,6 +1,18 @@
-# Copy over Omarchy configs
-mkdir -p ~/.config
-cp -R ~/.local/share/omarchy/config/* ~/.config/
+OMARCHY_DESCRIPTION="Config Files"
 
-# Use default bashrc from Omarchy
-cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
+omarchy_install() {
+  # Copy over Omarchy configs
+  mkdir -p ~/.config
+  cp -R ~/.local/share/omarchy/config/* ~/.config/
+
+  # Use default bashrc from Omarchy
+  cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
+}
+
+omarchy_verify() {
+  [[ -d ~/.config ]] || add_error "Config directory missing"
+  [[ -f ~/.bashrc ]] || add_error "Bashrc file missing"
+
+  [[ -d ~/.config/hypr ]] || add_error "Hypr config missing"
+  [[ -d ~/.config/waybar ]] || add_error "Waybar config missing"
+}

install/config/detect-keyboard-layout.sh

@@ -1,13 +1,29 @@
-# Copy over the keyboard layout that's been set in Arch during install to Hyprland
-conf="/etc/vconsole.conf"
-hyprconf="$HOME/.config/hypr/input.conf"
+OMARCHY_DESCRIPTION="Keyboard Layout Config"
 
-if grep -q '^XKBLAYOUT=' "$conf"; then
-  layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
-  sed -i "/^[[:space:]]*kb_options *=/i\  kb_layout = $layout" "$hyprconf"
-fi
+omarchy_install() {
+  # Copy over the keyboard layout that's been set in Arch during install to Hyprland
+  conf="/etc/vconsole.conf"
+  hyprconf="$HOME/.config/hypr/input.conf"
 
-if grep -q '^XKBVARIANT=' "$conf"; then
-  variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
-  sed -i "/^[[:space:]]*kb_options *=/i\  kb_variant = $variant" "$hyprconf"
-fi
+  if grep -q '^XKBLAYOUT=' "$conf"; then
+    layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
+    sed -i "/^[[:space:]]*kb_options *=/i\  kb_layout = $layout" "$hyprconf"
+  fi
+
+  if grep -q '^XKBVARIANT=' "$conf"; then
+    variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
+    sed -i "/^[[:space:]]*kb_options *=/i\  kb_variant = $variant" "$hyprconf"
+  fi
+}
+
+omarchy_verify() {
+  [[ -f "$HOME/.config/hypr/input.conf" ]] || add_error "Hyprland input config missing"
+
+  # If vconsole.conf has keyboard layout, check if it's in hypr config
+  if [[ -f "/etc/vconsole.conf" ]] && grep -q '^XKBLAYOUT=' "/etc/vconsole.conf"; then
+    layout=$(grep '^XKBLAYOUT=' "/etc/vconsole.conf" | cut -d= -f2 | tr -d '"')
+    if [[ -f "$HOME/.config/hypr/input.conf" ]]; then
+      grep -q "kb_layout = $layout" "$HOME/.config/hypr/input.conf" || add_error "Keyboard layout not configured in Hyprland"
+    fi
+  fi
+}

install/config/docker.sh

@@ -1,32 +1,52 @@
-# Configure Docker daemon:
-# - limit log size to avoid running out of disk
-# - use host's DNS resolver
-sudo mkdir -p /etc/docker
-sudo tee /etc/docker/daemon.json >/dev/null <<'EOF'
+OMARCHY_DESCRIPTION="Docker Configuration"
+
+omarchy_install() {
+  # Configure Docker daemon:
+  # - limit log size to avoid running out of disk
+  # - use host's DNS resolver
+  sudo mkdir -p /etc/docker
+  sudo tee /etc/docker/daemon.json >/dev/null <<'EOF'
 {
-    "log-driver": "json-file",
-    "log-opts": { "max-size": "10m", "max-file": "5" },
-    "dns": ["172.17.0.1"],
-    "bip": "172.17.0.1/16"
+  "log-driver": "json-file",
+  "log-opts": { "max-size": "10m", "max-file": "5" },
+  "dns": ["172.17.0.1"],
+  "bip": "172.17.0.1/16"
 }
 EOF
 
-# Expose systemd-resolved to our Docker network
-sudo mkdir -p /etc/systemd/resolved.conf.d
-echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
-sudo systemctl restart systemd-resolved
+  # Expose systemd-resolved to our Docker network
+  sudo mkdir -p /etc/systemd/resolved.conf.d
+  echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
+  sudo systemctl restart systemd-resolved
 
-# Start Docker automatically
-sudo systemctl enable docker
+  # Start Docker automatically
+  sudo systemctl enable docker
 
-# Give this user privileged Docker access
-sudo usermod -aG docker ${USER}
+  # Give this user privileged Docker access
+  sudo usermod -aG docker ${USER}
 
-# Prevent Docker from preventing boot for network-online.target
-sudo mkdir -p /etc/systemd/system/docker.service.d
-sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
+  # Prevent Docker from preventing boot for network-online.target
+  sudo mkdir -p /etc/systemd/system/docker.service.d
+  sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
 [Unit]
 DefaultDependencies=no
 EOF
 
-sudo systemctl daemon-reload
+  sudo systemctl daemon-reload
+}
+
+omarchy_verify() {
+  [[ -f /etc/docker/daemon.json ]] || add_error "Docker daemon.json missing"
+  [[ -f /etc/systemd/resolved.conf.d/20-docker-dns.conf ]] || add_error "Docker DNS config missing"
+  [[ -f /etc/systemd/system/docker.service.d/no-block-boot.conf ]] || add_error "Docker boot config missing"
+
+  getent group docker >/dev/null 2>&1 || add_error "Docker group does not exist"
+
+  groups "$USER" | grep -q docker || add_error "User $USER not in docker group"
+
+  if systemctl list-unit-files | grep -q docker.service; then
+    systemctl is-enabled docker >/dev/null 2>&1 || add_error "Docker service not enabled"
+
+    systemctl is-active docker >/dev/null 2>&1 || add_warning "Docker service is not running (may be intentional)"
+  fi
+}

install/config/fix-powerprofilesctl-shebang.sh

@@ -0,0 +1,14 @@
+OMARCHY_DESCRIPTION="Powerprofilesctl"
+
+omarchy_install() {
+  # Ensure we use system python3 and not mise's python3
+  sudo sed -i '/env python3/ c\#!/bin/python3' /usr/bin/powerprofilesctl
+}
+
+omarchy_verify() {
+  [[ -f /usr/bin/powerprofilesctl ]] || add_error "powerprofilesctl not found"
+
+  if [[ -f /usr/bin/powerprofilesctl ]]; then
+      head -n1 /usr/bin/powerprofilesctl | grep -q "^#!/bin/python3$" || add_error "powerprofilesctl shebang not fixed"
+  fi
+}

install/config/git.sh

@@ -1,20 +1,41 @@
-# Ensure git settings live under ~/.config
-mkdir -p ~/.config/git
-touch ~/.config/git/config
+OMARCHY_DESCRIPTION="Git"
 
-# Set common git aliases
-git config --global alias.co checkout
-git config --global alias.br branch
-git config --global alias.ci commit
-git config --global alias.st status
-git config --global pull.rebase true
-git config --global init.defaultBranch master
+omarchy_install() {
+  # Ensure git settings live under ~/.config
+  mkdir -p ~/.config/git
+  touch ~/.config/git/config
 
-# Set identification from install inputs
-if [[ -n "${OMARCHY_USER_NAME//[[:space:]]/}" ]]; then
-  git config --global user.name "$OMARCHY_USER_NAME"
-fi
+  # Set common git aliases
+  git config --global alias.co checkout
+  git config --global alias.br branch
+  git config --global alias.ci commit
+  git config --global alias.st status
+  git config --global pull.rebase true
+  git config --global init.defaultBranch master
 
-if [[ -n "${OMARCHY_USER_EMAIL//[[:space:]]/}" ]]; then
-  git config --global user.email "$OMARCHY_USER_EMAIL"
-fi
+  # Set identification from install inputs
+  if [[ -n "${OMARCHY_USER_NAME//[[:space:]]/}" ]]; then
+    git config --global user.name "$OMARCHY_USER_NAME"
+  fi
+
+  if [[ -n "${OMARCHY_USER_EMAIL//[[:space:]]/}" ]]; then
+    git config --global user.email "$OMARCHY_USER_EMAIL"
+  fi
+}
+
+omarchy_verify() {
+  [[ -d ~/.config/git ]] || add_error "Git config directory missing"
+  [[ -f ~/.config/git/config ]] || add_error "Git config file missing"
+
+  command -v git >/dev/null 2>&1 || add_error "Git not installed"
+
+  if command -v git >/dev/null 2>&1; then
+    git config --global pull.rebase >/dev/null || add_error "Git pull.rebase not configured"
+    git config --global init.defaultBranch >/dev/null || add_error "Git defaultBranch not configured"
+
+    git config --global alias.co >/dev/null || add_error "Git alias 'co' not configured"
+    git config --global alias.br >/dev/null || add_error "Git alias 'br' not configured"
+    git config --global alias.ci >/dev/null || add_error "Git alias 'ci' not configured"
+    git config --global alias.st >/dev/null || add_error "Git alias 'st' not configured"
+  fi
+}

install/config/gpg.sh

@@ -1,6 +1,20 @@
-# Setup GPG configuration with multiple keyservers for better reliability
-sudo mkdir -p /etc/gnupg
-sudo cp ~/.local/share/omarchy/default/gpg/dirmngr.conf /etc/gnupg/
-sudo chmod 644 /etc/gnupg/dirmngr.conf
-sudo gpgconf --kill dirmngr || true
-sudo gpgconf --launch dirmngr || true
+OMARCHY_DESCRIPTION="GPG"
+
+omarchy_install() {
+  # Setup GPG configuration with multiple keyservers for better reliability
+  sudo mkdir -p /etc/gnupg
+  sudo cp ~/.local/share/omarchy/default/gpg/dirmngr.conf /etc/gnupg/
+  sudo chmod 644 /etc/gnupg/dirmngr.conf
+  sudo gpgconf --kill dirmngr || true
+  sudo gpgconf --launch dirmngr || true
+}
+
+omarchy_verify() {
+  [[ -d /etc/gnupg ]] || add_error "GPG config directory missing"
+  [[ -f /etc/gnupg/dirmngr.conf ]] || add_error "GPG dirmngr.conf missing"
+
+  if [[ -f /etc/gnupg/dirmngr.conf ]]; then
+    local perms=$(stat -c %a /etc/gnupg/dirmngr.conf)
+    [[ "$perms" == "644" ]] || add_error "GPG dirmngr.conf has incorrect permissions: $perms (should be 644)"
+  fi
+}

install/config/hardware/bluetooth.sh

@@ -1,2 +1,9 @@
-# Turn on bluetooth by default
-chrootable_systemctl_enable bluetooth.service
+OMARCHY_DESCRIPTION="Enable Bluetooth Service"
+
+omarchy_install() {
+  chrootable_systemctl_enable bluetooth.service
+}
+
+omarchy_verify() {
+  systemctl is-enabled bluetooth.service >/dev/null 2>&1 || add_error "Bluetooth service not enabled"
+}

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

@@ -1,5 +1,18 @@
-# Install wifi drivers for 2013-2015 MacBooks using the BCM4360 chip
-if lspci -nnv | grep -A2 "14e4:43a0" | grep -q "106b:"; then
+OMARCHY_DESCRIPTION="Apple BCM4360 WiFi Driver"
+
+should_run() {
+  lspci -nnv | grep -A2 "14e4:43a0" | grep -q "106b:"
+}
+
+omarchy_install() {
+  should_run || return 0
+
   echo "Apple BCM4360 detected"
   sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
-fi
+}
+
+omarchy_verify() {
+  should_run || return 2
+
+  omarchy-pkg-present broadcom-wl || add_error "Broadcom wireless driver not installed"
+}

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

@@ -1,7 +1,23 @@
-# 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"
+OMARCHY_DESCRIPTION="MacBook SPI Keyboard Support"
 
+should_run() {
+  [[ "$(cat /sys/class/dmi/id/product_name 2>/dev/null)" =~ MacBook12,1|MacBookPro13,[123]|MacBookPro14,[123] ]]
+}
+
+omarchy_install() {
+  should_run || return 0
+
+  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
+}
+
+omarchy_verify() {
+  should_run || return 2  # Return 2 to indicate "not applicable"
+
+  # Check if driver is installed
+  pacman -Q macbook12-spi-driver-dkms &>/dev/null || add_error "MacBook SPI driver not installed"
+
+  # Check if mkinitcpio config exists
+  [[ -f /etc/mkinitcpio.conf.d/macbook_spi_modules.conf ]] || add_error "MacBook SPI modules config missing"
+}

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

@@ -0,0 +1,49 @@
+OMARCHY_DESCRIPTION="Apple T2 MacBook Support"
+
+# Detect T2 MacBook models using PCI IDs: 106b:1801 or 106b:1802
+should_run() {
+  lspci -nn | grep -q "106b:180[12]"
+}
+
+# Installation function
+omarchy_install() {
+  should_run || return 0
+
+  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
+}
+
+# Verification function
+omarchy_verify() {
+  should_run || return 2
+
+  pacman -Q linux-t2 &>/dev/null || add_error "T2 Linux kernel not installed"
+
+  # Check if config files exist
+  [[ -f /etc/modules-load.d/t2.conf ]] || add_error "T2 modules config missing"
+  [[ -f /etc/mkinitcpio.conf.d/apple-t2.conf ]] || add_error "T2 mkinitcpio config missing"
+  [[ -f /etc/modprobe.d/brcmfmac.conf ]] || add_error "T2 WiFi fix config missing"
+  [[ -f /etc/limine-entry-tool.d/t2-mac.conf ]] || add_error "T2 boot config missing"
+}

install/config/hardware/fix-f13-amd-audio-input.sh

@@ -1,5 +1,18 @@
-AMD_AUDIO_CARD=$(pactl list cards 2>/dev/null | grep -B20 "Family 17h/19h" | grep "Name: " | awk '{print $2}' || true)
+OMARCHY_DESCRIPTION="Framework 13 AMD Audio Input Fix"
+
+should_run() {
+  AMD_AUDIO_CARD=$(pactl list cards 2>/dev/null | grep -B20 "Family 17h/19h" | grep "Name: " | awk '{print $2}' || true)
+  [[ -n "$AMD_AUDIO_CARD" ]]
+}
+
+omarchy_install() {
+  should_run || return 0
 
-if [[ -n $AMD_AUDIO_CARD ]]; then
   pactl set-card-profile "$AMD_AUDIO_CARD" "HiFi (Mic1, Mic2, Speaker)" 2>/dev/null || true
-fi
+}
+
+omarchy_verify() {
+  should_run || return 2
+
+  pactl list cards | grep -A10 "$AMD_AUDIO_CARD" | grep -q "Active Profile:" || add_error "AMD audio profile not configured"
+}

install/config/hardware/fix-fkeys.sh

@@ -1,4 +1,16 @@
-# Ensure that F-keys on Apple-like keyboards (such as Lofree Flow84) are always F-keys
-if [[ ! -f /etc/modprobe.d/hid_apple.conf ]]; then
-  echo "options hid_apple fnmode=2" | sudo tee /etc/modprobe.d/hid_apple.conf
-fi
+OMARCHY_DESCRIPTION="Set F-keys as F-keys by default"
+
+omarchy_install() {
+  # Ensure that F-keys on Apple-like keyboards (such as Lofree Flow84) are always F-keys
+  if [[ ! -f /etc/modprobe.d/hid_apple.conf ]]; then
+      echo "options hid_apple fnmode=2" | sudo tee /etc/modprobe.d/hid_apple.conf
+  fi
+}
+
+omarchy_verify() {
+  [[ -f /etc/modprobe.d/hid_apple.conf ]] || add_error "Apple HID config missing"
+
+  if [[ -f /etc/modprobe.d/hid_apple.conf ]]; then
+      grep -q "options hid_apple fnmode=2" /etc/modprobe.d/hid_apple.conf || add_error "F-key mode not configured"
+  fi
+}

install/config/hardware/ignore-power-button.sh

@@ -1,2 +1,15 @@
-# Disable shutting system down on power button to bind it to power menu afterwards
-sudo sed -i 's/.*HandlePowerKey=.*/HandlePowerKey=ignore/' /etc/systemd/logind.conf
+OMARCHY_DESCRIPTION="Disable power button"
+
+omarchy_install() {
+  # Disable shutting system down on power button to bind it to power menu afterwards
+  sudo sed -i 's/.*HandlePowerKey=.*/HandlePowerKey=ignore/' /etc/systemd/logind.conf
+}
+
+omarchy_verify() {
+  [[ -f /etc/systemd/logind.conf ]] || add_error "Logind config missing"
+
+  # Check if power button is set to ignore
+  if [[ -f /etc/systemd/logind.conf ]]; then
+      grep -q "^HandlePowerKey=ignore" /etc/systemd/logind.conf || add_error "Power button not set to ignore"
+  fi
+}

install/config/hardware/intel.sh

@@ -1,11 +1,30 @@
-# This installs hardware video acceleration for Intel GPUs
-# Check if we have an Intel GPU at all
-if INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel'); then
+OMARCHY_DESCRIPTION="Setup Intel video acceleration"
+
+should_run() {
+  INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel' || true)
+  [[ -n "$INTEL_GPU" ]]
+}
+
+omarchy_install() {
+  should_run || return 0
+
   # HD Graphics and newer uses intel-media-driver
   if [[ "${INTEL_GPU,,}" =~ "hd graphics"|"xe"|"iris" ]]; then
-    sudo pacman -S --needed --noconfirm intel-media-driver
+      sudo pacman -S --needed --noconfirm intel-media-driver
   elif [[ "${INTEL_GPU,,}" =~ "gma" ]]; then
-    # Older generations from 2008 to ~2014-2017 use libva-intel-driver
-    sudo pacman -S --needed --noconfirm libva-intel-driver
+      # Older generations from 2008 to ~2014-2017 use libva-intel-driver
+      sudo pacman -S --needed --noconfirm libva-intel-driver
   fi
-fi
+}
+
+# Verification function
+omarchy_verify() {
+  should_run || return 2
+
+  # Check if appropriate driver is installed
+  if [[ "${INTEL_GPU,,}" =~ "hd graphics"|"xe"|"iris" ]]; then
+      pacman -Q intel-media-driver &>/dev/null || add_error "Intel media driver not installed"
+  elif [[ "${INTEL_GPU,,}" =~ "gma" ]]; then
+      pacman -Q libva-intel-driver &>/dev/null || add_error "Intel VA-API driver not installed"
+  fi
+}

install/config/hardware/network.sh

@@ -1,6 +1,14 @@
-# Ensure iwd service will be started
-sudo systemctl enable iwd.service
+OMARCHY_DESCRIPTION="Network Config"
 
-# Prevent systemd-networkd-wait-online timeout on boot
-sudo systemctl disable systemd-networkd-wait-online.service
-sudo systemctl mask systemd-networkd-wait-online.service
+omarchy_install() {
+  sudo systemctl enable iwd.service
+
+  sudo systemctl disable systemd-networkd-wait-online.service
+  sudo systemctl mask systemd-networkd-wait-online.service
+}
+
+omarchy_verify() {
+  systemctl is-enabled iwd.service >/dev/null 2>&1 || add_error "IWD service not enabled"
+
+  systemctl is-enabled systemd-networkd-wait-online.service 2>&1 | grep -q "masked" || add_error "systemd-networkd-wait-online not masked"
+}

install/config/hardware/nvidia.sh

@@ -1,31 +1,28 @@
-# ==============================================================================
-# Hyprland NVIDIA Setup Script for Arch Linux
-# ==============================================================================
-# This script automates the installation and configuration of NVIDIA drivers
-# for use with Hyprland on Arch Linux, following the official Hyprland wiki.
-#
-# Author: https://github.com/Kn0ax
-#
-# ==============================================================================
+OMARCHY_DESCRIPTION="NVIDIA GPU Configuration"
+
+should_run() {
+  NVIDIA_GPU=$(lspci | grep -i 'nvidia' || true)
+  [[ -n "$NVIDIA_GPU" ]]
+}
+
+omarchy_install() {
+  should_run || return 0
 
-# --- GPU Detection ---
-if [ -n "$(lspci | grep -i 'nvidia')" ]; then
-  # --- Driver Selection ---
   # Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
-  if echo "$(lspci | grep -i 'nvidia')" | grep -q -E "RTX [2-9][0-9]|GTX 16"; then
-    NVIDIA_DRIVER_PACKAGE="nvidia-open-dkms"
+  if echo "$NVIDIA_GPU" | grep -q -E "RTX [2-9][0-9]|GTX 16"; then
+      NVIDIA_DRIVER_PACKAGE="nvidia-open-dkms"
   else
-    NVIDIA_DRIVER_PACKAGE="nvidia-dkms"
+      NVIDIA_DRIVER_PACKAGE="nvidia-dkms"
   fi
 
   # Check which kernel is installed and set appropriate headers package
   KERNEL_HEADERS="linux-headers" # Default
   if pacman -Q linux-zen &>/dev/null; then
-    KERNEL_HEADERS="linux-zen-headers"
+      KERNEL_HEADERS="linux-zen-headers"
   elif pacman -Q linux-lts &>/dev/null; then
-    KERNEL_HEADERS="linux-lts-headers"
+      KERNEL_HEADERS="linux-lts-headers"
   elif pacman -Q linux-hardened &>/dev/null; then
-    KERNEL_HEADERS="linux-hardened-headers"
+      KERNEL_HEADERS="linux-hardened-headers"
   fi
 
   # force package database refresh
@@ -67,9 +64,9 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
   sudo mkinitcpio -P
 
   # Add NVIDIA environment variables to hyprland.conf
-  HYPRLAND_CONF="$HOME/.config/hypr/hyprland.conf"
+  HYPRLAND_CONF="$HOME/.config/hypr/envs.conf"
   if [ -f "$HYPRLAND_CONF" ]; then
-    cat >>"$HYPRLAND_CONF" <<'EOF'
+      cat >>"$HYPRLAND_CONF" <<'EOF'
 
 # NVIDIA environment variables
 env = NVD_BACKEND,direct
@@ -77,4 +74,22 @@ env = LIBVA_DRIVER_NAME,nvidia
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 EOF
   fi
-fi
+}
+
+omarchy_verify() {
+  should_run || return 2
+
+  pacman -Q nvidia-dkms &>/dev/null || pacman -Q nvidia-open-dkms &>/dev/null || add_error "NVIDIA driver not installed"
+
+  [[ -f /etc/modprobe.d/nvidia.conf ]] || add_error "NVIDIA modprobe config missing"
+
+  if [[ -f /etc/modprobe.d/nvidia.conf ]]; then
+      grep -q "options nvidia_drm modeset=1" /etc/modprobe.d/nvidia.conf || add_error "NVIDIA DRM modeset not enabled"
+  fi
+
+  grep -q "nvidia" /etc/mkinitcpio.conf || add_error "NVIDIA modules not in mkinitcpio.conf"
+
+  if [[ -f "$HOME/.config/hypr/hyprland.conf" ]]; then
+      grep -q "LIBVA_DRIVER_NAME,nvidia" "$HOME/.config/hypr/hyprland.conf" || add_error "NVIDIA env vars not in Hyprland config"
+  fi
+}

install/config/hardware/printer.sh

@@ -1,16 +1,32 @@
-chrootable_systemctl_enable cups.service
+OMARCHY_DESCRIPTION="Printer Config"
 
-# Disable multicast dns in resolved. Avahi will provide this for better network printer discovery
-sudo mkdir -p /etc/systemd/resolved.conf.d
-echo -e "[Resolve]\nMulticastDNS=no" | sudo tee /etc/systemd/resolved.conf.d/10-disable-multicast.conf
-chrootable_systemctl_enable avahi-daemon.service
+omarchy_install() {
+  chrootable_systemctl_enable cups.service
 
-# Enable mDNS resolution for .local domains
-sudo sed -i 's/^hosts:.*/hosts: mymachines mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] files myhostname dns/' /etc/nsswitch.conf
+  # Disable multicast dns in resolved. Avahi will provide this for better network printer discovery
+  sudo mkdir -p /etc/systemd/resolved.conf.d
+  echo -e "[Resolve]\nMulticastDNS=no" | sudo tee /etc/systemd/resolved.conf.d/10-disable-multicast.conf
+  chrootable_systemctl_enable avahi-daemon.service
 
-# Enable automatically adding remote printers
-if ! grep -q '^CreateRemotePrinters Yes' /etc/cups/cups-browsed.conf; then
-  echo 'CreateRemotePrinters Yes' | sudo tee -a /etc/cups/cups-browsed.conf
-fi
+  # Enable mDNS resolution for .local domains
+  sudo sed -i 's/^hosts:.*/hosts: mymachines mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] files myhostname dns/' /etc/nsswitch.conf
 
-chrootable_systemctl_enable cups-browsed.service
+  # Enable automatically adding remote printers
+  if ! grep -q '^CreateRemotePrinters Yes' /etc/cups/cups-browsed.conf; then
+      echo 'CreateRemotePrinters Yes' | sudo tee -a /etc/cups/cups-browsed.conf
+  fi
+
+  chrootable_systemctl_enable cups-browsed.service
+}
+
+omarchy_verify() {
+  systemctl is-enabled cups.service >/dev/null 2>&1 || add_error "CUPS service not enabled"
+  systemctl is-enabled avahi-daemon.service >/dev/null 2>&1 || add_error "Avahi daemon not enabled"
+  systemctl is-enabled cups-browsed.service >/dev/null 2>&1 || add_error "CUPS browsed service not enabled"
+
+  [[ -f /etc/systemd/resolved.conf.d/10-disable-multicast.conf ]] || add_error "Multicast DNS config missing"
+
+  grep -q "mdns_minimal" /etc/nsswitch.conf || add_error "mDNS not configured in nsswitch.conf"
+
+  [[ -f /etc/cups/cups-browsed.conf ]] && grep -q '^CreateRemotePrinters Yes' /etc/cups/cups-browsed.conf || add_error "Remote printers not enabled in CUPS"
+}

install/config/hardware/set-wireless-regdom.sh

@@ -1,33 +1,37 @@
-# First check that wireless-regdb is there
-if [ -f "/etc/conf.d/wireless-regdom" ]; then
-  unset WIRELESS_REGDOM
-  . /etc/conf.d/wireless-regdom
-fi
+OMARCHY_DESCRIPTION="Wireless Regdom"
 
-# If the region is already set, we're done
-if [ ! -n "${WIRELESS_REGDOM}" ]; then
-  # Get the current timezone
-  if [ -e "/etc/localtime" ]; then
-    TIMEZONE=$(readlink -f /etc/localtime)
-    TIMEZONE=${TIMEZONE#/usr/share/zoneinfo/}
+omarchy_install() {
+  if [ -f "/etc/conf.d/wireless-regdom" ]; then
+      unset WIRELESS_REGDOM
+      . /etc/conf.d/wireless-regdom
+  fi
 
-    # Some timezones are formatted with the two letter country code at the start
-    COUNTRY="${TIMEZONE%%/*}"
+  if [ ! -n "${WIRELESS_REGDOM}" ]; then
+    if [ -e "/etc/localtime" ]; then
+      TIMEZONE=$(readlink -f /etc/localtime)
+      TIMEZONE=${TIMEZONE#/usr/share/zoneinfo/}
 
-    # If we don't have a two letter country, get it from the timezone table
-    if [[ ! "$COUNTRY" =~ ^[A-Z]{2}$ ]] && [ -f "/usr/share/zoneinfo/zone.tab" ]; then
-      COUNTRY=$(awk -v tz="$TIMEZONE" '$3 == tz {print $1; exit}' /usr/share/zoneinfo/zone.tab)
-    fi
+      COUNTRY="${TIMEZONE%%/*}"
 
-    # Check if we have a two letter country code
-    if [[ "$COUNTRY" =~ ^[A-Z]{2}$ ]]; then
-      # Append it to the wireless-regdom conf file that is used at boot
-      echo "WIRELESS_REGDOM=\"$COUNTRY\"" | sudo tee -a /etc/conf.d/wireless-regdom >/dev/null
+      if [[ ! "$COUNTRY" =~ ^[A-Z]{2}$ ]] && [ -f "/usr/share/zoneinfo/zone.tab" ]; then
+        COUNTRY=$(awk -v tz="$TIMEZONE" '$3 == tz {print $1; exit}' /usr/share/zoneinfo/zone.tab)
+      fi
 
-      # Also set it one off now
-      if command -v iw &>/dev/null; then
-        sudo iw reg set ${COUNTRY}
+      if [[ "$COUNTRY" =~ ^[A-Z]{2}$ ]]; then
+        echo "WIRELESS_REGDOM=\"$COUNTRY\"" | sudo tee -a /etc/conf.d/wireless-regdom >/dev/null
+
+        if command -v iw &>/dev/null; then
+            sudo iw reg set ${COUNTRY}
+        fi
       fi
     fi
   fi
-fi
+}
+
+omarchy_verify() {
+  [[ -f /etc/conf.d/wireless-regdom ]] || add_error "Wireless regdom config missing"
+
+  if [[ -f /etc/conf.d/wireless-regdom ]]; then
+      grep -q "^WIRELESS_REGDOM=" /etc/conf.d/wireless-regdom || add_error "Wireless regulatory domain not configured"
+  fi
+}

install/config/hardware/usb-autosuspend.sh

@@ -1,5 +1,16 @@
-# Disable USB autosuspend to prevent peripheral disconnection issues
-if [[ ! -f /etc/modprobe.d/disable-usb-autosuspend.conf ]]; then
-  echo "options usbcore autosuspend=-1" | sudo tee /etc/modprobe.d/disable-usb-autosuspend.conf
-fi
+OMARCHY_DESCRIPTION="USB Autosuspend"
 
+omarchy_install() {
+  # Disable USB autosuspend to prevent peripheral disconnection issues
+  if [[ ! -f /etc/modprobe.d/disable-usb-autosuspend.conf ]]; then
+    echo "options usbcore autosuspend=-1" | sudo tee /etc/modprobe.d/disable-usb-autosuspend.conf
+  fi
+}
+
+omarchy_verify() {
+  [[ -f /etc/modprobe.d/disable-usb-autosuspend.conf ]] || add_error "USB autosuspend config missing"
+
+  if [[ -f /etc/modprobe.d/disable-usb-autosuspend.conf ]]; then
+    grep -q "options usbcore autosuspend=-1" /etc/modprobe.d/disable-usb-autosuspend.conf || add_error "USB autosuspend not disabled"
+  fi
+}

install/config/increase-lockout-limit.sh

@@ -1,3 +1,16 @@
-# Increase lockout limit to 10 and decrease timeout to 2 minutes
-sudo sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
-sudo sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
+OMARCHY_DESCRIPTION="Lockout Limit"
+
+omarchy_install() {
+  # Increase lockout limit to 10 and decrease timeout to 2 minutes
+  sudo sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
+  sudo sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
+}
+
+omarchy_verify() {
+  [[ -f /etc/pam.d/system-auth ]] || add_error "PAM system-auth file missing"
+
+  if [[ -f /etc/pam.d/system-auth ]]; then
+    grep -q "pam_faillock.so.*deny=10" /etc/pam.d/system-auth || add_error "Faillock deny limit not set to 10"
+    grep -q "pam_faillock.so.*unlock_time=120" /etc/pam.d/system-auth || add_error "Faillock unlock time not set to 120"
+  fi
+}

install/config/increase-sudo-tries.sh

@@ -1,3 +1,18 @@
-# Give the user 10 instead of 3 tries to fat finger their password before lockout
-echo "Defaults passwd_tries=10" | sudo tee /etc/sudoers.d/passwd-tries
-sudo chmod 440 /etc/sudoers.d/passwd-tries
+OMARCHY_DESCRIPTION="Sudo lockout limit"
+
+omarchy_install() {
+  # Give the user 10 instead of 3 tries to fat finger their password before lockout
+  echo "Defaults passwd_tries=10" | sudo tee /etc/sudoers.d/passwd-tries
+  sudo chmod 440 /etc/sudoers.d/passwd-tries
+}
+
+omarchy_verify() {
+  sudo test -f /etc/sudoers.d/passwd-tries || add_error "Sudoers passwd-tries file missing"
+
+  if sudo test -f /etc/sudoers.d/passwd-tries; then
+    local perms=$(sudo stat -c %a /etc/sudoers.d/passwd-tries)
+    [[ "$perms" == "440" ]] || add_error "Sudoers file has incorrect permissions: $perms (should be 440)"
+
+    sudo grep -q "passwd_tries=10" /etc/sudoers.d/passwd-tries || add_error "Passwd tries not set to 10"
+  fi
+}

install/config/lazyvim.sh

@@ -1 +1,10 @@
-omarchy-lazyvim-setup
+OMARCHY_DESCRIPTION="LazyVim"
+
+omarchy_install() {
+  omarchy-lazyvim-setup
+}
+
+omarchy_verify() {
+  [[ -d ~/.config/nvim ]] || add_error "Neovim config directory missing"
+  [[ -d ~/.local/share/nvim/lazy ]] || add_error "LazyVim plugins directory missing"
+}

install/config/localdb.sh

@@ -1,2 +1,12 @@
-# Update localdb so that locate will find everything installed
-sudo updatedb
+OMARCHY_DESCRIPTION="LocalDB"
+
+omarchy_install() {
+  # Update localdb so that locate will find everything installed
+  sudo updatedb
+}
+
+omarchy_verify() {
+  [[ -f /var/lib/mlocate/mlocate.db ]] || [[ -f /var/lib/plocate/plocate.db ]] || add_error "Locate database missing"
+
+  command -v locate >/dev/null 2>&1 || add_error "Locate command not available"
+}

install/config/mimetypes.sh

@@ -1,35 +1,48 @@
-omarchy-refresh-applications
-update-desktop-database ~/.local/share/applications
+OMARCHY_DESCRIPTION="Mimetypes"
 
-# Open all images with imv
-xdg-mime default imv.desktop image/png
-xdg-mime default imv.desktop image/jpeg
-xdg-mime default imv.desktop image/gif
-xdg-mime default imv.desktop image/webp
-xdg-mime default imv.desktop image/bmp
-xdg-mime default imv.desktop image/tiff
+omarchy_install() {
+  omarchy-refresh-applications
+  update-desktop-database ~/.local/share/applications
 
-# Open PDFs with the Document Viewer
-xdg-mime default org.gnome.Evince.desktop application/pdf
+  # Open all images with imv
+  xdg-mime default imv.desktop image/png
+  xdg-mime default imv.desktop image/jpeg
+  xdg-mime default imv.desktop image/gif
+  xdg-mime default imv.desktop image/webp
+  xdg-mime default imv.desktop image/bmp
+  xdg-mime default imv.desktop image/tiff
 
-# Use Chromium as the default browser
-xdg-settings set default-web-browser chromium.desktop
-xdg-mime default chromium.desktop x-scheme-handler/http
-xdg-mime default chromium.desktop x-scheme-handler/https
+  # Open PDFs with the Document Viewer
+  xdg-mime default org.gnome.Evince.desktop application/pdf
 
-# Open video files with mpv
-xdg-mime default mpv.desktop video/mp4
-xdg-mime default mpv.desktop video/x-msvideo
-xdg-mime default mpv.desktop video/x-matroska
-xdg-mime default mpv.desktop video/x-flv
-xdg-mime default mpv.desktop video/x-ms-wmv
-xdg-mime default mpv.desktop video/mpeg
-xdg-mime default mpv.desktop video/ogg
-xdg-mime default mpv.desktop video/webm
-xdg-mime default mpv.desktop video/quicktime
-xdg-mime default mpv.desktop video/3gpp
-xdg-mime default mpv.desktop video/3gpp2
-xdg-mime default mpv.desktop video/x-ms-asf
-xdg-mime default mpv.desktop video/x-ogm+ogg
-xdg-mime default mpv.desktop video/x-theora+ogg
-xdg-mime default mpv.desktop application/ogg
+  # Use Chromium as the default browser
+  xdg-settings set default-web-browser chromium.desktop
+  xdg-mime default chromium.desktop x-scheme-handler/http
+  xdg-mime default chromium.desktop x-scheme-handler/https
+
+  # Open video files with mpv
+  xdg-mime default mpv.desktop video/mp4
+  xdg-mime default mpv.desktop video/x-msvideo
+  xdg-mime default mpv.desktop video/x-matroska
+  xdg-mime default mpv.desktop video/x-flv
+  xdg-mime default mpv.desktop video/x-ms-wmv
+  xdg-mime default mpv.desktop video/mpeg
+  xdg-mime default mpv.desktop video/ogg
+  xdg-mime default mpv.desktop video/webm
+  xdg-mime default mpv.desktop video/quicktime
+  xdg-mime default mpv.desktop video/3gpp
+  xdg-mime default mpv.desktop video/3gpp2
+  xdg-mime default mpv.desktop video/x-ms-asf
+  xdg-mime default mpv.desktop video/x-ogm+ogg
+  xdg-mime default mpv.desktop video/x-theora+ogg
+  xdg-mime default mpv.desktop application/ogg
+}
+
+omarchy_verify() {
+  [[ -d ~/.local/share/applications ]] || add_error "Applications directory missing"
+
+  xdg-mime query default image/png | grep -q "imv.desktop" || add_error "Image viewer not set for PNG"
+  xdg-mime query default application/pdf | grep -q "Evince.desktop" || add_error "PDF viewer not set"
+  xdg-mime query default x-scheme-handler/http | grep -q "chromium.desktop" || add_warning "Browser not set to Chromium"
+  xdg-mime query default video/mp4 | grep -q "mpv.desktop" || add_error "Video player not set for MP4"
+}

install/config/mise-ruby.sh

@@ -1,26 +0,0 @@
-# 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 [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
-    echo "Downloading pre-built Ruby $RUBY_VERSION..."
-    curl -fsSL "$RUBY_URL" | tar -xz -C "$MISE_RUBY_DIR"
-  else
-    echo "Installing Ruby from offline cache..."
-    tar -xzf "$OFFLINE_CACHE/$RUBY_TARBALL" -C "$MISE_RUBY_DIR"
-  fi
-
-  mise use --global "ruby@${RUBY_VERSION}"
-fi

install/config/mise-work.sh

@@ -1,9 +1,23 @@
-# Add ./bin to path for all items in ~/Work
-mkdir -p "$HOME/Work"
+OMARCHY_DESCRIPTION="Mise"
 
-cat >"$HOME/Work/.mise.toml" <<'EOF'
+omarchy_install() {
+  # Add ./bin to path for all items in ~/Work
+  mkdir -p "$HOME/Work"
+
+  cat >"$HOME/Work/.mise.toml" <<'EOF'
 [env]
 _.path = "{{ cwd }}/bin"
 EOF
 
-mise trust ~/Work/.mise.toml
+  mise trust ~/Work/.mise.toml
+}
+
+omarchy_verify() {
+  [[ -d "$HOME/Work" ]] || add_error "Work directory missing"
+
+  [[ -f "$HOME/Work/.mise.toml" ]] || add_error "Mise config missing in Work directory"
+
+  if [[ -f "$HOME/Work/.mise.toml" ]]; then
+    grep -q '_.path' "$HOME/Work/.mise.toml" || add_error "Mise path configuration missing"
+  fi
+}

install/config/ssh-flakiness.sh

@@ -1,2 +1,14 @@
-# Solve common flakiness with SSH
-echo "net.ipv4.tcp_mtu_probing=1" | sudo tee -a /etc/sysctl.d/99-sysctl.conf
+OMARCHY_DESCRIPTION="SSH Flakiness Fix"
+
+omarchy_install() {
+  # Solve common flakiness with SSH
+  echo "net.ipv4.tcp_mtu_probing=1" | sudo tee -a /etc/sysctl.d/99-sysctl.conf
+}
+
+omarchy_verify() {
+  [[ -f /etc/sysctl.d/99-sysctl.conf ]] || add_error "Sysctl config file missing"
+
+  if [[ -f /etc/sysctl.d/99-sysctl.conf ]]; then
+    grep -q "net.ipv4.tcp_mtu_probing=1" /etc/sysctl.d/99-sysctl.conf || add_error "TCP MTU probing not configured"
+  fi
+}

install/config/sudoless-asdcontrol.sh

@@ -1,3 +1,18 @@
-# Setup sudo-less controls for controlling brightness on Apple Displays
-echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
-sudo chmod 440 /etc/sudoers.d/asdcontrol
+OMARCHY_DESCRIPTION="ASDControl Sudoless Brightness Control"
+
+omarchy_install() {
+  # Setup sudo-less controls for controlling brightness on Apple Displays
+  echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
+  sudo chmod 440 /etc/sudoers.d/asdcontrol
+}
+
+omarchy_verify() {
+  sudo test -f /etc/sudoers.d/asdcontrol || add_error "ASDControl sudoers file missing"
+
+  if sudo test -f /etc/sudoers.d/asdcontrol; then
+    local perms=$(sudo stat -c %a /etc/sudoers.d/asdcontrol)
+    [[ "$perms" == "440" ]] || add_error "Sudoers file has incorrect permissions: $perms (should be 440)"
+
+    sudo grep -q "NOPASSWD: /usr/local/bin/asdcontrol" /etc/sudoers.d/asdcontrol || add_error "ASDControl sudoers rule not configured"
+  fi
+}

install/config/theme.sh

@@ -1,28 +1,52 @@
-# Set links for Nautilius action icons
-sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-previous-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg
-sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-next-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg
+OMARCHY_DESCRIPTION="Theme"
 
-# Setup theme links
-mkdir -p ~/.config/omarchy/themes
-for f in ~/.local/share/omarchy/themes/*; do ln -nfs "$f" ~/.config/omarchy/themes/; done
+omarchy_install() {
+  # Set links for Nautilius action icons
+  sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-previous-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg
+  sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-next-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg
 
-# Set initial theme
-mkdir -p ~/.config/omarchy/current
-ln -snf ~/.config/omarchy/themes/tokyo-night ~/.config/omarchy/current/theme
-ln -snf ~/.config/omarchy/current/theme/backgrounds/1-scenery-pink-lakeside-sunset-lake-landscape-scenic-panorama-7680x3215-144.png ~/.config/omarchy/current/background
+  # Setup theme links
+  mkdir -p ~/.config/omarchy/themes
+  for f in ~/.local/share/omarchy/themes/*; do ln -nfs "$f" ~/.config/omarchy/themes/; done
 
-# Set specific app links for current theme
-ln -snf ~/.config/omarchy/current/theme/neovim.lua ~/.config/nvim/lua/plugins/theme.lua
+  # Set initial theme
+  mkdir -p ~/.config/omarchy/current
+  ln -snf ~/.config/omarchy/themes/tokyo-night ~/.config/omarchy/current/theme
+  ln -snf ~/.config/omarchy/current/theme/backgrounds/1-scenery-pink-lakeside-sunset-lake-landscape-scenic-panorama-7680x3215-144.png ~/.config/omarchy/current/background
 
-mkdir -p ~/.config/btop/themes
-ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme
+  # Set specific app links for current theme
+  ln -snf ~/.config/omarchy/current/theme/neovim.lua ~/.config/nvim/lua/plugins/theme.lua
 
-mkdir -p ~/.config/mako
-ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config
+  mkdir -p ~/.config/btop/themes
+  ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme
 
-# 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
+  mkdir -p ~/.config/mako
+  ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config
 
-sudo mkdir -p /etc/brave/policies/managed
-sudo chmod a+rw /etc/brave/policies/managed
+  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
+}
+
+omarchy_verify() {
+  [[ -d ~/.config/omarchy/themes ]] || add_error "Theme directory missing: ~/.config/omarchy/themes"
+  [[ -L ~/.config/omarchy/current/theme ]] || add_error "Current theme symlink missing"
+  [[ -L ~/.config/omarchy/current/background ]] || add_error "Background symlink missing"
+
+  [[ -L /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg ]] || add_error "Nautilus previous icon not linked"
+  [[ -L /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg ]] || add_error "Nautilus next icon not linked"
+
+  [[ -L ~/.config/nvim/lua/plugins/theme.lua ]] || add_error "Neovim theme link missing"
+  [[ -L ~/.config/btop/themes/current.theme ]] || add_error "btop theme link missing"
+  [[ -L ~/.config/mako/config ]] || add_error "mako config link missing"
+  [[ -L ~/.config/eza/theme.yml ]] || add_error "eza theme link missing"
+
+  [[ -d /etc/chromium/policies/managed ]] || add_error "Chromium policy directory missing"
+  [[ -d /etc/brave/policies/managed ]] || add_error "Brave policy directory missing"
+}

install/config/timezones.sh

@@ -1,5 +1,20 @@
-# Ensure timezone can be updated without needing to sudo
-sudo tee /etc/sudoers.d/omarchy-tzupdate >/dev/null <<EOF
+OMARCHY_DESCRIPTION="Timezone Update Permissions"
+
+omarchy_install() {
+  # Ensure timezone can be updated without needing to sudo
+  sudo tee /etc/sudoers.d/omarchy-tzupdate >/dev/null <<EOF
 %wheel ALL=(root) NOPASSWD: /usr/bin/tzupdate, /usr/bin/timedatectl
 EOF
-sudo chmod 0440 /etc/sudoers.d/omarchy-tzupdate
+  sudo chmod 0440 /etc/sudoers.d/omarchy-tzupdate
+}
+
+omarchy_verify() {
+  sudo test -f /etc/sudoers.d/omarchy-tzupdate || add_error "Timezone sudoers file missing"
+
+  if sudo test -f /etc/sudoers.d/omarchy-tzupdate; then
+    local perms=$(sudo stat -c %a /etc/sudoers.d/omarchy-tzupdate)
+    [[ "$perms" == "440" ]] || add_error "Sudoers file has incorrect permissions: $perms (should be 440)"
+
+    sudo grep -q "NOPASSWD: /usr/bin/tzupdate, /usr/bin/timedatectl" /etc/sudoers.d/omarchy-tzupdate || add_error "Timezone sudoers rule not configured"
+  fi
+}

install/config/xcompose.sh

@@ -1,8 +1,20 @@
-# Set default XCompose that is triggered with CapsLock
-tee ~/.XCompose >/dev/null <<EOF
+OMARCHY_DESCRIPTION="XCompose"
+
+omarchy_install() {
+  # Set default XCompose that is triggered with CapsLock
+  tee ~/.XCompose >/dev/null <<EOF
 include "%H/.local/share/omarchy/default/xcompose"
 
 # Identification
 <Multi_key> <space> <n> : "$OMARCHY_USER_NAME"
 <Multi_key> <space> <e> : "$OMARCHY_USER_EMAIL"
 EOF
+}
+
+omarchy_verify() {
+  [[ -f ~/.XCompose ]] || add_error "XCompose file missing"
+
+  if [[ -f ~/.XCompose ]]; then
+    grep -q "include.*xcompose" ~/.XCompose || add_error "XCompose include directive missing"
+  fi
+}