Reinstall a damaged Neovim plugin instead of only stashing its changes

Stashing a plugin's mismatched files wasn't enough for LuaSnip: the
interrupted update had also left new files git won't overwrite and a
half-cloned submodule, so lazy.nvim still couldn't check out the new
version, and said nothing. Move such a plugin to
~/.local/state/coredesktop/nvim-plugins/ instead, so Lazy! sync installs
it afresh and any edits to it are kept. A plugin the earlier version of
this step stashed is moved the same way.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

updates.d/46-neovim.sh

@@ -2,28 +2,36 @@
 
 # Only the plugins are updated; the kickstart.nvim config itself is the user's to edit.
 LAZY_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/nvim/lazy"
+PLUGIN_BACKUPS="${XDG_STATE_HOME:-$HOME/.local/state}/coredesktop/nvim-plugins"
 
 is_installed() {
   command -v nvim &>/dev/null && [ -d "$LAZY_DIR/lazy.nvim" ]
 }
 
 # lazy.nvim won't update a plugin whose tracked files differ from its checkout
-# (it checks with `git ls-files -d -m`), which an interrupted update can leave
-# behind. Stash those changes, so the plugin updates and they can still be
-# recovered with `git stash pop` in its folder, and put its submodules back.
-restore_plugins() {
-  local dir
+# (it checks with `git ls-files -d -m`). An interrupted update can leave a
+# plugin like that, along with leftovers git won't overwrite, such as new files
+# and half-cloned submodules (LuaSnip, 2026-10-20). Move such a plugin out of
+# the way, so `Lazy! sync` installs it afresh; any edits made to it are in the
+# copy. So is a plugin an earlier version of this step only stashed.
+set_aside_broken_plugins() {
+  local dir name dest
   for dir in "$LAZY_DIR"/*/; do
+    dir="${dir%/}"
     [ -d "$dir/.git" ] || continue
-    [ -n "$(git -C "$dir" ls-files -d -m 2> /dev/null)" ] || continue
-    echo "  $(basename "$dir") had local changes; stashing them so it can update."
-    git -C "$dir" stash push -q -m "Stashed by CoreDesktop's update" \
-      && git -C "$dir" submodule update -q --init --recursive --force
+    if [ -z "$(git -C "$dir" ls-files -d -m 2> /dev/null)" ] \
+        && ! git -C "$dir" stash list 2> /dev/null | grep -q "Stashed by CoreDesktop's update"; then
+      continue
+    fi
+    name="$(basename "$dir")"
+    dest="$PLUGIN_BACKUPS/$name-$(date +%Y-%m-%d-%H%M%S)"
+    mkdir -p "$PLUGIN_BACKUPS" && mv "$dir" "$dest" \
+      && echo "  $name's files didn't match its version, so it will be installed again. The old copy is in $dest"
   done
 }
 
 run_update() {
   echo "Updating Neovim plugins..."
-  restore_plugins
+  set_aside_broken_plugins
   nvim --headless "+Lazy! sync" +qa
 }