From 8e43c97610ee092e6e5ba4b603d1dbd5fc08fe08 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 19 Jul 2026 21:59:10 -0700 Subject: [PATCH] Fix Neovim theme symlink pointing at the Omarchy 4 theme location (#6318) * 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 --------- Co-authored-by: Claude Fable 5 --- install/config/hardware/intel/sof-firmware.sh | 3 --- migrations/1783833508.sh | 22 ++++++++++++++++--- migrations/1783834201.sh | 6 ++--- migrations/1784518937.sh | 10 +++++++++ 4 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 migrations/1784518937.sh diff --git a/install/config/hardware/intel/sof-firmware.sh b/install/config/hardware/intel/sof-firmware.sh index e0d70f2e..6d9b1294 100644 --- a/install/config/hardware/intel/sof-firmware.sh +++ b/install/config/hardware/intel/sof-firmware.sh @@ -3,9 +3,6 @@ # the DSP; without it the DSP fails to boot and PipeWire exposes only a Dummy # Output sink. This affects Arrow Lake, Meteor Lake, Tiger Lake, Alder Lake, # Wildcat Lake, Panther Lake, and similar platforms. -# -# omarchy-pkg-add is idempotent, so systems that already pull sof-firmware in -# via linux-ptl (Panther Lake XPS) are unaffected. if omarchy-hw-intel-sof; then omarchy-pkg-add sof-firmware diff --git a/migrations/1783833508.sh b/migrations/1783833508.sh index fecb48c7..c4bd4f56 100644 --- a/migrations/1783833508.sh +++ b/migrations/1783833508.sh @@ -1,16 +1,32 @@ echo "Add easier tmux pane controls with Alt+Enter splits and CSI-u Shift+Enter across terminals" -# tmux: add M-Enter/M-S-Enter/M-Escape pane bindings and enable extkeys for kitty terminal +# tmux: add pane bindings, enable kitty extkeys, and set informative terminal titles tmux_config="$HOME/.config/tmux/tmux.conf" if [[ -f $tmux_config ]]; then - if ! grep -q "M-S-Enter" "$tmux_config"; then - sed -i '/^# Pane Controls$/a\bind -n M-Enter split-window -v -c "#{pane_current_path}"\nbind -n M-S-Enter split-window -h -c "#{pane_current_path}"\nbind -n M-Escape kill-pane\n' "$tmux_config" + if ! grep -Fq 'bind -n M-Escape kill-pane' "$tmux_config"; then + sed -i '/^# Pane Controls$/a\bind -n M-Escape kill-pane' "$tmux_config" + fi + + if ! grep -Fq 'bind -n M-S-Enter split-window' "$tmux_config"; then + sed -i '/^# Pane Controls$/a\bind -n M-S-Enter split-window -h -c "#{pane_current_path}"' "$tmux_config" + fi + + if ! grep -Fq 'bind -n M-Enter split-window' "$tmux_config"; then + sed -i '/^# Pane Controls$/a\bind -n M-Enter split-window -v -c "#{pane_current_path}"' "$tmux_config" fi if ! grep -q "xterm-kitty:extkeys" "$tmux_config"; then sed -i '/^set -g extended-keys-format csi-u$/a\set -ag terminal-features "xterm-kitty:extkeys"' "$tmux_config" fi + if ! grep -Fq 'set -g set-titles on' "$tmux_config"; then + sed -i "/^set -gw automatic-rename-format/a\\set -g set-titles on" "$tmux_config" + fi + + if ! grep -Fq 'set -g set-titles-string' "$tmux_config"; then + sed -i "/^set -g set-titles on$/a\\set -g set-titles-string '#h:#W'" "$tmux_config" + fi + omarchy-restart-tmux fi diff --git a/migrations/1783834201.sh b/migrations/1783834201.sh index 77d4ca21..a0aac722 100644 --- a/migrations/1783834201.sh +++ b/migrations/1783834201.sh @@ -4,10 +4,8 @@ echo "Install sof-firmware for all Intel SOF audio DSP platforms (Arrow Lake, Me # Lake, Tiger Lake, Alder Lake) were not covered by the original sof-firmware # install guard. Without sof-firmware the DSP fails to boot and PipeWire exposes # only a Dummy Output. Install it now for all qualifying Intel systems. -# -# omarchy-pkg-add is idempotent — systems that already have the package are -# unaffected. -if omarchy-hw-intel-sof; then +if omarchy-hw-intel-sof && omarchy-pkg-missing sof-firmware; then omarchy-pkg-add sof-firmware + omarchy-state set reboot-required fi diff --git a/migrations/1784518937.sh b/migrations/1784518937.sh new file mode 100644 index 00000000..f92cc78e --- /dev/null +++ b/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