Add splitters to all panels... for now

2026-08-02 20:28:19 +02:00 · 2026-06-07 20:58:02 +02:00
585 changed files with 4790 additions and 6915 deletions
@@ -1,4 +0,0 @@
-
-# Python bytecode (orchestrator)
-__pycache__/
-*.pyc
@@ -74,19 +74,18 @@ Example:

 # Install Scripts

-The ISO owns installation orchestration. This repo ships target-side setup commands and reusable setup leaves:
+Install entry points (`install.sh`, `boot.sh`) use `#!/bin/bash`. Many scripts under `install/` are sourced via `run_logged` and intentionally do not have shebangs.

- `bin/omarchy-setup-system` runs root-owned system setup during ISO finalization.
- `bin/omarchy-setup-hardware` runs idempotent hardware-specific setup and is called by `omarchy-setup-system`.
- `bin/omarchy-finalize-user` runs the per-user runtime finalization (skill symlinks, xdg-user-dirs, mime defaults, `install/user/all.sh`). Shipped user defaults are seeded by `/etc/skel` from `omarchy-settings`, not by this command. `bin/omarchy-reinstall-configs` is the explicit destructive resync of those defaults into an existing user's `$HOME`.
- leaf scripts under `install/` are sourced by `run_logged $OMARCHY_INSTALL/path/to/script.sh` and intentionally do not have shebangs.
- avoid `exit` in sourced setup scripts unless intentionally aborting setup.
- use `$OMARCHY_INSTALL` and `$OMARCHY_PATH` instead of hard-coded Omarchy paths.
- keep root-scoped hardware setup under `install/hardware/` and orchestrate it through `install/hardware/all.sh`.
- keep every per-user setup leaf under `install/user/` (including `install/user/hardware/` and `install/user/first-run/`) so it is clear what must run for each user.
- prefer helper commands for package and command checks where available.
+Install stage files follow this pattern:

-Raw `command -v`, `pacman`, and `pacman-key` are acceptable in package-helper contexts where direct package-manager behavior is the point of the script.
+- `install/*/all.sh` lists scripts in execution order
+- leaf scripts are sourced by `run_logged $OMARCHY_INSTALL/path/to/script.sh`
+- avoid `exit` in sourced install scripts unless intentionally aborting the install
+- use `$OMARCHY_INSTALL` and `$OMARCHY_PATH` instead of hard-coded Omarchy paths
+- keep hardware-specific logic under `install/config/hardware/`
+- prefer helper commands for package and command checks where available
+
+Raw `command -v`, `pacman`, and `pacman-key` are acceptable in bootstrap/preflight/package-helper contexts where the helper commands may not be available yet or where direct package-manager behavior is the point of the script.

 # Helper Commands

@@ -99,7 +98,7 @@ Use these instead of raw shell commands:
 - `omarchy-notification-send` - send desktop notifications; do not call `notify-send` directly
 - `omarchy-hw-asus-rog` - detect ASUS ROG hardware (and similar `hw-*` commands)

-Exceptions are allowed for migration and package-helper scripts where the helper may not be available yet, where the helper itself is being implemented, or where direct package-manager behavior is required.
+Exceptions are allowed for bootstrap, preflight, migration, and package-helper scripts where the helper may not be available yet, where the helper itself is being implemented, or where direct package-manager behavior is required.

 # Config Structure

@@ -171,26 +170,19 @@ To copy a default config to user config with automatic backup:
 omarchy-refresh-config hypr/hyprlock.conf
 ```

-This copies `/etc/skel/.config/hypr/hyprlock.conf` to `~/.config/hypr/hyprlock.conf`.
+This copies `~/.local/share/omarchy/config/hypr/hyprlock.conf` to `~/.config/hypr/hyprlock.conf`.

 # Migrations

-Read `docs/migrations.md` before creating or changing migrations.
-
-Migrations are split by execution scope:
-
- `migrations/system/<timestamp>.sh` — root, noninteractive, safe to run from pacman via `omarchy-migrate-system` (`omarchy` `post_upgrade` calls it). Use for `/etc`, `/usr`, `/boot`, services, hardware quirks, and other system state. Do not prompt.
- `migrations/user/<timestamp>.sh` — current user/session, may touch `~/.config`, `~/.local`, user systemd, browser prefs, DBus/session state, and may prompt if necessary. Runs through `omarchy-migrate` / `omarchy-migrate-user`; pending state is per-user based on missing files under `~/.local/state/omarchy/migrations/user/`.
-
-To create a new migration, run `omarchy-dev-add-migration system --no-edit` or `omarchy-dev-add-migration user --no-edit` based on scope.
+To create a new migration, run `omarchy-dev-add-migration --no-edit`. This creates a migration file named after the unix timestamp of the last commit.

 New migration format:
- File permissions must be `0644` (`-rw-r--r--`); migration runners execute them with `bash -euo pipefail`, not through executable bits
+- File permissions must be `0644` (`-rw-r--r--`); migrations are sourced, not executed directly
 - No shebang line
 - Start with an `echo` describing what the migration does
 - Use `$OMARCHY_PATH` to reference the omarchy directory
 - Prefer helper commands such as `omarchy-cmd-present`, `omarchy-cmd-missing`, `omarchy-pkg-present`, and `omarchy-pkg-missing`

-Omarchy 4.0 is upgraded through `bin/omarchy-upgrade-to-4`, not through the normal migration runner. Do not add compatibility migrations for old installer layouts; put pre-4 package-layout transition work in the upgrade command instead.
+Some older migrations predate these rules. Do not copy older migrations that start with shebangs, omit the leading `echo`, or hard-code `~/.local/share/omarchy`.

-Migrations may use raw `pacman`, `command -v`, or direct config edits when needed for one-off repair work.
+Migrations may use raw `pacman`, `command -v`, or direct config edits when needed for historical compatibility or one-off repair work.
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Basecamp
-Exec=omarchy-launch-webapp https://launchpad.37signals.com
-Terminal=false
-Type=Application
-Icon=basecamp
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=ChatGPT
-Exec=omarchy-launch-webapp https://chatgpt.com/
-Terminal=false
-Type=Application
-Icon=chatgpt
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Discord
-Exec=omarchy-launch-webapp https://discord.com/channels/@me
-Terminal=false
-Type=Application
-Icon=discord
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Disk Usage
-Exec=xdg-terminal-exec --app-id=TUI.float -e bash -c "dust -r; read -n 1 -s"
-Terminal=false
-Type=Application
-Icon=disk-usage
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Docker
-Exec=xdg-terminal-exec --app-id=TUI.tile -e lazydocker
-Terminal=false
-Type=Application
-Icon=docker
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Figma
-Exec=omarchy-launch-webapp https://figma.com/
-Terminal=false
-Type=Application
-Icon=figma
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Fizzy
-Exec=omarchy-launch-webapp https://app.fizzy.do/
-Terminal=false
-Type=Application
-Icon=fizzy
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=GitHub
-Exec=omarchy-launch-webapp https://github.com/
-Terminal=false
-Type=Application
-Icon=github
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Google Contacts
-Exec=omarchy-launch-webapp https://contacts.google.com/
-Terminal=false
-Type=Application
-Icon=google-contacts
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Google Maps
-Exec=omarchy-launch-webapp https://maps.google.com
-Terminal=false
-Type=Application
-Icon=google-maps
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Google Messages
-Exec=omarchy-launch-webapp https://messages.google.com/web/conversations
-Terminal=false
-Type=Application
-Icon=google-messages
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Google Photos
-Exec=omarchy-launch-webapp https://photos.google.com/
-Terminal=false
-Type=Application
-Icon=google-photos
-StartupNotify=true
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=HEY
-Exec=omarchy-webapp-handler-hey %u
-Terminal=false
-Type=Application
-Icon=hey
-StartupNotify=true
-MimeType=x-scheme-handler/mailto
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=WhatsApp
-Exec=omarchy-launch-webapp https://web.whatsapp.com/
-Terminal=false
-Type=Application
-Icon=whatsapp
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=X
-Exec=omarchy-launch-webapp https://x.com/
-Terminal=false
-Type=Application
-Icon=x
-StartupNotify=true
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=YouTube
-Exec=omarchy-launch-webapp https://youtube.com/
-Terminal=false
-Type=Application
-Icon=youtube
-StartupNotify=true
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Zoom
-Exec=omarchy-webapp-handler-zoom %u
-Terminal=false
-Type=Application
-Icon=zoom
-StartupNotify=true
-MimeType=x-scheme-handler/zoommtg;x-scheme-handler/zoomus
@@ -4,7 +4,7 @@ Name=Battle.net
 GenericName=Game Launcher
 Comment=Blizzard game launcher (umu-launcher + GE-Proton)
 Exec=omarchy-launch-battlenet
-Icon=battle-net
+Icon=Battle.net
 Terminal=false
 Categories=Game;
 StartupNotify=true
@@ -39,7 +39,6 @@ GROUP_DESCRIPTIONS[clipboard]="Clipboard helpers"
 GROUP_DESCRIPTIONS[cmd]="Command and shortcut helpers"
 GROUP_DESCRIPTIONS[config]="System configuration helpers"
 GROUP_DESCRIPTIONS[debug]="Diagnostics and support logs"
-GROUP_DESCRIPTIONS[finalize]="Finalize user setup"
 GROUP_DESCRIPTIONS[default]="Default application selection"
 GROUP_DESCRIPTIONS[dev]="Omarchy development tools"
 GROUP_DESCRIPTIONS[dns]="DNS resolver configuration"
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# omarchy:summary=Set the branch for Omarchy's git repository.
+# omarchy:args=<master|rc|dev>
+
+if (($# == 0)); then
+  echo "Usage: omarchy-branch-set [master|rc|dev]"
+  exit 1
+else
+  branch="$1"
+fi
+
+if [[ $branch != "master" && $branch != "rc" && $branch != "dev" ]]; then
+  echo "Error: Invalid branch '$branch'. Must be one of: master, rc, dev"
+  exit 1
+fi
+
+git -C $OMARCHY_PATH switch $branch
@@ -1,21 +1,22 @@
 #!/bin/bash

-# omarchy:summary=Set the Omarchy package channel.
+# omarchy:summary=Set the Omarchy channel, which dictates what git branch and package repository is used.
 # omarchy:args=<stable|rc|edge|dev>
 # omarchy:requires-sudo=true

-set -e
-
 if (($# == 0)); then
  echo "Usage: omarchy-channel-set [stable|rc|edge|dev]"
  exit 1
+else
+  channel="$1"
 fi

-channel="$1"
 case "$channel" in
-  stable|rc|edge) omarchy-refresh-pacman "$channel" ;;
-  dev) omarchy-refresh-pacman edge ;;
-  *) echo "Unknown channel: $channel"; exit 1 ;;
+"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
+"rc") omarchy-branch-set "rc" && omarchy-refresh-pacman "rc" ;;
+"edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
+"dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
+*) echo "Unknown channel: $channel"; exit 1; ;;
 esac

 omarchy-update -y
@@ -37,7 +37,7 @@ fi
 cat > "$LOG_FILE" <<EOF
 Date: $(date)
 Hostname: $(hostname)
-Omarchy Package: $(pacman -Q omarchy 2>/dev/null || echo "unknown")
+Omarchy Branch: $(git -C "$OMARCHY_PATH" branch --show-current 2>/dev/null || echo "unknown")

 =========================================
 SYSTEM INFORMATION
@@ -75,12 +75,14 @@ ACTION=$(gum choose "${OPTIONS[@]}")
 case "$ACTION" in
  "Upload log")
    echo "Uploading debug log to logs.omarchy.org..."
-    URL=$(curl -sf -F "file=@$LOG_FILE" -Fexpires=24 https://logs.omarchy.org/)
+    URL=$(curl -sF "file=@$LOG_FILE" -Fexpires=24 https://logs.omarchy.org)
    if (( $? == 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
@@ -5,8 +5,7 @@
 # omarchy:examples=omarchy default terminal ghostty | omarchy default terminal kitty

 if (($# == 0)); then
-  desktop_id=$(xdg-terminal-exec --print-id 2>/dev/null || true)
-  desktop_id=${desktop_id%%:*}
+  desktop_id=$(grep -vE '^($|#)' ~/.config/xdg-terminals.list 2>/dev/null | head -n 1)
  case "$desktop_id" in
  Alacritty.desktop) echo "alacritty" ;;
  foot.desktop) echo "foot" ;;
@@ -1,33 +1,13 @@
 #!/bin/bash

-# omarchy:summary=Create a new Omarchy migration in the current source tree.
-# omarchy:args=<system|user> [--no-edit]
+# omarchy:summary=Creates a new Omarchy migration named after the unix timestamp of the last commit.

-set -euo pipefail
+cd ~/.local/share/omarchy
+migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
+touch $migration_file

-scope="${1:-}"
-case "$scope" in
-  system|user)
-    shift
-    ;;
-  -h|--help|"")
-    echo "Usage: omarchy-dev-add-migration <system|user> [--no-edit]"
-    exit 0
-    ;;
-  *)
-    echo "Unknown migration scope: $scope" >&2
-    echo "Usage: omarchy-dev-add-migration <system|user> [--no-edit]" >&2
-    exit 1
-    ;;
-esac
-
-cd "${OMARCHY_PATH:-$(pwd)}"
-mkdir -p "migrations/$scope"
-migration_file="migrations/$scope/$(git log -1 --format=%cd --date=unix).sh"
-touch "$migration_file"
-
-if [[ ${1:-} != "--no-edit" ]]; then
-  nvim "$migration_file"
+if [[ $1 != "--no-edit" ]]; then
+  nvim $migration_file
 fi

-printf '%s\n' "$PWD/$migration_file"
+echo $migration_file
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Point Omarchy at a local checkout for live editing
-# omarchy:group=dev
-# omarchy:args=<path-to-checkout>
-# omarchy:examples=omarchy dev link ~/Work/omarchy/omarchy-installer
-
-set -euo pipefail
-
-# Sudo wipes HYPRLAND_INSTANCE_SIGNATURE, so the live-session refresh below
-# can't reach hyprctl. Run as user; we sudo internally for the conf write.
-if [[ $EUID -eq 0 ]]; then
-  echo "Error: run omarchy-dev-link as your user, not under sudo." >&2
-  exit 1
-fi
-
-if [[ $# -ne 1 || $1 == "-h" || $1 == "--help" ]]; then
-  cat <<USAGE
-Usage: omarchy dev link <path-to-checkout>
-
-Writes /etc/omarchy.conf so OMARCHY_PATH resolves to <path-to-checkout>
-in all new shells, the Hyprland session, and Quickshell. Restarts
-omarchy-shell and reloads hyprctl so changes take effect immediately.
-
-Affects only \$OMARCHY_PATH-resolved trees: bin/, default/, shell/,
-themes/, applications/, config/. Files installed at fixed system paths
-(/etc/, /usr/lib/systemd/, udev rule bodies, /etc/skel after user
-creation, /usr/share/plymouth) are NOT covered — for those, use
-omarchy-dev-pkg-test to build and install the package from the checkout.
-USAGE
-  exit 0
-fi
-
-target=$(realpath -e "$1" 2>/dev/null) || {
-  echo "Error: path does not exist: $1" >&2
-  exit 1
-}
-
-for required in bin default shell; do
-  if [[ ! -d "$target/$required" ]]; then
-    echo "Warning: $target/$required not found — does this look like an Omarchy source checkout?" >&2
-  fi
-done
-
-# Strip any previous dev-link's bin/ from PATH before adding the new one,
-# so repeated link calls don't accumulate stale entries.
-prior_target=""
-if [[ -f /etc/omarchy.conf ]]; then
-  prior_target=$(sed -n 's/^[[:space:]]*export[[:space:]]\+OMARCHY_PATH="\?\([^"]*\)"\?/\1/p' /etc/omarchy.conf | tail -1)
-fi
-
-echo "Pointing Omarchy at $target"
-printf 'export OMARCHY_PATH="%s"\n' "$target" | sudo tee /etc/omarchy.conf >/dev/null
-
-export OMARCHY_PATH="$target"
-if [[ -n $prior_target && $prior_target != "$target" ]]; then
-  PATH=$(printf '%s' "$PATH" | tr ':' '\n' | grep -vFx "$prior_target/bin" | paste -sd:)
-fi
-export PATH="$target/bin:$PATH"
-
-if command -v hyprctl >/dev/null 2>&1 && hyprctl version &>/dev/null; then
-  hyprctl setenv OMARCHY_PATH "$target" >/dev/null
-  hyprctl setenv PATH "$PATH" >/dev/null
-  echo "  Updated Hyprland session env."
-
-  systemctl --user import-environment OMARCHY_PATH PATH 2>/dev/null || true
-  echo "  Updated systemd --user env."
-
-  if pgrep -x quickshell >/dev/null 2>&1; then
-    omarchy-restart-shell
-    echo "  Restarted omarchy-shell."
-  fi
-
-  hyprctl reload >/dev/null
-  echo "  Reloaded Hyprland config."
-fi
-
-echo
-echo "Done. Open a new shell (or restart existing ones) to pick up the new"
-echo "OMARCHY_PATH. Run 'omarchy dev unlink' to restore the package install."
@@ -1,137 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Build and install an Omarchy package from a local checkout
-# omarchy:group=dev
-# omarchy:args=[package-name] [path-to-checkout]
-# omarchy:examples=omarchy dev pkg-test | omarchy dev pkg-test omarchy-dev ~/Work/omarchy/omarchy-installer
-
-set -euo pipefail
-
-if [[ ${1:-} == "-h" || ${1:-} == "--help" ]]; then
-  cat <<USAGE
-Usage: omarchy dev pkg-test [package-name] [path-to-checkout]
-
-Builds and installs an Omarchy package from a local Omarchy source
-checkout. Use when changes need to land at fixed system paths (/etc/,
-/usr/lib/systemd/, udev rule bodies, plymouth) that omarchy-dev-link
-can't shadow.
-
-Defaults:
-  packages          omarchy-settings-dev omarchy-dev
-  path-to-checkout  ~/Work/omarchy/omarchy-installer
-
-Examples:
-  omarchy dev pkg-test
-  omarchy dev pkg-test omarchy-settings-dev
-  omarchy dev pkg-test omarchy-dev ~/Work/omarchy/omarchy-installer
-
-The pkgver of the built package is tagged 'dev.<short-sha>[.dirty]' so
-'pacman -Q' makes it obvious where the installed version came from.
-
-PKGBUILDs are read from \${OMARCHY_PKGBUILDS_DIR:-~/Work/omarchy/omarchy-pkgs/pkgbuilds}/<package-name>/.
-USAGE
-  exit 0
-fi
-
-remove_pkgver_function() {
-  local pkgbuild="$1"
-  local tmp="$pkgbuild.tmp"
-
-  awk '
-    /^pkgver\(\)[[:space:]]*\{/ {
-      in_pkgver = 1
-      depth = 0
-    }
-    in_pkgver {
-      line = $0
-      opens = gsub(/\{/, "{", line)
-      line = $0
-      closes = gsub(/\}/, "}", line)
-      depth += opens - closes
-      if (depth <= 0) {
-        in_pkgver = 0
-      }
-      next
-    }
-    { print }
-  ' "$pkgbuild" >"$tmp"
-  mv "$tmp" "$pkgbuild"
-}
-
-dev_package_name() {
-  local pkg="$1"
-
-  case "$pkg" in
-    omarchy | omarchy-settings)
-      printf '%s-dev\n' "$pkg"
-      ;;
-    *)
-      printf '%s\n' "$pkg"
-      ;;
-  esac
-}
-
-if (( $# == 0 )); then
-  PKGS=(omarchy-settings-dev omarchy-dev)
-  CHECKOUT="$HOME/Work/omarchy/omarchy-installer"
-  MAKEPKG_ARGS=()
-else
-  PKGS=("$(dev_package_name "$1")")
-  CHECKOUT="${2:-$HOME/Work/omarchy/omarchy-installer}"
-  MAKEPKG_ARGS=("${@:3}")
-fi
-PKGBUILDS_ROOT="${OMARCHY_PKGBUILDS_DIR:-$HOME/Work/omarchy/omarchy-pkgs/pkgbuilds}"
-
-if [[ ! -d "$CHECKOUT" ]]; then
-  echo "Error: checkout not found at $CHECKOUT" >&2
-  exit 1
-fi
-for PKG in "${PKGS[@]}"; do
-  PKGBUILD_DIR="$PKGBUILDS_ROOT/$PKG"
-  if [[ ! -f "$PKGBUILD_DIR/PKGBUILD" ]]; then
-    echo "Error: PKGBUILD not found at $PKGBUILD_DIR/PKGBUILD" >&2
-    echo "       Pass a different package name as arg 1, or set OMARCHY_PKGBUILDS_DIR." >&2
-    exit 1
-  fi
-done
-
-build_dir=$(mktemp -d -t omarchy-dev-pkg-test.XXXXXX)
-trap 'rm -rf "$build_dir"' EXIT
-
-# pkgver=dev.<sha>[.dirty] so pacman -Q makes the source obvious.
-short_sha=$(git -C "$CHECKOUT" rev-parse --short HEAD 2>/dev/null || echo "local")
-dirty=""
-if [[ -d "$CHECKOUT/.git" ]] && [[ -n "$(git -C "$CHECKOUT" status --porcelain)" ]]; then
-  dirty=".dirty"
-fi
-new_pkgver="dev.${short_sha}${dirty}"
-
-for PKG in "${PKGS[@]}"; do
-  PKGBUILD_DIR="$PKGBUILDS_ROOT/$PKG"
-  package_build_dir="$build_dir/$PKG"
-  mkdir -p "$package_build_dir"
-  cp -a "$PKGBUILD_DIR/." "$package_build_dir/"
-
-  remove_pkgver_function "$package_build_dir/PKGBUILD"
-  sed -i "s/^pkgver=.*/pkgver=${new_pkgver}/" "$package_build_dir/PKGBUILD"
-
-  echo "Building $PKG ${new_pkgver} from $CHECKOUT"
-  echo "  build dir: $package_build_dir"
-  echo "  PKGBUILD : $PKGBUILD_DIR/PKGBUILD"
-  echo
-
-  (
-    cd "$package_build_dir"
-    OMARCHY_SRC="$CHECKOUT" makepkg -s --skipchecksums --noconfirm "${MAKEPKG_ARGS[@]}"
-  )
-
-  # Install separately so we can pass --overwrite='*' (makepkg -i can't).
-  # Dev builds frequently conflict with files left behind by previous
-  # script-installed Omarchy versions; the build is the authoritative state.
-  built_pkg=$(ls -t "$package_build_dir"/*.pkg.tar.* 2>/dev/null | grep -v '\.sig$' | head -1)
-  if [[ -z $built_pkg ]]; then
-    echo "Error: no built package found in $package_build_dir" >&2
-    exit 1
-  fi
-  sudo pacman -U --noconfirm --overwrite='*' "$built_pkg"
-done
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Show the current Omarchy dev-link state
-# omarchy:group=dev
-
-default_target="/usr/share/omarchy"
-configured="$default_target"
-conf_present=0
-linked=0
-
-if [[ -f /etc/omarchy.conf ]]; then
-  conf_present=1
-  configured=$(
-    OMARCHY_PATH=
-    # shellcheck disable=SC1091
-    . /etc/omarchy.conf
-    printf '%s' "${OMARCHY_PATH:-<empty>}"
-  )
-  if [[ $configured != "$default_target" ]]; then
-    linked=1
-  fi
-fi
-
-if (( linked )); then
-  echo "dev-link: ACTIVE"
-  echo "  /etc/omarchy.conf -> OMARCHY_PATH=$configured"
-else
-  echo "dev-link: inactive"
-  if (( conf_present )); then
-    echo "  /etc/omarchy.conf -> OMARCHY_PATH=$configured (default guard)"
-  fi
-fi
-
-echo "  current shell:       OMARCHY_PATH=${OMARCHY_PATH:-<unset>}"
-
-if (( linked )) && [[ ${OMARCHY_PATH:-} != "$configured" ]]; then
-  echo
-  echo "Note: this shell predates dev-link. Open a new shell to pick up the change,"
-  echo "or 'export OMARCHY_PATH=$configured' to update just this shell."
-elif (( ! linked )) && [[ ${OMARCHY_PATH:-$default_target} != "$default_target" ]]; then
-  echo
-  echo "Note: no dev-link is configured, but this shell still has a stale OMARCHY_PATH."
-  echo "Open a new shell or run 'export OMARCHY_PATH=$default_target'."
-fi
-
-if command -v hyprctl >/dev/null 2>&1 && hyprctl version &>/dev/null; then
-  hypr_path=$(hyprctl getoption -j env 2>/dev/null | sed -n 's/.*OMARCHY_PATH=\([^"]*\).*/\1/p' | head -1)
-  if [[ -n "$hypr_path" ]]; then
-    echo "  hyprland session:   OMARCHY_PATH=$hypr_path"
-  fi
-fi
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Restore Omarchy to the package install (undo omarchy-dev-link)
-# omarchy:group=dev
-
-set -euo pipefail
-
-if [[ $EUID -eq 0 ]]; then
-  echo "Error: run omarchy-dev-unlink as your user, not under sudo." >&2
-  exit 1
-fi
-
-if [[ ${1:-} == "-h" || ${1:-} == "--help" ]]; then
-  cat <<USAGE
-Usage: omarchy dev unlink
-
-Writes /etc/omarchy.conf defensively so OMARCHY_PATH resolves to
-/usr/share/omarchy (the package install), even from stale session env.
-Updates Hyprland/systemd session env and restarts omarchy-shell so live
-state matches.
-USAGE
-  exit 0
-fi
-
-default_target="/usr/share/omarchy"
-linked=0
-prior_target=""
-
-if [[ -f /etc/omarchy.conf ]]; then
-  # Capture the path dev-link wrote BEFORE we reset the conf, so we know
-  # which bin/ to strip from PATH.
-  prior_target=$(sed -n 's/^[[:space:]]*export[[:space:]]\+OMARCHY_PATH="\?\([^"]*\)"\?/\1/p' /etc/omarchy.conf | tail -1)
-  if [[ $prior_target != "$default_target" ]]; then
-    linked=1
-    echo "Unlinking Omarchy from ${prior_target:-<empty>}"
-  else
-    echo "/etc/omarchy.conf already points at $default_target."
-  fi
-elif [[ ${OMARCHY_PATH:-$default_target} != "$default_target" ]]; then
-  prior_target="$OMARCHY_PATH"
-  echo "Not currently linked: /etc/omarchy.conf is absent."
-  echo "This shell still has OMARCHY_PATH=$OMARCHY_PATH; writing the default guard."
-else
-  echo "Not currently linked. Writing the default OMARCHY_PATH guard."
-fi
-
-printf 'export OMARCHY_PATH="%s"\n' "$default_target" | sudo tee /etc/omarchy.conf >/dev/null
-echo "Set /etc/omarchy.conf -> OMARCHY_PATH=$default_target"
-
-export OMARCHY_PATH="$default_target"
-if [[ -n $prior_target && $prior_target != "$default_target" ]]; then
-  PATH=$(printf '%s' "$PATH" | tr ':' '\n' | awk -v drop="$prior_target/bin" '$0 != drop' | paste -sd:)
-  export PATH
-fi
-
-if command -v systemctl >/dev/null 2>&1; then
-  if systemctl --user import-environment OMARCHY_PATH PATH 2>/dev/null; then
-    echo "  Updated systemd --user env."
-  fi
-fi
-
-if command -v hyprctl >/dev/null 2>&1 && hyprctl version &>/dev/null; then
-  hyprctl setenv OMARCHY_PATH "$default_target" >/dev/null
-  hyprctl setenv PATH "$PATH" >/dev/null
-  echo "  Updated Hyprland session env."
-
-  if pgrep -x quickshell >/dev/null 2>&1; then
-    omarchy-restart-shell
-    echo "  Restarted omarchy-shell."
-  fi
-
-  hyprctl reload >/dev/null
-  echo "  Reloaded Hyprland config."
-fi
-
-echo
-if (( linked )) || [[ -n $prior_target ]]; then
-  echo "Done. Existing shells still have the old OMARCHY_PATH until restarted."
-  echo "For this shell, run: export OMARCHY_PATH=$default_target"
-else
-  echo "Done."
-fi
@@ -1,133 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Finalize Omarchy user setup (runtime tweaks /etc/skel can't do)
-# omarchy:group=finalize
-# omarchy:examples=omarchy finalize user | omarchy finalize user --force
-
-set -euo pipefail
-
-usage() {
-  cat <<USAGE
-Usage: omarchy finalize user [--force] [--first-install]
-
-Runs the per-user setup steps that /etc/skel can't seed:
-dev-aware skill symlinks, xdg-user-dirs + gtk bookmarks (need \$HOME),
-vconsole→hypr keyboard sync, default browser/mailto, and install/user/all.sh.
-
-For shipped configs see /etc/skel (new users) and omarchy-reinstall-configs
-(existing users explicitly resyncing).
-
--first-install is used by the ISO in the target chroot. It marks shipped
-user migrations complete for the freshly-created user.
-
-Idempotency marker: ~/.local/state/omarchy/finalize-user.done
-USAGE
-}
-
-if (( EUID == 0 )); then
-  echo "Error: run omarchy-finalize-user as the user being configured, not as root." >&2
-  exit 1
-fi
-
-force=0
-first_install=0
-while (($#)); do
-  case "$1" in
-    --force)
-      force=1
-      shift
-      ;;
-    --first-install)
-      first_install=1
-      force=1
-      shift
-      ;;
-    -h|--help)
-      usage
-      exit 0
-      ;;
-    *)
-      echo "Unknown option: $1" >&2
-      usage >&2
-      exit 1
-      ;;
-  esac
-done
-
-state_dir="$HOME/.local/state/omarchy"
-marker="$state_dir/finalize-user.done"
-mkdir -p "$state_dir"
-
-if [[ -f $marker && $force -eq 0 ]]; then
-  echo "User finalization already complete (rerun with --force to refresh)."
-  exit 0
-fi
-
-export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
-export OMARCHY_INSTALL="${OMARCHY_INSTALL:-$OMARCHY_PATH/install}"
-export OMARCHY_SETUP_CONTEXT="${OMARCHY_SETUP_CONTEXT:-runtime}"
-export PATH="$OMARCHY_PATH/bin:$PATH"
-
-if (( first_install )); then
-  export OMARCHY_SETUP_CONTEXT=iso-chroot
-fi
-
-if [[ -n ${OMARCHY_INSTALL_LOG_FILE:-} && -f $OMARCHY_INSTALL/helpers/logging.sh ]]; then
-  source "$OMARCHY_INSTALL/helpers/logging.sh"
-else
-  run_logged() {
-    local script="$1"
-    bash -eE -c 'source "$1"' bash "$script"
-  }
-fi
-
-# Dev-aware skill symlinks. Cannot live in /etc/skel because OMARCHY_PATH may
-# point at a dev checkout (omarchy dev link) where the target differs.
-mkdir -p ~/.agents/skills ~/.claude/skills ~/.codex/skills ~/.pi/agent/skills
-ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.agents/skills/omarchy
-ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.claude/skills/omarchy
-ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.codex/skills/omarchy
-ln -sfn "$OMARCHY_PATH/default/omarchy-skill" ~/.pi/agent/skills/omarchy
-
-mkdir -p ~/Downloads ~/Pictures ~/Videos ~/.config/gtk-3.0
-xdg-user-dirs-update --set TEMPLATES "$HOME"
-xdg-user-dirs-update --set PUBLICSHARE "$HOME"
-xdg-user-dirs-update --set DESKTOP "$HOME"
-rmdir ~/Templates ~/Public ~/Desktop 2>/dev/null || true
-touch ~/.config/gtk-3.0/bookmarks
-for dir in Downloads Projects Pictures Videos; do
-  bookmark="file://$HOME/$dir $dir"
-  grep -qxF "$bookmark" ~/.config/gtk-3.0/bookmarks || echo "$bookmark" >>~/.config/gtk-3.0/bookmarks
-done
-
-conf=/etc/vconsole.conf
-hyprlua="$HOME/.config/hypr/input.lua"
-if [[ -f $conf && -f $hyprlua ]]; then
-  sed -i '/^[[:space:]]*kb_layout[[:space:]]*=/d' "$hyprlua"
-  sed -i '/^[[:space:]]*kb_variant[[:space:]]*=/d' "$hyprlua"
-
-  if grep -q '^XKBLAYOUT=' "$conf"; then
-    layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
-    sed -i "/^[[:space:]]*kb_options *=/i\    kb_layout = \"$layout\"," "$hyprlua"
-  fi
-  if grep -q '^XKBVARIANT=' "$conf"; then
-    variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
-    sed -i "/^[[:space:]]*kb_options *=/i\    kb_variant = \"$variant\"," "$hyprlua"
-  fi
-fi
-
-source "$OMARCHY_INSTALL/user/all.sh"
-
-omarchy-refresh-applications
-xdg-settings set default-web-browser chromium.desktop
-xdg-mime default HEY.desktop x-scheme-handler/mailto
-
-if (( first_install )); then
-  mkdir -p "$state_dir/migrations/user"
-  for migration in "$OMARCHY_PATH"/migrations/user/*.sh; do
-    [[ -f $migration ]] && touch "$state_dir/migrations/user/$(basename "$migration")"
-  done
-fi
-
-touch "$marker"
-echo "User finalization complete."
@@ -1,135 +1,25 @@
 #!/bin/bash

-# omarchy:summary=Finish first-login setup for Omarchy.
-# omarchy:args=[--force]
+# omarchy:summary=Finish the installation of Omarchy with items that can only be done after logging in.
+# omarchy:requires-sudo=true

 set -e

-usage() {
-  cat <<USAGE
-Usage: omarchy-first-run [--force]
+FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode

-Run first-login user setup and notification hooks. By default this only runs
-once per user. Use --force to rerun the full sequence and refresh user setup.
-USAGE
-}
+if [[ -f $FIRST_RUN_MODE ]]; then
+  rm -f "$FIRST_RUN_MODE"

-force=0
-finalize_user_args=()
-while (($#)); do
-  case "$1" in
-    --force)
-      force=1
-      finalize_user_args+=(--force)
-      shift
-      ;;
-    -h|--help)
-      usage
-      exit 0
-      ;;
-    *)
-      echo "Unknown option: $1" >&2
-      usage >&2
-      exit 1
-      ;;
-  esac
-done
+  bash "$OMARCHY_PATH/install/first-run/recover-internal-monitor.sh"
+  bash "$OMARCHY_PATH/install/first-run/cleanup-reboot-sudoers.sh"
+  bash "$OMARCHY_PATH/install/first-run/firewall.sh"
+  bash "$OMARCHY_PATH/install/first-run/dns-resolver.sh"
+  bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
+  bash "$OMARCHY_PATH/install/first-run/gdk-scale.sh"
+  bash "$OMARCHY_PATH/install/first-run/gtk-primary-paste.sh"
+  omarchy-hook-install post-update "$OMARCHY_PATH/install/first-run/install-voxtype.hook"
+  sudo /bin/rm -f /etc/sudoers.d/first-run

-omarchy-finalize-user "${finalize_user_args[@]}" || true
-
-state_dir=~/.local/state/omarchy
-mkdir -p "$state_dir"
-
-FIRST_RUN_LOG="$state_dir/first-run.log"
-first_run_failed=0
-
-log_first_run() {
-  printf '[%s] %s\n' "$(date '+%Y-%m-%d %H:%M:%S')" "$*" >>"$FIRST_RUN_LOG"
-}
-
-notification_server_ready() {
-  if command -v gdbus >/dev/null 2>&1; then
-    gdbus call --session \
-      --dest org.freedesktop.Notifications \
-      --object-path /org/freedesktop/Notifications \
-      --method org.freedesktop.Notifications.GetServerInformation >/dev/null 2>&1
-  elif command -v busctl >/dev/null 2>&1; then
-    busctl --user call \
-      org.freedesktop.Notifications \
-      /org/freedesktop/Notifications \
-      org.freedesktop.Notifications \
-      GetServerInformation >/dev/null 2>&1
-  else
-    return 0
-  fi
-}
-
-wait_for_notifications() {
-  command -v omarchy-shell >/dev/null || return 0
-
-  for _ in {1..100}; do
-    if omarchy-shell notifications ping >/dev/null 2>&1 && notification_server_ready; then
-      return 0
-    fi
-    sleep 0.1
-  done
-
-  log_first_run "Timed out waiting for notification service; continuing"
-  return 0
-}
-
-run_first_run_step() {
-  local name="$1"
-  shift
-
-  log_first_run "Starting: $name"
-  if "$@"; then
-    log_first_run "Completed: $name"
-  else
-    local status=$?
-    first_run_failed=1
-    log_first_run "Failed: $name (exit code: $status)"
-  fi
-}
-
-wait_for_notifications
-
-MIGRATION_NOTIFY_WATCH_MARKER="$state_dir/user-migration-notify-watch-enabled"
-if [[ ! -f $MIGRATION_NOTIFY_WATCH_MARKER || $force -eq 1 ]]; then
-  if systemctl --user enable --now omarchy-update-user-notify.path >/dev/null 2>&1; then
-    touch "$MIGRATION_NOTIFY_WATCH_MARKER"
-  fi
-fi
-
-run_first_run_step "notify about pending user migrations" omarchy-migrate-notify
-
-USER_MARKER="$state_dir/first-run-user.done"
-if [[ ! -f $USER_MARKER || $force -eq 1 ]]; then
-  run_first_run_step "install Voxtype post-update hook" \
-    omarchy-hook-install post-update "$OMARCHY_PATH/install/user/first-run/install-voxtype.hook"
-
-  run_first_run_step "enable user systemd units" \
-    bash "$OMARCHY_PATH/install/user/first-run/enable-user-units.sh"
-  run_first_run_step "set GNOME theme" \
-    bash "$OMARCHY_PATH/install/user/first-run/gnome-theme.sh"
-  run_first_run_step "set GTK primary paste" \
-    bash "$OMARCHY_PATH/install/user/first-run/gtk-primary-paste.sh"
-
-  wait_for_notifications
-  run_first_run_step "show welcome notification" \
-    bash "$OMARCHY_PATH/install/user/first-run/welcome.sh"
-  # The first-run notification scripts register action callbacks in background
-  # notify-send processes. Give the notification server a tick to ingest the
-  # welcome toast before queueing the Wi-Fi/update toasts.
-  sleep 0.3
-  run_first_run_step "show Wi-Fi/update notifications" \
-    bash "$OMARCHY_PATH/install/user/first-run/wifi.sh"
-
-  if (( first_run_failed == 0 )); then
-    touch "$USER_MARKER"
-  else
-    log_first_run "One or more first-run steps failed; first-run will retry next login"
-  fi
-else
-  echo "First-run already complete (rerun with --force to refresh)."
+  bash "$OMARCHY_PATH/install/first-run/welcome.sh"
+  bash "$OMARCHY_PATH/install/first-run/wifi.sh"
 fi
@@ -4,87 +4,50 @@
 # omarchy:args=<font-name>
 # omarchy:examples=omarchy font list | omarchy font set "CaskaydiaMono Nerd Font"

-usage() {
-  echo "Usage: omarchy-font-set <font-name>"
-}
+font_name="$1"

-font_name="${1:-}"
-omarchy_root="${OMARCHY_PATH:-/usr/share/omarchy}"
+if [[ -n $font_name ]]; then
+  if fc-list | grep -iq "$font_name"; then
+    if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
+      sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
+    fi

-case "$font_name" in
-  -h|--help)
-    usage
-    exit 0
-    ;;
-  "")
-    usage >&2
-    exit 1
-    ;;
-esac
+    if [[ -f ~/.config/kitty/kitty.conf ]]; then
+      sed -i "s/^font_family .*/font_family $font_name/g" ~/.config/kitty/kitty.conf
+      pkill -USR1 kitty
+    fi

-if ! fc-list | grep -Fqi -- "$font_name"; then
-  echo "Font '$font_name' not found."
-  exit 1
-fi
+    if [[ -f ~/.config/ghostty/config ]]; then
+      sed -i "s/font-family = \".*\"/font-family = \"$font_name\"/g" ~/.config/ghostty/config
+      pkill -SIGUSR2 ghostty
+    fi

-if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
-  sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
-fi
+    if [[ -f ~/.config/foot/foot.ini ]]; then
+      sed -i "s/^font=.*/font=$font_name:size=9/g" ~/.config/foot/foot.ini
+    fi

-if [[ -f ~/.config/kitty/kitty.conf ]]; then
-  sed -i "s/^font_family .*/font_family $font_name/g" ~/.config/kitty/kitty.conf
-  pkill -USR1 kitty
-fi
+    # fontconfig is the canonical source of truth — the omarchy shell, Qt
+    # apps, and anything else that resolves "monospace" all read from here.
+    xmlstarlet ed -L \
+      -u '//match[@target="pattern"][test/string="monospace"]/edit[@name="family"]/string' \
+      -v "$font_name" \
+      ~/.config/fontconfig/fonts.conf

-if [[ -f ~/.config/ghostty/config ]]; then
-  sed -i "s/font-family = \".*\"/font-family = \"$font_name\"/g" ~/.config/ghostty/config
-  pkill -SIGUSR2 ghostty
-fi
+    omarchy-restart-shell

-if [[ -f ~/.config/foot/foot.ini ]]; then
-  sed -i "s/^font=.*/font=$font_name:size=9/g" ~/.config/foot/foot.ini
-fi
+    if pgrep -x ghostty; then
+      omarchy-notification-send -g  "You must restart Ghostty to see font change"
+    fi

-# fontconfig is the canonical source of truth — the omarchy shell, Qt apps,
-# and anything resolving "monospace" all read from here. The shipped default
-# is package-owned; create a user override only when the user changes fonts.
-fontconfig_file="$HOME/.config/fontconfig/fonts.conf"
-if [[ ! -f $fontconfig_file ]]; then
-  fontconfig_default="$omarchy_root/default/fontconfig/conf.avail/50-omarchy.conf"
-  if [[ ! -f $fontconfig_default ]]; then
-    echo "Default fontconfig file not found: $fontconfig_default" >&2
+    if pgrep -x foot; then
+      omarchy-notification-send -g  "You must restart Foot to see font change"
+    fi
+
+    omarchy-hook font-set "$font_name"
+  else
+    echo "Font '$font_name' not found."
    exit 1
  fi
-  mkdir -p "$(dirname "$fontconfig_file")"
-  cp "$fontconfig_default" "$fontconfig_file"
+else
+  echo "Usage: omarchy-font-set <font-name>"
 fi
-
-# We own the markup in 50-omarchy.conf, so the monospace block is predictable:
-# the <string>FAMILY</string> immediately after <string>monospace</string> is
-# the family we're replacing.
-tmp=$(mktemp)
-if ! awk -v new_font="$font_name" '
-  in_mono && /<string>[^<]*<\/string>/ {
-    sub(/<string>[^<]*<\/string>/, "<string>" new_font "</string>")
-    in_mono = 0
-  }
-  /<string>monospace<\/string>/ { in_mono = 1 }
-  { print }
-' "$fontconfig_file" >"$tmp"; then
-  rm -f "$tmp"
-  echo "Failed to update $fontconfig_file" >&2
-  exit 1
-fi
-mv "$tmp" "$fontconfig_file"
-
-omarchy-restart-shell
-
-if pgrep -x ghostty; then
-  omarchy-notification-send -g  "You must restart Ghostty to see font change"
-fi
-
-if pgrep -x foot; then
-  omarchy-notification-send -g  "You must restart Foot to see font change"
-fi
-
-omarchy-hook font-set "$font_name"
@@ -51,7 +51,11 @@ desktop_name="$game_name"
 desktop_id=$(printf '%s' "$desktop_name" | tr '[:upper:]' '[:lower:]' | tr -cs '[:alnum:]' '-' | sed 's/^-//; s/-$//')
 desktop_dir="$HOME/.local/share/applications"
 desktop_file="$desktop_dir/$desktop_id.desktop"
-mkdir -p "$desktop_dir"
+icon_dir="$desktop_dir/icons"
+icon_path="$icon_dir/Retro Gaming.png"
+
+mkdir -p "$desktop_dir" "$icon_dir"
+[[ -f $icon_path ]] || cp "$HOME/.local/share/omarchy/applications/icons/Retro Gaming.png" "$icon_path"

 cat >"$desktop_file" <<EOF
 [Desktop Entry]
@@ -61,7 +65,7 @@ Comment=Play $game_name with RetroArch
 Exec=retroarch -L "$core_path" "$game_path"
 Terminal=false
 Type=Application
-Icon=retro-gaming
+Icon=$icon_path
 StartupNotify=true
 Categories=Game;Emulator;
 EOF
@@ -38,9 +38,8 @@ if [[ -f $MKINITCPIO_CONF ]] && grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF";
    if [[ -n $RESUME_OFFSET ]]; then
      echo "Fixing empty resume_offset ($RESUME_OFFSET)"
      sudo sed -i "s/resume_offset=\"$/resume_offset=$RESUME_OFFSET\"/" "$RESUME_DROP_IN"
-      if ! $NO_REBUILD; then
-        sudo limine-mkinitcpio
-      fi
+      sudo sed -i "s/resume_offset=\"$/resume_offset=$RESUME_OFFSET\"/" /etc/default/limine
+      $NO_REBUILD || sudo limine-mkinitcpio
    fi
  fi
  echo "Hibernation is already set up"
@@ -101,6 +100,7 @@ if [[ ! -f $RESUME_DROP_IN ]]; then
  if [[ -n $RESUME_OFFSET ]]; then
    sudo mkdir -p /etc/limine-entry-tool.d
    echo "KERNEL_CMDLINE[default]+=\" resume=$RESUME_DEVICE resume_offset=$RESUME_OFFSET\"" | sudo tee "$RESUME_DROP_IN" >/dev/null
+    sudo tee -a /etc/default/limine < "$RESUME_DROP_IN" >/dev/null
  else
    echo "Warning: Could not determine resume offset for $SWAP_FILE" >&2
  fi
@@ -113,6 +113,7 @@ if grep -q "\[s2idle\]" /sys/power/mem_sleep 2>/dev/null; then
    echo "Enabling ACPI RTC alarm for s2idle suspend"
    sudo mkdir -p /etc/limine-entry-tool.d
    echo 'KERNEL_CMDLINE[default]+=" rtc_cmos.use_acpi_alarm=1"' | sudo tee "$LIMINE_DROP_IN" >/dev/null
+    sudo tee -a /etc/default/limine < "$LIMINE_DROP_IN" >/dev/null
  fi
 fi

@@ -67,7 +67,7 @@ brave-origin)
  setup_policy_directory /etc/brave/policies/managed
  mkdir -p ~/.config
  # FIXME: Use normal chromium flags when Brave Origin wrapper has been fixed
-  echo "--load-extension=/usr/share/omarchy/default/chromium/extensions/copy-url,/usr/share/omarchy/default/chromium/extensions/yt-dlp" > ~/.config/brave-origin-beta-flags.conf
+  echo "--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url,~/.local/share/omarchy/default/chromium/extensions/yt-dlp" > ~/.config/brave-origin-beta-flags.conf
  omarchy-install-chromium-ytdlp
  omarchy-theme-set-browser
  announce_browser_installed "Brave Origin"
@@ -63,9 +63,12 @@ EOF
  launched_installer=1
 fi

-mkdir -p "$HOME/.local/share/applications"
-install -m 644 "$OMARCHY_PATH/applications/battlenet.desktop" \
+mkdir -p "$HOME/.local/share/applications" "$HOME/.local/share/icons/hicolor/48x48/apps"
+install -m 644 "$HOME/.local/share/omarchy/applications/battlenet.desktop" \
  "$HOME/.local/share/applications/battlenet.desktop"
+install -m 644 "$HOME/.local/share/omarchy/applications/icons/Battle.net.png" \
+  "$HOME/.local/share/icons/hicolor/48x48/apps/Battle.net.png"
+gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
 update-desktop-database "$HOME/.local/share/applications" 2>/dev/null || true

 if (( launched_installer )); then
@@ -13,6 +13,8 @@ SUNSHINE_ADMIN_APP="Sunshine Admin"
 SUNSHINE_ADMIN_URL="https://localhost:47990"
 SUNSHINE_ADMIN_EXEC="omarchy-launch-webapp $SUNSHINE_ADMIN_URL --ignore-certificate-errors"
 SUNSHINE_ICON_SOURCE="/usr/share/sunshine/web/images/logo-sunshine-45.png"
+SUNSHINE_ICON_NAME="Sunshine Admin.png"
+WEBAPP_ICON_DIR="$HOME/.local/share/applications/icons"
 HYPR_AUTOSTART_FILE="$HOME/.config/hypr/autostart.lua"
 HYPR_AUTOSTART_ENTRY='o.launch_on_start("sunshine")'

@@ -57,7 +59,9 @@ open_ufw_ports() {
 }

 install_admin_webapp() {
-  omarchy-webapp-install "$SUNSHINE_ADMIN_APP" "$SUNSHINE_ADMIN_URL" "$SUNSHINE_ICON_SOURCE" "$SUNSHINE_ADMIN_EXEC"
+  mkdir -p "$WEBAPP_ICON_DIR"
+  cp "$SUNSHINE_ICON_SOURCE" "$WEBAPP_ICON_DIR/$SUNSHINE_ICON_NAME"
+  omarchy-webapp-install "$SUNSHINE_ADMIN_APP" "$SUNSHINE_ADMIN_URL" "$SUNSHINE_ICON_NAME" "$SUNSHINE_ADMIN_EXEC"
 }

 enable_hyprland_autostart() {
@@ -32,10 +32,10 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do

  case $terminal in
  *Alacritty*)
-    hypr_exec "alacritty --class=org.omarchy.screensaver --config-file $OMARCHY_PATH/default/alacritty/screensaver.toml -e omarchy-screensaver"
+    hypr_exec "alacritty --class=org.omarchy.screensaver --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml -e omarchy-screensaver"
    ;;
  *ghostty*)
-    hypr_exec "ghostty --class=org.omarchy.screensaver --config-file=$OMARCHY_PATH/default/ghostty/screensaver --font-size=18 -e omarchy-screensaver"
+    hypr_exec "ghostty --class=org.omarchy.screensaver --config-file=~/.local/share/omarchy/default/ghostty/screensaver --font-size=18 -e omarchy-screensaver"
    ;;
  *foot*)
    hypr_exec "foot --app-id=org.omarchy.screensaver --config=\"$OMARCHY_PATH/default/foot/screensaver.ini\" -e omarchy-screensaver"
@@ -1,97 +1,28 @@
 #!/bin/bash

-# omarchy:summary=Run pending Omarchy system and user migrations.
-# omarchy:args=[--pending [all|system|user]]
+# omarchy:summary=Run all pending migrations to bring the system in line with the installed version.

-set -euo pipefail
+STATE_DIR="$HOME/.local/state/omarchy/migrations"
+mkdir -p "$STATE_DIR"

-mode="run"
-pending_scope="all"
+# Skipped migrations are tracked separately
+mkdir -p "$STATE_DIR/skipped"

-usage() {
-  echo "Usage: omarchy-migrate [--pending [all|system|user]]"
-}
+# Run any pending migrations
+for file in $OMARCHY_PATH/migrations/*.sh; do
+  filename=$(basename "$file")

-while (($#)); do
-  case "$1" in
-    --pending|--check)
-      mode="pending"
-      shift
-      if [[ ${1:-} == "all" || ${1:-} == "system" || ${1:-} == "user" ]]; then
-        pending_scope="$1"
-        shift
+  if [[ ! -f $STATE_DIR/$filename && ! -f $STATE_DIR/skipped/$filename ]]; then
+    echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"
+
+    if bash $file; then
+      touch "$STATE_DIR/$filename"
+    else
+      if gum confirm "Migration ${filename%.sh} failed. Skip and continue?"; then
+        touch "$STATE_DIR/skipped/$filename"
+      else
+        exit 1
      fi
-      ;;
-    --pending=all|--pending=system|--pending=user)
-      mode="pending"
-      pending_scope="${1#--pending=}"
-      shift
-      ;;
-    -h|--help)
-      usage
-      exit 0
-      ;;
-    *)
-      echo "Unknown option: $1" >&2
-      exit 1
-      ;;
-  esac
+    fi
+  fi
 done
-
-pending_output=""
-
-append_pending() {
-  local scope="$1"
-  local command="$2"
-  local output=""
-  local migration=""
-
-  if output=$("$command" --pending 2>/dev/null); then
-    while IFS= read -r migration; do
-      [[ -n $migration ]] || continue
-      pending_output+="$scope/$migration"$'\n'
-    done <<<"$output"
-  fi
-}
-
-if [[ $mode == "pending" ]]; then
-  case "$pending_scope" in
-    all)
-      append_pending system omarchy-migrate-system
-      append_pending user omarchy-migrate-user
-      ;;
-    system)
-      append_pending system omarchy-migrate-system
-      ;;
-    user)
-      append_pending user omarchy-migrate-user
-      ;;
-  esac
-
-  if [[ -n $pending_output ]]; then
-    printf '%s' "$pending_output"
-    exit 0
-  else
-    exit 1
-  fi
-fi
-
-wait_for_pacman_transaction() {
-  local lock_file=/var/lib/pacman/db.lck
-
-  [[ -e $lock_file ]] || return 0
-  echo "Waiting for pacman transaction to finish before running Omarchy migrations..."
-
-  for _ in {1..900}; do
-    [[ -e $lock_file ]] || return 0
-    sleep 1
-  done
-
-  echo "Pacman transaction is still running; Omarchy migrations will retry on next login."
-  exit 0
-}
-
-wait_for_pacman_transaction
-
-omarchy-migrate-system
-omarchy-migrate-user
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Notify the user when Omarchy has pending user migrations
-
-set -euo pipefail
-
-pending_migrations=$(omarchy-migrate --pending user 2>/dev/null) || exit 0
-pending_count=$(printf '%s\n' "$pending_migrations" | sed '/^[[:space:]]*$/d' | wc -l)
-
-if (( pending_count == 1 )); then
-  message="1 new Omarchy user migration is available. Click to run it in a terminal."
-else
-  message="$pending_count new Omarchy user migrations are available. Click to run them in a terminal."
-fi
-
-notify_command=$(printf 'if [[ -n $(omarchy-notification-send -u critical -g  "Run Omarchy Migrations" %q -a) ]]; then omarchy-launch-floating-terminal-with-presentation omarchy-migrate; fi' "$message")
-
-if command -v systemd-run >/dev/null 2>&1; then
-  unit="omarchy-migrations-notification-$(date +%Y%m%d%H%M%S)"
-  systemd-run --user --scope --unit="$unit" bash -lc "$notify_command" >/dev/null 2>&1 && exit 0
-fi
-
-print_pending_migrations() {
-  echo "Omarchy has pending user migrations. Run omarchy-migrate in a terminal to apply them:"
-  while IFS= read -r migration; do
-    [[ -n $migration ]] || continue
-    printf '  %s\n' "$migration"
-  done <<<"$pending_migrations"
-}
-
-if [[ -t 1 ]]; then
-  print_pending_migrations
-else
-  print_pending_migrations >&2
-fi
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Run pending Omarchy system migrations as root.
-# omarchy:args=[--pending]
-# omarchy:requires-sudo=true
-
-set -euo pipefail
-
-mode="run"
-while (($#)); do
-  case "$1" in
-    --pending|--check)
-      mode="pending"
-      shift
-      ;;
-    -h|--help)
-      echo "Usage: omarchy-migrate-system [--pending]"
-      exit 0
-      ;;
-    *)
-      echo "Unknown option: $1" >&2
-      exit 1
-      ;;
-  esac
-done
-
-OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
-STATE_DIR="${OMARCHY_SYSTEM_MIGRATION_STATE:-/var/lib/omarchy/migrations/system}"
-MIGRATIONS_DIR="$OMARCHY_PATH/migrations/system"
-
-pending_migrations() {
-  [[ -d $MIGRATIONS_DIR ]] || return 0
-
-  for file in "$MIGRATIONS_DIR"/*.sh; do
-    [[ -f $file ]] || continue
-    filename=$(basename "$file")
-
-    if [[ ! -f $STATE_DIR/$filename ]]; then
-      printf '%s\n' "$filename"
-    fi
-  done
-}
-
-if [[ $mode == "pending" ]]; then
-  pending_output=$(pending_migrations)
-  if [[ -n $pending_output ]]; then
-    printf '%s\n' "$pending_output"
-    exit 0
-  else
-    exit 1
-  fi
-fi
-
-if (( EUID != 0 )) && [[ -z ${OMARCHY_SYSTEM_MIGRATION_STATE:-} ]]; then
-  if ! "$0" --pending >/dev/null; then
-    exit 0
-  fi
-
-  exec sudo --preserve-env=OMARCHY_PATH "$0" "$@"
-fi
-
-mkdir -p "$STATE_DIR"
-[[ -d $MIGRATIONS_DIR ]] || exit 0
-
-for file in "$MIGRATIONS_DIR"/*.sh; do
-  [[ -f $file ]] || continue
-  filename=$(basename "$file")
-
-  if [[ ! -f $STATE_DIR/$filename ]]; then
-    echo -e "\e[32m\nRunning system migration (${filename%.sh})\e[0m"
-    OMARCHY_PATH="$OMARCHY_PATH" bash -euo pipefail "$file"
-    touch "$STATE_DIR/$filename"
-  fi
-done
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Run pending Omarchy migrations for the current user.
-# omarchy:args=[--pending]
-
-set -euo pipefail
-
-mode="run"
-while (($#)); do
-  case "$1" in
-    --pending|--check)
-      mode="pending"
-      shift
-      ;;
-    -h|--help)
-      echo "Usage: omarchy-migrate-user [--pending]"
-      exit 0
-      ;;
-    *)
-      echo "Unknown option: $1" >&2
-      exit 1
-      ;;
-  esac
-done
-
-OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
-STATE_DIR="${OMARCHY_USER_MIGRATION_STATE:-$HOME/.local/state/omarchy/migrations/user}"
-MIGRATIONS_DIR="$OMARCHY_PATH/migrations/user"
-
-pending_migrations() {
-  [[ -d $MIGRATIONS_DIR ]] || return 0
-
-  for file in "$MIGRATIONS_DIR"/*.sh; do
-    [[ -f $file ]] || continue
-    filename=$(basename "$file")
-
-    if [[ ! -f $STATE_DIR/$filename ]]; then
-      printf '%s\n' "$filename"
-    fi
-  done
-}
-
-if [[ $mode == "pending" ]]; then
-  pending_output=$(pending_migrations)
-  if [[ -n $pending_output ]]; then
-    printf '%s\n' "$pending_output"
-    exit 0
-  else
-    exit 1
-  fi
-fi
-
-mkdir -p "$STATE_DIR"
-[[ -d $MIGRATIONS_DIR ]] || exit 0
-
-for file in "$MIGRATIONS_DIR"/*.sh; do
-  [[ -f $file ]] || continue
-  filename=$(basename "$file")
-
-  if [[ ! -f $STATE_DIR/$filename ]]; then
-    echo -e "\e[32m\nRunning user migration (${filename%.sh})\e[0m"
-    OMARCHY_PATH="$OMARCHY_PATH" bash -euo pipefail "$file"
-    touch "$STATE_DIR/$filename"
-  fi
-done
@@ -6,11 +6,7 @@
 # omarchy:requires-sudo=true

 if omarchy-pkg-missing "$@"; then
-  if (( EUID == 0 )); then
-    pacman -S --noconfirm --needed "$@" || exit 1
-  else
-    sudo pacman -S --noconfirm --needed "$@" || exit 1
-  fi
+  sudo pacman -S --noconfirm --needed "$@" || exit 1
 fi

 for pkg in "$@"; do
@@ -35,7 +35,7 @@ fi
 staging_dir=$(mktemp -d)
 trap 'rm -rf "$staging_dir"' EXIT

-find $OMARCHY_PATH/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} +
+find ~/.local/share/omarchy/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} +
 cp "$logo_path" "$staging_dir/logo.png"

 for asset in bullet.png entry.png lock.png; do
@@ -5,7 +5,7 @@

 theme_dir="/usr/share/plymouth/themes/omarchy"

-sudo find $OMARCHY_PATH/default/plymouth -maxdepth 1 -type f -exec cp -t "$theme_dir/" {} +
+sudo find ~/.local/share/omarchy/default/plymouth -maxdepth 1 -type f -exec cp -t "$theme_dir/" {} +
 sudo plymouth-set-default-theme omarchy

 if omarchy-cmd-present limine-mkinitcpio; then
@@ -42,7 +42,7 @@ theme_dir="/usr/share/plymouth/themes/omarchy"
 staging_dir=$(mktemp -d)
 trap 'rm -rf "$staging_dir"' EXIT

-find $OMARCHY_PATH/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} +
+find ~/.local/share/omarchy/default/plymouth -maxdepth 1 -type f -exec cp -t "$staging_dir/" {} +
 cp "$logo_path" "$staging_dir/logo.png"

 sed -i \
@@ -65,7 +65,7 @@ fi

 # Sync the SDDM login screen with the same colors and logo.
 sddm_dir="/usr/share/sddm/themes/omarchy"
-sddm_template="$OMARCHY_PATH/default/sddm/omarchy/Main.qml"
+sddm_template="$HOME/.local/share/omarchy/default/sddm/omarchy/Main.qml"

 sed \
  -e "s/#1a1b26/#$bg_hex/g" \
@@ -1,6 +1,10 @@
 #!/bin/bash

-# omarchy:summary=Ensure default application launchers and mise wrappers are installed.
+# omarchy:summary=Ensure all default .desktop, web apps, TUIs, and mise wrappers are installed.
+
+mkdir -p ~/.local/share/icons/hicolor/48x48/apps/
+cp "$OMARCHY_PATH"/applications/icons/*.png ~/.local/share/icons/hicolor/48x48/apps/
+gtk-update-icon-cache ~/.local/share/icons/hicolor &>/dev/null

 # Copy .desktop declarations
 mkdir -p ~/.local/share/applications
@@ -10,8 +14,10 @@ if omarchy-cmd-present alacritty; then
  cp "$OMARCHY_PATH/default/alacritty/Alacritty.desktop" ~/.local/share/applications/
 fi

-if [[ -f "$OMARCHY_PATH/install/user/mise.sh" ]]; then
-  bash "$OMARCHY_PATH/install/user/mise.sh"
-fi
+# Refresh the webapps, TUIs, and mise wrappers
+bash "$OMARCHY_PATH/install/packaging/icons.sh"
+bash "$OMARCHY_PATH/install/packaging/webapps.sh"
+bash "$OMARCHY_PATH/install/packaging/tuis.sh"
+bash "$OMARCHY_PATH/install/packaging/mise.sh"

 update-desktop-database ~/.local/share/applications
@@ -1,37 +1,37 @@
 #!/bin/bash

-# omarchy:summary=Copy a shipped user config from /etc/skel/.config into ~/.config (backs up your version).
+# omarchy:summary=Copies the named config from ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z.
 # omarchy:args=<config-path>

-config_file=${1:-}
+config_file=$1

 if [[ -z $config_file ]]; then
  cat <<USAGE
  Usage: $0 [config_file]

-  Must provide a file path relative to .config to be refreshed.
-  To copy /etc/skel/.config/hypr/hyprland.lua to ~/.config/hypr/hyprland.lua:
+  Must provide a file path from the .config directory to be refreshed.
+  To copy ~/.local/share/omarchy/config/hypr/hyprland.lua to ~/.config/hypr/hyprland.lua

    $0 hypr/hyprland.lua
 USAGE
  exit 1
 fi

+# Backup the destination file (with timestamp) to avoid clobbering (Ex: hyprland.lua.bak.1753817951)
 user_config_file="${HOME}/.config/$config_file"
-default_config_file="/etc/skel/.config/$config_file"
+default_config_file="$OMARCHY_PATH/config/$config_file"
 backup_config_file="$user_config_file.bak.$(date +%s)"

-if [[ ! -e $default_config_file ]]; then
-  echo "Not a shipped user config: $config_file" >&2
-  exit 1
-fi
-
 mkdir -p "$(dirname "$user_config_file")"

 if [[ -f $user_config_file ]]; then
-  cp -f "$user_config_file" "$backup_config_file"
-  cp -f "$default_config_file" "$user_config_file"
+  # Create preliminary backup
+  cp -f "$user_config_file" "$backup_config_file" 2>/dev/null

+  # Replace config with new default
+  cp -f "$default_config_file" "$user_config_file" 2>/dev/null
+
+  # Compare and delete/inform accordingly
  if cmp -s "$user_config_file" "$backup_config_file"; then
    rm "$backup_config_file"
  else
@@ -39,5 +39,6 @@ if [[ -f $user_config_file ]]; then
    diff "$user_config_file" "$backup_config_file" || true
  fi
 else
-  cp -f "$default_config_file" "$user_config_file"
+  # Config file did not exist already
+  cp -f "$default_config_file" "$user_config_file" 2>/dev/null
 fi
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Overwrite the user config for fastfetch with the Omarchy default.
+
+omarchy-refresh-config fastfetch/config.jsonc
@@ -9,23 +9,5 @@ omarchy-refresh-config hypr/input.lua
 omarchy-refresh-config hypr/looknfeel.lua
 omarchy-refresh-config hypr/hyprland.lua
 omarchy-refresh-config hypr/monitors.lua
-
-mkdir -p ~/.local/state/omarchy/toggles/hypr
-cp "$OMARCHY_PATH/default/hypr/toggles/flags.lua" ~/.local/state/omarchy/toggles/hypr/
-
-conf=/etc/vconsole.conf
-hyprlua="$HOME/.config/hypr/input.lua"
-if [[ -f $conf && -f $hyprlua ]]; then
-  sed -i '/^[[:space:]]*kb_layout[[:space:]]*=/d' "$hyprlua"
-  sed -i '/^[[:space:]]*kb_variant[[:space:]]*=/d' "$hyprlua"
-
-  if grep -q '^XKBLAYOUT=' "$conf"; then
-    layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
-    sed -i "/^[[:space:]]*kb_options *=/i\    kb_layout = \"$layout\"," "$hyprlua"
-  fi
-
-  if grep -q '^XKBVARIANT=' "$conf"; then
-    variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
-    sed -i "/^[[:space:]]*kb_options *=/i\    kb_variant = \"$variant\"," "$hyprlua"
-  fi
-fi
+bash "$OMARCHY_PATH/install/config/omarchy-toggles.sh"
+bash "$OMARCHY_PATH/install/config/detect-keyboard-layout.sh"
@@ -11,7 +11,7 @@ echo "Resetting limine config"

 sudo mv /boot/limine.conf /boot/limine.conf.bak

-sudo cp $OMARCHY_PATH/default/limine/limine.conf /boot/limine.conf
+sudo cp ~/.local/share/omarchy/default/limine/limine.conf /boot/limine.conf

 sudo limine-update
 sudo limine-snapper-sync
@@ -23,4 +23,4 @@ sudo cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-$channel" /etc/pacman.d/mirr
 omarchy-hook pre-refresh-pacman

 # Reset all package DBs and then update
-sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syyuu --noconfirm
+sudo pacman -Syyuu --noconfirm
@@ -3,7 +3,7 @@
 # omarchy:summary=Overwrite the user config for the Plymouth drive decryption and boot sequence with the Omarchy default and rebuild it.
 # omarchy:requires-sudo=true

-sudo cp -r $OMARCHY_PATH/default/plymouth/* /usr/share/plymouth/themes/omarchy/
+sudo cp -r ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
 sudo plymouth-set-default-theme omarchy

 if command -v limine-mkinitcpio &>/dev/null; then
@@ -5,9 +5,12 @@

 set -e

-echo -e "This will reinstall all default Omarchy packages and reset default configs.\nWarning: user config changes will be overwritten.\n"
+# Attempt to reinstall all default Omarchy packages and reset all the default configs.

-if gum confirm "Are you sure you want to reinstall and lose config changes?"; then
+echo -e "This will reinstall all the default Omarchy packages and reset all default configs.\nWarning: All user changes to configs will be lost.\n"
+
+if gum confirm "Are you sure you want to reinstall and lose all config changes?"; then
+  omarchy-reinstall-git
  omarchy-reinstall-pkgs
  omarchy-reinstall-configs

@@ -1,28 +1,24 @@
 #!/bin/bash

-# omarchy:summary=Reset Omarchy user configs and shipped defaults in $HOME (destructive)
+# omarchy:summary=Reset all Omarchy user configs to the defaults
+# omarchy:requires-sudo=true

-set -euo pipefail
+set -e
+
+# Overwrite all user configs with the Omarchy defaults.

 if (( EUID == 0 )); then
  echo "Error: This script should not be run as root"
  exit 1
 fi

-echo "Resetting Omarchy user configs to shipped defaults..."
+echo "Resetting all Omarchy configs"
+cp -R ~/.local/share/omarchy/config/* ~/.config/
+cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
+echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' | tee ~/.bash_profile >/dev/null

-# /etc/skel is the same tree useradd -m copies to seed a fresh user's $HOME.
-# Replaying it over an existing user resyncs every package-shipped user
-# default in one pass: .bashrc, .config/**, .local/share/applications,
-# nautilus-python extensions, branding, hypr toggles, and migration markers.
-# Trailing dot copies dotfiles; the shell wouldn't glob them with /etc/skel/*.
-cp -af /etc/skel/. ~/
+$(bash $OMARCHY_PATH/install/config/theme.sh)

 omarchy-refresh-limine
 omarchy-refresh-plymouth
-
-if omarchy-cmd-present omarchy-nvim-refresh; then
-  omarchy-nvim-refresh
-elif omarchy-cmd-present omarchy-nvim-setup; then
-  omarchy-nvim-setup --force
-fi
+omarchy-nvim-setup
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# omarchy:summary=Reinstall the stable Omarchy source directory from git
+
+set -e
+
+# Reinstall the Omarchy configuration directory from the git source.
+
+git clone --depth=1 --branch master "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
+mv $OMARCHY_PATH ~/.local/share/omarchy-old
+mv ~/.local/share/omarchy-new $OMARCHY_PATH
@@ -11,8 +11,8 @@ set -e
 omarchy-refresh-pacman

 # Downgrade any packages to the stable setup
-sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Suu --noconfirm
+sudo pacman -Suu --noconfirm

 # Ensure all packages are installed
 mapfile -t packages < <(grep -v '^#' "$OMARCHY_PATH/install/omarchy-base.packages" | grep -v '^$')
-sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syu --noconfirm --needed "${packages[@]}"
+sudo pacman -Syu --noconfirm --needed "${packages[@]}"
@@ -12,7 +12,9 @@ sleep 1

 rm -rf "$PREFIX"
 rm -f "$HOME/.local/share/applications/battlenet.desktop"
+rm -f "$HOME/.local/share/icons/hicolor/48x48/apps/Battle.net.png"
 rm -f "$HOME/.cache/omarchy/Battle.net-Setup.exe"
+gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
 update-desktop-database "$HOME/.local/share/applications" 2>/dev/null || true

 echo
@@ -24,6 +24,7 @@ if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI w
    spotify \
    libreoffice-fresh \
    1password \
+    1password-beta \
    1password-cli \
    xournalpp \
    signal-desktop \
@@ -3,21 +3,9 @@
 # omarchy:summary=Restart the Omarchy shell
 # omarchy:examples=omarchy restart shell

-omarchy_root="${OMARCHY_PATH:-/usr/share/omarchy}"
-if [[ ! -f $omarchy_root/shell/shell.qml && -f /usr/share/omarchy/shell/shell.qml ]]; then
-  omarchy_root=/usr/share/omarchy
-fi
+CONFIG_DIR="$OMARCHY_PATH/shell"

-CONFIG_DIR="$omarchy_root/shell"
-[[ -f $CONFIG_DIR/shell.qml ]] || { echo "Omarchy shell config not found: $CONFIG_DIR" >&2; exit 1; }
-
-export OMARCHY_PATH="$omarchy_root"
-export PATH="$omarchy_root/bin:/usr/local/bin:/usr/bin:/bin:$PATH"
-
-omarchy_shell_bin=/usr/bin/omarchy-shell
-[[ -x $omarchy_shell_bin ]] || omarchy_shell_bin=omarchy-shell
-
-if [[ $("$omarchy_shell_bin" lock isLocked 2>/dev/null || true) == "true" ]]; then
+if [[ $(omarchy-shell lock isLocked 2>/dev/null || true) == "true" ]]; then
  echo "Refusing to restart Omarchy shell while the session is locked." >&2
  exit 1
 fi
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Apply Omarchy hardware-specific packages and system configuration
-# omarchy:group=setup
-# omarchy:requires-sudo=true
-# omarchy:examples=omarchy setup hardware --install-user dhh
-
-set -euo pipefail
-
-usage() {
-  cat <<USAGE
-Usage: omarchy setup hardware --install-user USER
-
-Runs idempotent hardware detection/setup for the installed machine. This is
-called by omarchy-setup-system during ISO finalization and can be rerun later
-for diagnostics or after hardware/package updates.
-USAGE
-}
-
-install_user="${OMARCHY_INSTALL_USER:-}"
-while (($#)); do
-  case "$1" in
-    --install-user)
-      install_user="${2:-}"
-      shift 2
-      ;;
-    -h|--help)
-      usage
-      exit 0
-      ;;
-    *)
-      echo "Unknown option: $1" >&2
-      usage >&2
-      exit 1
-      ;;
-  esac
-done
-
-if (( EUID != 0 )); then
-  echo "Error: omarchy-setup-hardware must run as root" >&2
-  exit 1
-fi
-
-if [[ -z $install_user || $install_user == "root" ]]; then
-  echo "Error: --install-user must name the target non-root user" >&2
-  exit 1
-fi
-
-if ! getent passwd "$install_user" >/dev/null; then
-  echo "Error: user '$install_user' does not exist" >&2
-  exit 1
-fi
-
-export OMARCHY_INSTALL_USER="$install_user"
-export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
-export OMARCHY_INSTALL="${OMARCHY_INSTALL:-$OMARCHY_PATH/install}"
-export OMARCHY_INSTALL_LOG_FILE="${OMARCHY_INSTALL_LOG_FILE:-/var/log/omarchy-install.log}"
-export PATH="$OMARCHY_PATH/bin:$PATH"
-
-source "$OMARCHY_INSTALL/helpers/logging.sh"
-source "$OMARCHY_INSTALL/hardware/all.sh"
@@ -7,7 +7,7 @@

 set -e

-target_user=${OMARCHY_INSTALL_USER:-${SUDO_USER:-}}
+target_user=${SUDO_USER:-}
 if [[ -z $target_user && -n ${PKEXEC_UID:-} ]]; then
  target_user=$(getent passwd "$PKEXEC_UID" | cut -d: -f1)
 fi
@@ -59,9 +59,4 @@ else
 fi


-# omarchy-shell can't reach a running shell during chroot install. The echo
-# is just confirmation, so swallow the failure rather than letting it become
-# the script's exit code.
-if omarchy-shell lock status >/dev/null 2>&1; then
-  echo "Lock screen authentication configured."
-fi
+omarchy-shell lock status >/dev/null 2>&1 && echo "Lock screen authentication configured."
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Apply Omarchy system setup in the installed target
-# omarchy:group=setup
-# omarchy:requires-sudo=true
-# omarchy:examples=omarchy setup system --install-user dhh --first-install
-
-set -euo pipefail
-
-usage() {
-  cat <<USAGE
-Usage: omarchy setup system --install-user USER [--first-install|--upgrade]
-
-Runs root-owned Omarchy system setup. The ISO calls this in the target chroot
-after packages are installed and the target user exists. It also calls
-omarchy-setup-hardware, so hardware setup cannot be accidentally skipped.
-USAGE
-}
-
-install_user="${OMARCHY_INSTALL_USER:-}"
-first_install=0
-upgrade=0
-
-while (($#)); do
-  case "$1" in
-    --install-user)
-      install_user="${2:-}"
-      shift 2
-      ;;
-    --first-install)
-      first_install=1
-      shift
-      ;;
-    --upgrade)
-      upgrade=1
-      shift
-      ;;
-    -h|--help)
-      usage
-      exit 0
-      ;;
-    *)
-      echo "Unknown option: $1" >&2
-      usage >&2
-      exit 1
-      ;;
-  esac
-done
-
-if (( EUID != 0 )); then
-  echo "Error: omarchy-setup-system must run as root" >&2
-  exit 1
-fi
-
-if [[ -z $install_user || $install_user == "root" ]]; then
-  echo "Error: --install-user must name the target non-root user" >&2
-  exit 1
-fi
-
-if ! getent passwd "$install_user" >/dev/null; then
-  echo "Error: user '$install_user' does not exist" >&2
-  exit 1
-fi
-
-export OMARCHY_INSTALL_USER="$install_user"
-export OMARCHY_FIRST_INSTALL="$first_install"
-export OMARCHY_UPGRADE="$upgrade"
-export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
-export OMARCHY_INSTALL="${OMARCHY_INSTALL:-$OMARCHY_PATH/install}"
-export OMARCHY_INSTALL_LOG_FILE="${OMARCHY_INSTALL_LOG_FILE:-/var/log/omarchy-install.log}"
-export PATH="$OMARCHY_PATH/bin:$PATH"
-
-source "$OMARCHY_INSTALL/helpers/logging.sh"
-start_install_log
-
-run_logged "$OMARCHY_INSTALL/config/theme-system.sh"
-run_logged "$OMARCHY_INSTALL/config/increase-lockout-limit.sh"
-run_logged "$OMARCHY_INSTALL/config/lockscreen-pam.sh"
-run_logged "$OMARCHY_INSTALL/config/fix-powerprofilesctl-shebang.sh"
-run_logged "$OMARCHY_INSTALL/config/docker.sh"
-run_logged "$OMARCHY_INSTALL/config/enable-services.sh"
-run_logged "$OMARCHY_INSTALL/config/firewall.sh"
-
-omarchy-setup-hardware --install-user "$install_user"
-
-run_logged "$OMARCHY_INSTALL/login/sddm.sh"
-
-run_logged "$OMARCHY_INSTALL/post-install/pacman.sh"
-run_logged "$OMARCHY_INSTALL/post-install/udev.sh"
-run_logged "$OMARCHY_INSTALL/post-install/localdb.sh"
-
-stop_install_log
@@ -4,6 +4,6 @@

 clear
 echo -e "\033[32m"
-cat <$OMARCHY_PATH/logo.txt
+cat <~/.local/share/omarchy/logo.txt
 echo -e "\033[0m"
 echo
@@ -7,13 +7,11 @@
 monitor_command='exec dbus-monitor --system "type='\''signal'\'',sender='\''org.freedesktop.login1'\'',interface='\''org.freedesktop.login1.Manager'\'',member='\''PrepareForSleep'\''"'

 consume_sleep_events() {
-  local line sleep_lock
-  sleep_lock=$(command -v omarchy-system-sleep-lock || true)
-  sleep_lock=${sleep_lock:-/usr/bin/omarchy-system-sleep-lock}
+  local line

  while IFS= read -r line; do
    if [[ $line == *"boolean true"* ]]; then
-      "$sleep_lock"
+      "$OMARCHY_PATH/bin/omarchy-system-sleep-lock"
      exit 0
    fi
  done
@@ -24,12 +22,9 @@ if [[ ${1:-} == "--consume" ]]; then
  exit 0
 fi

-sleep_monitor=$(command -v omarchy-system-sleep-monitor || true)
-sleep_monitor=${sleep_monitor:-/usr/bin/omarchy-system-sleep-monitor}
-
 exec systemd-inhibit \
  --what=sleep \
  --mode=delay \
  --who=Omarchy \
  --why="Lock screen before suspend" \
-  bash -lc "$monitor_command | \"$sleep_monitor\" --consume"
+  bash -lc "$monitor_command | \"$OMARCHY_PATH/bin/omarchy-system-sleep-monitor\" --consume"
@@ -56,18 +56,21 @@ snapshot_current_background() {
  snapshot_background_path "$current_background" "previous"
 }

-choose_theme_background() {
+set_theme_background() {
  local backgrounds=()
-  local current_background index next_index i
+  local current_background index new_background next_index new_background_snapshot

-  CHOSEN_THEME_BACKGROUND=""
  mapfile -d '' -t backgrounds < <(
    find -L "$HOME/.config/omarchy/backgrounds/$THEME_NAME/" "$CURRENT_THEME_PATH/backgrounds/" -maxdepth 1 -type f \
      \( -iname '*.jpg' -o -iname '*.jpeg' -o -iname '*.png' -o -iname '*.gif' -o -iname '*.bmp' -o -iname '*.webp' \) \
      -print0 2>/dev/null | sort -z
  )

-  (( ${#backgrounds[@]} > 0 )) || return 1
+  if (( ${#backgrounds[@]} == 0 )); then
+    omarchy-notification-send "No background was found for theme" -t 2000
+    shell_ipc shell applyTheme "$colors_payload" "$shell_payload" || true
+    return
+  fi

  current_background=$(readlink "$CURRENT_BACKGROUND_LINK" 2>/dev/null || true)
  index=-1
@@ -79,28 +82,12 @@ choose_theme_background() {
  done

  if (( index == -1 )); then
-    CHOSEN_THEME_BACKGROUND="${backgrounds[0]}"
+    new_background="${backgrounds[0]}"
  else
    next_index=$(((index + 1) % ${#backgrounds[@]}))
-    CHOSEN_THEME_BACKGROUND="${backgrounds[$next_index]}"
-  fi
-}
-
-set_theme_background_link() {
-  choose_theme_background || return 1
-  ln -nsf "$CHOSEN_THEME_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
-}
-
-set_theme_background() {
-  local new_background new_background_snapshot
-
-  if ! choose_theme_background; then
-    omarchy-notification-send "No background was found for theme" -t 2000
-    shell_ipc shell applyTheme "$colors_payload" "$shell_payload" || true
-    return
+    new_background="${backgrounds[$next_index]}"
  fi

-  new_background="$CHOSEN_THEME_BACKGROUND"
  new_background_snapshot=$(snapshot_background_path "$new_background" "next")

  if [[ -f $OLD_BACKGROUND_SNAPSHOT && -f $new_background_snapshot ]]; then
@@ -123,10 +110,6 @@ set_theme_background() {
 }

 THEME_NAME=$(echo "$1" | sed -E 's/<[^>]+>//g' | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
-THEME_HEADLESS=0
-if [[ ${OMARCHY_THEME_HEADLESS:-} == "1" || ${OMARCHY_THEME_OFFLINE:-} == "1" ]]; then
-  THEME_HEADLESS=1
-fi

 if [[ ! -d $OMARCHY_THEMES_PATH/$THEME_NAME ]] && [[ ! -d $USER_THEMES_PATH/$THEME_NAME ]]; then
  echo "Theme '$THEME_NAME' does not exist"
@@ -156,7 +139,7 @@ fi
 omarchy-theme-set-templates

 OLD_BACKGROUND_SNAPSHOT=""
-if [[ $THEME_HEADLESS != "1" && $OMARCHY_THEME_SKIP_BACKGROUND != "1" ]]; then
+if [[ $OMARCHY_THEME_SKIP_BACKGROUND != "1" ]]; then
  OLD_BACKGROUND_SNAPSHOT=$(snapshot_current_background)
 fi

@@ -171,12 +154,7 @@ echo "$THEME_NAME" >"$HOME/.config/omarchy/current/theme.name"
 # the theme hooks run.
 colors_payload=$([[ -f $CURRENT_THEME_PATH/colors.toml ]] && base64 -w 0 "$CURRENT_THEME_PATH/colors.toml")
 shell_payload=$([[ -f $CURRENT_THEME_PATH/shell.toml ]] && base64 -w 0 "$CURRENT_THEME_PATH/shell.toml")
-if [[ $THEME_HEADLESS == "1" ]]; then
-  # No shell/session bus exists during ISO chroot finalization, but the first
-  # real login still needs a current background symlink for omarchy-shell to
-  # render.
-  [[ $OMARCHY_THEME_SKIP_BACKGROUND == "1" ]] || set_theme_background_link || true
-elif [[ $OMARCHY_THEME_SKIP_BACKGROUND == "1" ]]; then
+if [[ $OMARCHY_THEME_SKIP_BACKGROUND == "1" ]]; then
  shell_ipc shell applyTheme "$colors_payload" "$shell_payload" || true
 else
  set_theme_background
@@ -203,15 +181,13 @@ post_theme_commands=(
  omarchy-theme-set-keyboard
 )

-if [[ $THEME_HEADLESS != "1" ]]; then
-  run_parallel "${post_theme_commands[@]}"
+run_parallel "${post_theme_commands[@]}"

-  # Call hook on theme set
-  omarchy-hook theme-set "$THEME_NAME" >/dev/null
+# Call hook on theme set
+omarchy-hook theme-set "$THEME_NAME" >/dev/null

-  # Warm selector caches after the theme is applied. The shell hot-reloads theme
-  # colors/backgrounds, so keep the running instance alive and preload the picker
-  # rows/selection to avoid first-open carousel settling after a theme change.
-  omarchy-theme-switcher --preload >/dev/null 2>&1
-  omarchy-theme-bg-cache >/dev/null 2>&1 &
-fi
+# Warm selector caches after the theme is applied. The shell hot-reloads theme
+# colors/backgrounds, so keep the running instance alive and preload the picker
+# rows/selection to avoid first-open carousel settling after a theme change.
+omarchy-theme-switcher --preload >/dev/null 2>&1
+omarchy-theme-bg-cache >/dev/null 2>&1 &
@@ -3,13 +3,6 @@
 # omarchy:summary=Apply the current theme to GNOME color mode and icon settings
 # omarchy:hidden=true

-# gsettings needs a user DBus session. During ISO installs this command can be
-# reached from arch-chroot while applying the initial Omarchy theme; defer until
-# the user has a real session instead of emitting dconf warnings.
-if [[ -z ${DBUS_SESSION_BUS_ADDRESS:-} ]]; then
-  exit 0
-fi
-
 THEME_DIR=~/.config/omarchy/current/theme
 COLORS_FILE="$THEME_DIR/colors.toml"

@@ -1,76 +1,40 @@
 #!/bin/bash

 # omarchy:summary=Create a desktop launcher for a terminal UI app
-# omarchy:args=[name command window-style icon-url-or-name]
+# omarchy:args=[name command window-style icon-url]

 set -e

-ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
-
-safe_icon_name() {
-  printf '%s\n' "$1" \
-    | tr '[:upper:]' '[:lower:]' \
-    | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//'
-}
-
-icon_name_from_ref() {
-  local ref="$1"
-  local name
-  name=$(basename "$ref")
-
-  if [[ $name == *.* ]]; then
-    safe_icon_name "${name%.*}"
-  else
-    printf '%s\n' "$name"
-  fi
-}
-
-install_user_icon() {
-  local source="$1"
-  local name="$2"
-  local ext="${source##*.}"
-
-  [[ $ext == "$source" ]] && ext="png"
-  mkdir -p "$ICON_DIR"
-  cp "$source" "$ICON_DIR/$name.$ext"
-  gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
-  printf '%s\n' "$name"
-}
-
 if (( $# != 4 )); then
  echo -e "\e[32mLet's create a TUI shortcut you can start with the app launcher.\n\e[0m"
  APP_NAME=$(gum input --prompt "Name> " --placeholder "My TUI")
  APP_EXEC=$(gum input --prompt "Launch Command> " --placeholder "lazydocker or bash -c 'dust; read -n 1 -s'")
  WINDOW_STYLE=$(gum choose --header "Window style" float tile)
-  ICON_REF=$(gum input --prompt "Icon URL/name> " --placeholder "See https://dashboardicons.com or enter an installed icon name")
+  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG or SVG!)")
 else
  APP_NAME="$1"
  APP_EXEC="$2"
  WINDOW_STYLE="$3"
-  ICON_REF="$4"
+  ICON_URL="$4"
 fi

-if [[ -z $APP_NAME || -z $APP_EXEC || -z $ICON_REF ]]; then
-  echo "You must set app name, app command, and icon URL/name!"
+if [[ -z $APP_NAME || -z $APP_EXEC || -z $ICON_URL ]]; then
+  echo "You must set app name, app command, and icon URL!"
  exit 1
 fi

+ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
-mkdir -p "$(dirname "$DESKTOP_FILE")"

-if [[ $ICON_REF =~ ^https?:// ]]; then
-  ICON_VALUE=$(safe_icon_name "$APP_NAME")
+if [[ ! $ICON_URL =~ ^https?:// ]] && [[ -f $ICON_URL ]]; then
+  ICON_PATH="$ICON_URL"
+else
+  ICON_PATH="$ICON_DIR/$APP_NAME.png"
  mkdir -p "$ICON_DIR"
-  if ! curl -sL -o "$ICON_DIR/$ICON_VALUE.png" "$ICON_REF"; then
+  if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
    echo "Error: Failed to download icon."
    exit 1
  fi
-  gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
-elif [[ -f $ICON_REF ]]; then
-  ICON_VALUE=$(install_user_icon "$ICON_REF" "$(safe_icon_name "$APP_NAME")")
-else
-  # Bundled Omarchy icons are package-owned under /usr/share/icons/hicolor.
-  ICON_VALUE=$(icon_name_from_ref "$ICON_REF")
 fi

 if [[ $WINDOW_STYLE == "float" ]]; then
@@ -87,7 +51,7 @@ Comment=$APP_NAME
 Exec=xdg-terminal-exec --app-id=$APP_CLASS -e $APP_EXEC
 Terminal=false
 Type=Application
-Icon=$ICON_VALUE
+Icon=$ICON_PATH
 StartupNotify=true
 EOF

@@ -5,8 +5,7 @@

 set -e

-ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
-OLD_ICON_DIR="$HOME/.local/share/applications/icons"
+ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"

 if (( $# == 0 )); then
@@ -33,7 +32,6 @@ if [[ -z $APP_NAME ]]; then
  exit 1
 fi

-icon_name=$(printf '%s\n' "$APP_NAME" | tr '[:upper:]' '[:lower:]' | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//')
 rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
-rm -f "$ICON_DIR/$icon_name.png" "$ICON_DIR/$APP_NAME.png" "$OLD_ICON_DIR/$APP_NAME.png"
+rm -f "$ICON_DIR/$APP_NAME.png"
 omarchy-notification-send -g  "TUI removed" "$APP_NAME"
@@ -5,8 +5,7 @@
 set -e

 APP_DIR="${1:-$HOME/.local/share/applications}"
-ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
-OLD_ICON_DIR="$HOME/.local/share/applications/icons"
+ICON_DIR="$HOME/.local/share/applications/icons"

 echo "Scanning for TUIs in $APP_DIR..."

@@ -24,10 +23,9 @@ fi

 for file in "${tui_desktop_files[@]}"; do
  app_name=$(basename "$file" .desktop)
-  icon_name=$(printf '%s\n' "$app_name" | tr '[:upper:]' '[:lower:]' | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//')
  echo "Removing TUI: $app_name"
  rm -f "$file"
-  rm -f "$ICON_DIR/$icon_name.png" "$ICON_DIR/$app_name.png" "$OLD_ICON_DIR/$app_name.png"
+  rm -f "$ICON_DIR/$app_name.png"
 done

 if command -v update-desktop-database &>/dev/null; then
@@ -7,100 +7,17 @@

 set -e

-if [[ -z ${OMARCHY_UPDATE_LOGGED:-} ]]; then
+# Run the update inside a PTY so pacman/yay keep showing download progress
+# while still logging the full session for later analysis.
+if [[ -z $OMARCHY_UPDATE_LOGGED ]]; then
  script_command=$(printf '%q ' "$0" "$@")
  exec env OMARCHY_UPDATE_LOGGED=1 script -qefc "$script_command" "/tmp/omarchy-update.log"
 fi

-acquire_update_lock() {
-  local lock_dir="${XDG_RUNTIME_DIR:-/tmp}"
-  local lock_path="$lock_dir/omarchy-update.lock"
-  local lock_fd_path=""
-
-  mkdir -p "$lock_dir" 2>/dev/null || true
-
-  if [[ -n ${OMARCHY_UPDATE_LOCK_FD:-} && -e /proc/$$/fd/$OMARCHY_UPDATE_LOCK_FD ]]; then
-    lock_fd_path=$(readlink -f "/proc/$$/fd/$OMARCHY_UPDATE_LOCK_FD" 2>/dev/null || true)
-    if [[ $lock_fd_path == "$(readlink -m "$lock_path")" ]] && flock -n "$OMARCHY_UPDATE_LOCK_FD"; then
-      return 0
-    fi
-  fi
-
-  exec {OMARCHY_UPDATE_LOCK_FD}>"$lock_path"
-  if ! flock -n "$OMARCHY_UPDATE_LOCK_FD"; then
-    echo "An Omarchy update is already running."
-    exit 1
-  fi
-  export OMARCHY_UPDATE_LOCK_FD
-}
-
-update_disabled_idle=0
-sleep_inhibit_pid=""
-
-disable_sleep_for_update() {
-  command -v systemd-inhibit >/dev/null 2>&1 || return 0
-
-  systemd-inhibit \
-    --what=sleep:idle \
-    --who=omarchy-update \
-    --why="Omarchy update in progress" \
-    --mode=block \
-    sleep infinity >/dev/null 2>&1 &
-  sleep_inhibit_pid=$!
-}
-
-disable_idle_for_update() {
-  local stay_awake_state="$HOME/.local/state/omarchy/indicators/stay-awake"
-
-  if [[ ! -f $stay_awake_state ]]; then
-    omarchy-toggle-idle stay-awake >/dev/null 2>&1 || true
-    update_disabled_idle=1
-  fi
-}
-
-restore_update_inhibitors() {
-  if (( update_disabled_idle )); then
-    omarchy-toggle-idle allow-idle >/dev/null 2>&1 || true
-  fi
-
-  if [[ -n $sleep_inhibit_pid ]]; then
-    kill "$sleep_inhibit_pid" >/dev/null 2>&1 || true
-    wait "$sleep_inhibit_pid" >/dev/null 2>&1 || true
-  fi
-}
-
-run_update_pipeline() {
-  disable_sleep_for_update
-  disable_idle_for_update
-
-  omarchy-update-keyring
-  omarchy-update-system-pkgs
-  omarchy-migrate
-  omarchy-hook post-update
-  omarchy-update-aur-pkgs
-  omarchy-update-mise
-  omarchy-update-orphan-pkgs
-
-  omarchy-update-analyze-logs
-
-  # Re-check after updates so the status bar reflects any remaining updates.
-  # This clears the state when everything is current, so a separate reset command
-  # is not needed.
-  if omarchy-update-available >/dev/null; then
-    omarchy-shell -q omarchy.system-update refresh
-  else
-    omarchy-shell -q omarchy.system-update clear
-  fi
-
-  omarchy-update-restart
-}
-
-acquire_update_lock
-
-trap restore_update_inhibitors EXIT
 trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m"' ERR

-if [[ ${1:-} == "-y" ]] || omarchy-update-confirm; then
+if [[ $1 == "-y" ]] || omarchy-update-confirm; then
  omarchy-snapshot create || (($? == 127))
-  run_update_pipeline
+  omarchy-update-git
+  omarchy-update-perform
 fi
@@ -1,119 +1,24 @@
 #!/bin/bash

-# omarchy:summary=Check whether system or AUR packages have available updates.
+# omarchy:summary=Get remote tag

-set -euo pipefail
-
-CHECK_TIMEOUT="${OMARCHY_UPDATE_CHECK_TIMEOUT:-60}"
-STATE_DIR="${XDG_STATE_HOME:-$HOME/.local/state}/omarchy/updates"
-TMP_PARENT="${TMPDIR:-/tmp}"
-
-mkdir -p "$STATE_DIR"
-
-tmp_dir=$(mktemp -d "$TMP_PARENT/omarchy-update-available.XXXXXX")
-trap 'rm -rf "$tmp_dir"' EXIT
-
-packages_raw="$tmp_dir/packages.raw"
-packages_tmp="$tmp_dir/packages"
-aur_raw="$tmp_dir/aur.raw"
-aur_tmp="$tmp_dir/aur"
-errors_tmp="$tmp_dir/errors"
-
-packages_file="$STATE_DIR/packages"
-aur_file="$STATE_DIR/aur"
-available_file="$STATE_DIR/available"
-checked_at_file="$STATE_DIR/checked-at"
-error_file="$STATE_DIR/error"
-
-: >"$packages_raw"
-: >"$packages_tmp"
-: >"$aur_raw"
-: >"$aur_tmp"
-: >"$errors_tmp"
-
-strip_update_output() {
-  local source="$1"
-  local destination="$2"
-
-  sed -E 's/\x1B\[[0-9;]*m//g' "$source" | sed '/^[[:space:]]*$/d' >"$destination"
-}
-
-check_system_packages() {
-  local status=0
-
-  if command -v checkupdates >/dev/null 2>&1 && command -v fakeroot >/dev/null 2>&1; then
-    CHECKUPDATES_DB="$tmp_dir/checkupdates-db" timeout "$CHECK_TIMEOUT" checkupdates --nocolor >"$packages_raw" 2>"$tmp_dir/checkupdates.err" || status=$?
-
-    case "$status" in
-      0|2)
-        ;;
-      124)
-        echo "System package update check timed out" >>"$errors_tmp"
-        ;;
-      *)
-        echo "System package update check failed" >>"$errors_tmp"
-        sed '/^[[:space:]]*$/d' "$tmp_dir/checkupdates.err" >>"$errors_tmp" || true
-        ;;
-    esac
-  elif command -v pacman >/dev/null 2>&1; then
-    # Fallback for systems that have not picked up pacman-contrib/fakeroot yet.
-    # This only reports updates already known to the local sync database.
-    pacman -Qu --color never >"$packages_raw" 2>/dev/null || true
-  else
-    echo "pacman is not available" >>"$errors_tmp"
-  fi
-
-  strip_update_output "$packages_raw" "$packages_tmp"
-}
-
-check_aur_packages() {
-  local status=0
-
-  command -v pacman >/dev/null 2>&1 || return 0
-  command -v yay >/dev/null 2>&1 || return 0
-  pacman -Qem >/dev/null 2>&1 || return 0
-
-  timeout "$CHECK_TIMEOUT" yay --color never -Qua >"$aur_raw" 2>"$tmp_dir/yay.err" || status=$?
-
-  case "$status" in
-    0|1)
-      ;;
-    124)
-      echo "AUR package update check timed out" >>"$errors_tmp"
-      ;;
-    *)
-      echo "AUR package update check failed" >>"$errors_tmp"
-      sed '/^[[:space:]]*$/d' "$tmp_dir/yay.err" >>"$errors_tmp" || true
-      ;;
-  esac
-
-  strip_update_output "$aur_raw" "$aur_tmp"
-  grep -vw '\[ignored\]$' "$aur_tmp" >"$aur_tmp.filtered" || true
-  mv "$aur_tmp.filtered" "$aur_tmp"
-}
-
-check_system_packages
-check_aur_packages
-
-cp "$packages_tmp" "$packages_file"
-cp "$aur_tmp" "$aur_file"
-cat "$packages_tmp" "$aur_tmp" >"$available_file"
-date --iso-8601=seconds >"$checked_at_file"
-
-if [[ -s $errors_tmp ]]; then
-  cp "$errors_tmp" "$error_file"
-else
-  rm -f "$error_file"
+latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
+if [[ -z $latest_tag ]]; then
+  echo "Error: Could not retrieve latest tag."
+  exit 1
 fi

-if [[ -s $available_file ]]; then
-  cat "$available_file"
+# Get local tag
+current_tag=$(git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1))
+if [[ -z $current_tag ]]; then
+  echo "Error: Could not retrieve current tag."
+  exit 1
+fi
+
+if [[ $current_tag != $latest_tag ]]; then
+  echo "Omarchy update available ($latest_tag)"
  exit 0
+else
+  echo "Omarchy is up to date ($current_tag)"
+  exit 1
 fi
-
-if [[ -s $error_file ]]; then
-  cat "$error_file" >&2
-fi
-
-echo "System is up to date"
-exit 1
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# omarchy:summary=Ensure the status bar icon offering the available update is removed
+
+omarchy-shell -q SystemUpdate refresh
+exit 0
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# omarchy:summary=Switch Omarchy branches and update from the selected branch
+# omarchy:args=<branch>
+
+set -e
+
+if (($# == 0)); then
+  echo "Usage: omarchy-update-branch [master|dev]"
+  exit 1
+fi
+
+branch="$1"
+
+# Snapshot before switching branch
+omarchy-snapshot create || (( $? == 127 ))
+
+if ! git -C "$OMARCHY_PATH" diff --quiet || ! git -C "$OMARCHY_PATH" diff --cached --quiet; then
+  stashed=true
+  git -C "$OMARCHY_PATH" stash push -u -m "Autostash before switching to $branch"
+else
+  stashed=false
+fi
+
+# Switch branches
+git -C "$OMARCHY_PATH" switch "$branch"
+
+# Reapply stash if we made one
+if [[ $stashed == "true" ]]; then
+  if ! git -C "$OMARCHY_PATH" stash pop; then
+    echo "⚠️ Conflicts when applying stash — stash kept"
+  fi
+fi
+
+# Update the system from the new branch
+omarchy-update-perform
@@ -8,7 +8,7 @@ gum style --border normal --padding "1 2" \
  "• You cannot stop the update once you start!" \
  "• Make sure you're connected to power or have a full battery" \
  "" \
-  "What's new: https://github.com/basecamp/omarchy/releases/latest"
+  "What's new: https://github.com/basecamp/omarchy/releases"

 echo

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# omarchy:summary=Pull the latest Omarchy git changes
+
+set -e
+
+echo -e "\e[32mUpdate Omarchy\e[0m"
+
+omarchy-update-time
+
+# Suppress Hyprland config errors while git updates default config files mid-pull
+hyprctl keyword debug:suppress_errors true &>/dev/null || true
+hyprctl eval 'hl.config({ debug = { suppress_errors = true } })' &>/dev/null || true
+
+git -C $OMARCHY_PATH pull --autostash
+git -C $OMARCHY_PATH --no-pager diff --check || git -C $OMARCHY_PATH reset --merge
+
+hyprctl reload &>/dev/null || true
@@ -1,29 +1,13 @@
 #!/bin/bash

-# omarchy:summary=Review and optionally remove orphaned system packages after updates
+# omarchy:summary=Remove orphaned system packages after updates
 # omarchy:requires-sudo=true

-set -e
-
-mapfile -t orphans < <(pacman -Qtdq 2>/dev/null || true)
-(( ${#orphans[@]} )) || exit 0
-
-echo -e "\e[32m\nOrphan system packages\e[0m"
-printf '  %s\n' "${orphans[@]}"
-echo
-
-if [[ ! -t 0 || ! -t 1 ]]; then
-  echo "${#orphans[@]} orphaned package(s) found. Re-run omarchy-update-orphan-pkgs in a terminal to review/remove them."
+orphans=$(pacman -Qtdq || true)
+if [[ -n $orphans ]]; then
+  echo -e "\e[32m\nRemove orphan system packages\e[0m"
+  for pkg in $orphans; do
+    sudo pacman -Rs --noconfirm "$pkg" || true
+  done
  echo
-  exit 0
 fi
-
-if ! gum confirm --default=false "Remove ${#orphans[@]} orphaned package(s)?"; then
-  echo "Keeping orphaned packages."
-  echo
-  exit 0
-fi
-
-echo -e "\e[32m\nRemoving orphan system packages\e[0m"
-sudo pacman -Rns "${orphans[@]}"
-echo
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Prevent direct pacman system upgrades from bypassing omarchy update.
-# omarchy:hidden=true
-
-set -euo pipefail
-
-if [[ ${OMARCHY_UPDATE_PACMAN:-} == "1" || ${OMARCHY_ALLOW_DIRECT_PACMAN:-} == "1" ]]; then
-  exit 0
-fi
-
-pacman_args=()
-if [[ -n ${OMARCHY_PACMAN_CMDLINE:-} ]]; then
-  read -r -a pacman_args <<<"$OMARCHY_PACMAN_CMDLINE"
-elif [[ -r /proc/$PPID/cmdline ]]; then
-  mapfile -d '' -t pacman_args <"/proc/$PPID/cmdline" || true
-fi
-
-is_system_upgrade=0
-has_sync=0
-has_sysupgrade=0
-
-for arg in "${pacman_args[@]}"; do
-  case "$arg" in
-    --sync)
-      has_sync=1
-      ;;
-    --sysupgrade)
-      has_sysupgrade=1
-      ;;
-    --*)
-      ;;
-    -*)
-      [[ $arg == *S* ]] && has_sync=1
-      [[ $arg == *u* ]] && has_sysupgrade=1
-      ;;
-  esac
-done
-
-if (( has_sync && has_sysupgrade )); then
-  is_system_upgrade=1
-fi
-
-(( is_system_upgrade )) || exit 0
-
-cat >&2 <<'MESSAGE'
-
-Woah partner...
-
-This looks like a direct pacman system upgrade. Omarchy updates should normally
-run through:
-
-  omarchy update
-
-That path handles the update transcript, snapshot, keyrings, package upgrade,
-migrations, post-update hooks, shell update state, and restart checks together.
-
-If you really meant to bypass Omarchy for this transaction, rerun pacman with:
-
-  sudo env OMARCHY_ALLOW_DIRECT_PACMAN=1 pacman -Syu
-
-MESSAGE
-
-exit 1
@@ -1,7 +1,26 @@
 #!/bin/bash

-# omarchy:summary=Compatibility wrapper for omarchy-update -y.
-# omarchy:hidden=true
+# omarchy:summary=Run the full Omarchy update pipeline
 # omarchy:requires-sudo=true

-exec omarchy-update -y
+set -e
+
+# Ensure screensaver/sleep doesn't set in during updates
+hyprctl dispatch 'hl.dsp.window.tag({ tag = "+noidle" })' &>/dev/null || hyprctl dispatch tagwindow +noidle &>/dev/null || true
+
+# Perform all update steps
+omarchy-update-keyring
+omarchy-update-available-reset
+omarchy-update-system-pkgs
+omarchy-migrate
+omarchy-update-aur-pkgs
+omarchy-update-mise
+omarchy-update-orphan-pkgs
+omarchy-hook post-update
+
+omarchy-update-analyze-logs
+
+omarchy-update-restart
+
+# Re-enable screensaver/sleep after updates
+hyprctl dispatch 'hl.dsp.window.tag({ tag = "-noidle" })' &>/dev/null || hyprctl dispatch tagwindow -- -noidle &>/dev/null || true
@@ -6,25 +6,4 @@
 set -e

 echo -e "\e[32m\nUpdate system packages\e[0m"
-
-# Transition --overwrite: previous script-installed Omarchy wrote these paths
-# as unowned files; pacman would refuse the omarchy-settings upgrade on first
-# encounter. Drop each entry once the transition release is the baseline.
-sudo env OMARCHY_UPDATE_PACMAN=1 pacman -Syu --noconfirm \
-  --overwrite '/etc/docker/daemon.json' \
-  --overwrite '/etc/gnupg/dirmngr.conf' \
-  --overwrite '/etc/modprobe.d/omarchy-usb-autosuspend.conf' \
-  --overwrite '/etc/sudoers.d/omarchy-asdcontrol' \
-  --overwrite '/etc/sudoers.d/omarchy-passwd-tries' \
-  --overwrite '/etc/sudoers.d/omarchy-tzupdate' \
-  --overwrite '/etc/sysctl.d/90-omarchy-file-watchers.conf' \
-  --overwrite '/etc/sysctl.d/99-omarchy-sysctl.conf' \
-  --overwrite '/etc/systemd/logind.conf.d/10-ignore-power-button.conf' \
-  --overwrite '/etc/systemd/resolved.conf.d/10-disable-multicast.conf' \
-  --overwrite '/etc/systemd/resolved.conf.d/20-docker-dns.conf' \
-  --overwrite '/etc/systemd/system.conf.d/10-faster-shutdown.conf' \
-  --overwrite '/etc/systemd/system/user@.service.d/10-faster-shutdown.conf' \
-  --overwrite '/etc/systemd/system/docker.service.d/no-block-boot.conf' \
-  --overwrite '/etc/systemd/system/plocate-updatedb.service.d/ac-only.conf' \
-  --overwrite '/usr/lib/systemd/system-sleep/unmount-fuse' \
-  --overwrite '/usr/share/plymouth/themes/omarchy/*'
+sudo pacman -Syyu --noconfirm
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Compatibility wrapper for omarchy-migrate-notify.
-# omarchy:hidden=true
-
-exec omarchy-migrate-notify "$@"
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# omarchy:summary=No-op now that omarchy-update-perform is responsible for idle management.
+# omarchy:hidden=true
@@ -28,7 +28,7 @@ else
    echo "========================================="
    echo "SYSTEM INFORMATION"
    echo "========================================="
-    echo "Hostname: $(uname -n)"
+    echo "Hostname: $(hostname)"
    echo "Kernel: $(uname -r)"
    echo "Date: $(date)"
    echo ""
@@ -39,53 +39,14 @@ else
  } >"$SYSTEM_INFO"
 fi

-same_or_prefix_log() {
-  local a="$1" b="$2" size_a size_b min_size
-  [[ -s $a && -s $b ]] || return 1
-  cmp -s "$a" "$b" && return 0
-
-  size_a=$(stat -c '%s' "$a" 2>/dev/null) || return 1
-  size_b=$(stat -c '%s' "$b" 2>/dev/null) || return 1
-  if (( size_a < size_b )); then
-    min_size=$size_a
-  else
-    min_size=$size_b
-  fi
-  (( min_size > 0 )) || return 1
-
-  cmp -n "$min_size" "$a" "$b" >/dev/null 2>&1
-}
-
 case "$LOG_TYPE" in
 install)
-  # In the live ISO before reboot, the target system is mounted at /mnt so the
-  # omarchy install log lives at /mnt/var/log/omarchy-install.log. On the
-  # installed system it's at /var/log/omarchy-install.log. Prefer whichever
-  # exists, with /mnt taking precedence (only present in the ISO context, and
-  # there it's the right one).
  ARCHINSTALL_LOG="/var/log/archinstall/install.log"
-  LIVE_OMARCHY_LOG="/var/log/omarchy-install.log"
-  TARGET_OMARCHY_LOG="/mnt/var/log/omarchy-install.log"
+  OMARCHY_LOG="/var/log/omarchy-install.log"

+  # Combine system info with logs
  cat "$SYSTEM_INFO" >"$TEMP_LOG"
-  if [[ -s $ARCHINSTALL_LOG ]]; then
-    printf '\n========================================\nARCHINSTALL SUBSYSTEM LOG (%s)\n========================================\n\n' "$ARCHINSTALL_LOG" >>"$TEMP_LOG"
-    cat "$ARCHINSTALL_LOG" >>"$TEMP_LOG"
-  fi
-
-  if [[ -s $LIVE_OMARCHY_LOG ]]; then
-    printf '\n========================================\nOMARCHY INSTALL LOG (%s)\n========================================\n\n' "$LIVE_OMARCHY_LOG" >>"$TEMP_LOG"
-    cat "$LIVE_OMARCHY_LOG" >>"$TEMP_LOG"
-  fi
-
-  if [[ -s $TARGET_OMARCHY_LOG ]] && ! same_or_prefix_log "$LIVE_OMARCHY_LOG" "$TARGET_OMARCHY_LOG"; then
-    printf '\n========================================\nTARGET OMARCHY INSTALL LOG (%s)\n========================================\n\n' "$TARGET_OMARCHY_LOG" >>"$TEMP_LOG"
-    cat "$TARGET_OMARCHY_LOG" >>"$TEMP_LOG"
-  fi
-
-  if [[ ! -s $LIVE_OMARCHY_LOG && ! -s $TARGET_OMARCHY_LOG ]]; then
-    echo "Warning: omarchy install log not found (looked at /var/log and /mnt/var/log)" >&2
-  fi
+  cat $ARCHINSTALL_LOG $OMARCHY_LOG >>"$TEMP_LOG" 2>/dev/null

  if [[ ! -s $TEMP_LOG ]]; then
    echo "Error: No install logs found"
@@ -152,13 +113,15 @@ esac

 echo ""

-URL=$(curl -sf -F "file=@$TEMP_LOG" -Fexpires=24 https://logs.omarchy.org/)
+URL=$(curl -sF "file=@$TEMP_LOG" -Fexpires=24 https://logs.omarchy.org)

 if (( $? == 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
@@ -2,22 +2,4 @@

 # omarchy:summary=Print the installed Omarchy version

-omarchy_path=${OMARCHY_PATH:-/usr/share/omarchy}
-omarchy_path=${omarchy_path%/}
-
-if [[ $omarchy_path != "/usr/share/omarchy" ]]; then
-  hash=$(git -C "$omarchy_path" rev-parse --short HEAD 2>/dev/null || true)
-
-  if [[ -n $hash ]]; then
-    echo "dev ($hash)"
-  else
-    echo "dev"
-  fi
-
-  exit 0
-fi
-
-version=$(pacman -Q omarchy 2>/dev/null | awk '{ print $2 }')
-[[ -n $version ]] || exit 1
-
-echo "$version"
+cat $OMARCHY_PATH/version
@@ -1,18 +1,5 @@
 #!/bin/bash

-# omarchy:summary=Print the active Omarchy dev-link git branch
-# omarchy:hidden=true
+# omarchy:summary=Print the current Omarchy git branch

-omarchy_path=${OMARCHY_PATH:-/usr/share/omarchy}
-omarchy_path=${omarchy_path%/}
-
-[[ $omarchy_path != "/usr/share/omarchy" ]] || exit 1
-
-branch=$(git -C "$omarchy_path" branch --show-current 2>/dev/null || true)
-if [[ -z $branch ]]; then
-  hash=$(git -C "$omarchy_path" rev-parse --short HEAD 2>/dev/null || true)
-  [[ -n $hash ]] || exit 1
-  branch="detached@$hash"
-fi
-
-echo "$branch"
+echo $(git -C "$OMARCHY_PATH" rev-parse --abbrev-ref HEAD)
@@ -1,41 +1,11 @@
 #!/bin/bash

 # omarchy:summary=Create a desktop launcher for a web app
-# omarchy:args=[name url icon-url-or-name [custom-exec] [mime-types]]
+# omarchy:args=[name url icon [custom-exec] [mime-types]]

 set -e

-ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
-
-safe_icon_name() {
-  printf '%s\n' "$1" \
-    | tr '[:upper:]' '[:lower:]' \
-    | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//'
-}
-
-icon_name_from_ref() {
-  local ref="$1"
-  local name
-  name=$(basename "$ref")
-
-  if [[ $name == *.* ]]; then
-    safe_icon_name "${name%.*}"
-  else
-    printf '%s\n' "$name"
-  fi
-}
-
-install_user_icon() {
-  local source="$1"
-  local name="$2"
-  local ext="${source##*.}"
-
-  [[ $ext == "$source" ]] && ext="png"
-  mkdir -p "$ICON_DIR"
-  cp "$source" "$ICON_DIR/$name.$ext"
-  gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
-  printf '%s\n' "$name"
-}
+ICON_DIR="$HOME/.local/share/applications/icons"

 if (( $# < 3 )); then
  echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
@@ -48,12 +18,10 @@ if (( $# < 3 )); then
  # Try to fetch favicon automatically first.
  FAVICON_URL="https://www.google.com/s2/favicons?domain=${APP_URL}&sz=128"
  mkdir -p "$ICON_DIR"
-  ICON_VALUE=$(safe_icon_name "$APP_NAME")
-  if curl -fsSL -o "$ICON_DIR/$ICON_VALUE.png" "$FAVICON_URL" && [[ -s $ICON_DIR/$ICON_VALUE.png ]]; then
-    gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
-    ICON_REF="$ICON_VALUE"
+  if curl -fsSL -o "$ICON_DIR/$APP_NAME.png" "$FAVICON_URL" && [[ -s $ICON_DIR/$APP_NAME.png ]]; then
+    ICON_REF="$APP_NAME.png"
  else
-    ICON_REF=$(gum input --prompt "Icon URL/name> " --placeholder "Could not fetch favicon automatically. Enter PNG icon URL or icon name")
+    ICON_REF=$(gum input --prompt "Icon URL> " --placeholder "Could not fetch favicon automatically. Enter PNG icon URL (see https://dashboardicons.com)")
  fi

  CUSTOM_EXEC=""
@@ -77,24 +45,21 @@ if [[ -z $APP_NAME || -z $APP_URL ]]; then
  exit 1
 fi

+# Resolve icon from URL or from a local icon name.
+mkdir -p "$ICON_DIR"
+
 if [[ -z $ICON_REF ]]; then
  ICON_REF="https://www.google.com/s2/favicons?domain=${APP_URL}&sz=128"
 fi

 if [[ $ICON_REF =~ ^https?:// ]]; then
-  ICON_VALUE=$(safe_icon_name "$APP_NAME")
-  mkdir -p "$ICON_DIR"
-  if ! curl -fsSL -o "$ICON_DIR/$ICON_VALUE.png" "$ICON_REF" || [[ ! -s $ICON_DIR/$ICON_VALUE.png ]]; then
+  ICON_PATH="$ICON_DIR/$APP_NAME.png"
+  if ! curl -fsSL -o "$ICON_PATH" "$ICON_REF" || [[ ! -s $ICON_PATH ]]; then
    echo "Error: Failed to download icon."
    exit 1
  fi
-  gtk-update-icon-cache "$HOME/.local/share/icons/hicolor" &>/dev/null || true
-elif [[ -f $ICON_REF ]]; then
-  ICON_VALUE=$(install_user_icon "$ICON_REF" "$(safe_icon_name "$APP_NAME")")
 else
-  # Bundled Omarchy icons are package-owned under /usr/share/icons/hicolor.
-  # Accept either "HEY" or the historical "HEY.png" argument form.
-  ICON_VALUE=$(icon_name_from_ref "$ICON_REF")
+  ICON_PATH="$ICON_DIR/$ICON_REF"
 fi

 # Use custom exec if provided, otherwise default behavior
@@ -102,7 +67,6 @@ EXEC_COMMAND="${CUSTOM_EXEC:-omarchy-launch-webapp $APP_URL}"

 # Create application .desktop file
 DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
-mkdir -p "$(dirname "$DESKTOP_FILE")"

 cat >"$DESKTOP_FILE" <<EOF
 [Desktop Entry]
@@ -112,7 +76,7 @@ Comment=$APP_NAME
 Exec=$EXEC_COMMAND
 Terminal=false
 Type=Application
-Icon=$ICON_VALUE
+Icon=$ICON_PATH
 StartupNotify=true
 EOF

@@ -5,8 +5,7 @@

 set -e

-ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
-OLD_ICON_DIR="$HOME/.local/share/applications/icons"
+ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"

 if (( $# == 0 )); then
@@ -33,9 +32,8 @@ if [[ -z $APP_NAME ]]; then
  exit 1
 fi

-icon_name=$(printf '%s\n' "$APP_NAME" | tr '[:upper:]' '[:lower:]' | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//')
 rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
-rm -f "$ICON_DIR/$icon_name.png" "$ICON_DIR/$APP_NAME.png" "$OLD_ICON_DIR/$APP_NAME.png"
+rm -f "$ICON_DIR/$APP_NAME.png"

 omarchy-notification-send -g  "Web app removed" "$APP_NAME"
 update-desktop-database "$DESKTOP_DIR" &>/dev/null
@@ -5,8 +5,7 @@
 set -e

 APP_DIR="${1:-$HOME/.local/share/applications}"
-ICON_DIR="$HOME/.local/share/icons/hicolor/256x256/apps"
-OLD_ICON_DIR="$HOME/.local/share/applications/icons"
+ICON_DIR="$HOME/.local/share/applications/icons"

 echo "Scanning for web apps in $APP_DIR..."

@@ -24,10 +23,9 @@ fi

 for file in "${webapp_desktop_files[@]}"; do
  app_name=$(basename "$file" .desktop)
-  icon_name=$(printf '%s\n' "$app_name" | tr '[:upper:]' '[:lower:]' | sed 's/[^[:alnum:]]\+/-/g; s/^-//; s/-$//')
  echo "Removing web app: $app_name"
  rm -f "$file"
-  rm -f "$ICON_DIR/$icon_name.png" "$ICON_DIR/$app_name.png" "$OLD_ICON_DIR/$app_name.png"
+  rm -f "$ICON_DIR/$app_name.png"
 done

 if command -v update-desktop-database &>/dev/null; then
@@ -3,7 +3,6 @@
 # omarchy:summary=Set Wi-Fi power save mode on wireless interfaces
 # omarchy:args=<on|off>

-shopt -s nullglob
 for iface in /sys/class/net/*/wireless; do
  iface="$(basename "$(dirname "$iface")")"
  iw dev "$iface" set power_save "$1" 2>/dev/null
@@ -44,14 +44,19 @@ install_windows() {

  mkdir -p "$HOME/.windows"
  mkdir -p "$HOME/.config/windows"
-  mkdir -p "$HOME/.local/share/applications"
+  mkdir -p "$HOME/.local/share/applications/icons"
+
+  # Install Windows VM icon and desktop file
+  if [[ -f $OMARCHY_PATH/applications/icons/windows.png ]]; then
+    cp "$OMARCHY_PATH/applications/icons/windows.png" "$HOME/.local/share/applications/icons/windows.png"
+  fi

  cat << EOF | tee "$HOME/.local/share/applications/windows-vm.desktop" > /dev/null
 [Desktop Entry]
 Name=Windows
 Comment=Start Windows VM via Docker and connect with RDP
 Exec=uwsm app -- omarchy-windows-vm launch
-Icon=windows
+Icon=$HOME/.local/share/applications/icons/windows.png
 Terminal=false
 Type=Application
 Categories=System;Virtualization;
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# Set install mode to online since boot.sh is used for curl installations
+export OMARCHY_ONLINE_INSTALL=true
+
+ansi_art='                 ▄▄▄
+ ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄
+███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
+███   ███  ███   ███   ███  ███   ███  ███   ███  ███   █▀   ███   ███  ███   ███
+███   ███  ███   ███   ███ ▄███▄▄▄███ ▄███▄▄▄██▀  ███       ▄███▄▄▄███▄ ███▄▄▄███
+███   ███  ███   ███   ███ ▀███▀▀▀███ ▀███▀▀▀▀    ███      ▀▀███▀▀▀███  ▀▀▀▀▀▀███
+███   ███  ███   ███   ███  ███   ███ ██████████  ███   █▄   ███   ███  ▄██   ███
+███   ███  ███   ███   ███  ███   ███  ███   ███  ███   ███  ███   ███  ███   ███
+ ▀█████▀    ▀█   ███   █▀   ███   █▀   ███   ███  ███████▀   ███   █▀    ▀█████▀
+                                       ███   █▀                                  '
+
+clear
+echo -e "\n$ansi_art\n"
+
+# Use custom branch if instructed, otherwise default to master
+OMARCHY_REF="${OMARCHY_REF:-master}"
+
+# Set mirror based on branch
+if [[ $OMARCHY_REF == "dev" ]]; then
+  export OMARCHY_MIRROR=edge
+  echo 'Server = https://mirror.omarchy.org/$repo/os/$arch' | sudo tee /etc/pacman.d/mirrorlist >/dev/null
+elif [[ $OMARCHY_REF == "rc" ]]; then
+  export OMARCHY_MIRROR=rc
+  echo 'Server = https://rc-mirror.omarchy.org/$repo/os/$arch' | sudo tee /etc/pacman.d/mirrorlist >/dev/null
+else
+  export OMARCHY_MIRROR=stable
+  echo 'Server = https://stable-mirror.omarchy.org/$repo/os/$arch' | sudo tee /etc/pacman.d/mirrorlist >/dev/null
+fi
+
+sudo pacman -Syu --noconfirm --needed git
+
+# Use custom repo if specified, otherwise default to basecamp/omarchy
+OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
+
+echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
+rm -rf ~/.local/share/omarchy/
+git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
+
+echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
+cd ~/.local/share/omarchy
+git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
+cd -
+
+echo -e "\nInstallation starting..."
+source ~/.local/share/omarchy/install.sh
@@ -1,4 +1,4 @@
 --ozone-platform=wayland
 --ozone-platform-hint=wayland
 --enable-features=TouchpadOverscrollHistoryNavigation
--load-extension=/usr/share/omarchy/default/chromium/extensions/copy-url,/usr/share/omarchy/default/chromium/extensions/yt-dlp
+--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url,~/.local/share/omarchy/default/chromium/extensions/yt-dlp
@@ -66,13 +66,13 @@
      "type": "command",
      "key": "\ue900 OS",
      "keyColor": "blue",
-      "text": "version=$(omarchy-version) && echo \"Omarchy $version\""
+      "text": "version=$(omarchy-version); echo \"Omarchy $version\""
    },
    {
      "type": "command",
      "key": "│ ├󰘬",
      "keyColor": "blue",
-      "text": "omarchy-version-branch"
+      "text": "branch=$(omarchy-version-branch); echo \"$branch\""
    },
    {
      "type": "command",
@@ -23,7 +23,7 @@
    <test name="family" qual="any">
      <string>monospace</string>
    </test>
-    <edit name="family" mode="assign" binding="strong">
+    <edit name="family" mode="append" binding="same">
      <string>JetBrainsMono Nerd Font</string>
    </edit>
  </match>
@@ -1,16 +1,9 @@
 -- Learn how to configure Hyprland: https://wiki.hypr.land/Configuring/Start/

-- Drop cached omarchy modules so hyprctl reload re-reads them from disk.
-for k in pairs(package.loaded) do
-  if k:match("^default%.hypr") or k:match("^hypr%.") then
-    package.loaded[k] = nil
-  end
-end
-
 -- Load user modules from ~/.config and Omarchy defaults from $OMARCHY_PATH.
 package.path = os.getenv("HOME")
  .. "/.config/?.lua;"
-  .. (os.getenv("OMARCHY_PATH") or "/usr/share/omarchy")
+  .. (os.getenv("OMARCHY_PATH") or (os.getenv("HOME") .. "/.local/share/omarchy"))
  .. "/?.lua;"
  .. package.path

@@ -1,7 +1,6 @@
 [Unit]
 Description=Bluetooth pairing agent (auto-accept)
 Documentation=man:bt-agent(1)
-ConditionPathIsDirectory=/sys/class/bluetooth
 # bluez must be reachable on the system bus before we can register.
 After=dbus.socket
 Requires=dbus.socket
--- a/Show More
+++ b/Show More