Merge pull request #1232 from basecamp/dev

Omarchy 2.0.5

bin/omarchy-font-list

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fc-list :spacing=100 -f "%{family[0]}\n" | grep -v -i -E 'emoji|signwriting' | sort -u
+fc-list :spacing=100 -f "%{family[0]}\n" | grep -v -i -E 'emoji|signwriting|omarchy' | sort -u

bin/omarchy-install-dev-env

@@ -6,7 +6,7 @@ if [[ -z "$1" ]]; then
 fi
 
 install_php() {
-  sudo pacman -Sy php composer php-sqlite --noconfirm
+  sudo pacman -S php composer php-sqlite --noconfirm
 
   # Install Path for Composer
   if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then
@@ -33,6 +33,11 @@ install_php() {
   done
 }
 
+install_node() {
+  echo -e "Installing Node.js...\n"
+  mise use --global node@lts
+}
+
 case "$1" in
 ruby)
   echo -e "Installing Ruby on Rails...\n"
@@ -42,8 +47,7 @@ ruby)
   echo -e "\nYou can now run: rails new myproject"
   ;;
 node)
-  echo -e "Installing Node.js...\n"
-  mise use --global node@lts
+  install_node
   ;;
 bun)
   echo -e "Installing Bun...\n"
@@ -64,6 +68,7 @@ php)
 laravel)
   echo -e "Installing PHP and Laravel...\n"
   install_php
+  install_node
   composer global require laravel/installer
   echo -e "\nYou can now run: laravel new myproject"
   ;;

bin/omarchy-install-dropbox

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-echo "Installing all dependencies..."
-sudo pacman -S --noconfirm --needed \
+# FIXME: Should not use AUR dependencies when we can avoid it
+echo "Installing all dependencies [from AUR]..."
+yay -S --noconfirm --needed \
   dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 
 echo "Starting Dropbox..."

bin/omarchy-install-steam

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

bin/omarchy-launch-browser

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,/usr}/share/applications/$(xdg-settings get default-web-browser) 2>/dev/null | head -1) ${args[@]} $@
+exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$(xdg-settings get default-web-browser) 2>/dev/null | head -1) ${args[@]} $@

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

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

bin/omarchy-launch-webapp

@@ -7,4 +7,4 @@ google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi*) ;;
 *) browser="chromium.desktop" ;;
 esac
 
-exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$1" "${@:2}"
+exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$1" "${@:2}"

bin/omarchy-menu

@@ -26,7 +26,7 @@ terminal() {
 }
 
 present_terminal() {
-  alacritty --class Omarchy -e bash -c "omarchy-show-logo; eval \"$1\"; omarchy-show-done;"
+  omarchy-launch-floating-terminal-with-presentation $1
 }
 
 edit_in_nvim() {
@@ -35,23 +35,23 @@ edit_in_nvim() {
 }
 
 install() {
-  present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2"
+  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2"
 }
 
 install_and_launch() {
-  present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2 && setsid gtk-launch $3"
+  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2 && setsid gtk-launch $3"
 }
 
 install_font() {
-  present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
+  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
 }
 
 aur_install() {
-  present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2"
+  present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
 }
 
 aur_install_and_launch() {
-  present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2 && setsid gtk-launch $3"
+  present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2 && setsid gtk-launch $3"
 }
 
 show_learn_menu() {
@@ -219,8 +219,8 @@ show_install_editor_menu() {
 }
 
 show_install_ai_menu() {
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
-  *Claude*) install "Claude Code" "claude-code" ;;
+  case $(menu "Install" "󱚤  Claude Code [AUR]\n󱚤  Gemini\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
+  *Claude*) aur_install "Claude Code" "claude-code" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
   *Studio*) aur_install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" "ollama" ;;
@@ -315,7 +315,7 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" "󰣇  Omarchy\n  Config\n󰸌  Themes\n  Process\n  Timezone") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n  Timezone") in
   *Omarchy*) present_terminal omarchy-update ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
@@ -377,11 +377,12 @@ go_to_menu() {
   *screenrecord*) show_screenrecord_menu ;;
   *toggle*) show_toggle_menu ;;
   *setup*) show_setup_menu ;;
+  *power*) show_setup_power_menu ;;
   *install*) show_install_menu ;;
   *remove*) show_remove_menu ;;
   *update*) show_update_menu ;;
+  *about*) alacritty --class Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' ;;
   *system*) show_system_menu ;;
-  *about*) terminal bash -c 'fastfetch; read -n 1 -s' ;;
   esac
 }
 

bin/omarchy-pkg-aur-install

@@ -14,12 +14,11 @@ fzf_args=(
   --color 'pointer:green,marker:green'
 )
 
-yay -Sy
 pkg_names=$(yay -Slqa | fzf "${fzf_args[@]}")
 
 if [[ -n "$pkg_names" ]]; then
   # Convert newline-separated selections to space-separated for yay
-  echo "$pkg_names" | tr '\n' ' ' | xargs yay -Sy --noconfirm
+  echo "$pkg_names" | tr '\n' ' ' | xargs yay -S --noconfirm
   sudo updatedb
   omarchy-show-done
 fi

bin/omarchy-pkg-ignored

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+IGNORED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.ignored"
+
+if [[ -f $IGNORED_PACKAGES_FILE ]]; then
+  tr '\r\n' ',' <"$IGNORED_PACKAGES_FILE" | sed 's/,$//'
+fi

bin/omarchy-pkg-install

@@ -14,12 +14,11 @@ fzf_args=(
   --color 'pointer:green,marker:green'
 )
 
-sudo pacman -Sy
 pkg_names=$(pacman -Slq | fzf "${fzf_args[@]}")
 
 if [[ -n "$pkg_names" ]]; then
   # Convert newline-separated selections to space-separated for yay
-  echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Sy --noconfirm
+  echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -S --noconfirm
   sudo updatedb
   omarchy-show-done
 fi

bin/omarchy-pkg-pinned

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+PINNED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.pinned"
+
+if [[ -f $PINNED_PACKAGES_FILE ]]; then
+  tr '\r\n' ',' <"$PINNED_PACKAGES_FILE" | sed 's/,$//'
+fi

bin/omarchy-refresh-fastfetch

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+omarchy-refresh-config fastfetch/config.jsonc

bin/omarchy-reset-sudo

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-echo "Resetting sudo lockout for user: $USER"
+# Resetting sudo lockout for user
 su -c "faillock --reset --user $USER"

bin/omarchy-snapshot

@@ -16,9 +16,15 @@ case "$COMMAND" in
 create)
   DESC="$(omarchy-version)"
 
-  for config in root home; do
+  echo -e "\e[32mCreate system snapshot\e[0m"
+  
+  # Get existing snapper config names from CSV output
+  mapfile -t CONFIGS < <(sudo snapper --csvout list-configs | awk -F, 'NR>1 {print $1}')
+
+  for config in "${CONFIGS[@]}"; do
     sudo snapper -c "$config" create -c number -d "$DESC"
   done
+  echo
   ;;
 restore)
   sudo limine-snapper-restore

bin/omarchy-tui-remove

@@ -3,8 +3,8 @@
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"
 
-if [ "$#" -ne 1 ]; then
-  # Find all web apps
+if [ "$#" -eq 0 ]; then
+  # Find all TUIs
   while IFS= read -r -d '' file; do
     if grep -q '^Exec=.*alacritty.*-e' "$file"; then
       TUIS+=("$(basename "${file%.desktop}")")
@@ -14,23 +14,28 @@ if [ "$#" -ne 1 ]; then
   if ((${#TUIS[@]})); then
     IFS=$'\n' SORTED_TUIS=($(sort <<<"${TUIS[*]}"))
     unset IFS
-    APP_NAME=$(gum choose --header "Select TUI to remove..." "${SORTED_TUIS[@]}")
+    APP_NAMES_STRING=$(gum choose --no-limit --header "Select TUI to remove..." --selected-prefix="✗ " "${SORTED_TUIS[@]}")
+    # Convert newline-separated string to array
+    APP_NAMES=()
+    while IFS= read -r line; do
+      [[ -n "$line" ]] && APP_NAMES+=("$line")
+    done <<< "$APP_NAMES_STRING"
   else
     echo "No TUIs to remove."
     exit 1
   fi
 else
-  APP_NAME="$1"
+  # Use array to preserve spaces in app names
+  APP_NAMES=("$@")
 fi
 
-if [[ -z "$APP_NAME" ]]; then
-  echo "You must provide TUI name."
+if [[ ${#APP_NAMES[@]} -eq 0 ]]; then
+  echo "You must provide TUI names."
   exit 1
 fi
 
-rm "$DESKTOP_DIR/$APP_NAME.desktop"
-rm "$ICON_DIR/$APP_NAME.png"
-
-if [ "$#" -ne 1 ]; then
-  echo -e "Removed $APP_NAME\n"
-fi
+for APP_NAME in "${APP_NAMES[@]}"; do
+  rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
+  rm -f "$ICON_DIR/$APP_NAME.png"
+  echo "Removed $APP_NAME"
+done

bin/omarchy-update-available

@@ -1,13 +1,18 @@
 #!/bin/bash
 
-# Ensure remote is reachable
-if ! git -C "$OMARCHY_PATH" ls-remote &>/dev/null; then
-  echo "Error: Unable to reach remote repository."
+# Get remote tag
+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
 
-latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
+# 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)"

bin/omarchy-update-system-pkgs

@@ -1,12 +1,13 @@
 #!/bin/bash
 
 echo -e "\e[32m\nUpdate system packages\e[0m"
-sudo pacman -Syu --noconfirm
-echo
+echo "sudo pacman -Syu --noconfirm --ignore \"$(omarchy-pkg-ignored)\""
+sudo pacman -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)"
 
 if omarchy-pkg-aur-accessible; then
   echo -e "\e[32m\nUpdate AUR packages\e[0m"
-  yay -Syu --noconfirm
+  echo "yay -Syu --noconfirm  --ignore \"$(omarchy-pkg-ignored)\""
+  yay -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)"
   echo
 else
   echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"

bin/omarchy-version-branch

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo $(git -C "$OMARCHY_PATH" rev-parse --abbrev-ref HEAD)

bin/omarchy-webapp-remove

@@ -3,7 +3,7 @@
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"
 
-if [ "$#" -ne 1 ]; then
+if [ "$#" -eq 0 ]; then
   # Find all web apps
   while IFS= read -r -d '' file; do
     if grep -q '^Exec=.*omarchy-launch-webapp.*' "$file"; then
@@ -14,23 +14,28 @@ if [ "$#" -ne 1 ]; then
   if ((${#WEB_APPS[@]})); then
     IFS=$'\n' SORTED_WEB_APPS=($(sort <<<"${WEB_APPS[*]}"))
     unset IFS
-    APP_NAME=$(gum choose --header "Select web app to remove..." "${SORTED_WEB_APPS[@]}")
+    APP_NAMES_STRING=$(gum choose --no-limit --header "Select web app to remove..." --selected-prefix="✗ " "${SORTED_WEB_APPS[@]}")
+    # Convert newline-separated string to array
+    APP_NAMES=()
+    while IFS= read -r line; do
+      [[ -n "$line" ]] && APP_NAMES+=("$line")
+    done <<< "$APP_NAMES_STRING"
   else
     echo "No web apps to remove."
     exit 1
   fi
 else
-  APP_NAME="$1"
+  # Use array to preserve spaces in app names
+  APP_NAMES=("$@")
 fi
 
-if [[ -z "$APP_NAME" ]]; then
-  echo "You must provide web app name."
+if [[ ${#APP_NAMES[@]} -eq 0 ]]; then
+  echo "You must provide web app names."
   exit 1
 fi
 
-rm "$DESKTOP_DIR/$APP_NAME.desktop"
-rm "$ICON_DIR/$APP_NAME.png"
-
-if [ "$#" -ne 1 ]; then
-  echo -e "Removed $APP_NAME\n"
-fi
+for APP_NAME in "${APP_NAMES[@]}"; do
+  rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
+  rm -f "$ICON_DIR/$APP_NAME.png"
+  echo "Removed $APP_NAME"
+done

boot.sh

@@ -14,7 +14,7 @@ ansi_art='                 ▄▄▄
 clear
 echo -e "\n$ansi_art\n"
 
-sudo pacman -Sy --noconfirm --needed git
+sudo pacman -Syu --noconfirm --needed git
 
 # Use custom repo if specified, otherwise default to basecamp/omarchy
 OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"

config/fastfetch/config.jsonc

@@ -63,41 +63,20 @@
       "format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
     },
     {
-      "type": "os",
-      "key": "󰣇 OS",
-      "keyColor": "yellow"
+      "type": "command",
+      "key": "\ue900 OS",
+      "keyColor": "blue",
+      "text": "version=$(omarchy-version); echo \"Omarchy $version\""
+    },
+    {
+      "type": "command",
+      "key": "│ ├󰘬",
+      "keyColor": "blue",
+      "text": "branch=$(omarchy-version-branch); echo \"$branch\""
     },
     {
       "type": "kernel",
       "key": "│ ├",
-      "keyColor": "yellow"
-    },
-    {
-      "type": "packages",
-      "key": "│ ├󰏖",
-      "keyColor": "yellow"
-    },
-    {
-      "type": "shell",
-      "key": "└ └",
-      "keyColor": "yellow"
-    },
-    "break",
-    {
-      "type": "command",
-      "key": "Ø Omarchy",
-      "keyColor": "blue",
-      "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"$version\""
-    },
-    {
-      "type": "command",
-      "key": "│ ├󰸌",
-      "keyColor": "blue",
-      "text": "theme=$(omarchy-theme-current); echo -e \"$theme \\e[38m●\\e[37m●\\e[36m●\\e[35m●\\e[34m●\\e[33m●\\e[32m●\\e[31m●\""
-    },
-    {
-      "type": "de",
-      "key": " DE",
       "keyColor": "blue"
     },
     {
@@ -105,29 +84,35 @@
       "key": "│ ├",
       "keyColor": "blue"
     },
+    {
+      "type": "de",
+      "key": " DE",
+      "keyColor": "blue"
+    },
+    {
+      "type": "terminal",
+      "key": "│ ├",
+      "keyColor": "blue"
+    },
+    {
+      "type": "packages",
+      "key": "│ ├󰏖",
+      "keyColor": "blue"
+    },
     {
       "type": "wmtheme",
       "key": "│ ├󰉼",
       "keyColor": "blue"
     },
     {
-      "type": "icons",
-      "key": "│ ├󰀻",
-      "keyColor": "blue"
-    },
-    {
-      "type": "cursor",
-      "key": "│ ├",
-      "keyColor": "blue"
+      "type": "command",
+      "key": "│ ├󰸌",
+      "keyColor": "blue",
+      "text": "theme=$(omarchy-theme-current); echo -e \"$theme \\e[38m●\\e[37m●\\e[36m●\\e[35m●\\e[34m●\\e[33m●\\e[32m●\\e[31m●\""
     },
     {
       "type": "terminalfont",
-      "key": "│ ├",
-      "keyColor": "blue"
-    },
-    {
-      "type": "terminal",
-      "key": "└ └",
+      "key": "└ └",
       "keyColor": "blue"
     },
     {

config/hypr/bindings.conf

@@ -2,7 +2,7 @@
 $terminal = uwsm app -- alacritty
 $browser = omarchy-launch-browser
 
-bindd = SUPER, return, Terminal, exec, $terminal --working-directory $(omarchy-cmd-terminal-cwd)
+bindd = SUPER, return, Terminal, exec, $terminal --working-directory=$(omarchy-cmd-terminal-cwd)
 bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
 bindd = SUPER, B, Browser, exec, $browser
 bindd = SUPER, M, Music, exec, uwsm app -- spotify

config/hypr/hypridle.conf

@@ -2,7 +2,6 @@ general {
     lock_cmd = omarchy-lock-screen                         # lock screen and 1password
     before_sleep_cmd = loginctl lock-session               # lock before suspend.
     after_sleep_cmd = hyprctl dispatch dpms on             # to avoid having to press a key twice to turn on the display.
-    on_unlock_cmd = omarchy-restart-waybar                 # prevent stacking of waybar when waking
     inhibit_sleep = 3                                      # wait until screen is locked
 }
 

config/waybar/config.jsonc

@@ -5,7 +5,7 @@
   "spacing": 0,
   "height": 26,
   "modules-left": ["custom/omarchy", "hyprland/workspaces"],
-  "modules-center": ["group/status-cluster", "clock", "custom/update"],
+  "modules-center": ["clock", "custom/update"],
   "modules-right": [
     "group/tray-expander",
     "bluetooth",
@@ -46,7 +46,7 @@
   "custom/update": {
     "format": "",
     "exec": "omarchy-update-available",
-    "on-click": "alacritty --class Omarchy --title Omarchy -e omarchy-update",
+    "on-click": "omarchy-launch-floating-terminal-with-presentation omarchy-update",
     "tooltip-format": "Omarchy update available",
     "interval": 3600
   },
@@ -72,7 +72,7 @@
     "tooltip-format-ethernet": "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
     "tooltip-format-disconnected": "Disconnected",
     "interval": 3,
-    "nospacing": 1,
+    "spacing": 1,
     "on-click": "alacritty --class=Impala -e impala"
   },
   "battery": {
@@ -88,6 +88,7 @@
     "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
     "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
     "interval": 5,
+    "on-click": "omarchy-menu power",
     "states": {
       "warning": 20,
       "critical": 10

config/waybar/style.css

@@ -58,24 +58,6 @@ tooltip {
   margin-left: 8.75px;
 }
 
-#group-status-cluster {
-  margin-right: 8.75px;
-}
-
-#custom-status-dnd,
-#custom-status-nightlight, 
-#custom-status-idle {
-  min-width: 12px;
-  margin: 0 2px;
-  font-size: 10px;
-}
-
-#custom-status-dnd.status-dnd,
-#custom-status-nightlight.status-nightlight,
-#custom-status-idle.status-idle {
-  opacity: 1;
-}
-
 .hidden {
   opacity: 0;
 }

default/hypr/apps.conf

@@ -1,6 +1,6 @@
 # App-specific tweaks
 source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
-source = ~/.local/share/omarchy/default/hypr/apps/chromium.conf
+source = ~/.local/share/omarchy/default/hypr/apps/browser.conf
 source = ~/.local/share/omarchy/default/hypr/apps/hyprshot.conf
 source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf
 source = ~/.local/share/omarchy/default/hypr/apps/steam.conf

default/hypr/apps/browser.conf

@@ -0,0 +1,13 @@
+# Browser types
+windowrule = tag +chromium-based-browser, class:([cC]hrom(e|ium)|[bB]rave-browser|Microsoft-edge|Vivaldi-stable)
+windowrule = tag +firefox-based-browser, class:(Firefox|zen|librewolf)
+
+# Force chromium-based browsers into a tile to deal with --app bug
+windowrule = tile, tag:chromium-based-browser
+
+# Only a subtle opacity change, but not for video sites
+windowrule = opacity 1 0.97, tag:chromium-based-browser
+windowrule = opacity 1 0.97, tag:firefox-based-browser
+
+# Some video sites should never have opacity applied to them
+windowrule = opacity 1.0 1.0, initialTitle:(youtube\.com_/|app\.zoom\.us_/wc/home)

default/hypr/apps/chromium.conf

@@ -1,6 +0,0 @@
-# Force chromium into a tile to deal with --app bug
-windowrule = tile, class:^(Chromium)$
-
-# Only slight opacity when unfocused
-windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable|Brave-browser|brave-browser)$
-windowrule = opacity 1 1, initialTitle:(youtube.com_/|app.zoom.us_/wc/home)

default/hypr/bindings/tiling.conf

@@ -39,8 +39,8 @@ bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9
 bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10
 
 # Tab between workspaces
-bind = SUPER, TAB, workspace, e+1
-bind = SUPER SHIFT, TAB, workspace, e-1
+bindd = SUPER, TAB, Next workspace, workspace, e+1
+bindd = SUPER SHIFT, TAB, Previous workspace, workspace, e-1
 
 # Swap active window with the one next to it with SUPER + SHIFT + arrow keys
 bindd = SUPER SHIFT, left, Swap window to the left, swapwindow, l

default/hypr/bindings/utilities.conf

@@ -1,6 +1,6 @@
 # Menus
 bindd = SUPER, SPACE, Launch apps, exec, walker -p "Start…"
-bindd = SUPER CTRL, E, Show clipboard, exec, walker -m Emojis
+bindd = SUPER CTRL, E, Emoji picker, exec, walker -m Emojis
 bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu
 bindd = SUPER, ESCAPE, Power menu, exec, omarchy-menu system
 bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system

install.sh

@@ -38,6 +38,7 @@ source $OMARCHY_INSTALL/config/xcompose.sh
 source $OMARCHY_INSTALL/config/mise-ruby.sh
 source $OMARCHY_INSTALL/config/docker.sh
 source $OMARCHY_INSTALL/config/mimetypes.sh
+source $OMARCHY_INSTALL/config/localdb.sh
 source $OMARCHY_INSTALL/config/hardware/network.sh
 source $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh
 source $OMARCHY_INSTALL/config/hardware/bluetooth.sh
@@ -51,12 +52,6 @@ source $OMARCHY_INSTALL/login/plymouth.sh
 source $OMARCHY_INSTALL/login/limine-snapper.sh
 source $OMARCHY_INSTALL/login/alt-bootloaders.sh
 
-# Updates
-sudo updatedb
-
-# Update system packages
-sudo pacman -Syu --noconfirm
-
 # Reboot
 clear
 tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch

install/config/detect-keyboard-layout.sh

@@ -2,7 +2,7 @@
 
 # Copy over the keyboard layout that's been set in Arch during install to Hyprland
 conf="/etc/vconsole.conf"
-hyprconf="$HOME/.config/hypr/hyprland.conf"
+hyprconf="$HOME/.config/hypr/input.conf"
 
 layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
 variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')

install/config/hardware/network.sh

@@ -4,7 +4,7 @@
 # This can happen if archinstall used ethernet
 if ! command -v iwctl &>/dev/null; then
   sudo pacman -S --noconfirm --needed iwd
-  chrootable_systemctl_enable iwd.service
+  sudo systemctl enable iwd.service
 fi
 
 # Prevent systemd-networkd-wait-online timeout on boot

install/config/hardware/nvidia.sh

@@ -36,7 +36,7 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
   fi
 
   # force package database refresh
-  sudo pacman -Syy
+  sudo pacman -Syu --noconfirm
 
   # Install packages
   PACKAGES_TO_INSTALL=(

install/config/localdb.sh

@@ -0,0 +1,2 @@
+# Update localdb so that locate will find everything installed
+sudo updatedb

install/login/limine-snapper.sh

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

install/packages.sh

@@ -95,7 +95,6 @@ sudo pacman -S --noconfirm --needed \
   tldr \
   tree-sitter-cli \
   ttf-cascadia-mono-nerd \
-  ttf-font-awesome \
   ttf-ia-writer \
   ttf-jetbrains-mono \
   typora \
@@ -113,6 +112,7 @@ sudo pacman -S --noconfirm --needed \
   wl-clip-persist \
   wl-clipboard \
   wl-screenrec \
+  woff2-font-awesome \
   xdg-desktop-portal-gtk \
   xdg-desktop-portal-hyprland \
   xmlstarlet \

install/packaging/pins.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# We pin explicit packages that are bad upstream here
+pinned_packages=$(omarchy-pkg-pinned)
+
+if [[ -n $pinned_packages ]]; then
+  echo -e "\e[32m\nInstall pinned system packages\e[0m"
+
+  for pinned in $pinned_packages; do
+    echo "sudo pacman -U --noconfirm $pinned"
+    sudo pacman -U --noconfirm $pinned
+  done
+fi

install/preflight/repositories.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 
 # Install build tools
-sudo pacman -Sy --needed --noconfirm base-devel
+sudo pacman -S --needed --noconfirm base-devel
 
 # Add fun and color and verbosity to the pacman installer
 if ! grep -q "ILoveCandy" /etc/pacman.conf; then
   sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
 fi
 
-# Add the Omarchy repository as first choice
+# Add the Omarchy repository
 if ! grep -q "omarchy" /etc/pacman.conf; then
-  sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\/\n' /etc/pacman.conf
+  echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch/\n" | sudo tee -a /etc/pacman.conf >/dev/null
 fi
 
 # Set mirrors to global ones only
@@ -30,16 +30,10 @@ if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ]; then
     if ! grep -q "chaotic-aur" /etc/pacman.conf; then
       echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
     fi
-
-    # Refresh all repos
-    sudo pacman -Sy
   else
     echo -e "Failed to install Chaotic-AUR, so won't include it in pacman config!"
   fi
 fi
 
-# Allow repository index updates without sudo
-sudo tee /etc/sudoers.d/repositories >/dev/null <<EOF
-$USER ALL=(ALL) NOPASSWD: /usr/binpacman -Sy
-EOF
-sudo chmod 440 /etc/sudoers.d/repositories
+# Refresh all repos
+sudo pacman -Syu --noconfirm

migrations/1751134561.sh

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

migrations/1752091783.sh

@@ -1,4 +1,4 @@
 echo "Install Plymouth splash screen"
 
-sudo pacman -Sy --needed --noconfirm uwsm plymouth
+sudo pacman -S --needed --noconfirm uwsm plymouth
 source "$HOME/.local/share/omarchy/install/login/plymouth.sh"

migrations/1752981883.sh

@@ -1,7 +1,7 @@
 echo "Replace wofi with walker as the default launcher"
 
 if ! command -v walker &>/dev/null; then
-  sudo pacman -Sy --noconfirm --needed walker-bin libqalculate
+  sudo pacman -S --noconfirm --needed walker-bin libqalculate
 
   sudo pacman -Rns --noconfirm wofi
   rm -rf ~/.config/wofi

migrations/1753352057.sh

@@ -11,7 +11,7 @@ if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.c
     echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
 
     # Refresh pacman package databases
-    sudo pacman -Sy
+    sudo pacman -Syu --noconfirm
   else
     echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
   fi

migrations/1754509222.sh

@@ -1,3 +1,3 @@
 echo "Add xmlstarlet needed for updating fonts via Omarchy menu"
 
-sudo pacman -Sy --noconfirm --needed xmlstarlet
+sudo pacman -S --noconfirm --needed xmlstarlet

migrations/1754515289.sh

@@ -1,4 +1,4 @@
 echo "Update and restart Walker to resolve stuck Omarchy menu"
 
-sudo pacman -Sy --noconfirm walker-bin
+sudo pacman -Syu --noconfirm walker-bin
 omarchy-restart-walker

migrations/1755164105.sh

@@ -11,7 +11,7 @@ set_theme_colors() {
 
 if command -v chromium &>/dev/null; then
   sudo pacman -Rns --noconfirm chromium || true
-  sudo pacman -Sy --noconfirm omarchy-chromium
+  sudo pacman -S --noconfirm omarchy-chromium
 
   if pgrep -x chromium; then
     if gum confirm "Chromium must be restarted. Ready?"; then

migrations/1755795450.sh

@@ -1,3 +1,3 @@
 echo "Ensure latest uwsm is installed"
 
-sudo pacman -Sy --noconfirm uwsm
+sudo pacman -Syu --noconfirm uwsm

migrations/1755870033.sh

@@ -1,3 +1,5 @@
 echo "Use current terminal shell cwd for new terminal working directories"
 
-sed -i 's|bindd = SUPER, return, Terminal, exec, \$terminal|bindd = SUPER, return, Terminal, exec, $terminal --working-directory $(omarchy-cmd-terminal-cwd)|' ~/.config/hypr/bindings.conf
+if ! grep -q "working-directory" ~/.config/hypr/bindings.conf; then
+  sed -i '/bindd = SUPER, return, Terminal, exec, \$terminal/ s|$| --working-directory=$(omarchy-cmd-terminal-cwd)|' ~/.config/hypr/bindings.conf
+fi

migrations/1756103168.sh

@@ -1,6 +0,0 @@
-echo "Allow pacman -Sy without sudo to easier installs"
-
-sudo tee /etc/sudoers.d/repositories >/dev/null <<EOF
-$USER ALL=(ALL) NOPASSWD: /usr/binpacman -Sy
-EOF
-sudo chmod 440 /etc/sudoers.d/repositories

migrations/1756153445.sh

@@ -0,0 +1,10 @@
+echo "Checking and correcting Snapper configs if needed"
+if command -v snapper &>/dev/null; then
+  if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then
+    sudo snapper -c root create-config /
+  fi
+
+  if ! sudo snapper list-configs 2>/dev/null | grep -q "home"; then
+    sudo snapper -c home create-config /home
+  fi
+fi

migrations/1756203383.sh

@@ -0,0 +1,5 @@
+echo "Remove old About, Activity, Audio Settings apps that are in Omarchy Menu or hotkey"
+
+rm -f ~/.local/share/applications/About.desktop
+rm -f ~/.local/share/applications/Activity.desktop
+rm -f ~/.local/share/applications/wiremix.desktop

migrations/1756208867.sh

@@ -0,0 +1,3 @@
+echo "Update fastfetch config"
+
+omarchy-refresh-config fastfetch/config.jsonc

migrations/1756284863.sh

@@ -0,0 +1,3 @@
+echo "Pin abseil-cpp as the latest package is broken"
+
+sudo pacman -U --noconfirm https://archive.archlinux.org/packages/u/uwsm/uwsm-0.23.0-1-any.pkg.tar.zst

migrations/1756300740.sh

@@ -0,0 +1,3 @@
+echo "Remove no-longer-needed sudoless package listing updates"
+
+sudo rm -f /etc/sudoers.d/repositories

migrations/1756360551.sh

@@ -0,0 +1,6 @@
+echo "Move Omarchy Package Repository after Arch core/extra/multilib for extra security on resolution"
+
+sudo cp /etc/pacman.conf /etc/pacman.conf.bak
+sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
+sudo sed -i '/\[chaotic-aur\]/i\[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/\n' /etc/pacman.conf ||
+  sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/" >> /etc/pacman.conf'

migrations/1756363651.sh

@@ -0,0 +1,3 @@
+echo "Update About config to include the Omarchy branch name"
+
+omarchy-refresh-fastfetch

migrations/1756365707.sh

@@ -0,0 +1,4 @@
+# FIXME: This really shouldn't happen, need to find out why!
+echo "Ensure walker is present"
+
+sudo pacman -Syu --needed --noconfirm walker-bin

migrations/1756371020.sh

@@ -0,0 +1,3 @@
+echo "Stop restarting waybar on unlock to see if we have solved the stacking problem for good"
+
+omarchy-refresh-hypridle