Fix again

This reverts commit 8c2f51c08c.

bin/omarchy

@@ -12,10 +12,15 @@ show_ascii_art() {
 main_menu() {
   show_ascii_art
 
-  local options=("Theme" "Setup" "Update" "Manual" "Exit")
+  local options=("Theme" "Font" "Setup" "Update" "Manual" "Exit")
   choice=$(printf "%s\n" "${options[@]}" | gum choose --header "") || exit 0
   case "$choice" in
   Theme) theme_menu ;;
+  Font)
+    omarchy-font-menu
+    ack_command
+    main_menu
+    ;;
   Update) update_menu ;;
   Setup) setup_menu ;;
   Manual) open_manual ;;
@@ -53,10 +58,11 @@ update_menu() {
 
 theme_menu() {
   show_ascii_art
-  local menu=("Pick" "Install" "Remove" "Back")
+  local menu=("Pick" "Install" "Update" "Remove" "Back")
   local commands=(
     "omarchy-theme-menu"
     "install_theme_prompt"
+    "omarchy-theme-update"
     "remove_theme_prompt"
     "main_menu"
   )

bin/omarchy-font-menu

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+font=$(
+  fc-list :spacing=100 -f "%{family[0]}\n" |
+    grep -v -i -E 'emoji|signwriting' |
+    sort -u |
+    gum choose --header "Choose terminal font"
+)
+
+if [[ -n "$font" ]]; then
+  sed -i "s/family = \".*\"/family = \"$font\"/g" ~/.config/alacritty/alacritty.toml
+fi

bin/omarchy-theme-update

@@ -0,0 +1,4 @@
+#!/bin/bash
+for dir in ~/.config/omarchy/themes/*/; do
+    [ -d "$dir" ] && [ ! -L "${dir%/}" ] && echo "Updating: $(basename "$dir")" && git -C "$dir" pull
+done

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

@@ -6,7 +6,7 @@ theme = "omarchy-default"
 theme_base = []
 theme_location = ["~/.local/share/omarchy/default/walker/themes/"]
 monitor = ""
-hotreload_theme = false
+hotreload_theme = true
 as_window = false
 timeout = 0
 disable_click_to_close = false
@@ -204,15 +204,16 @@ fd_flags = "--ignore-vcs --type file --type directory"
 cmd_alt = "xdg-open $(dirname ~/%RESULT%)"
 weight = 5
 icon = "file"
-name = "finder"
+name = "Finder"
 placeholder = "Finder"
 switcher_only = true
 ignore_gitignore = true
 refresh = true
 concurrency = 8
 show_icon_when_single = true
-preview_images = false
+preview_images = true
-hidden = true
+hidden = false
+prefix = '.'
 
 [builtins.runner]
 eager_loading = true

default/bash/shell

@@ -12,3 +12,6 @@ fi
 # Set complete path
 export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/omarchy/bin:$PATH"
 set +h
+
+# Omarchy path
+export OMARCHY_PATH="/home/$USER/.local/share/omarchy"

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/looknfeel.conf

@@ -70,7 +70,7 @@ animations {
 }
 
 # Application-sepcific animation
-layerrule=noanim,walker
+layerrule = noanim,walker
 
 # Remove 1px border around hyprshot screenshots
 layerrule = noanim, selection

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 590 400, class:Omarchy
+windowrule = size 590 450, class:Omarchy
 windowrule = size 700 470 class:About
 
 # Float and center file pickers

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/fonts.sh

@@ -1,36 +1,7 @@
 #!/bin/bash
 
+yay -S --noconfirm --needed ttf-font-awesome ttf-cascadia-mono-nerd ttf-ia-writer noto-fonts noto-fonts-emoji
+
 if [ -z "$OMARCHY_BARE" ]; then
-  yay -S --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
+  yay -S --noconfirm --needed ttf-jetbrains-mono noto-fonts-cjk noto-fonts-extra
-else
-  yay -S --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji
-fi
-
-mkdir -p ~/.local/share/fonts
-
-if ! fc-list | grep -qi "CaskaydiaMono Nerd Font"; then
-  cd /tmp
-  wget https://github.com/ryanoasis/nerd-fonts/releases/latest/download/CascadiaMono.zip
-  unzip CascadiaMono.zip -d CascadiaFont
-  cp CascadiaFont/CaskaydiaMonoNerdFont-Regular.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFont-Bold.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFont-Italic.ttf ~/.local/share/fonts
-  cp CascadiaFont/CaskaydiaMonoNerdFont-BoldItalic.ttf ~/.local/share/fonts
-  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
-
-if ! fc-list | grep -qi "iA Writer Mono S"; then
-  cd /tmp
-  wget -O iafonts.zip https://github.com/iaolo/iA-Fonts/archive/refs/heads/master.zip
-  unzip iafonts.zip -d iaFonts
-  cp iaFonts/iA-Fonts-master/iA\ Writer\ Mono/Static/iAWriterMonoS-*.ttf ~/.local/share/fonts
-  rm -rf iafonts.zip iaFonts
-  fc-cache
-  cd -
 fi

migrations/1752091783.sh

@@ -1,2 +1,2 @@
 echo "Install Plymouth splash screen"
-source "$HOME/.local/share/omarchy/install/login.sh"
+source "$HOME/.local/share/omarchy/install/config/login.sh"

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