Fixup the migration to reuse config logic

* Change lazyvim and asdcontrol to packages

* Remove asdcontrol and lazyvim

* Add lazyvim setup

* Don't trigger rebuild. We already rebuild later.

* Add new pacman.conf after install

* Update config to keep mirrors in mirrorlist

* Add lazyvim setup back

* Make webapp installer work with local images

* Update tuis to work offline

* Update pacman config situation

* Extract the reboot segment into its own file

* Explainer

* Can't return in executed scripts

* Add post-install

* Extract the reboot segment into its own file

* Fix rebase doubling up

* Add run wrapper function for feedback

* Redirect output to log

* Move gnome updates to first-run

* Add theme to first-run

* Updat to try to get logging working

* Create the file and give permissions

* Test gsettings

* Revert "Test gsettings"

This reverts commit 49c27d319407f6c95fcbb4c5a2646e54b50c9ab4.

* Stop logging

* Add time outputs to end of logs

* Rearrange some scripts to cleanup

* Cleanup

* Add timing to run script

* Don't enable multilib for offline

* Add prebuild ruby

* Try spinner setup

* Prevent exit 1 due to grep not matching

* Update limine config to work for USB installs as well

* Add offline install to env report

* Fix grep pipefailure

* Update logs exports to work with subshells

* Fix backward logic

* Attempt to fix logging again

* Export chrootable for subshells

* Clean up outputs

* Move chrootable up

* Source chroot instead

* Changes for logging

* Center up reboot notice

* Update fixed paths

* Update trap

* Revert reverting precompiled ruby due to issues

* Revert "Revert reverting precompiled ruby due to issues"

This reverts commit c159e7dc51cfdd2fb750c49c66bc4468e1208446.

* Remove junk to cleanup fixed paths now that we have relative

* Add git branch check to transition beta to main

* Log output

* Add time output on summary screen

* We don't need sudo here

* Add ansi helpers to make code cleaner

* Add dry-run helpers for testing

* Split out some common / reused items

* Add log output function

* Use gum log to output cleaner

* Cleanup

* Update trap with options

* Fix reboot and pad it

* Cleanup

* Add dry-run for testing

* Use default $PADDING for gum

* More styles

* Styles and really exit

* Update to new format

* Add ansi vars

* Update log output to prevent flickering

* Fix logo exporting

* Trap updates

* Add exit handler

* Prevent double-trapping

* Update traps

* Consolidate logic

* Update reboot to work in chroot

* Eliminate double-guard

* Attempt to speed up by removing mkinitcpio hooks

* Add multilib for nvidia users

* Add back wireless-regdom

* Remove dryrun items

* Fix to be offline

* Set fonts for plymouth to solve freetype2 issue

* Required -y to run

* Update omarchy-refresh-plymouth to account for limine changes

* Update omarchy-refresh-plymouth to account for limine changes (#1575)

* Required -y to run

* Update omarchy-refresh-plymouth to account for limine changes

---------

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

* Update modes

* Remove direct executions of .sh files

* Add variable safety

* Add omarchy-upload-log

* Add broadcome fix for MBP

* Prevent printing on screen when rebooting

* Make packages list universal

* Rename

* Remove retry message

* Fix packages target

* Add system info to upload

* Update variable name

* Remove unnecessary executable statuses

* Remove gesture default

* Add bcm4360 fix to install

* Add useful debug info

* Add OMARCHY_PATH

* Only look locally offline

* Rename / rearrange files

* Export so they're available to subshells

* Update for alternate

* Rearrange

* Log install time if no arch

* Add limine to packages list

* Update comments

* Update sizing method

* Update mode switcher

* Move icons to be embedded in installer

* Set install mode to online

* shebang and sudo

* Remove deleted branch check

* Elim banners

* Elim verbosity

* Rename LOG_FILE

* Multilib on by default

* Flip to positive

* Switch to gnome-theme.sh for first run

* Elim ansi-codes helper

* Move guard up to be the first thing that's hit

* Extract a couple of functions

* Trim

* Trim

* Move back to trap

* Update to single gum file

* Just show total

* Pulled function to a helper

* Extract explaining function

* Use complete conditional flows where possible

* Reference variable close to its use

* Use modern bash conditional syntax

* Comment before function

* Use a simpler shared exit headline

Doesn't matter how we stopped, just that we did

* CRs

* Keep constants together

* Style on comment

* Explain QR Code

* Modern bash conditional and use lowercase for all local variables

* Use bash calculation syntax for numbers

* Use calculation syntax where possible

* cleanup was not intention revealing enough imo

* Spacing

* Retry won't produce something different in offline mode

* Not needed

* Use modern bash conditional style

* String-wrapping not needed in [[ ]]

* Might as well use constants for all of these

* Don't need the wrapping

* Move the output saving into where we're working with it

* Not needed as long as we just source this

* Gum is a helper

* Slim down logging setup

* Reflect broader scope of work

* Everything should live in file

* Simpler

* Ordering

* Style

* Better separation of concerns

* Stop pretending these are meant to run directly

* Move all packaging execution together

* No longer used in an offline centric setup

* None of these are directly executable any more either

* Modern bash conditional

* Better name

* Explain what's going on

* Use modern bash conditional

* Use modern bash styule

* No need for bashing

---------

Co-authored-by: David Heinemeier Hansson <david@hey.com>
Co-authored-by: DoppioJP <jakub@doppio.jp>

bin/omarchy-cmd-audio-switch

@@ -1,19 +1,50 @@
 #!/bin/bash
 
-# Find all the audio sinks but exit if there are none
+focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
-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
 
-# Find current audio sink
+sinks=$(pactl -f json list sinks | jq '[.[] | select([.ports[]? | .availability == "available"] | any)]')
-current=$(wpctl status | sed -n '/Sinks:/,/Sources:/p' | grep '^\s*│\s*\*' | sed -E 's/^[^0-9]*([0-9]+)\..*/\1/')
+sinks_count=$(echo "$sinks" | jq '. | length')
 
-# Find the next sink (looping around in the list)
+if [ "$sinks_count" -eq 0 ]; then
-for i in "${!sinks[@]}"; do
+  swayosd-client \
-  [ "${sinks[$i]}" = "$current" ] && next=${sinks[$(((i + 1) % ${#sinks[@]}))]}
+    --monitor "$focused_monitor" \
-done
+    --custom-message "No audio devices found"
-next=${next:-${sinks[0]}}
+  exit 1
+fi
 
-# Set the next sink and ensure it's not muted
+current_sink_name=$(pactl get-default-sink)
-wpctl set-default "$next"
+current_sink_index=$(echo "$sinks" | jq -r --arg name "$current_sink_name" 'map(.name) | index($name)')
-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-first-run

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

bin/omarchy-cmd-screenrecord

@@ -8,31 +8,47 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-if [[ $2 == "audio" ]]; then
+# Selects region or output
-  AUDIO="--audio"
+SCOPE="$1"
-else
-  AUDIO=""
-fi
 
-screenrecording() {
+# Selects audio inclusion or not
+AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
+
+start_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 $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" "$@"
+    wl-screenrec $AUDIO -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@" &
   fi
+
+  toggle_screenrecording_indicator
 }
 
-if pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null; then
+stop_screenrecording() {
   pkill -x wl-screenrec
   pkill -x wf-recorder
+
   notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
-elif [[ "$1" == "output" ]]; then
+
-  screenrecording
+  sleep 0.2 # ensures the process is actually dead before we check
+  toggle_screenrecording_indicator
+}
+
+toggle_screenrecording_indicator() {
+  pkill -RTMIN+8 waybar
+}
+
+screenrecording_active() {
+  pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null
+}
+
+if screenrecording_active; then
+  stop_screenrecording
+elif [[ "$SCOPE" == "output" ]]; then
+  start_screenrecording
 else
   region=$(slurp) || exit 1
-  screenrecording -g "$region"
+  start_screenrecording -g "$region"
 fi

bin/omarchy-cmd-screenrecord-stop

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null; then
-  pkill -x wl-screenrec
-  pkill -x wf-recorder
-  notify-send "Screen recording stopped" -t 2000
-fi

bin/omarchy-cmd-screensaver

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 function exit_screensaver {
+  hyprctl keyword cursor:invisible false
   pkill -x tte 2>/dev/null
   pkill -f "alacritty --class Screensaver" 2>/dev/null
   exit 0
@@ -8,6 +9,8 @@ function exit_screensaver {
 
 trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
 
+hyprctl keyword cursor:invisible true
+
 while true; do
   effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
   tte -i ~/.config/omarchy/branding/screensaver.txt \

bin/omarchy-drive-info

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

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

@@ -0,0 +1,21 @@
+#!/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,7 +1,7 @@
 #!/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>" >&2
+  echo "Usage: omarchy-install-dev-env <ruby|node|bun|go|laravel|symfony|php|python|elixir|phoenix|rust|java|ocaml|dotnet|clojure>" >&2
   exit 1
 fi
 
@@ -131,4 +131,9 @@ 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

@@ -3,7 +3,7 @@
 options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB")
 
 if [[ "$#" -eq 0 ]]; then
-  choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
+  choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
 else
   choices="$@"
 fi
@@ -12,7 +12,7 @@ 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=postgres16 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:16 ;;
+    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 ;;
     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-steam

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-echo "Adding multilib repository for 32-bit compatibility"
-sudo sed -i '/^#\s*\[multilib\]/,/^#\s*Include/ s/^#\s*//' /etc/pacman.conf
-
 echo "Now pick dependencies matching your graphics card"
 sudo pacman -Syu --noconfirm steam
 setsid gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-menu

@@ -2,6 +2,21 @@
 
 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 [[ "$BACK_TO_EXIT" == "true" ]]; then
+    exit 0
+  elif [[ -n "$parent_menu" ]]; then
+    "$parent_menu"
+  else
+    show_main_menu
+  fi
+}
+
 menu() {
   local prompt="$1"
   local options="$2"
@@ -80,7 +95,7 @@ show_style_menu() {
 show_theme_menu() {
   theme=$(menu "Theme" "$(omarchy-theme-list)" "" "$(omarchy-theme-current)")
   if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    show_main_menu
+    back_to show_style_menu
   else
     omarchy-theme-set "$theme"
   fi
@@ -89,7 +104,7 @@ show_theme_menu() {
 show_font_menu() {
   theme=$(menu "Font" "$(omarchy-font-list)" "-w 350" "$(omarchy-font-current)")
   if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    show_main_menu
+    back_to show_style_menu
   else
     omarchy-font-set "$theme"
   fi
@@ -114,8 +129,10 @@ show_screenshot_menu() {
 }
 
 show_screenrecord_menu() {
-  case $(menu "Screenrecord" "  Region\n  Display") in
+  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio") in
+  *"Region + Audio"*) omarchy-cmd-screenrecord region audio ;;
   *Region*) omarchy-cmd-screenrecord ;;
+  *"Display + Audio"*) omarchy-cmd-screenrecord output audio ;;
   *Display*) omarchy-cmd-screenrecord output ;;
   *) show_capture_menu ;;
   esac
@@ -163,7 +180,7 @@ show_setup_power_menu() {
   profile=$(menu "Power Profile" "$(omarchy-powerprofiles-list)" "" "$(powerprofilesctl get)")
 
   if [[ "$profile" == "CNCLD" || -z "$profile" ]]; then
-    show_main_menu
+    back_to show_setup_menu
   else
     powerprofilesctl set "$profile"
   fi
@@ -227,10 +244,10 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  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" ;;
   *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
-  *Gemini*) install "Gemini" "gemini-cli" ;;
+  *Gemini*) aur_install "Gemini" "gemini-cli" ;;
   *Studio*) install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
   *Crush*) install "Crush" "crush-bin" ;;
@@ -268,7 +285,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") 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\n  Clojure") in
   *Rails*) present_terminal "omarchy-install-dev-env ruby" ;;
   *Docker*) present_terminal omarchy-install-docker-dbs ;;
   *JavaScript*) show_install_javascript_menu ;;
@@ -281,6 +298,7 @@ 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
 }
@@ -324,13 +342,14 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n󰇅  Hardware\n  Timezone") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n󰇅  Hardware\n  Password\n  Timezone") in
   *Omarchy*) present_terminal omarchy-update ;;
   *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
 }
@@ -368,6 +387,14 @@ show_update_hardware_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 ;;
+  esac
+}
+
 show_system_menu() {
   case $(menu "System" "  Lock\n󱄄  Screensaver\n󰤄  Suspend\n  Relaunch\n󰜉  Restart\n󰐥  Shutdown") in
   *Lock*) omarchy-lock-screen ;;
@@ -376,7 +403,7 @@ show_system_menu() {
   *Relaunch*) uwsm stop ;;
   *Restart*) systemctl reboot ;;
   *Shutdown*) systemctl poweroff ;;
-  *) show_main_menu ;;
+  *) back_to show_main_menu ;;
   esac
 }
 
@@ -405,6 +432,7 @@ go_to_menu() {
 }
 
 if [[ -n "$1" ]]; then
+  BACK_TO_EXIT=true
   go_to_menu "$1"
 else
   show_main_menu

bin/omarchy-menu-keybindings

@@ -83,7 +83,11 @@ 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'
+  walker --dmenu --theme keybindings -p 'Keybindings' -w 800 -h "$menu_height"
+

bin/omarchy-pkg-aur-install

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

bin/omarchy-pkg-install

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 fzf_args=(
   --multi
   --preview 'pacman -Sii {1}'
@@ -19,6 +17,5 @@ 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,6 +17,5 @@ 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-plymouth

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-if [[ "$1" == "-y" ]]; then
+sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
-  sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
+sudo plymouth-set-default-theme omarchy
-  sudo plymouth-set-default-theme -R omarchy
+
+if command -v limine-mkinitcpio &>/dev/null; then
+  sudo limine-mkinitcpio
+else
+  sudo mkinitcpio -P
 fi

bin/omarchy-setup-dns

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

bin/omarchy-tui-install

@@ -20,13 +20,16 @@ fi
 
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
-ICON_PATH="$ICON_DIR/$APP_NAME.png"
 
-mkdir -p "$ICON_DIR"
+if [[ ! "$ICON_URL" =~ ^https?:// ]] && [ -f "$ICON_URL" ]; then
-
+  ICON_PATH="$ICON_URL"
-if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
+else
+  ICON_PATH="$ICON_DIR/$APP_NAME.png"
+  mkdir -p "$ICON_DIR"
+  if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
     echo "Error: Failed to download icon."
-  return 1
+    exit 1
+  fi
 fi
 
 if [[ $WINDOW_STYLE == "float" ]]; then

bin/omarchy-update

@@ -7,4 +7,4 @@ omarchy-update-git
 omarchy-migrate
 omarchy-update-system-pkgs
 omarchy-update-restart
-omarchy-restart-waybar # removes update-available icon
+omarchy-update-available-reset

bin/omarchy-update-available-reset

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Ensure Waybar icon offering the available update is removed
+pkill -RTMIN+7 waybar

bin/omarchy-update-git

@@ -1,5 +1,6 @@
 #!/bin/bash
 
 echo -e "\e[32mUpdate Omarchy\e[0m"
+
 git -C $OMARCHY_PATH pull --autostash
 git -C $OMARCHY_PATH diff --check || git -C $OMARCHY_PATH reset --merge

bin/omarchy-upload-log

@@ -0,0 +1,126 @@
+#!/bin/bash
+
+# Upload logs to 0x0.st
+
+LOG_TYPE="${1:-install}"
+TEMP_LOG="/tmp/upload-log.txt"
+SYSTEM_INFO="/tmp/system-info.txt"
+
+# Get system information if fastfetch is available
+if command -v fastfetch >/dev/null 2>&1; then
+  {
+    echo "========================================="
+    echo "SYSTEM INFORMATION"
+    echo "========================================="
+    # Use fastfetch with no logo to get clean output
+    fastfetch --logo none --pipe 2>/dev/null || echo "Failed to get system info"
+    echo ""
+    echo "========================================="
+    echo "LOG CONTENT"
+    echo "========================================="
+    echo ""
+  } >"$SYSTEM_INFO"
+else
+  # Fallback to basic info if fastfetch isn't available
+  {
+    echo "========================================="
+    echo "SYSTEM INFORMATION"
+    echo "========================================="
+    echo "Hostname: $(hostname)"
+    echo "Kernel: $(uname -r)"
+    echo "Date: $(date)"
+    echo ""
+    echo "========================================="
+    echo "LOG CONTENT"
+    echo "========================================="
+    echo ""
+  } >"$SYSTEM_INFO"
+fi
+
+case "$LOG_TYPE" in
+install)
+  ARCHINSTALL_LOG="/var/log/archinstall/install.log"
+  OMARCHY_LOG="/var/log/omarchy-install.log"
+
+  # Combine system info with logs
+  cat "$SYSTEM_INFO" >"$TEMP_LOG"
+  cat $ARCHINSTALL_LOG $OMARCHY_LOG >>"$TEMP_LOG" 2>/dev/null
+
+  if [ ! -s "$TEMP_LOG" ]; then
+    echo "Error: No install logs found"
+    exit 1
+  fi
+
+  echo "Uploading installation log to 0x0.st..."
+  ;;
+
+this-boot)
+  # Combine system info with boot logs
+  cat "$SYSTEM_INFO" >"$TEMP_LOG"
+  journalctl -b 0 >>"$TEMP_LOG" 2>/dev/null
+
+  if [ ! -s "$TEMP_LOG" ]; then
+    echo "Error: No logs found for current boot"
+    exit 1
+  fi
+
+  echo "Uploading current boot logs to 0x0.st..."
+  ;;
+
+last-boot)
+  # Combine system info with previous boot logs
+  cat "$SYSTEM_INFO" >"$TEMP_LOG"
+  journalctl -b -1 >>"$TEMP_LOG" 2>/dev/null
+
+  if [ ! -s "$TEMP_LOG" ]; then
+    echo "Error: No logs found for previous boot"
+    exit 1
+  fi
+
+  echo "Uploading previous boot logs to 0x0.st..."
+  ;;
+
+installed)
+  # System info plus all installed packages
+  cat "$SYSTEM_INFO" >"$TEMP_LOG"
+  {
+    echo ""
+    echo "========================================="
+    echo "INSTALLED PACKAGES (pacman -Q)"
+    echo "========================================="
+    pacman -Q 2>/dev/null || echo "Failed to get package list"
+  } >>"$TEMP_LOG"
+
+  if [ ! -s "$TEMP_LOG" ]; then
+    echo "Error: Failed to gather system information"
+    exit 1
+  fi
+
+  echo "Uploading system information to 0x0.st..."
+  ;;
+
+*)
+  echo "Usage: $0 [install|this-boot|last-boot|system-info]"
+  echo "  install      - Upload installation logs (default)"
+  echo "  this-boot    - Upload logs from current boot"
+  echo "  last-boot    - Upload logs from previous boot"
+  echo "  installed    - Upload system info and installed packages"
+  exit 1
+  ;;
+esac
+
+echo ""
+
+URL=$(curl -sF "file=@$TEMP_LOG" -Fexpires=24 https://0x0.st)
+
+if [ $? -eq 0 ] && [ -n "$URL" ]; then
+  echo "✓ Log uploaded successfully!"
+  echo "Share this URL:"
+  echo ""
+  echo "  $URL"
+  echo ""
+  echo "This link will expire in 24 hours."
+else
+  echo "Error: Failed to upload log file"
+  exit 1
+fi

bin/omarchy-webapp-install

@@ -18,13 +18,16 @@ fi
 
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
-ICON_PATH="$ICON_DIR/$APP_NAME.png"
 
-mkdir -p "$ICON_DIR"
+if [[ ! "$ICON_URL" =~ ^https?:// ]] && [ -f "$ICON_URL" ]; then
-
+  ICON_PATH="$ICON_URL"
-if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
+else
+  ICON_PATH="$ICON_DIR/$APP_NAME.png"
+  mkdir -p "$ICON_DIR"
+  if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
     echo "Error: Failed to download icon."
-  return 1
+    exit 1
+  fi
 fi
 
 cat >"$DESKTOP_FILE" <<EOF

boot.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Set install mode to online since boot.sh is used for curl installations
+export OMARCHY_INSTALL_MODE="online"
+
 ansi_art='                 ▄▄▄                                                   
  ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄ 
 ███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███

config/hypr/hyprland.conf

@@ -16,4 +16,5 @@ source = ~/.config/hypr/monitors.conf
 source = ~/.config/hypr/input.conf
 source = ~/.config/hypr/bindings.conf
 source = ~/.config/hypr/envs.conf
+source = ~/.config/hypr/looknfeel.conf
 source = ~/.config/hypr/autostart.conf

config/hypr/hyprsunset.conf

@@ -1,6 +1,6 @@
 # Makes hyprsunset do nothing to the screen by default
 # Without this, the default applies some tint to the monitor
 profile {
-    time = 00:00
+    time = 07:00
     identity = true
 }

config/hypr/input.conf

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

config/hypr/looknfeel.conf

@@ -0,0 +1,17 @@
+# Change the default Omarchy look'n'feel
+
+# https://wiki.hyprland.org/Configuring/Variables/#general
+general {
+    # No gaps between windows
+    # gaps_in = 0
+    # gaps_out = 0
+
+    # Use master layout instead of dwindle
+    # layout = master
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#decoration
+decoration {
+    # Use round window corners
+    # rounding = 8
+}

config/waybar/config.jsonc

@@ -5,7 +5,7 @@
   "spacing": 0,
   "height": 26,
   "modules-left": ["custom/omarchy", "hyprland/workspaces"],
-  "modules-center": ["clock", "custom/update"],
+  "modules-center": ["clock", "custom/update", "custom/screenrecording-indicator"],
   "modules-right": [
     "group/tray-expander",
     "bluetooth",
@@ -48,6 +48,7 @@
     "exec": "omarchy-update-available",
     "on-click": "omarchy-launch-floating-terminal-with-presentation omarchy-update",
     "tooltip-format": "Omarchy update available",
+    "signal": 7,
     "interval": 3600
   },
 
@@ -124,6 +125,12 @@
     "format": " ",
     "tooltip": false
   },
+  "custom/screenrecording-indicator": {
+    "on-click": "omarchy-cmd-screenrecord",
+    "exec": "$OMARCHY_PATH/default/waybar/indicators/screen-recording.sh",
+    "signal": 8,
+    "return-type": "json"
+  },
   "tray": {
     "icon-size": 12,
     "spacing": 12

config/waybar/style.css

@@ -37,6 +37,7 @@
 #bluetooth,
 #pulseaudio,
 #custom-omarchy,
+#custom-screenrecording-indicator,
 #custom-update {
   min-width: 12px;
   margin: 0 7.5px;
@@ -61,3 +62,13 @@ tooltip {
 .hidden {
   opacity: 0;
 }
+
+#custom-screenrecording-indicator {
+  min-width: 12px;
+  margin-left: 8.75px;
+  font-size: 10px;
+}
+
+#custom-screenrecording-indicator.active {
+  color: #a55555;
+}

default/bash/shell

@@ -10,5 +10,5 @@ if [[ ! -v BASH_COMPLETION_VERSINFO && -f /usr/share/bash-completion/bash_comple
 fi
 
 # Set complete path
-export PATH="./bin:$HOME/.local/bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"
 set +h

default/hypr/input.conf

@@ -14,8 +14,3 @@ input {
         natural_scroll = false
     }
 }
-
-# https://wiki.hyprland.org/Configuring/Variables/#gestures
-gestures {
-    workspace_swipe = false
-}

default/mako/core.ini

@@ -0,0 +1,16 @@
+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/pacman.conf

@@ -22,8 +22,8 @@ Include = /etc/pacman.d/mirrorlist
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
-# [multilib]
+[multilib]
-# Include = /etc/pacman.d/mirrorlist
+Include = /etc/pacman.d/mirrorlist
 
 [omarchy]
 SigLevel = Optional TrustAll

default/plymouth/omarchy.plymouth

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

default/waybar/indicators/screen-recording.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null; then
+  echo '{"text": "󰻂", "tooltip": "Stop recording", "class": "active"}'
+else
+  echo '{"text": ""}'
+fi

install.sh

@@ -1,58 +1,18 @@
 #!/bin/bash
 
 # Exit immediately if a command exits with a non-zero status
-set -eE
+set -eEo pipefail
 
-OMARCHY_PATH="$HOME/.local/share/omarchy"
+# Define Omarchy locations
-OMARCHY_INSTALL="$OMARCHY_PATH/install"
+export OMARCHY_PATH="$HOME/.local/share/omarchy"
+export OMARCHY_INSTALL="$OMARCHY_PATH/install"
+export OMARCHY_INSTALL_LOG_FILE="/var/log/omarchy-install.log"
 export PATH="$OMARCHY_PATH/bin:$PATH"
 
-# Preparation
+# Install
-source $OMARCHY_INSTALL/preflight/show-env.sh
+source "$OMARCHY_INSTALL/helpers/all.sh"
-source $OMARCHY_INSTALL/preflight/trap-errors.sh
+source "$OMARCHY_INSTALL/preflight/all.sh"
-source $OMARCHY_INSTALL/preflight/guard.sh
+source "$OMARCHY_INSTALL/packaging/all.sh"
-source $OMARCHY_INSTALL/preflight/chroot.sh
+source "$OMARCHY_INSTALL/config/all.sh"
-source $OMARCHY_INSTALL/preflight/pacman.sh
+source "$OMARCHY_INSTALL/login/all.sh"
-source $OMARCHY_INSTALL/preflight/migrations.sh
+source "$OMARCHY_INSTALL/post-install/all.sh"
-source $OMARCHY_INSTALL/preflight/first-run-mode.sh
-
-# Packaging
-source $OMARCHY_INSTALL/packages.sh
-source $OMARCHY_INSTALL/packaging/fonts.sh
-source $OMARCHY_INSTALL/packaging/lazyvim.sh
-source $OMARCHY_INSTALL/packaging/webapps.sh
-source $OMARCHY_INSTALL/packaging/tuis.sh
-
-# Configuration
-source $OMARCHY_INSTALL/config/config.sh
-source $OMARCHY_INSTALL/config/theme.sh
-source $OMARCHY_INSTALL/config/branding.sh
-source $OMARCHY_INSTALL/config/git.sh
-source $OMARCHY_INSTALL/config/gpg.sh
-source $OMARCHY_INSTALL/config/timezones.sh
-source $OMARCHY_INSTALL/config/increase-sudo-tries.sh
-source $OMARCHY_INSTALL/config/increase-lockout-limit.sh
-source $OMARCHY_INSTALL/config/ssh-flakiness.sh
-source $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
-source $OMARCHY_INSTALL/config/xcompose.sh
-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/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/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

install/config/all.sh

@@ -0,0 +1,27 @@
+run_logged $OMARCHY_INSTALL/config/config.sh
+run_logged $OMARCHY_INSTALL/config/theme.sh
+run_logged $OMARCHY_INSTALL/config/branding.sh
+run_logged $OMARCHY_INSTALL/config/git.sh
+run_logged $OMARCHY_INSTALL/config/gpg.sh
+run_logged $OMARCHY_INSTALL/config/timezones.sh
+run_logged $OMARCHY_INSTALL/config/increase-sudo-tries.sh
+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/docker.sh
+run_logged $OMARCHY_INSTALL/config/mimetypes.sh
+run_logged $OMARCHY_INSTALL/config/localdb.sh
+run_logged $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
+run_logged $OMARCHY_INSTALL/config/hardware/network.sh
+run_logged $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh
+run_logged $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh
+run_logged $OMARCHY_INSTALL/config/hardware/bluetooth.sh
+run_logged $OMARCHY_INSTALL/config/hardware/printer.sh
+run_logged $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh
+run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
+run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh
+run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
+run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh

install/config/branding.sh

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

install/config/config.sh

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

install/config/detect-keyboard-layout.sh

@@ -1,16 +1,13 @@
-#!/bin/bash
-
 # 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"
 
-layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
+if grep -q '^XKBLAYOUT=' "$conf"; then
-variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
+  layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
-
-if [[ -n "$layout" ]]; then
   sed -i "/^[[:space:]]*kb_options *=/i\  kb_layout = $layout" "$hyprconf"
 fi
 
-if [[ -n "$variant" ]]; then
+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

install/config/docker.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Configure Docker daemon:
 # - limit log size to avoid running out of disk
 # - use host's DNS resolver

install/config/git.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Ensure git settings live under ~/.config
 mkdir -p ~/.config/git
 touch ~/.config/git/config

install/config/gpg.sh

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

install/config/hardware/bluetooth.sh

@@ -1,4 +1,2 @@
-#!/bin/bash
-
 # Turn on bluetooth by default
 chrootable_systemctl_enable bluetooth.service

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

@@ -0,0 +1,5 @@
+# Install wifi drivers for 2013-2015 MacBooks using the BCM4360 chip
+if lspci -nnv | grep -A2 "14e4:43a0" | grep -q "106b:"; then
+  echo "Apple BCM4360 detected"
+  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
+fi

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

@@ -1,6 +1,4 @@
-#!/bin/bash
+AMD_AUDIO_CARD=$(pactl list cards 2>/dev/null | grep -B20 "Family 17h/19h" | grep "Name: " | awk '{print $2}' || true)
-
-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

install/config/hardware/fix-fkeys.sh

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

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

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

install/config/hardware/intel.sh

@@ -0,0 +1,11 @@
+# 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,5 +1,3 @@
-#!/bin/bash
-
 # Ensure iwd service will be started
 sudo systemctl enable iwd.service
 

install/config/hardware/nvidia.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # ==============================================================================
 # Hyprland NVIDIA Setup Script for Arch Linux
 # ==============================================================================
@@ -30,11 +28,6 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
     KERNEL_HEADERS="linux-hardened-headers"
   fi
 
-  # 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
-  fi
-
   # force package database refresh
   sudo pacman -Syu --noconfirm
 

install/config/hardware/printer.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 chrootable_systemctl_enable cups.service
 
 # Disable multicast dns in resolved. Avahi will provide this for better network printer discovery
@@ -7,6 +5,9 @@ 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

@@ -0,0 +1,33 @@
+# 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/hardware/usb-autosuspend.sh

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

install/config/increase-lockout-limit.sh

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

install/config/increase-sudo-tries.sh

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

install/config/lazyvim.sh

@@ -0,0 +1 @@
+omarchy-lazyvim-setup

install/config/mimetypes.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 omarchy-refresh-applications
 update-desktop-database ~/.local/share/applications
 

install/config/mise-ruby.sh

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

install/config/mise-work.sh

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

install/config/ssh-flakiness.sh

@@ -1,4 +1,2 @@
-#!/bin/bash
-
 # Solve common flakiness with SSH
 echo "net.ipv4.tcp_mtu_probing=1" | sudo tee -a /etc/sysctl.d/99-sysctl.conf

install/config/sudoless-asdcontrol.sh

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

@@ -1,13 +1,6 @@
-#!/bin/bash
-
-gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
-gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
-
 # 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
-sudo gtk-update-icon-cache /usr/share/icons/Yaru
 
 # Setup theme links
 mkdir -p ~/.config/omarchy/themes

install/config/timezones.sh

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

install/config/xcompose.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Set default XCompose that is triggered with CapsLock
 tee ~/.XCompose >/dev/null <<EOF
 include "%H/.local/share/omarchy/default/xcompose"

install/first-run/battery-monitor.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 if ls /sys/class/power_supply/BAT* &>/dev/null; then
   # This computer runs on a battery
   powerprofilesctl set balanced || true

install/first-run/firewall.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Allow nothing in, everything out
 sudo ufw default deny incoming
 sudo ufw default allow outgoing

install/first-run/gnome-theme.sh

@@ -0,0 +1,5 @@
+gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
+gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
+
+sudo gtk-update-icon-cache /usr/share/icons/Yaru

install/helpers/all.sh

@@ -0,0 +1,4 @@
+source $OMARCHY_INSTALL/helpers/chroot.sh
+source $OMARCHY_INSTALL/helpers/presentation.sh
+source $OMARCHY_INSTALL/helpers/errors.sh
+source $OMARCHY_INSTALL/helpers/logging.sh

install/helpers/chroot.sh

@@ -6,3 +6,6 @@ chrootable_systemctl_enable() {
     sudo systemctl enable --now $1
   fi
 }
+
+# Export the function so it's available in subshells
+export -f chrootable_systemctl_enable

install/helpers/errors.sh

@@ -0,0 +1,159 @@
+# Directs user to Omarchy Discord
+QR_CODE='
+█▀▀▀▀▀█ ▄ ▄ ▀▄▄▄█ █▀▀▀▀▀█
+█ ███ █ ▄▄▄▄▀▄▀▄▀ █ ███ █
+█ ▀▀▀ █ ▄█  ▄█▄▄▀ █ ▀▀▀ █
+▀▀▀▀▀▀▀ ▀▄█ █ █ █ ▀▀▀▀▀▀▀
+▀▀█▀▀▄▀▀▀▀▄█▀▀█  ▀ █ ▀ █ 
+█▄█ ▄▄▀▄▄ ▀ ▄ ▀█▄▄▄▄ ▀ ▀█
+▄ ▄▀█ ▀▄▀▀▀▄ ▄█▀▄█▀▄▀▄▀█▀
+█ ▄▄█▄▀▄█ ▄▄▄  ▀ ▄▀██▀ ▀█
+▀ ▀   ▀ █ ▀▄  ▀▀█▀▀▀█▄▀  
+█▀▀▀▀▀█ ▀█  ▄▀▀ █ ▀ █▄▀██
+█ ███ █ █▀▄▄▀ █▀███▀█▄██▄
+█ ▀▀▀ █ ██  ▀ █▄█ ▄▄▄█▀ █
+▀▀▀▀▀▀▀ ▀ ▀ ▀▀▀  ▀ ▀▀▀▀▀▀'
+
+# Track if we're already handling an error to prevent double-trapping
+ERROR_HANDLING=false
+
+# Cursor is usually hidden while we install
+show_cursor() {
+  printf "\033[?25h"
+}
+
+# Display truncated log lines from the install log
+show_log_tail() {
+  if [[ -f $OMARCHY_INSTALL_LOG_FILE ]]; then
+    local log_lines=$(($TERM_HEIGHT - $LOGO_HEIGHT - 35))
+    local max_line_width=$((LOGO_WIDTH - 4))
+
+    tail -n $log_lines "$OMARCHY_INSTALL_LOG_FILE" | while IFS= read -r line; do
+      if ((${#line} > max_line_width)); then
+        local truncated_line="${line:0:$max_line_width}..."
+      else
+        local truncated_line="$line"
+      fi
+
+      gum style "$truncated_line"
+    done
+
+    echo
+  fi
+}
+
+# Display the failed command or script name
+show_failed_script_or_command() {
+  if [[ -n ${CURRENT_SCRIPT:-} ]]; then
+    gum style "Failed script: $CURRENT_SCRIPT"
+  else
+    # Truncate long command lines to fit the display
+    local cmd="$BASH_COMMAND"
+    local max_cmd_width=$((LOGO_WIDTH - 4))
+
+    if ((${#cmd} > max_cmd_width)); then
+      cmd="${cmd:0:$max_cmd_width}..."
+    fi
+
+    gum style "$cmd"
+  fi
+}
+
+# Save original stdout and stderr for trap to use
+save_original_outputs() {
+  exec 3>&1 4>&2
+}
+
+# Restore stdout and stderr to original (saved in FD 3 and 4)
+# This ensures output goes to screen, not log file
+restore_outputs() {
+  if [ -e /proc/self/fd/3 ] && [ -e /proc/self/fd/4 ]; then
+    exec 1>&3 2>&4
+  fi
+}
+
+# Error handler
+catch_errors() {
+  # Prevent recursive error handling
+  if [[ $ERROR_HANDLING == true ]]; then
+    return
+  else
+    ERROR_HANDLING=true
+  fi
+
+  # Store exit code immediately before it gets overwritten
+  local exit_code=$?
+
+  stop_log_output
+  restore_outputs
+
+  clear_logo
+  show_cursor
+
+  gum style --foreground 1 --padding "1 0 1 $PADDING_LEFT" "Omarchy installation stopped!"
+  show_log_tail
+
+  gum style "This command halted with exit code $exit_code:"
+  show_failed_script_or_command
+
+  gum style "$QR_CODE"
+  echo
+  gum style "Get help from the community via QR code or at https://discord.gg/tXFUdasqhY"
+
+  # Offer options menu
+  while true; do
+    options=()
+
+    # If online install, show retry first
+    if [[ ${OMARCHY_INSTALL_MODE:-offline} == "online" ]]; then
+      options+=("Retry installation")
+    fi
+
+    # Add upload option if internet is available
+    if ping -c 1 -W 1 1.1.1.1 >/dev/null 2>&1; then
+      options+=("Upload log for support")
+    fi
+
+    # Add remaining options
+    options+=("View full log")
+    options+=("Exit")
+
+    choice=$(gum choose "${options[@]}" --header "What would you like to do?" --height 6 --padding "1 $PADDING_LEFT")
+
+    case "$choice" in
+    "Retry installation")
+      bash ~/.local/share/omarchy/install.sh
+      break
+      ;;
+    "View full log")
+      less "$OMARCHY_INSTALL_LOG_FILE"
+      ;;
+    "Upload log for support")
+      omarchy-upload-install-log
+      ;;
+    "Exit" | "")
+      exit 1
+      ;;
+    esac
+  done
+}
+
+# Exit handler - ensures cleanup happens on any exit
+exit_handler() {
+  local exit_code=$?
+
+  # Only run if we're exiting with an error and haven't already handled it
+  if [[ $exit_code -ne 0 && $ERROR_HANDLING != true ]]; then
+    catch_errors
+  else
+    stop_log_output
+    show_cursor
+  fi
+}
+
+# Set up traps
+trap catch_errors ERR INT TERM
+trap exit_handler EXIT
+
+# Save original outputs in case we trap
+save_original_outputs

install/helpers/logging.sh

@@ -0,0 +1,134 @@
+start_log_output() {
+  local ANSI_SAVE_CURSOR="\033[s"
+  local ANSI_RESTORE_CURSOR="\033[u"
+  local ANSI_CLEAR_LINE="\033[2K"
+  local ANSI_HIDE_CURSOR="\033[?25l"
+  local ANSI_RESET="\033[0m"
+  local ANSI_GRAY="\033[90m"
+
+  # Save cursor position and hide cursor
+  printf $ANSI_SAVE_CURSOR
+  printf $ANSI_HIDE_CURSOR
+
+  (
+    local log_lines=20
+    local max_line_width=$((LOGO_WIDTH - 4))
+
+    while true; do
+      # Read the last N lines into an array
+      mapfile -t current_lines < <(tail -n $log_lines "$OMARCHY_INSTALL_LOG_FILE" 2>/dev/null)
+
+      # Build complete output buffer with escape sequences
+      output=""
+      for ((i = 0; i < log_lines; i++)); do
+        line="${current_lines[i]:-}"
+
+        # Truncate if needed
+        if [ ${#line} -gt $max_line_width ]; then
+          line="${line:0:$max_line_width}..."
+        fi
+
+        # Add clear line escape and formatted output for each line
+        if [ -n "$line" ]; then
+          output+="${ANSI_CLEAR_LINE}${ANSI_GRAY}${PADDING_LEFT_SPACES}  → ${line}${ANSI_RESET}\n"
+        else
+          output+="${ANSI_CLEAR_LINE}${PADDING_LEFT_SPACES}\n"
+        fi
+      done
+
+      printf "${ANSI_RESTORE_CURSOR}%b" "$output"
+
+      sleep 0.1
+    done
+  ) &
+  monitor_pid=$!
+}
+
+stop_log_output() {
+  if [ -n "${monitor_pid:-}" ]; then
+    kill $monitor_pid 2>/dev/null || true
+    wait $monitor_pid 2>/dev/null || true
+    unset monitor_pid
+  fi
+}
+
+start_install_log() {
+  sudo touch "$OMARCHY_INSTALL_LOG_FILE"
+  sudo chmod 666 "$OMARCHY_INSTALL_LOG_FILE"
+
+  export OMARCHY_START_TIME=$(date '+%Y-%m-%d %H:%M:%S')
+
+  echo "=== Omarchy Installation Started: $OMARCHY_START_TIME ===" >>"$OMARCHY_INSTALL_LOG_FILE"
+  start_log_output
+}
+
+stop_install_log() {
+  stop_log_output
+  show_cursor
+
+  if [[ -n ${OMARCHY_INSTALL_LOG_FILE:-} ]]; then
+    OMARCHY_END_TIME=$(date '+%Y-%m-%d %H:%M:%S')
+    echo "=== Omarchy Installation Completed: $OMARCHY_END_TIME ===" >>"$OMARCHY_INSTALL_LOG_FILE"
+    echo "" >>"$OMARCHY_INSTALL_LOG_FILE"
+    echo "=== Installation Time Summary ===" >>"$OMARCHY_INSTALL_LOG_FILE"
+
+    if [ -f "/var/log/archinstall/install.log" ]; then
+      ARCHINSTALL_START=$(grep -m1 '^\[' /var/log/archinstall/install.log 2>/dev/null | sed 's/^\[\([^]]*\)\].*/\1/' || true)
+      ARCHINSTALL_END=$(grep 'Installation completed without any errors' /var/log/archinstall/install.log 2>/dev/null | sed 's/^\[\([^]]*\)\].*/\1/' || true)
+
+      if [ -n "$ARCHINSTALL_START" ] && [ -n "$ARCHINSTALL_END" ]; then
+        ARCH_START_EPOCH=$(date -d "$ARCHINSTALL_START" +%s)
+        ARCH_END_EPOCH=$(date -d "$ARCHINSTALL_END" +%s)
+        ARCH_DURATION=$((ARCH_END_EPOCH - ARCH_START_EPOCH))
+
+        ARCH_MINS=$((ARCH_DURATION / 60))
+        ARCH_SECS=$((ARCH_DURATION % 60))
+
+        echo "Archinstall: ${ARCH_MINS}m ${ARCH_SECS}s" >>"$OMARCHY_INSTALL_LOG_FILE"
+      fi
+    fi
+
+    if [ -n "$OMARCHY_START_TIME" ]; then
+      OMARCHY_START_EPOCH=$(date -d "$OMARCHY_START_TIME" +%s)
+      OMARCHY_END_EPOCH=$(date -d "$OMARCHY_END_TIME" +%s)
+      OMARCHY_DURATION=$((OMARCHY_END_EPOCH - OMARCHY_START_EPOCH))
+
+      OMARCHY_MINS=$((OMARCHY_DURATION / 60))
+      OMARCHY_SECS=$((OMARCHY_DURATION % 60))
+
+      echo "Omarchy:     ${OMARCHY_MINS}m ${OMARCHY_SECS}s" >>"$OMARCHY_INSTALL_LOG_FILE"
+
+      if [ -n "$ARCH_DURATION" ]; then
+        TOTAL_DURATION=$((ARCH_DURATION + OMARCHY_DURATION))
+        TOTAL_MINS=$((TOTAL_DURATION / 60))
+        TOTAL_SECS=$((TOTAL_DURATION % 60))
+        echo "Total:       ${TOTAL_MINS}m ${TOTAL_SECS}s" >>"$OMARCHY_INSTALL_LOG_FILE"
+      fi
+    fi
+    echo "=================================" >>"$OMARCHY_INSTALL_LOG_FILE"
+
+    echo "Rebooting system..." >>"$OMARCHY_INSTALL_LOG_FILE"
+  fi
+}
+
+run_logged() {
+  local script="$1"
+
+  export CURRENT_SCRIPT="$script"
+
+  echo "[$(date '+%Y-%m-%d %H:%M:%S')] Starting: $script" >>"$OMARCHY_INSTALL_LOG_FILE"
+
+  # Use bash -c to create a clean subshell
+  bash -c "source '$script'" </dev/null >>"$OMARCHY_INSTALL_LOG_FILE" 2>&1
+
+  local exit_code=$?
+
+  if [ $exit_code -eq 0 ]; then
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] Completed: $script" >>"$OMARCHY_INSTALL_LOG_FILE"
+    unset CURRENT_SCRIPT
+  else
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] Failed: $script (exit code: $exit_code)" >>"$OMARCHY_INSTALL_LOG_FILE"
+  fi
+
+  return $exit_code
+}

install/helpers/presentation.sh

@@ -0,0 +1,48 @@
+# Ensure we have gum available
+if ! command -v gum &>/dev/null; then
+  sudo pacman -S --needed --noconfirm gum
+fi
+
+# Get terminal size from /dev/tty (works in all scenarios: direct, sourced, or piped)
+if [ -e /dev/tty ]; then
+  TERM_SIZE=$(stty size 2>/dev/null </dev/tty)
+
+  if [ -n "$TERM_SIZE" ]; then
+    export TERM_HEIGHT=$(echo "$TERM_SIZE" | cut -d' ' -f1)
+    export TERM_WIDTH=$(echo "$TERM_SIZE" | cut -d' ' -f2)
+  else
+    # Fallback to reasonable defaults if stty fails
+    export TERM_WIDTH=80
+    export TERM_HEIGHT=24
+  fi
+else
+  # No terminal available (e.g., non-interactive environment)
+  export TERM_WIDTH=80
+  export TERM_HEIGHT=24
+fi
+
+export LOGO_PATH="$OMARCHY_PATH/logo.txt"
+export LOGO_WIDTH=$(awk '{ if (length > max) max = length } END { print max+0 }' "$LOGO_PATH" 2>/dev/null || echo 0)
+export LOGO_HEIGHT=$(wc -l <"$LOGO_PATH" 2>/dev/null || echo 0)
+
+export PADDING_LEFT=$((($TERM_WIDTH - $LOGO_WIDTH) / 2))
+export PADDING_LEFT_SPACES=$(printf "%*s" $PADDING_LEFT "")
+
+# Tokyo Night theme for gum confirm
+export GUM_CONFIRM_PROMPT_FOREGROUND="6"     # Cyan for prompt
+export GUM_CONFIRM_SELECTED_FOREGROUND="0"   # Black text on selected
+export GUM_CONFIRM_SELECTED_BACKGROUND="2"   # Green background for selected
+export GUM_CONFIRM_UNSELECTED_FOREGROUND="7" # White for unselected
+export GUM_CONFIRM_UNSELECTED_BACKGROUND="0" # Black background for unselected
+export PADDING="0 0 0 $PADDING_LEFT"         # Gum Style
+export GUM_CHOOSE_PADDING="$PADDING"
+export GUM_FILTER_PADDING="$PADDING"
+export GUM_INPUT_PADDING="$PADDING"
+export GUM_SPIN_PADDING="$PADDING"
+export GUM_TABLE_PADDING="$PADDING"
+export GUM_CONFIRM_PADDING="$PADDING"
+
+clear_logo() {
+  printf "\033[H\033[2J" # Clear screen and move cursor to top-left
+  gum style --foreground 2 --padding "1 0 0 $PADDING_LEFT" "$(<"$LOGO_PATH")"
+}

install/iso.sh

@@ -0,0 +1,14 @@
+# Called by Omarchy ISO setup before starting configurator and archinstall
+
+source "$OMARCHY_INSTALL/preflight/set-size-vars.sh"
+source "$OMARCHY_INSTALL/helpers/logo.sh"
+source "$OMARCHY_INSTALL/preflight/gum.sh"
+source "$OMARCHY_INSTALL/helpers/tail-log-output.sh"
+source "$OMARCHY_INSTALL/helpers/trap-errors.sh"
+
+source $OMARCHY_INSTALL/helpers/chroot.sh
+source $OMARCHY_INSTALL/helpers/logo.sh
+source $OMARCHY_INSTALL/helpers/gum.sh
+source $OMARCHY_INSTALL/helpers/errors.sh
+source $OMARCHY_INSTALL/helpers/logging.sh
+source $OMARCHY_INSTALL/helpers/layout.sh

install/login/all.sh

@@ -0,0 +1,4 @@
+run_logged $OMARCHY_INSTALL/login/plymouth.sh
+run_logged $OMARCHY_INSTALL/login/limine-snapper.sh
+run_logged $OMARCHY_INSTALL/login/enable-mkinitcpio.sh
+run_logged $OMARCHY_INSTALL/login/alt-bootloaders.sh

install/login/alt-bootloaders.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 if ! command -v limine &>/dev/null; then
   # Add kernel hooks
   if ! grep -Eq '^HOOKS=.*plymouth' /etc/mkinitcpio.conf; then

install/login/enable-mkinitcpio.sh

@@ -0,0 +1,18 @@
+echo "Re-enabling mkinitcpio hooks..."
+
+# Restore the specific mkinitcpio pacman hooks
+if [ -f /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled ]; then
+  sudo mv /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled /usr/share/libalpm/hooks/90-mkinitcpio-install.hook
+fi
+
+if [ -f /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled ]; then
+  sudo mv /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook
+fi
+
+echo "mkinitcpio hooks re-enabled"
+
+if command -v limine &>/dev/null; then
+  sudo limine-update
+else
+  sudo mkinitcpio -P
+fi

install/login/limine-snapper.sh

@@ -1,14 +1,27 @@
-#!/bin/bash
-
 if command -v limine &>/dev/null; then
   sudo tee /etc/mkinitcpio.conf.d/omarchy_hooks.conf <<EOF >/dev/null
 HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs)
 EOF
 
-  [[ -f /boot/EFI/limine/limine.conf ]] && EFI=true
+  [[ -f /boot/EFI/limine/limine.conf ]] || [[ -f /boot/EFI/BOOT/limine.conf ]] && EFI=true
 
   # Conf location is different between EFI and BIOS
-  [[ -n "$EFI" ]] && limine_config="/boot/EFI/limine/limine.conf" || limine_config="/boot/limine/limine.conf"
+  if [[ -n "$EFI" ]]; then
+    # Check USB location first, then regular EFI location
+    if [[ -f /boot/EFI/BOOT/limine.conf ]]; then
+      limine_config="/boot/EFI/BOOT/limine.conf"
+    else
+      limine_config="/boot/EFI/limine/limine.conf"
+    fi
+  else
+    limine_config="/boot/limine/limine.conf"
+  fi
+
+  # Double-check and exit if we don't have a config file for some reason
+  if [[ ! -f $limine_config ]]; then
+    echo "Error: Limine config not found at $limine_config" >&2
+    exit 1
+  fi
 
   CMDLINE=$(grep "^[[:space:]]*cmdline:" "$limine_config" | head -1 | sed 's/^[[:space:]]*cmdline:[[:space:]]*//')
 
@@ -63,10 +76,9 @@ term_background_bright: 24283b
 EOF
 
   sudo pacman -S --noconfirm --needed limine-snapper-sync limine-mkinitcpio-hook
-  sudo limine-update
 
   # Match Snapper configs if not installing from the ISO
-  if [ -z "${OMARCHY_CHROOT_INSTALL:-}" ]; then
+  if [[ -z ${OMARCHY_CHROOT_INSTALL:-} ]]; then
     if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then
       sudo snapper -c root create-config /
     fi
@@ -85,7 +97,7 @@ EOF
 fi
 
 # Add UKI entry to UEFI machines to skip bootloader showing on normal boot
-if [ -n "$EFI" ] && efibootmgr &>/dev/null && ! efibootmgr | grep -q Omarchy &&
+if [[ -n $EFI ]] && efibootmgr &>/dev/null && ! efibootmgr | grep -q Omarchy &&
   ! cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "American Megatrends"; then
   sudo efibootmgr --create \
     --disk "$(findmnt -n -o SOURCE /boot | sed 's/p\?[0-9]*$//')" \

install/login/plymouth.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Hyprland launched via UWSM and login directly as user, rely on disk encryption + hyprlock for security
 
 # ==============================================================================
@@ -8,7 +6,7 @@
 
 if [ "$(plymouth-set-default-theme)" != "omarchy" ]; then
   sudo cp -r "$HOME/.local/share/omarchy/default/plymouth" /usr/share/plymouth/themes/omarchy/
-  sudo plymouth-set-default-theme -R omarchy
+  sudo plymouth-set-default-theme omarchy
 fi
 
 # ==============================================================================

install/omarchy-base.packages

@@ -0,0 +1,131 @@
+# Omarchy core package list installed via install/packages.sh
+# This file is also used by the ISO builder when determining needs
+
+1password-beta
+1password-cli
+alacritty
+asdcontrol-git
+avahi
+bash-completion
+bat
+blueberry
+brightnessctl
+btop
+cargo
+clang
+cups
+cups-browsed
+cups-filters
+cups-pdf
+docker
+docker-buildx
+docker-compose
+dust
+evince
+eza
+fastfetch
+fcitx5
+fcitx5-gtk
+fcitx5-qt
+fd
+ffmpegthumbnailer
+fontconfig
+fzf
+gcc14
+github-cli
+gnome-calculator
+gnome-keyring
+gnome-themes-extra
+gum
+gvfs-mtp
+gvfs-smb
+hypridle
+hyprland
+hyprland-qtutils
+hyprlock
+hyprpicker
+hyprshot
+hyprsunset
+imagemagick
+impala
+imv
+inetutils
+iwd
+jq
+kdenlive
+kvantum-qt5
+lazydocker
+lazygit
+less
+libqalculate
+libreoffice
+llvm
+localsend
+luarocks
+mako
+man
+mariadb-libs
+mise
+mpv
+nautilus
+noto-fonts
+noto-fonts-cjk
+noto-fonts-emoji
+noto-fonts-extra
+nss-mdns
+nvim
+obs-studio
+obsidian
+omarchy-chromium
+omarchy-lazyvim
+pamixer
+pinta
+playerctl
+plocate
+plymouth
+polkit-gnome
+postgresql-libs
+power-profiles-daemon
+python-gobject
+python-poetry-core
+python-terminaltexteffects
+qt5-wayland
+ripgrep
+satty
+signal-desktop
+slurp
+spotify
+starship
+sushi
+swaybg
+swayosd
+system-config-printer
+tldr
+tree-sitter-cli
+ttf-cascadia-mono-nerd
+ttf-ia-writer
+ttf-jetbrains-mono-nerd
+typora
+tzupdate
+ufw
+ufw-docker
+unzip
+uwsm
+walker-bin
+waybar
+wf-recorder
+whois
+wireless-regdb
+wiremix
+wireplumber
+wl-clip-persist
+wl-clipboard
+wl-screenrec
+woff2-font-awesome
+xdg-desktop-portal-gtk
+xdg-desktop-portal-hyprland
+xmlstarlet
+xournalpp
+yaru-icon-theme
+yay
+zoxide

install/omarchy-other.packages

@@ -0,0 +1,59 @@
+# Packages installed outside of install/packages.sh or optional packages
+# Utilized by ISO builder to ensure package availability in the ISO
+
+autoconf-archive
+base
+base-devel
+broadcom-wl
+btrfs-progs
+dart
+dkms
+efibootmgr
+egl-wayland
+git
+git
+gst-plugin-pipewire
+gtk4-layer-shell
+gum
+htop
+intel-media-driver
+intltool
+iwd
+jdk-openjdk
+jq
+lib32-nvidia-utils
+libpulse
+libsass
+libva-intel-driver
+libva-intel-driver
+libva-mesa-driver
+libva-nvidia-driver
+limine
+limine-mkinitcpio-hook
+limine-snapper-sync
+linux
+linux-firmware
+linux-headers
+mesa
+nvidia-dkms
+nvidia-open-dkms
+nvidia-utils
+openssl
+pipewire
+pipewire-alsa
+pipewire-jack
+pipewire-pulse
+plymouth
+qt5-remoteobjects
+qt6-wayland
+sassc
+snapper
+sof-firmware
+tzupdate
+webp-pixbuf-loader
+wget
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-nouveau
+yay-debug
+zram-generator

install/packages.sh

@@ -1,129 +0,0 @@
-#!/bin/bash
-
-sudo pacman -S --noconfirm --needed \
-  1password-beta \
-  1password-cli \
-  asdcontrol-git \
-  alacritty \
-  avahi \
-  bash-completion \
-  bat \
-  blueberry \
-  brightnessctl \
-  btop \
-  cargo \
-  clang \
-  cups \
-  cups-browsed \
-  cups-filters \
-  cups-pdf \
-  docker \
-  docker-buildx \
-  docker-compose \
-  dust \
-  evince \
-  eza \
-  fastfetch \
-  fcitx5 \
-  fcitx5-gtk \
-  fcitx5-qt \
-  fd \
-  ffmpegthumbnailer \
-  fontconfig \
-  fzf \
-  gcc14 \
-  github-cli \
-  gnome-calculator \
-  gnome-keyring \
-  gnome-themes-extra \
-  gum \
-  gvfs-mtp \
-  gvfs-smb \
-  hypridle \
-  hyprland \
-  hyprland-qtutils \
-  hyprlock \
-  hyprpicker \
-  hyprshot \
-  hyprsunset \
-  imagemagick \
-  impala \
-  imv \
-  inetutils \
-  iwd \
-  jq \
-  kdenlive \
-  kvantum-qt5 \
-  lazydocker \
-  lazygit \
-  less \
-  libqalculate \
-  libreoffice \
-  llvm \
-  localsend \
-  luarocks \
-  mako \
-  man \
-  mariadb-libs \
-  mise \
-  mpv \
-  nautilus \
-  noto-fonts \
-  noto-fonts-cjk \
-  noto-fonts-emoji \
-  noto-fonts-extra \
-  nss-mdns \
-  nvim \
-  obs-studio \
-  obsidian \
-  omarchy-chromium \
-  pamixer \
-  pinta \
-  playerctl \
-  plocate \
-  plymouth \
-  polkit-gnome \
-  postgresql-libs \
-  power-profiles-daemon \
-  python-gobject \
-  python-poetry-core \
-  python-terminaltexteffects \
-  qt5-wayland \
-  ripgrep \
-  satty \
-  signal-desktop \
-  slurp \
-  spotify \
-  starship \
-  sushi \
-  swaybg \
-  swayosd \
-  system-config-printer \
-  tldr \
-  tree-sitter-cli \
-  ttf-cascadia-mono-nerd \
-  ttf-ia-writer \
-  ttf-jetbrains-mono-nerd \
-  typora \
-  tzupdate \
-  ufw \
-  ufw-docker \
-  unzip \
-  uwsm \
-  walker-bin \
-  waybar \
-  wf-recorder \
-  whois \
-  wiremix \
-  wireplumber \
-  wl-clip-persist \
-  wl-clipboard \
-  wl-screenrec \
-  woff2-font-awesome \
-  xdg-desktop-portal-gtk \
-  xdg-desktop-portal-hyprland \
-  xmlstarlet \
-  xournalpp \
-  yaru-icon-theme \
-  yay \
-  zoxide