Fix again

This reverts commit 8c2f51c08c.

bin/omarchy-cmd-screensaver

@@ -1,20 +1,10 @@
 #!/bin/bash
 
-if command -v tte &>/dev/null; then
+trap "exit" SIGINT
-  while true; do
-    effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
-    tte -i ~/.local/share/omarchy/logo.txt \
-      --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
-      "$effect" &
-
-    while pgrep tte >/dev/null; do
-      if read -n 1 -t 0.01; then
-        pkill tte 2>/dev/null
-        exit 0
-      fi
-    done
-  done
-else
-  gum spin --title "Can't find tte. Try: pip install terminaltexteffects" -- sleep 2
-fi
 
+while true; do
+  effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
+  tte -i ~/.local/share/omarchy/logo.txt \
+    --frame-rate 240 --canvas-width 0 --canvas-height 0 --anchor-canvas c --anchor-text c \
+    "$effect"
+done

bin/omarchy-launch-screensaver

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-pgrep -f "alacritty --class Screensaver" ||
+pkill -f "alacritty --class Screensaver" ||
   alacritty --class Screensaver --title Screensaver -o 'colors.primary.background="#000000"' \
-    -o 'colors.cursor.cursor="#000000"' -e ~/.local/share/omarchy/bin/omarchy-cmd-screensaver
+    -e ~/.local/share/omarchy/bin/omarchy-cmd-screensaver

bin/omarchy-menu-power

@@ -2,17 +2,15 @@
 
 show_power_menu() {
   # The first characters are invisible sort keys.
-  local menu_options=" Lock
+  local menu_options="\u200B Lock
-󱄄 Save
+\u200C󰤄 Suspend
-󰤄 Suspend
+\u200D Relaunch
- Relaunch
+\u2060󰜉 Restart
-󰜉 Restart
+\u2063󰐥 Shutdown"
-󰐥 Shutdown"
   local selection=$(echo -e "$menu_options" | walker --dmenu --theme dmenu_150)
 
   case "$selection" in
   *Lock*) hyprlock ;;
-  *Save*) ~/.local/share/omarchy/bin/omarchy-launch-screensaver ;;
   *Suspend*) systemctl suspend ;;
   *Relaunch*) uwsm stop ;;
   *Restart*) systemctl reboot ;;

bin/omarchy-migrate

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# Exit immediately if a command exits with a non-zero status
-set -e
-
-# Create the migrations state directory, we will store an empty file for each migration that has already been performed.
-STATE_DIR="$HOME/.local/state/omarchy/migrations"
-mkdir -p "$STATE_DIR"
-
-# Run any pending migrations
-cd ~/.local/share/omarchy
-
-for file in migrations/*.sh; do
-  filename=$(basename "$file")
-  migrate_at="${filename%.sh}"
-
-  # Migration already applied, to re-run it simply delete the state file and try again
-  [ -e "${STATE_DIR}/$filename" ] && continue
-
-  echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"
-  source $file
-  touch "${STATE_DIR}/$filename"
-done
-
-# Back to where we came from
-cd - >/dev/null

bin/omarchy-refresh-config

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# This script deploys ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z
-config_file=$1
-
-if [[ -z "$config_file" ]]; then
-  cat <<USAGE
-  Usage: $0 [config_file]
-
-  Must provide a file path from the .config directory to be refreshed.
-  To copy ~/.local/share/omarchy/config/hypr/hyprlock.conf to ~/.config/hypr/hyprlock.conf
-    
-    $0 hypr/hyprlock.conf     
-USAGE
-  exit 1
-fi
-
-# Backup the destination file (with timestamp) to avoid clobbering (Ex: hyprlock.conf.bak.1753817951)
-user_config_file="${HOME}/.config/$config_file"
-default_config_file="${HOME}/.local/share/omarchy/config/$config_file"
-backup_config_file="$user_config_file.bak.$(date +%s)"
-
-# 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
-  echo -e "\e[31mReplaced $user_config_file with new Omarchy default.\nSaved backup as ${backup_config_file}.\n\n\e[32mChanges:\e[0m"
-  diff "$user_config_file" "$backup_config_file"
-fi

bin/omarchy-refresh-hypridle

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-omarchy-refresh-config hypr/hypridle.conf
-omarchy-restart-hypridle

bin/omarchy-refresh-hyprlock

@@ -1,4 +1,11 @@
 #!/bin/bash
 
-omarchy-refresh-config hypr/hyprlock.conf
+# Overwrite local Hyprlock settings with the latest in Omarchy, but create a backup if it differs
+cp -f ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak 2>/dev/null
+cp -f ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/ 2>/dev/null
 
+if cmp -s ~/.config/hypr/hyprlock.conf.bak ~/.config/hypr/hyprlock.conf; then
+  rm ~/.config/hypr/hyprlock.conf.bak
+else
+  echo -e "\e[31mExisting .config/hypr/hyprlock.conf replaced with new Omarchy default, but a .bak file was made.\e[0m"
+fi

bin/omarchy-refresh-swayosd

@@ -1,7 +1,13 @@
 #!/bin/bash
 
-omarchy-refresh-config swayosd/config.toml
+cp -f ~/.config/swayosd/config.toml ~/.config/swayosd/config.toml.bak 2>/dev/null
-omarchy-refresh-config swayosd/style.css
+cp -f ~/.local/share/omarchy/config/swayosd/config.toml ~/.config/swayosd/ 3>/dev/null
+
+if cmp -s ~/.config/swayosd/config.toml.bak ~/.config/swayosd/config.toml; then
+  rm ~/.config/swayosd//config.toml.bak
+else
+  echo -e "\e[31mExisting .config/swayosd/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m"
+fi
 
 pkill swayosd-server
 setsid uwsm app -- swayosd-server &>/dev/null &

bin/omarchy-refresh-walker

@@ -1,4 +1,13 @@
 #!/bin/bash
 
-omarchy-refresh-config walker/config.toml
+cp -f ~/.config/walker/config.toml ~/.config/walker/config.toml.bak 2>/dev/null
-omarchy-restart-walker
+cp -f ~/.local/share/omarchy/config/walker/config.toml ~/.config/walker/ 2>/dev/null
+
+if cmp -s ~/.config/walker/config.toml.bak ~/.config/walker/config.toml; then
+  rm ~/.config/walker/config.toml.bak
+else
+  echo -e "\e[31mExisting .config/walker/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m"
+fi
+
+pkill walker
+setsid uwsm app -- walker --gapplication-service &

bin/omarchy-refresh-waybar

@@ -1,5 +1,25 @@
 #!/bin/bash
 
-omarchy-refresh-config waybar/config.jsonc
+# Backup existing settings
-omarchy-refresh-config waybar/style.css
+cp -f ~/.config/waybar/config.jsonc ~/.config/waybar/config.jsonc.bak 2>/dev/null
-omarchy-restart-waybar
+cp -f ~/.config/waybar/style.css ~/.config/waybar/style.css.bak 2>/dev/null
+
+# Overwrite local waybar settings with the latest in Omarchy
+cp -f ~/.local/share/omarchy/config/waybar/config.jsonc ~/.config/waybar/ 2>/dev/null
+cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
+
+# Remove identical backup files
+if cmp -s ~/.config/waybar/config.jsonc.bak ~/.config/waybar/config.jsonc; then
+  rm ~/.config/waybar/config.jsonc.bak
+else
+  echo -e "\e[31mExisting .config/waybar/config.jsonc replaced with new Omarchy default, but a .bak file was made.\e[0m"
+fi
+
+if cmp -s ~/.config/waybar/style.css.bak ~/.config/waybar/style.css; then
+  rm ~/.config/waybar/style.css.bak
+else
+  echo -e "\e[31mExisting .config/waybar/style.css replaced with new Omarchy default, but a .bak file was made.\e[0m"
+fi
+
+# Restart waybar
+pkill -SIGUSR2 waybar

bin/omarchy-restart-hypridle

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-pkill -x hypridle
-uwsm app -- hypridle >/dev/null 2>&1 &

bin/omarchy-restart-walker

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-pkill walker
-setsid uwsm app -- walker --gapplication-service &

bin/omarchy-restart-waybar

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-killall waybar || true
-setsid uwsm app -- waybar &>/dev/null &

bin/omarchy-restart-xcompose

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-pkill fcitx5
-uwsm app -- fcitx5 >/dev/null 2>&1 &

bin/omarchy-theme-set

@@ -32,19 +32,12 @@ else
   gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
 fi
 
-# Change gnome icon theme color
-if [[ -f ~/.config/omarchy/current/theme/icons.theme ]]; then
-  gsettings set org.gnome.desktop.interface icon-theme "$(<~/.config/omarchy/current/theme/icons.theme)"
-else
-  gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
-fi
-
 # Trigger alacritty config reload
 touch "$HOME/.config/alacritty/alacritty.toml"
 
 # Restart components to apply new theme
 pkill -SIGUSR2 btop
-"$HOME/.local/share/omarchy/bin/omarchy-restart-waybar"
+pkill -SIGUSR2 waybar
 pkill swayosd-server
 setsid uwsm app -- swayosd-server &>/dev/null &
 makoctl reload

bin/omarchy-update

@@ -1,25 +1,31 @@
 #!/bin/bash
 
-# Exit immediately if a command exits with a non-zero status
+cd ~/.local/share/omarchy
-set -e
 
-# Show logo
+if [[ $1 == "all" ]]; then
-clear
+  # Run all migrations since the root commit
-cat <~/.local/share/omarchy/logo.txt
+  migration_starting_point=$(git log --max-parents=0 --first-parent --format="%H")
+else
+  # Remember the commit we're at before upgrading in order to only run new migrations
+  migration_starting_point=$(git log -1 --format=%H)
+fi
 
 # Get the latest while trying to preserve any modifications
-omarchy_path=~/.local/share/omarchy
+git pull --autostash
-git -C $omarchy_path pull --autostash
+git diff --check || git reset --merge
-git -C $omarchy_path diff --check || git -C $omarchy_path reset --merge
 
-# Run migrations
+# Run any pending migrations
-"$HOME/.local/share/omarchy/bin/omarchy-migrate"
+for file in $(git diff --name-only --diff-filter=A $migration_starting_point.. migrations/*.sh); do
+  filename=$(basename "$file")
+  migrate_at="${filename%.sh}"
+
+  echo -e "\e[32m\nRunning migration ($migrate_at)\e[0m"
+  source $file
+done
 
 # Update system packages
 echo -e "\e[32m\nUpdate system packages\e[0m"
 yay -Syu --noconfirm
 
-# Offer to reboot if the kernel has been changed
+# Back to where we came from
-if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $2}')" ]; then
+cd - >/dev/null
-  gum confirm "Linux kernel has been updated. Reboot?" && sudo reboot now
-fi

bin/omarchy-update-available

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-omarchy_path="$HOME/.local/share/omarchy"
-latest_tag=$(git -C $omarchy_path ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
-current_tag=$(git -C $omarchy_path describe --tags $(git -C $omarchy_path rev-list --tags --max-count=1))
-
-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

config/hypr/hypridle.conf

@@ -1,14 +1,8 @@
 general {
-    lock_cmd = pidof hyprlock || hyprlock                  # avoid starting multiple hyprlock instances.
+    lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
-    before_sleep_cmd = loginctl lock-session               # lock before suspend.
+    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.
+    after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
-    on_lock_cmd = pkill -f "alacritty --class Screensaver" # avoid running screensaver when locked
+    on_unlock_cmd = pkill -SIGUSR2 waybar       # prevent stacking of waybar when waking
-    on_unlock_cmd = omarchy-restart-waybar                 # prevent stacking of waybar when waking
-}
-
-listener {
-    timeout = 60                            # 1min
-    on-timeout = omarchy-launch-screensaver # start screensaver
 }
 
 listener {

config/hypr/hyprland.conf

@@ -26,7 +26,7 @@ $webapp = $browser --app
 bind = SUPER, return, exec, $terminal
 bind = SUPER, F, exec, uwsm app -- nautilus --new-window
 bind = SUPER, B, exec, $browser
-bind = SUPER, M, exec, uwsm app -- spotify
+bind = SUPER, M, exec, $terminal -e spotify_player
 bind = SUPER, N, exec, $terminal -e nvim
 bind = SUPER, T, exec, $terminal -e btop
 bind = SUPER, D, exec, $terminal -e lazydocker

config/walker/config.toml

@@ -199,7 +199,7 @@ typeahead = true
 hidden = true
 
 [builtins.finder]
-use_fd = true
+use_fd = false
 fd_flags = "--ignore-vcs --type file --type directory"
 cmd_alt = "xdg-open $(dirname ~/%RESULT%)"
 weight = 5
@@ -213,7 +213,7 @@ concurrency = 8
 show_icon_when_single = true
 preview_images = true
 hidden = false
-prefix = "."
+prefix = '.'
 
 [builtins.runner]
 eager_loading = true

config/waybar/config.jsonc

@@ -8,8 +8,7 @@
     "hyprland/workspaces"
   ],
   "modules-center": [
-    "clock",
+    "clock"
-    "custom/update"
   ],
   "modules-right": [
     "group/tray-expander",
@@ -43,12 +42,6 @@
       "5": []
     }
   },
-  "custom/update": {
-    "format": "",
-    "exec": "~/.local/share/omarchy/bin/omarchy-update-available",
-    "on-click": "alacritty --class Omarchy --title Omarchy -e omarchy-update",
-    "interval": 3600
-  },
   "cpu": {
     "interval": 5,
     "format": "󰍛",

config/waybar/style.css

@@ -26,10 +26,6 @@
   min-width: 9px;
 }
 
-#workspaces button.empty {
-  opacity: 0.5;
-}
-
 #tray,
 #cpu,
 #battery,

default/bash/envs

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

default/bash/functions

@@ -65,3 +65,9 @@ web2app-remove() {
   rm "$DESKTOP_FILE"
   rm "$ICON_PATH"
 }
+
+# Ensure changes to ~/.XCompose are immediately available
+refresh-xcompose() {
+  pkill fcitx5
+  uwsm app -- fcitx5 >/dev/null 2>&1 &
+}

default/hypr/bindings/media.conf

@@ -10,7 +10,7 @@ bindel = ,XF86MonBrightnessUp, exec, $osdclient --brightness raise
 bindel = ,XF86MonBrightnessDown, exec, $osdclient --brightness lower
 
 # Requires playerctl
-bindl = , XF86AudioNext, exec, $osdclient --playerctl next
+bindl = , XF86AudioNext, exec, playerctl next
 bindl = , XF86AudioPause, exec, $osdclient --playerctl play-pause
 bindl = , XF86AudioPlay, exec, $osdclient --playerctl play-pause
-bindl = , XF86AudioPrev, exec, $osdclient --playerctl previous
+bindl = , XF86AudioPrev, exec, playerctl previous

default/hypr/windows.conf

@@ -8,7 +8,7 @@ windowrule = tile, class:^(Chromium)$
 windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
 windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
 windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty)$
-windowrule = size 600 470, class:Omarchy
+windowrule = size 590 450, class:Omarchy
 windowrule = size 700 470 class:About
 
 # Float and center file pickers

default/plymouth/omarchy.script

@@ -5,8 +5,8 @@ Window.SetBackgroundBottomColor(0.101, 0.105,  0.149);
 
 logo.image = Image("logo.png");
 logo.sprite = Sprite(logo.image);
-logo.sprite.SetX (Window.GetWidth()  / 2 - logo.image.GetWidth()  / 2);
+logo.sprite.SetX (Window.GetX() + Window.GetWidth()  / 2 - logo.image.GetWidth()  / 2);
-logo.sprite.SetY (Window.GetHeight() / 2 - logo.image.GetHeight() / 2);
+logo.sprite.SetY (Window.GetY() + Window.GetHeight() / 2 - logo.image.GetHeight() / 2);
 logo.sprite.SetOpacity (1);
 
 # Use these to adjust the progress bar timing
@@ -119,7 +119,7 @@ entry.image = Image("entry.png");
 bullet.image = Image("bullet.png");
 
 entry.sprite = Sprite(entry.image);
-entry.x = Window.GetWidth()/2 - entry.image.GetWidth() / 2;
+entry.x = Window.GetX() + Window.GetWidth()/2 - entry.image.GetWidth() / 2;
 entry.y = logo.sprite.GetY() + logo.image.GetHeight() + 40;
 entry.sprite.SetPosition(entry.x, entry.y, 10001);
 entry.sprite.SetOpacity(0);
@@ -171,13 +171,8 @@ fun display_password_callback (prompt, bullets)
     for (index = 0; bullet.sprites[index]; index++)
       bullet.sprites[index].SetOpacity(0);
     
-    # Create and show bullets for current password (max 21)
+    # Create and show bullets for current password
-    max_bullets = 21;
+    for (index = 0; index < bullets; index++)
-    bullets_to_show = bullets;
-    if (bullets_to_show > max_bullets)
-      bullets_to_show = max_bullets;
-    
-    for (index = 0; index < bullets_to_show; index++)
       {
         if (!bullet.sprites[index])
           {
@@ -200,7 +195,7 @@ Plymouth.SetDisplayPasswordFunction(display_password_callback);
 progress_box.image = Image("progress_box.png");
 progress_box.sprite = Sprite(progress_box.image);
 
-progress_box.x = Window.GetWidth() / 2 - progress_box.image.GetWidth() / 2;
+progress_box.x = Window.GetX() + Window.GetWidth() / 2 - progress_box.image.GetWidth() / 2;
 progress_box.y = entry.y + entry.image.GetHeight() / 2 - progress_box.image.GetHeight() / 2;
 progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 0);
 progress_box.sprite.SetOpacity(0);
@@ -209,7 +204,7 @@ progress_bar.original_image = Image("progress_bar.png");
 progress_bar.sprite = Sprite();
 progress_bar.image = progress_bar.original_image.Scale(1, progress_bar.original_image.GetHeight());
 
-progress_bar.x = Window.GetWidth() / 2 - progress_bar.original_image.GetWidth() / 2;
+progress_bar.x = Window.GetX() + Window.GetWidth() / 2 - progress_bar.original_image.GetWidth() / 2;
 progress_bar.y = progress_box.y + (progress_box.image.GetHeight() - progress_bar.original_image.GetHeight()) / 2;
 progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 1);
 progress_bar.sprite.SetOpacity(0);

install.sh

@@ -28,7 +28,6 @@ show_subtext() {
 # Install prerequisites
 source $OMARCHY_INSTALL/preflight/aur.sh
 source $OMARCHY_INSTALL/preflight/presentation.sh
-source $OMARCHY_INSTALL/preflight/migrations.sh
 
 # Configuration
 show_logo beams 240
@@ -39,7 +38,6 @@ source $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
 source $OMARCHY_INSTALL/config/fix-fkeys.sh
 source $OMARCHY_INSTALL/config/network.sh
 source $OMARCHY_INSTALL/config/power.sh
-source $OMARCHY_INSTALL/config/timezones.sh
 source $OMARCHY_INSTALL/config/login.sh
 source $OMARCHY_INSTALL/config/nvidia.sh
 

install/apps/xtras.sh

@@ -4,10 +4,10 @@ if [ -z "$OMARCHY_BARE" ]; then
   yay -S --noconfirm --needed \
     gnome-calculator gnome-keyring signal-desktop \
     obsidian-bin libreoffice obs-studio kdenlive \
-    xournalpp localsend-bin
+    xournalpp localsend-bin spotify-player
 
   # Packages known to be flaky or having key signing issues are run one-by-one
-  for pkg in pinta typora spotify zoom; do
+  for pkg in pinta typora zoom; do
     yay -S --noconfirm --needed "$pkg" ||
       echo -e "\e[31mFailed to install $pkg. Continuing without!\e[0m"
   done

install/desktop/theme.sh

@@ -10,14 +10,8 @@ if ! yay -Q gnome-themes-extra &>/dev/null; then
   yay -S --noconfirm gnome-themes-extra # Adds Adwaita-dark theme
 fi
 
-# Allow icons to match the theme
-if ! yay -! yaru-icon-theme &>/dev/null; then
-  yay -S --noconfirm yaru-icon-theme
-fi
-
 gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
 gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
 
 # Setup theme links
 mkdir -p ~/.config/omarchy/themes

install/preflight/migrations.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-omarchy_migrations_state_path=~/.local/state/omarchy/migrations
-mkdir -p $omarchy_migrations_state_path
-
-for file in ~/.local/share/omarchy/migrations/*.sh; do
-  touch "$omarchy_migrations_state_path/$(basename "$file")"
-done

migrations/1751225707.sh

@@ -2,5 +2,5 @@ echo "Fixing persistent workspaces in waybar config"
 
 if [[ -f ~/.config/waybar/config ]]; then
   sed -i 's/"persistent_workspaces":/"persistent-workspaces":/' ~/.config/waybar/config
-  omarchy-restart-waybar
+  pkill -SIGUSR2 waybar
 fi

migrations/1752187060.sh

@@ -0,0 +1,14 @@
+echo "Add missing Propo version of Caskaydia Mono Nerd Font for Waybar use"
+
+if ! fc-list | grep -qi "CaskaydiaMono Nerd Font Propo"; then
+  cd /tmp
+  wget https://github.com/ryanoasis/nerd-fonts/releases/latest/download/CascadiaMono.zip
+  unzip CascadiaMono.zip -d CascadiaFont
+  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-Regular.ttf ~/.local/share/fonts
+  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-Bold.ttf ~/.local/share/fonts
+  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-Italic.ttf ~/.local/share/fonts
+  cp CascadiaFont/CaskaydiaMonoNerdFontPropo-BoldItalic.ttf ~/.local/share/fonts
+  rm -rf CascadiaMono.zip CascadiaFont
+  fc-cache
+  cd -
+fi

migrations/1752981882.sh

@@ -0,0 +1,5 @@
+echo "Add missing libappindicator-gtk3 for Dropbox icon tray to work right"
+
+if ! pacman -Q libappindicator-gtk3 &>/dev/null; then
+  yay -S --noconfirm --needed libappindicator-gtk3
+fi

migrations/1753064164.sh

@@ -0,0 +1,6 @@
+echo "Add missing Dropbox dependencies"
+
+# Dropbox is still there, but the dependencies aren't yet
+if command -v dropbox-cli &>/dev/null && ! pacman -Q libappindicator-gtk3 &>/dev/null; then
+  yay -S --noconfirm --needed dropbox libappindicator-gtk3 python-gpgme nautilus-dropbox
+fi

migrations/1753352057.sh

@@ -12,6 +12,8 @@ if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.c
 
     # Refresh pacman package databases
     sudo pacman -Sy
+
+    chaotic_ok=1
   else
     echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
   fi

migrations/1753795654.sh

@@ -0,0 +1,12 @@
+if [[ ! -f ~/.local/state/omarchy/bare.mode ]]; then
+  echo "Offer to swap Spotify GUI to TUI"
+
+  if command -v spotify >/dev/null && ! command -v spotify_player >/dev/null; then
+    if gum confirm "Replace Spotify GUI with TUI?"; then
+      yay -Sy --noconfirm spotify-player
+      yay -Rns --noconfirm spotify
+
+      sed -i -E 's|bind = (.+), exec, .*spotify|bind = \1, exec, $terminal -e spotify_player|' ~/.config/hypr/hyprland.conf
+    fi
+  fi
+fi

migrations/1753908454.sh

@@ -1,12 +0,0 @@
-echo "Migrate from manually downloaded fonts to font packages"
-if ! yay -Q ttf-cascadia-mono-nerd &>/dev/null; then
-  yay -S --noconfirm ttf-cascadia-mono-nerd
-  rm -rf ~/.local/share/fonts/Caskaydia*
-  fc-cache
-fi
-
-if ! yay -Q ttf-ia-writer &>/dev/null; then
-  yay -S --noconfirm ttf-ia-writer
-  rm -rf ~/.local/share/fonts/iAWriterMonoS*
-  fc-cache
-fi

migrations/1753998861.sh

@@ -1,4 +0,0 @@
-echo "Update Walker config to include . as the leader key for the finder"
-if ! grep -q 'prefix = "\."' ~/.config/walker/config.toml; then
-  omarchy-refresh-walker
-fi

migrations/1754047941.sh

@@ -1,9 +0,0 @@
-echo "Add icon theme coloring"
-
-if ! yay -! yaru-icon-theme &>/dev/null; then
-  yay -S --noconfirm yaru-icon-theme
-
-  if [[ -f ~/.config/omarchy/current/theme/icons.theme ]]; then
-    gsettings set org.gnome.desktop.interface icon-theme "$(<~/.config/omarchy/current/theme/icons.theme)"
-  fi
-fi

migrations/1754108993.sh

@@ -1,2 +0,0 @@
-echo "Fix Plymouth login positioning in multi-monitor setups + limit password from overflowing"
-omarchy-refresh-plymouth

migrations/1754113760.sh

@@ -1,10 +0,0 @@
-echo "Change reload Waybar on unlock command to prevent stacking"
-
-if ! grep -q 'on_unlock_cmd *= *omarchy-restart-waybar' ~/.config/hypr/hypridle.conf; then
-  sed -i \
-    '/^    on_unlock_cmd = pkill -SIGUSR2 waybar[[:space:]]*# prevent stacking of waybar when waking$/c\
-    on_unlock_cmd = omarchy-restart-waybar  # prevent stacking of waybar when waking' \
-    ~/.config/hypr/hypridle.conf
-
-  omarchy-restart-waybar
-fi

migrations/1754133148.sh

@@ -1,6 +0,0 @@
-echo "Update Waybar CSS to dim unused workspaces"
-
-if ! grep -q "#workspaces button\.empty" ~/.config/waybar/style.css; then
-  omarchy-refresh-config waybar/style.css
-  omarchy-restart-waybar
-fi

migrations/1754136581.sh

@@ -1,6 +0,0 @@
-echo "Start screensaver automatically after 1 minute and stop before locking"
-
-if ! grep -q "omarchy-launch-screensaver" ~/.config/hypr/hypridle.conf; then
-  omarchy-refresh-hypridle
-  omarchy-refresh-hyprlock
-fi

themes/catppuccin-latte/icons.theme

@@ -1 +0,0 @@
-Yaru-blue

themes/catppuccin/icons.theme

@@ -1 +0,0 @@
-Yaru-purple

themes/everforest/icons.theme

@@ -1 +0,0 @@
-Yaru-sage

themes/gruvbox/icons.theme

@@ -1 +0,0 @@
-Yaru-olive

themes/kanagawa/icons.theme

@@ -1 +0,0 @@
-Yaru-blue

themes/matte-black/icons.theme

@@ -1 +0,0 @@
-Yaru-red

themes/nord/icons.theme

@@ -1 +0,0 @@
-Yaru-blue

themes/ristretto/icons.theme

@@ -1 +0,0 @@
-Yaru-yellow

themes/ristretto/neovim.lua

@@ -1,31 +1,22 @@
 return {
-  {
+	{
-    "gthelding/monokai-pro.nvim",
+		"gthelding/monokai-pro.nvim",
-    config = function()
+		config = function()
-      require("monokai-pro").setup({
+			require("monokai-pro").setup({
-        filter = "ristretto",
+				filter = "ristretto",
-        override = function()
+				override = function()
-          return {
+					return {
-            NonText = { fg = "#948a8b" },
+						NonText = { fg = "#948a8b" },
-            MiniIconsGrey = { fg = "#948a8b" },
+					}
-	    MiniIconsRed = { fg = "#fd6883" },
+				end,
-	    MiniIconsBlue = { fg = "#85dacc" },
+			})
-	    MiniIconsGreen = { fg = "#adda78" },
+			vim.cmd([[colorscheme monokai-pro]])
-	    MiniIconsYellow = { fg = "#f9cc6c" },
+		end,
-	    MiniIconsOrange = { fg = "#f38d70" },
+	},
-	    MiniIconsPurple = { fg = "#a8a9eb" },
+	{
-	    MiniIconsAzure = { fg = "#a8a9eb" },
+		"LazyVim/LazyVim",
-	    MiniIconsCyan = { fg = "#85dacc" }, -- same value as MiniIconsBlue for consistency
+		opts = {
-          }
+			colorscheme = "monokai-pro",
-        end,
+		},
-      })
+	},
-      vim.cmd([[colorscheme monokai-pro]])
-    end,
-  },
-  {
-    "LazyVim/LazyVim",
-    opts = {
-      colorscheme = "monokai-pro",
-    },
-  },
 }

themes/rose-pine/icons.theme

@@ -1 +0,0 @@
-Yaru-blue

themes/tokyo-night/icons.theme

@@ -1 +0,0 @@
-Yaru-magenta