Revert "Quick fix for lazyvim bufferline error when using catppuccin (#1084)"

This reverts commit b6896bd58f.

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,23 +0,0 @@
-name: Bug
-description: Report a problem
-labels: [bug]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Remember: Omarchy is an open source gift, not a product you bought from a vendor
-
-  - type: input
-    id: system-details
-    attributes:
-      label: System details
-      placeholder: e.g. AMD 9950X, NVIDIA 5090, Omarchy 2.1.0
-    validations:
-      required: true
-
-  - type: textarea
-    id: steps
-    attributes:
-      label: What's wrong?
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/ISSUE_TEMPLATE/documentation.yml

@@ -1,15 +0,0 @@
-name: Documentation
-description: New pages or changes to existing
-labels: [documentation]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Remember: Omarchy is an open source gift, not a product you bought from a vendor
-
-  - type: textarea
-    id: steps
-    attributes:
-      label: What correction or addition do we need?
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,15 +0,0 @@
-name: Enhancement
-description: Feature or change
-labels: [enhancement]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Remember: Omarchy is an open source gift, not a product you bought from a vendor
-
-  - type: textarea
-    id: steps
-    attributes:
-      label: What do you need?
-    validations:
-      required: true

bin/omarchy-cmd-audio-switch

@@ -1,50 +1,19 @@
 #!/bin/bash
 
-focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
+# Find all the audio sinks but exit if there are none
+sinks=($(wpctl status | sed -n '/Sinks:/,/Sources:/p' | grep -E '^\s*│\s+\*?\s*[0-9]+\.' | sed -E 's/^[^0-9]*([0-9]+)\..*/\1/'))
+[ ${#sinks[@]} -eq 0 ] && exit 1
 
-sinks=$(pactl -f json list sinks)
-sinks_count=$(echo "$sinks" | jq '. | length')
+# Find current audio sink
+current=$(wpctl status | sed -n '/Sinks:/,/Sources:/p' | grep '^\s*│\s*\*' | sed -E 's/^[^0-9]*([0-9]+)\..*/\1/')
 
-if [ "$sinks_count" -eq 0 ]; then
-  swayosd-client \
-    --monitor "$focused_monitor" \
-    --custom-message "No audio devices found"
-  exit 1
-fi
+# Find the next sink (looping around in the list)
+for i in "${!sinks[@]}"; do
+  [ "${sinks[$i]}" = "$current" ] && next=${sinks[$(((i + 1) % ${#sinks[@]}))]}
+done
+next=${next:-${sinks[0]}}
 
-current_sink_name=$(pactl get-default-sink)
-current_sink_index=$(echo "$sinks" | jq -r --arg name "$current_sink_name" 'map(.name) | index($name)')
+# Set the next sink and ensure it's not muted
+wpctl set-default "$next"
+wpctl set-mute "$next" 0
 
-if [ "$current_sink_index" != "null" ]; then
-  next_sink_index=$(((current_sink_index + 1) % sinks_count))
-else
-  next_sink_index=0
-fi
-
-next_sink=$(echo "$sinks" | jq -r ".[$next_sink_index]")
-next_sink_name=$(echo "$next_sink" | jq -r '.name')
-next_sink_description=$(echo "$next_sink" | jq -r '.description')
-next_sink_volume=$(echo "$next_sink" | jq -r \
-  '.volume | to_entries[0].value.value_percent | sub("%"; "")')
-next_sink_is_muted=$(echo "$next_sink" | jq -r '.mute')
-
-if [ "$next_sink_is_muted" = "true" ] || [ "$next_sink_volume" -eq 0 ]; then
-  icon_state="muted"
-elif [ "$next_sink_volume" -le 33 ]; then
-  icon_state="low"
-elif [ "$next_sink_volume" -le 66 ]; then
-  icon_state="medium"
-else
-  icon_state="high"
-fi
-
-next_sink_volume_icon="sink-volume-${icon_state}-symbolic"
-
-if [ "$next_sink_name" != "$current_sink_name" ]; then
-  pactl set-default-sink "$next_sink_name"
-fi
-
-swayosd-client \
-  --monitor "$focused_monitor" \
-  --custom-message "$next_sink_description" \
-  --custom-icon "$next_sink_volume_icon"

bin/omarchy-cmd-screenrecord

@@ -8,21 +8,15 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-if [[ $2 == "audio" ]]; then
-  AUDIO="--audio"
-else
-  AUDIO=""
-fi
-
 screenrecording() {
   filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
   notify-send "Screen recording starting..." -t 1000
   sleep 1
 
   if lspci | grep -Eqi 'nvidia|intel.*graphics'; then
-    wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@"
+    wf-recorder -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" "$@"
+    wl-screenrec -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@"
   fi
 }
 

bin/omarchy-cmd-screensaver

@@ -15,7 +15,7 @@ while true; do
     "$effect" &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 3; then
+    if read -n 1 -t 2; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-screenshot

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

bin/omarchy-cmd-terminal-cwd

@@ -5,7 +5,7 @@ terminal_pid=$(hyprctl activewindow | awk '/pid:/ {print $2}')
 shell_pid=$(pgrep -P "$terminal_pid" | head -n1)
 
 if [[ -n $shell_pid ]]; then
-  readlink -f "/proc/$shell_pid/cwd" 2>/dev/null || echo "$HOME"
+  readlink -f "/proc/$shell_pid/cwd" 2>/dev/null
 else
   echo "$HOME"
 fi

bin/omarchy-drive-info

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# Drive, like /dev/nvme0, to display information about
-if (($# == 0)); then
-  echo "Usage: omarchy-drive-info [/dev/drive]"
-  exit 1
-else
-  drive="$1"
-fi
-
-# Find the root drive in case we are looking at partitions
-root_drive=$(lsblk -no PKNAME "$drive" 2>/dev/null | tail -n1)
-if [[ -n "$root_drive" ]]; then
-  root_drive="/dev/$root_drive"
-else
-  root_drive="$drive"
-fi
-
-# Get basic disk information
-size=$(lsblk -dno SIZE "$drive" 2>/dev/null)
-model=$(lsblk -dno MODEL "$root_drive" 2>/dev/null)
-
-# Format display string
-display="$drive"
-[[ -n "$size" ]] && display="$display ($size)"
-[[ -n "$model" ]] && display="$display - $model"
-
-echo "$display"

bin/omarchy-drive-select

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# Select a drive from a list with info that includes space and brand
-
-if (($# == 0)); then
-  drives=$(lsblk -dpno NAME | grep -E '/dev/(sd|hd|vd|nvme|mmcblk|xv)')
-else
-  drives="$@"
-fi
-
-drives_with_info=""
-while IFS= read -r drive; do
-  [[ -n "$drive" ]] || continue
-  drives_with_info+="$(omarchy-drive-info "$drive")"$'\n'
-done <<<"$drives"
-
-selected_drive="$(printf "%s" "$drives_with_info" | gum choose --header "Select drive")" || exit 1
-printf "%s\n" "$selected_drive" | awk '{print $1}'

bin/omarchy-drive-set-password

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-encrypted_drives=$(blkid -t TYPE=crypto_LUKS -o device)
-
-if [[ -n $encrypted_drives ]]; then
-  if [[ $(wc -l <<<"$encrypted_drives") -eq 1 ]]; then
-    drive_to_change="$encrypted_drives"
-  else
-    drive_to_change="$(omarchy-drive-select "$encrypted_drives")"
-  fi
-
-  if [[ -n $drive_to_change ]]; then
-    echo "Changing full-disk encryption password for $drive_to_change"
-    sudo cryptsetup luksChangeKey --pbkdf argon2id --iter-time 2000 "$drive_to_change"
-  else
-    echo "No drive selected."
-  fi
-else
-  echo "No encrypted drives available."
-  exit 1
-fi

bin/omarchy-install-dev-env

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 if [[ -z "$1" ]]; then
-  echo "Usage: omarchy-install-dev-env <ruby|node|bun|go|laravel|symfony|php|python|elixir|phoenix|rust|java|ocaml|dotnet|clojure>" >&2
+  echo "Usage: omarchy-install-dev-env <ruby|node|bun|go|laravel|symfony|php|python|elixir|phoenix|rust|java|ocaml|dotnet>" >&2
   exit 1
 fi
 
 install_php() {
-  sudo pacman -S php composer php-sqlite xdebug --noconfirm
+  sudo pacman -S php composer php-sqlite --noconfirm
 
   # Install Path for Composer
   if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then
@@ -28,12 +28,6 @@ install_php() {
     "pdo_mysql"
   )
 
-  # Enable Xdebug
-  sudo sed -i \
-    -e 's/^;zend_extension=xdebug.so/zend_extension=xdebug.so/' \
-    -e 's/^;xdebug.mode=debug/xdebug.mode=debug/' \
-    /etc/php/conf.d/xdebug.ini
-
   for ext in "${extensions_to_enable[@]}"; do
     sudo sed -i "s/^;extension=${ext}/extension=${ext}/" "$php_ini_path"
   done
@@ -81,7 +75,7 @@ laravel)
 symfony)
   echo -e "Installing PHP and Symfony...\n"
   install_php
-  omarchy-pkg-add symfony-cli
+  yay -S symfony-cli --noconfirm
   echo -e "\nYou can now run: symfony new --webapp myproject"
   ;;
 python)
@@ -131,9 +125,4 @@ dotnet)
   echo -e "Installing .NET...\n"
   mise use --global dotnet@latest
   ;;
-clojure)
-  echo -e "Installing Clojure...\n"
-  omarchy-pkg-add rlwrap
-  mise use --global clojure@latest
-  ;;
 esac

bin/omarchy-install-docker-dbs

@@ -1,18 +1,13 @@
 #!/bin/bash
 
 options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB")
-
-if [[ "$#" -eq 0 ]]; then
-  choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
-else
-  choices="$@"
-fi
+choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
 
 if [[ -n "$choices" ]]; then
   for db in $choices; do
     case $db in
     MySQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8.4 ;;
-    PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres17 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:17 ;;
+    PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres16 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:16 ;;
     MariaDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mariadb11 -e MARIADB_ROOT_PASSWORD= -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true mariadb:11.8 ;;
     Redis) sudo docker run -d --restart unless-stopped -p "127.0.0.1:6379:6379" --name=redis redis:7 ;;
     MongoDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:27017:27017" --name mongodb -e MONGO_INITDB_ROOT_USERNAME=admin -e MONGO_INITDB_ROOT_PASSWORD=admin123 mongo:noble ;;

bin/omarchy-install-dropbox

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-echo "Installing all dependencies..."
-omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
+# FIXME: Should not use AUR dependencies when we can avoid it
+echo "Installing all dependencies [from AUR]..."
+yay -S --noconfirm --needed \
+  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 
 echo "Starting Dropbox..."
 uwsm app -- dropbox-cli start &>/dev/null &

bin/omarchy-install-steam

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "Adding multilib repository for 32-bit compatibility"
-sudo sed -i '/^#\s*\[multilib\]/,/^#\s*Include/ s/^#\s*//' /etc/pacman.conf
+sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
 
 echo "Now pick dependencies matching your graphics card"
 sudo pacman -Syu --noconfirm steam

bin/omarchy-menu

@@ -2,21 +2,6 @@
 
 export PATH="$HOME/.local/share/omarchy/bin:$PATH"
 
-# Set to true when going directly to a submenu, so we can exit directly
-BACK_TO_EXIT=false
-
-back_to() {
-  local parent_menu="$1"
-
-  if [[ "$DIRECT_ACCESS" == "true" ]]; then
-    exit 0
-  elif [[ -n "$parent_menu" ]]; then
-    "$parent_menu"
-  else
-    show_main_menu
-  fi
-}
-
 menu() {
   local prompt="$1"
   local options="$2"
@@ -95,7 +80,7 @@ show_style_menu() {
 show_theme_menu() {
   theme=$(menu "Theme" "$(omarchy-theme-list)" "" "$(omarchy-theme-current)")
   if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    back_to show_style_menu
+    show_main_menu
   else
     omarchy-theme-set "$theme"
   fi
@@ -104,7 +89,7 @@ show_theme_menu() {
 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
+    show_main_menu
   else
     omarchy-font-set "$theme"
   fi
@@ -129,10 +114,8 @@ show_screenshot_menu() {
 }
 
 show_screenrecord_menu() {
-  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio") in
-  *"Region + Audio"*) omarchy-cmd-screenrecord region audio ;;
+  case $(menu "Screenrecord" "  Region\n  Display") in
   *Region*) omarchy-cmd-screenrecord ;;
-  *"Display + Audio"*) omarchy-cmd-screenrecord output audio ;;
   *Display*) omarchy-cmd-screenrecord output ;;
   *) show_capture_menu ;;
   esac
@@ -180,7 +163,7 @@ show_setup_power_menu() {
   profile=$(menu "Power Profile" "$(omarchy-powerprofiles-list)" "" "$(powerprofilesctl get)")
 
   if [[ "$profile" == "CNCLD" || -z "$profile" ]]; then
-    back_to show_setup_menu
+    show_main_menu
   else
     powerprofilesctl set "$profile"
   fi
@@ -217,20 +200,19 @@ show_install_menu() {
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden") in
+  case $(menu "Install" "  Dropbox\n  Tailscale") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
-  *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
+  case $(menu "Install" "  VSCode\n  Cursor [AUR]\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
   *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
-  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
+  *Cursor*) aur_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" ;;
+  *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) install "Helix" "helix" ;;
   *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
   *) show_install_menu ;;
@@ -244,14 +226,14 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini [AUR]\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
-  *Claude*) install "Claude Code" "claude-code" ;;
+  case $(menu "Install" "󱚤  Claude Code [AUR]\n󱚤  Gemini\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
+  *Claude*) aur_install "Claude Code" "claude-code" ;;
   *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
-  *Gemini*) aur_install "Gemini" "gemini-cli" ;;
-  *Studio*) install "LM Studio" "lmstudio" ;;
+  *Gemini*) install "Gemini" "gemini-cli" ;;
+  *Studio*) aur_install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
-  *Crush*) install "Crush" "crush-bin" ;;
-  *opencode*) install "opencode" "opencode" ;;
+  *Crush*) aur_install "Crush" "crush-bin" ;;
+  *opencode*) aur_install "opencode" "opencode-bin" ;;
   *) show_install_menu ;;
   esac
 }
@@ -260,7 +242,7 @@ show_install_gaming_menu() {
   case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
   *Steam*) present_terminal omarchy-install-steam ;;
   *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
-  *Minecraft*) aur_install_and_launch "Minecraft [AUR]" "minecraft-launcher" "minecraft-launcher" ;;
+  *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
   *) show_install_menu ;;
   esac
 }
@@ -285,7 +267,7 @@ show_install_font_menu() {
 }
 
 show_install_development_menu() {
-  case $(menu "Install" "󰫏  Ruby on Rails\n  Docker DB\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure") in
+  case $(menu "Install" "󰫏  Ruby on Rails\n  Docker DB\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml") in
   *Rails*) present_terminal "omarchy-install-dev-env ruby" ;;
   *Docker*) present_terminal omarchy-install-docker-dbs ;;
   *JavaScript*) show_install_javascript_menu ;;
@@ -298,7 +280,6 @@ show_install_development_menu() {
   *Java*) present_terminal "omarchy-install-dev-env java" ;;
   *NET*) present_terminal "omarchy-install-dev-env dotnet" ;;
   *OCaml*) present_terminal "omarchy-install-dev-env ocaml" ;;
-  *Clojure*) present_terminal "omarchy-install-dev-env clojure" ;;
   *) show_install_menu ;;
   esac
 }
@@ -342,14 +323,12 @@ 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  Config\n󰸌  Themes\n  Process\n  Timezone") in
   *Omarchy*) present_terminal omarchy-update ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
-  *Hardware*) show_update_hardware_menu ;;
   *Timezone*) omarchy-cmd-tzupdate ;;
-  *Password*) show_update_password_menu ;;
   *) show_main_menu ;;
   esac
 }
@@ -361,7 +340,7 @@ show_update_process_menu() {
   *Swayosd*) omarchy-restart-swayosd ;;
   *Walker*) omarchy-restart-walker ;;
   *Waybar*) omarchy-restart-waybar ;;
-  *) show_update_menu ;;
+  *) show_main_menu ;;
   esac
 }
 
@@ -375,23 +354,7 @@ show_update_config_menu() {
   *Swayosd*) present_terminal omarchy-refresh-swayosd ;;
   *Walker*) present_terminal omarchy-refresh-walker ;;
   *Waybar*) present_terminal omarchy-refresh-waybar ;;
-  *) show_update_menu ;;
-  esac
-}
-
-show_update_hardware_menu() {
-  case $(menu "Restart" "󱚾  Wi-Fi\n󰂯  Bluetooth") in
-  *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
-  *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
-  *) show_update_menu ;;
-  esac
-}
-
-show_update_password_menu() {
-  case $(menu "Update Password" "  Drive Encryption\n  User") in
-  *Drive*) present_terminal omarchy-drive-set-password ;;
-  *User*) present_terminal passwd ;;
-  *) show_update_menu ;;
+  *) show_main_menu ;;
   esac
 }
 
@@ -403,7 +366,7 @@ show_system_menu() {
   *Relaunch*) uwsm stop ;;
   *Restart*) systemctl reboot ;;
   *Shutdown*) systemctl poweroff ;;
-  *) back_to show_main_menu ;;
+  *) show_main_menu ;;
   esac
 }
 
@@ -432,7 +395,6 @@ go_to_menu() {
 }
 
 if [[ -n "$1" ]]; then
-  BACK_TO_EXIT=true
   go_to_menu "$1"
 else
   show_main_menu

bin/omarchy-menu-keybindings

@@ -83,11 +83,7 @@ parse_bindings() {
 }'
 }
 
-monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
-menu_height=$((monitor_height * 40 / 100))
-
 dynamic_bindings | \
   sort -u | \
   parse_bindings | \
-  walker --dmenu --theme keybindings -p 'Keybindings' -w 800 -h "$menu_height"
-
+  walker --dmenu --theme keybindings -p 'Keybindings'

bin/omarchy-pkg-add

@@ -1,9 +1,7 @@
 #!/bin/bash
 
 for pkg in "$@"; do
-  if ! pacman -Q "$pkg" &>/dev/null; then
-    sudo pacman -S --noconfirm "$pkg" || exit 1
-  fi
+  pacman -Q "$pkg" &>/dev/null
 done
 
 exit 0

bin/omarchy-pkg-aur-install

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 fzf_args=(
   --multi
   --preview 'yay -Sii {1}'

bin/omarchy-pkg-install

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 fzf_args=(
   --multi
   --preview 'pacman -Sii {1}'
@@ -17,5 +19,6 @@ pkg_names=$(pacman -Slq | fzf "${fzf_args[@]}")
 if [[ -n "$pkg_names" ]]; then
   # Convert newline-separated selections to space-separated for yay
   echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -S --noconfirm
+  sudo updatedb
   omarchy-show-done
 fi

bin/omarchy-pkg-remove

@@ -17,5 +17,6 @@ pkg_names=$(yay -Qqe | fzf "${fzf_args[@]}")
 if [[ -n "$pkg_names" ]]; then
   # Convert newline-separated selections to space-separated for yay
   echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Rns --noconfirm
+  sudo updatedb
   omarchy-show-done
 fi

bin/omarchy-refresh-pacman-mirrorlist

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

bin/omarchy-restart-bluetooth

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-rfkill unblock bluetooth
-rfkill list bluetooth

bin/omarchy-restart-wifi

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-rfkill unblock wifi
-rfkill list wifi

bin/omarchy-setup-dns

@@ -37,6 +37,8 @@ EOF
 DHCP)
   sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
 [Resolve]
+DNS=
+FallbackDNS=
 DNSOverTLS=no
 EOF
   

bin/omarchy-update-system-pkgs

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

config/hypr/bindings.conf

@@ -2,7 +2,7 @@
 $terminal = uwsm app -- alacritty
 $browser = omarchy-launch-browser
 
-bindd = SUPER, return, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
+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, M, Music, exec, uwsm app -- spotify

config/hypr/input.conf

@@ -9,9 +9,6 @@ input {
   repeat_rate = 40
   repeat_delay = 600
 
-  # Start with numlock on by default
-  numlock_by_default = true
-
   # Increase sensitity for mouse/trackpack (default: 0)
   # sensitivity = 0.35
 

config/waybar/config.jsonc

@@ -57,8 +57,8 @@
     "on-click": "alacritty -e btop"
   },
   "clock": {
-    "format": "{:L%A %H:%M}",
-    "format-alt": "{:L%d %B W%V %Y}",
+    "format": "{:%A %H:%M}",
+    "format-alt": "{:%d %B W%V %Y}",
     "tooltip": false,
     "on-click-right": "omarchy-cmd-tzupdate"
   },

default/hypr/apps.conf

@@ -1,12 +1,10 @@
 # App-specific tweaks
-source = ~/.local/share/omarchy/default/hypr/apps/1password.conf
-source = ~/.local/share/omarchy/default/hypr/apps/bitwarden.conf
+source = ~/.local/share/omarchy/default/hypr/apps/pip.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/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/walker.conf
+source = ~/.local/share/omarchy/default/hypr/apps/1password.conf
+source = ~/.local/share/omarchy/default/hypr/apps/jetbrains.conf

default/hypr/apps/bitwarden.conf

@@ -1 +0,0 @@
-windowrule = noscreenshare, class:^(Bitwarden)$

default/hypr/apps/browser.conf

@@ -1,6 +1,6 @@
 # Browser types
 windowrule = tag +chromium-based-browser, class:([cC]hrom(e|ium)|[bB]rave-browser|Microsoft-edge|Vivaldi-stable)
-windowrule = tag +firefox-based-browser, class:([fF]irefox|zen|librewolf)
+windowrule = tag +firefox-based-browser, class:(Firefox|zen|librewolf)
 
 # Force chromium-based browsers into a tile to deal with --app bug
 windowrule = tile, tag:chromium-based-browser
@@ -10,4 +10,4 @@ windowrule = opacity 1 0.97, tag:chromium-based-browser
 windowrule = opacity 1 0.97, tag:firefox-based-browser
 
 # Some video sites should never have opacity applied to them
-windowrule = opacity 1.0 1.0, initialTitle:((?i)(?:[a-z0-9-]+\.)*youtube\.com_/|app\.zoom\.us_/wc/home)
+windowrule = opacity 1.0 1.0, initialTitle:(youtube\.com_/|app\.zoom\.us_/wc/home)

default/hypr/apps/qemu.conf

@@ -1 +0,0 @@
-windowrule = opacity 1 1, class:qemu

default/hypr/apps/retroarch.conf

@@ -1,4 +1,3 @@
 windowrule = fullscreen, class:com.libretro.RetroArch
 windowrule = opacity 1 1, class:com.libretro.RetroArch
-windowrule = idleinhibit fullscreen, class:com.libretro.RetroArch
 

default/hypr/apps/steam.conf

@@ -4,4 +4,3 @@ windowrule = center, class:steam, title:Steam
 windowrule = opacity 1 1, class:steam
 windowrule = size 1100 700, class:steam, title:Steam
 windowrule = size 460 800, class:steam, title:Friends List
-windowrule = idleinhibit fullscreen, class:steam

default/hypr/bindings/utilities.conf

@@ -7,7 +7,7 @@ bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system
 bindd = SUPER, K, Show key bindings, exec, omarchy-menu-keybindings
 
 # Aesthetics
-bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, omarchy-toggle-waybar
+bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, pkill -SIGUSR1 waybar
 bindd = SUPER CTRL, SPACE, Next background in theme, exec, omarchy-theme-bg-next
 bindd = SUPER SHIFT CTRL, SPACE, Pick new theme, exec, omarchy-menu theme
 
@@ -33,10 +33,8 @@ bindd = SHIFT, PRINT, Screenshot of window, exec, omarchy-cmd-screenshot window
 bindd = CTRL, PRINT, Screenshot of display, exec, omarchy-cmd-screenshot output
 
 # Screen recordings
-bindd = ALT, PRINT, Screen record a region, exec, omarchy-cmd-screenrecord region
-bindd = ALT SHIFT, PRINT, Screen record a region with audio, exec, omarchy-cmd-screenrecord region audio
+bindd = ALT, PRINT, Screen record a region, exec, omarchy-cmd-screenrecord
 bindd = CTRL ALT, PRINT, Screen record display, exec, omarchy-cmd-screenrecord output
-bindd = CTRL ALT SHIFT, PRINT, Screen record display with audio, exec, omarchy-cmd-screenrecord output audio
 
 # Color picker
 bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a

default/hypr/envs.conf

@@ -10,11 +10,6 @@ env = SDL_VIDEODRIVER,wayland
 env = MOZ_ENABLE_WAYLAND,1
 env = ELECTRON_OZONE_PLATFORM_HINT,wayland
 env = OZONE_PLATFORM,wayland
-env = XDG_SESSION_TYPE,wayland
-
-# Allow better support for screen sharing (Google Meet, Discord, etc)
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_DESKTOP,Hyprland
 
 xwayland {
   force_zero_scaling = true

default/hypr/windows.conf

@@ -7,5 +7,8 @@ windowrule = opacity 0.97 0.9, class:.*
 # Fix some dragging issues with XWayland
 windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
 
+# Prevent screensaver/lock while running apps fullscreen
+windowrule = idleinhibit fullscreen, class:.*
+
 # App-specific tweaks
 source = ~/.local/share/omarchy/default/hypr/apps.conf

default/mako/core.ini

@@ -1,16 +0,0 @@
-anchor=top-right
-default-timeout=5000
-width=420
-height=110
-
-[app-name=Spotify]
-invisible=1
-
-[mode=do-not-disturb]
-invisible=true
-
-[mode=do-not-disturb app-name=notify-send]
-invisible=false
-
-[urgency=critical]
-default-timeout=0

default/pacman/mirrorlist

@@ -1,3 +0,0 @@
-Server = https://mirror.omarchy.org/$repo/os/$arch
-Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
-Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch

default/pacman/pacman.conf

@@ -1,30 +0,0 @@
-# See the pacman.conf(5) manpage for option and repository directives
-
-[options]
-Color
-ILoveCandy
-VerbosePkgLists
-HoldPkg = pacman glibc
-Architecture = auto
-CheckSpace
-ParallelDownloads = 5
-DownloadUser = alpm
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel = Required DatabaseOptional
-LocalFileSigLevel = Optional
-
-# pacman searches repositories in the order defined here
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# [multilib]
-# Include = /etc/pacman.d/mirrorlist
-
-[omarchy]
-SigLevel = Optional TrustAll
-Server = https://pkgs.omarchy.org/$arch

default/plymouth/omarchy.plymouth

@@ -7,5 +7,3 @@ ModuleName=script
 ImageDir=/usr/share/plymouth/themes/omarchy
 ScriptFile=/usr/share/plymouth/themes/omarchy/omarchy.script
 ConsoleLogBackgroundColor=0x1a1b26
-MonospaceFont=Cantarell 11
-Font=Cantarell 11

install.sh

@@ -3,21 +3,21 @@
 # Exit immediately if a command exits with a non-zero status
 set -eE
 
-OMARCHY_PATH="$HOME/.local/share/omarchy"
-OMARCHY_INSTALL="$OMARCHY_PATH/install"
-export PATH="$OMARCHY_PATH/bin:$PATH"
+export PATH="$HOME/.local/share/omarchy/bin:$PATH"
+OMARCHY_INSTALL=~/.local/share/omarchy/install
 
 # Preparation
 source $OMARCHY_INSTALL/preflight/show-env.sh
 source $OMARCHY_INSTALL/preflight/trap-errors.sh
 source $OMARCHY_INSTALL/preflight/guard.sh
 source $OMARCHY_INSTALL/preflight/chroot.sh
-source $OMARCHY_INSTALL/preflight/pacman.sh
+source $OMARCHY_INSTALL/preflight/repositories.sh
 source $OMARCHY_INSTALL/preflight/migrations.sh
 source $OMARCHY_INSTALL/preflight/first-run-mode.sh
 
 # Packaging
 source $OMARCHY_INSTALL/packages.sh
+source $OMARCHY_INSTALL/packaging/asdcontrol.sh
 source $OMARCHY_INSTALL/packaging/fonts.sh
 source $OMARCHY_INSTALL/packaging/lazyvim.sh
 source $OMARCHY_INSTALL/packaging/webapps.sh
@@ -39,22 +39,29 @@ source $OMARCHY_INSTALL/config/mise-ruby.sh
 source $OMARCHY_INSTALL/config/docker.sh
 source $OMARCHY_INSTALL/config/mimetypes.sh
 source $OMARCHY_INSTALL/config/localdb.sh
-source $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
 source $OMARCHY_INSTALL/config/hardware/network.sh
-source $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh
 source $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh
 source $OMARCHY_INSTALL/config/hardware/bluetooth.sh
 source $OMARCHY_INSTALL/config/hardware/printer.sh
 source $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh
 source $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
 source $OMARCHY_INSTALL/config/hardware/nvidia.sh
-source $OMARCHY_INSTALL/config/hardware/intel.sh
-source $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
 
 # Login
 source $OMARCHY_INSTALL/login/plymouth.sh
 source $OMARCHY_INSTALL/login/limine-snapper.sh
 source $OMARCHY_INSTALL/login/alt-bootloaders.sh
 
-# Finishing
-source $OMARCHY_INSTALL/reboot.sh
+# Reboot
+clear
+tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
+echo
+echo "You're done! So we're ready to reboot now..." | tte --frame-rate 640 wipe
+
+if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
+  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
+  echo -e "\nRemember to remove USB installer!\n\n"
+fi
+
+sleep 5
+reboot

install/config/git.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# Ensure git settings live under ~/.config
-mkdir -p ~/.config/git
-touch ~/.config/git/config
-
 # Set common git aliases
 git config --global alias.co checkout
 git config --global alias.br branch

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

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-AMD_AUDIO_CARD=$(pactl list cards | grep -B20 "Family 17h/19h" | grep "Name: " | awk '{print $2}')
-
-if [[ -n $AMD_AUDIO_CARD ]]; then
-  pactl set-card-profile "$AMD_AUDIO_CARD" "HiFi (Mic1, Mic2, Speaker)" 2>/dev/null || true
-fi

install/config/hardware/intel.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# 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
-  # HD Graphics and newer uses intel-media-driver
-  if [[ "${INTEL_GPU,,}" =~ "hd graphics"|"xe"|"iris" ]]; then
-    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
-  fi
-fi
-

install/config/hardware/network.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
-# Ensure iwd service will be started
-sudo systemctl enable iwd.service
+# Install iwd explicitly if it wasn't included in archinstall
+# This can happen if archinstall used ethernet
+if ! command -v iwctl &>/dev/null; then
+  sudo pacman -S --noconfirm --needed iwd
+  sudo systemctl enable iwd.service
+fi
 
 # Prevent systemd-networkd-wait-online timeout on boot
 sudo systemctl disable systemd-networkd-wait-online.service

install/config/hardware/nvidia.sh

@@ -32,7 +32,7 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
 
   # Enable multilib repository for 32-bit libraries
   if ! grep -q "^\[multilib\]" /etc/pacman.conf; then
-    sudo sed -i '/^#\s*\[multilib\]/,/^#\s*Include/ s/^#\s*//' /etc/pacman.conf
+    sudo sed -i '/^#\[multilib\]/,/^#Include/ s/^#//' /etc/pacman.conf
   fi
 
   # force package database refresh

install/config/hardware/printer.sh

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

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

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# First check that wireless-regdb is there
-if [ -f "/etc/conf.d/wireless-regdom" ]; then
-  unset WIRELESS_REGDOM
-  . /etc/conf.d/wireless-regdom
-fi
-
-# 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/}
-    
-    # Some timezones are formatted with the two letter country code at the start
-    COUNTRY="${TIMEZONE%%/*}"
-    
-    # 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
-    
-    # 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
-        
-      # Also set it one off now
-      if command -v iw &> /dev/null; then
-        sudo iw reg set ${COUNTRY}
-      fi
-    fi
-  fi
-fi
-

install/config/sudoless-asdcontrol.sh

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

install/config/theme.sh

@@ -26,4 +26,3 @@ ln -snf ~/.config/omarchy/current/theme/btop.theme ~/.config/btop/themes/current
 
 mkdir -p ~/.config/mako
 ln -snf ~/.config/omarchy/current/theme/mako.ini ~/.config/mako/config
-

install/first-run/firewall.sh

@@ -17,9 +17,6 @@ sudo ufw allow in proto udp from 172.16.0.0/12 to 172.17.0.1 port 53 comment 'al
 # Turn on the firewall
 sudo ufw --force enable
 
-# Enable UFW systemd service to start on boot
-sudo systemctl enable ufw
-
 # Turn on Docker protections
 sudo ufw-docker install
 sudo ufw reload

install/packages.sh

@@ -1,9 +1,6 @@
-#!/bin/bash
-
 sudo pacman -S --noconfirm --needed \
   1password-beta \
   1password-cli \
-  asdcontrol-git \
   alacritty \
   avahi \
   bash-completion \
@@ -29,7 +26,6 @@ sudo pacman -S --noconfirm --needed \
   fcitx5-qt \
   fd \
   ffmpegthumbnailer \
-  fontconfig \
   fzf \
   gcc14 \
   github-cli \
@@ -50,7 +46,6 @@ sudo pacman -S --noconfirm --needed \
   impala \
   imv \
   inetutils \
-  iwd \
   jq \
   kdenlive \
   kvantum-qt5 \
@@ -88,7 +83,6 @@ sudo pacman -S --noconfirm --needed \
   python-gobject \
   python-poetry-core \
   python-terminaltexteffects \
-  qt5-wayland \
   ripgrep \
   satty \
   signal-desktop \
@@ -114,7 +108,6 @@ sudo pacman -S --noconfirm --needed \
   waybar \
   wf-recorder \
   whois \
-  wireless-regdb \
   wiremix \
   wireplumber \
   wl-clip-persist \

install/packaging/asdcontrol.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Install asdcontrol for controlling brightness on Apple Displays
+if ! command -v asdcontrol &>/dev/null; then
+  git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol
+  cd /tmp/asdcontrol
+  make
+  sudo make install
+  cd -
+  rm -rf /tmp/asdcontrol
+
+  # Setup sudo-less controls
+  echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
+  sudo chmod 440 /etc/sudoers.d/asdcontrol
+fi

install/preflight/pacman.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Install build tools
-sudo pacman -S --needed --noconfirm base-devel
-
-# Configure pacman
-sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
-sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
-
-# Refresh all repos
-sudo pacman -Syu --noconfirm

install/preflight/repositories.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Install build tools
+sudo pacman -S --needed --noconfirm base-devel
+
+# Add fun and color and verbosity to the pacman installer
+if ! grep -q "ILoveCandy" /etc/pacman.conf; then
+  sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
+fi
+
+# Add the Omarchy repository
+if ! grep -q "omarchy" /etc/pacman.conf; then
+  sudo tee -a /etc/pacman.conf >/dev/null <<'EOF'
+
+[omarchy]
+SigLevel = Optional TrustAll
+Server = https://pkgs.omarchy.org/$arch
+EOF
+fi
+
+# Set mirrors to global ones only
+sudo tee /etc/pacman.d/mirrorlist >/dev/null <<'EOF'
+Server = https://mirror.omarchy.org/$repo/os/$arch
+Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
+Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
+EOF
+
+# Refresh all repos
+sudo pacman -Syu --noconfirm

install/preflight/trap-errors.sh

@@ -24,11 +24,7 @@ catch_errors() {
   echo "    ▀▀▀▀▀▀▀ ▀ ▀ ▀▀▀  ▀ ▀▀▀▀▀▀    "
   echo "                                 "
 
-  if command -v gum >/dev/null && gum confirm "Retry installation?"; then
-    bash ~/.local/share/omarchy/install.sh
-  else
-    echo "You can retry later by running: bash ~/.local/share/omarchy/install.sh"
-  fi
+  echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
 }
 
 trap catch_errors ERR

install/reboot.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-clear
-tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
-echo
-echo "You're done! So we're ready to reboot now..." | tte --frame-rate 640 wipe
-
-if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
-  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
-  echo -e "\nRemember to remove USB installer!\n\n"
-fi
-
-sleep 5
-reboot

migrations/1751134560.sh

@@ -9,7 +9,6 @@ omarchy-refresh-config uwsm/env
 echo -e "\n\e[31mOmarchy bins have been added to PATH (and OMARCHY_PATH is now system-wide).\nYou must immediately relaunch Hyprland or most Omarchy cmds won't work.\nPlease run Omarchy > Update again after the quick relaunch is complete.\e[0m"
 echo
 
-mkdir -p ~/.local/state/omarchy/migrations
 gum confirm "Ready to relaunch Hyprland? (All applications will be closed)" &&
   touch ~/.local/state/omarchy/migrations/1751134560.sh &&
   uwsm stop

migrations/1751134561.sh

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

migrations/1755164105.sh

@@ -1,15 +1,15 @@
 echo "Switch to Omarchy Chromium for synchronized theme switching"
 
-if omarchy-cmd-present chromium; then
-  set_theme_colors() {
-    if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]]; then
-      chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
-    else
-      # Use a default, neutral grey if theme doesn't have a color
-      chromium --no-startup-window --set-theme-color="28,32,39"
-    fi
-  }
+set_theme_colors() {
+  if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]] && command -v chromium &>/dev/null; then
+    chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
+  else
+    # Use a default, neutral grey if theme doesn't have a color
+    chromium --no-startup-window --set-theme-color="28,32,39"
+  fi
+}
 
+if omarchy-cmd-present chromium; then
   omarchy-pkg-drop chromium
   omarchy-pkg-add omarchy-chromium
 

migrations/1756411333.sh

@@ -1,3 +1,7 @@
 echo "Use new Omarchy mirror as default"
 
-omarchy-refresh-pacman-mirrorlist
+sudo tee /etc/pacman.d/mirrorlist >/dev/null <<'EOF'
+Server = https://mirror.omarchy.org/$repo/os/$arch
+Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
+Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
+EOF

migrations/1756629295.sh

@@ -1,3 +0,0 @@
-echo "Ensure qt5-wayland is installed so KeepassXC, Nextcloud, Sqlite Browser, and other apps display correctly"
-
-omarchy-pkg-add qt5-wayland

migrations/1756642681.sh

@@ -1,3 +0,0 @@
-echo "Fix audio input on AMD Framework laptops"
-
-source $OMARCHY_PATH/install/config/hardware/fix-f13-amd-audio-input.sh || true

migrations/1756650507.sh

@@ -1,5 +0,0 @@
-echo "Fix JetBrains font setting"
-
-if [[ $(omarchy-font-current) == JetBrains* ]]; then
-  omarchy-font-set "JetBrainsMono Nerd Font"
-fi

migrations/1756911131.sh

@@ -1,11 +0,0 @@
-echo "Enable UFW systemd service for existing installations"
-
-if omarchy-cmd-present ufw; then
-    if sudo ufw status | grep -q "Status: active\|22/tcp\|53317"; then
-        if ! systemctl is-enabled ufw >/dev/null 2>&1; then
-            sudo systemctl enable ufw --now
-            echo "UFW systemd service enabled"
-        fi
-    fi
-fi
-

migrations/1757279511.sh

@@ -1,6 +0,0 @@
-echo "Add locale to the waybar clock format"
-
-sed -i \
-  -e 's/{:%A %H:%M}/{:L%A %H:%M}/' \
-  -e 's/{:%d %B W%V %Y}/{:L%d %B W%V %Y}/' \
-  "$HOME/.config/waybar/config.jsonc"

migrations/1757361127.sh

@@ -1,8 +0,0 @@
-echo "Fix DHCP DNS to allow VPN DNS override"
-
-if [ -f /etc/systemd/resolved.conf ]; then
-  if grep -q "^DNS=$" /etc/systemd/resolved.conf && grep -q "^FallbackDNS=$" /etc/systemd/resolved.conf; then
-    sudo sed -i '/^DNS=$/d; /^FallbackDNS=$/d' /etc/systemd/resolved.conf
-    sudo systemctl restart systemd-resolved
-  fi
-fi

migrations/1757361128.sh

@@ -1,7 +0,0 @@
-echo "Enable mDNS resolution for existing Avahi installations"
-
-if systemctl is-enabled avahi-daemon.service >/dev/null 2>&1; then
-  if ! grep -q "mdns_minimal" /etc/nsswitch.conf; then
-    sudo sed -i 's/^hosts:.*/hosts: mymachines mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] files myhostname dns/' /etc/nsswitch.conf
-  fi
-fi

migrations/1757483378.sh

@@ -1,4 +0,0 @@
-echo "6Ghz Wi-Fi + Intel graphics acceleration for existing installations"
-
-$OMARCHY_PATH/install/config/hardware/set-wireless-regdom.sh
-$OMARCHY_PATH/install/config/hardware/intel.sh

migrations/1757515650.sh

@@ -1,2 +0,0 @@
-echo "Update plymouth theme to avoid freetype2 issue that broke the styled login screen"
-omarchy-refresh-plymouth

themes/catppuccin-latte/mako.ini

@@ -1,10 +1,25 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#4c4f69
 border-color=#1e66f5
 background-color=#eff1f5
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
 max-icon-size=32
-outer-margin=20
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+
+[urgency=critical]
+default-timeout=0

themes/catppuccin/mako.ini

@@ -1,10 +1,24 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#cad3f5
 border-color=#c6d0f5
 background-color=#24273a
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
 max-icon-size=32
-outer-margin=20
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0

themes/everforest/mako.ini

@@ -1,10 +1,24 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#d3c6aa
 border-color=#d3c6aa
 background-color=#2d353b
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
 max-icon-size=32
-outer-margin=20
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0

themes/gruvbox/mako.ini

@@ -1,10 +1,24 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#d4be98
 border-color=#a89984
 background-color=#282828
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
 max-icon-size=32
-outer-margin=20
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0

themes/kanagawa/mako.ini

@@ -1,10 +1,24 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#dcd7ba
 border-color=#dcd7ba
 background-color=#1f1f28
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
 max-icon-size=32
-outer-margin=20
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0

themes/matte-black/mako.ini

@@ -1,10 +1,24 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#8a8a8d
 border-color=#8A8A8D
 background-color=#1e1e1e
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 11
-max-icon-size=32
+anchor=top-right
 outer-margin=20
+default-timeout=5000
+max-icon-size=32
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0

themes/nord/mako.ini

@@ -1,10 +1,24 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#d8dee9
 border-color=#D8DEE9
 background-color=#2e3440
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
 max-icon-size=32
-outer-margin=20
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0

themes/osaka-jade/mako.ini

@@ -1,10 +1,24 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#C1C497
 border-color=#214237
 background-color=#11221C
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 12
+anchor=top-right
+outer-margin=5
+default-timeout=5000
 max-icon-size=32
-outer-margin=5
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0

themes/ristretto/alacritty.toml

@@ -22,7 +22,7 @@ white   = "#f1e5e7"
 
 [colors.cursor]
 cursor = '#c3b7b8'
-text = '#2c2525'
+text = '#c3b7b8'
 
 [colors.primary]
 background = '#2c2525'

themes/ristretto/mako.ini

@@ -1,10 +1,24 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#e6d9db
 border-color=#e6d9db
 background-color=#2c2525
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
 max-icon-size=32
-outer-margin=20
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0

themes/rose-pine/mako.ini

@@ -1,10 +1,24 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#575279
 border-color=#575279
 background-color=#faf4ed
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
 max-icon-size=32
-outer-margin=20
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0

themes/tokyo-night/mako.ini

@@ -1,10 +1,24 @@
-include=~/.local/share/omarchy/default/mako/core.ini
-
 text-color=#a9b1d6
 border-color=#33ccff
 background-color=#1a1b26
+width=420
+height=110
 padding=10
 border-size=2
 font=Liberation Sans 11
+anchor=top-right
+outer-margin=20
+default-timeout=5000
 max-icon-size=32
-outer-margin=20
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0