Repository navigation
Merge upstream quattro (drop Elsewhen user plugin symlink) - #39
Merged
Merged
Conversation
|
Important Review skippedBot user detected. To trigger a single review, invoke the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picks the one new omacom/omarchy
quattrocommit since PR #37 onto this fork’s currentquattro(bd0caa27, lock face-scan chrome from #38).Upstream moved from
e38c1d12(Ignore.claude/) to45748a28. A rawgit mergeof upstreamquattrois still not a fast-forward — earlier cherry-pick syncs already landed those commits — so this is a clean cherry-pick of the leftover commit only. No leftover open sync PRs.Fork-only Cursor and face/lock work is untouched: official-tarball installer, no mise wrapper, usage collector, Cursor/Grok update steps, the theme-set fix from #22, and face scan #26–#38.
Drop the obsolete Elsewhen user plugin symlink (upstream
45748a28)/usr/share/omarchy/shell/plugins/omacom.elsewhen, where the shell discovers it automatically. The extra user symlink under~/.config/omarchy/plugins/is no longer needed.config/omarchy/plugins/omacom.elsewhen.1789581661still installs theelsewhenpackage, rescans plugins, and runsomarchy bar put omacom.elsewhen --before omarchy.clock. It no longer creates the user symlink.omarchy update.docs/omarchy-shell.mdpoints at the packaged plugin path instead of the old/usr/share/omarchy/plugins/+ symlink story.shell.jsonstill placesomacom.elsewhenimmediately before the center clock.Tests
Passed locally on this branch:
test/shell.d/elsewhen-default-migration-test.sh(package failure, no user link on install/rerun, existing checkout/symlink preserved, scan/put failures leave the migration pending)test/shell.d/config-test.sh(Elsewhen still immediately before the clock; other default bar/layout cases)Note
Low Risk
Install/migration and documentation only; bar placement and idempotent behavior are unchanged, with no auth or data-handling impact.
Overview
Elsewhen no longer depends on a user symlink under
~/.config/omarchy/plugins/. The packaged plugin lives at/usr/share/omarchy/shell/plugins/omacom.elsewhen, where the shell discovers it automatically.Fresh installs drop
config/omarchy/plugins/omacom.elsewhen. Migration1789581661still installs theelsewhenpackage, runsrescanPlugins, and places the widget before the clock; it no longer creates theln -sinto the user config tree. Existing checkouts, directories, and custom symlinks are left alone.Docs and
elsewhen-default-migration-test.share updated to match: no link on install or rerun, package failure still stops before shell changes.Reviewed by Cursor Bugbot for commit d163569. Configure here.