Merge branch 'master' into rc

* Address upgrade migration review feedback

* Only promote firmware during kernel transitions

* Remove the dropped packages preventing installation

* Fix Neovim theme symlink pointing at the Omarchy 4 theme location

omarchy-nvim briefly created ~/.config/nvim/lua/plugins/theme.lua linked
to ~/.local/state/omarchy/current, which doesn't exist on Omarchy 3.x,
so fresh installs errored on nvim startup with "Failed to load
plugins.theme" (#6309). Retarget the link to ~/.config/omarchy/current
unless the user has already customized it.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

bin/omarchy-install-gaming-retroarch

@@ -10,12 +10,12 @@ omarchy-pkg-add \
   retroarch-assets-glui retroarch-assets-ozone retroarch-assets-xmb \
   libretro-beetle-pce libretro-beetle-pce-fast libretro-beetle-psx libretro-beetle-psx-hw libretro-beetle-supergrafx \
   libretro-blastem \
-  libretro-bsnes libretro-bsnes-hd libretro-bsnes2014 \
+  libretro-bsnes libretro-bsnes-hd \
   libretro-core-info \
   libretro-desmume libretro-dolphin libretro-flycast \
   libretro-gambatte libretro-genesis-plus-gx \
   libretro-kronos \
-  libretro-mame libretro-mame2016 libretro-melonds libretro-mesen libretro-mesen-s libretro-mgba libretro-mupen64plus-next \
+  libretro-mame libretro-melonds libretro-mesen libretro-mesen-s libretro-mgba libretro-mupen64plus-next \
   libretro-nestopia \
   libretro-overlays \
   libretro-parallel-n64 libretro-picodrive libretro-play libretro-ppsspp \

bin/omarchy-remove-gaming-retroarch

@@ -10,12 +10,12 @@ omarchy-pkg-drop \
   retroarch-assets-glui retroarch-assets-ozone retroarch-assets-xmb \
   libretro-beetle-pce libretro-beetle-pce-fast libretro-beetle-psx libretro-beetle-psx-hw libretro-beetle-supergrafx \
   libretro-blastem \
-  libretro-bsnes libretro-bsnes-hd libretro-bsnes2014 \
+  libretro-bsnes libretro-bsnes-hd \
   libretro-core-info \
   libretro-desmume libretro-dolphin libretro-flycast \
   libretro-gambatte libretro-genesis-plus-gx \
   libretro-kronos \
-  libretro-mame libretro-mame2016 libretro-melonds libretro-mesen libretro-mesen-s libretro-mgba libretro-mupen64plus-next \
+  libretro-mame libretro-melonds libretro-mesen libretro-mesen-s libretro-mgba libretro-mupen64plus-next \
   libretro-nestopia \
   libretro-overlays \
   libretro-parallel-n64 libretro-picodrive libretro-play libretro-ppsspp \

bin/omarchy-toggle-waybar

@@ -6,7 +6,7 @@
 omarchy-toggle waybar-off
 
 if pgrep -x waybar >/dev/null; then
-  pkill -x waybar
+  pkill -9 -x waybar
 else
   uwsm-app -- waybar >/dev/null 2>&1 &
 fi

install/omarchy-base.packages

@@ -89,7 +89,7 @@ noto-fonts
 noto-fonts-cjk
 noto-fonts-emoji
 nss-mdns
-nvim
+neovim
 obs-studio
 obsidian
 omarchy-nvim

migrations/1783833508.sh

@@ -40,7 +40,7 @@ fi
 foot_config="$HOME/.config/foot/foot.ini"
 if [[ -f $foot_config ]]; then
   if ! grep -q '^\[text-bindings\]$' "$foot_config"; then
-    sed -i '$a\\\n[text-bindings]' "$foot_config"
+    printf '\n[text-bindings]\n' >> "$foot_config"
   fi
 
   if ! grep -Fq '\x1b[13;4u=Mod1+Shift+Return' "$foot_config"; then

migrations/1784518937.sh

@@ -0,0 +1,10 @@
+echo "Point the Neovim theme symlink at the Omarchy 3.x theme location"
+
+# omarchy-nvim briefly created ~/.config/nvim/lua/plugins/theme.lua linked to
+# the Omarchy 4 theme location, which doesn't exist on Omarchy 3.x, so Neovim
+# failed to load plugins.theme on startup (#6309). Retarget the link to the
+# 3.x location, but leave any customized link alone.
+theme_link="$HOME/.config/nvim/lua/plugins/theme.lua"
+if [[ -L $theme_link && $(readlink "$theme_link") == *.local/state/omarchy/current/theme/neovim.lua ]]; then
+  ln -snf "../../../../.config/omarchy/current/theme/neovim.lua" "$theme_link"
+fi