Skip to content

Merge upstream quattro (drop Elsewhen user plugin symlink) - #39

Merged
mark-groves merged 1 commit into
quattrofrom
cursor/upstream-changes-pr-a263
Sep 21, 2026
Merged

mark-groves merged 1 commit into
quattrofrom
cursor/upstream-changes-pr-a263

Conversation

@cursor

@cursor cursor Bot commented Sep 20, 2026 •

Copy link
Copy Markdown

Cherry-picks the one new omacom/omarchy quattro commit since PR #37 onto this fork’s current quattro (bd0caa27, lock face-scan chrome from #38).

Upstream moved from e38c1d12 (Ignore .claude/) to 45748a28. A raw git merge of upstream quattro is 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)

  • Elsewhen now ships at /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.
  • Fresh installs no longer ship config/omarchy/plugins/omacom.elsewhen.
  • Migration 1789581661 still installs the elsewhen package, rescans plugins, and runs omarchy bar put omacom.elsewhen --before omarchy.clock. It no longer creates the user symlink.
  • Existing checkouts, custom plugin directories, and existing user symlinks stay intact. The migration is still idempotent and still leaves the shell restart to omarchy update.
  • docs/omarchy-shell.md points at the packaged plugin path instead of the old /usr/share/omarchy/plugins/ + symlink story.
  • Default shell.json still places omacom.elsewhen immediately 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)
Open in Web View Automation 

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. Migration 1789581661 still installs the elsewhen package, runs rescanPlugins, and places the widget before the clock; it no longer creates the ln -s into the user config tree. Existing checkouts, directories, and custom symlinks are left alone.

Docs and elsewhen-default-migration-test.sh are 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.

@coderabbitai

coderabbitai Bot commented Sep 20, 2026 •

Copy link
Copy Markdown

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: 1b694249-9fd6-4125-8989-1c8ace5aa74d

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@mark-groves
mark-groves marked this pull request as ready for review September 20, 2026 23:58
@mark-groves
mark-groves merged commit 47d22f6 into quattro Sep 21, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants