Skip to content

Merge upstream quattro (OWE video, Omasnap, test/docs cleanup) - #42

Closed
cursor[bot] wants to merge 16 commits into
quattrofrom
cursor/upstream-changes-pr-3e46
Closed

cursor[bot] wants to merge 16 commits into
quattrofrom
cursor/upstream-changes-pr-3e46

Conversation

@cursor

@cursor cursor Bot commented Sep 21, 2026

Copy link
Copy Markdown

Cherry-picks the 15 new first-parent omacom/omarchy quattro commits since PR #39 onto this fork’s current quattro (74996039, pstack Grok 4.7 from #41).

Upstream moved from 45748a28 (drop Elsewhen user plugin symlink) to b8c382da. 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 first-parent commits 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–#40. The OWE lock-feed Loader was merged into the fork lock view without dropping the face card.

OWE owns desktop video backgrounds and the lock feed (upstream omacom#12429)

  • New base packages: owe and owe-lockfeed. qt6-multimedia / qt6-multimedia-ffmpeg leave the default set; the shell no longer ships its own video player (shell/Ui/BackgroundVideo.qml is gone).
  • Desktop backgrounds are stills in BackgroundMedia; while OWE is running it owns the video path. Migration 1789764927 installs the packages, hooks theme-set to /usr/share/owe/10-owe-sync, and enables owed.service (starts it only when a graphical session is already up).
  • Lock keeps a cached poster (shell/plugins/lock/poster.sh via ffmpegthumbnailer) and loads LockFeedSurface.qml through an isolated Loader, so a missing OWE module costs only the video, not the lock screen. Playback stops when displays blank or power-saver is on.
  • Manual 39-backgrounds.md notes that OWE plays desktop video audio and that the lock feed is the lock-screen source.

Screenshots move to Omasnap (upstream omacom#9446)

  • omasnap replaces Satty and Tensaku as the default capture/annotate tool. omarchy-capture-screenshot is now a thin compatibility wrapper.
  • Migration 1788129995 installs Omasnap, drops satty/tensaku, removes a leftover NoDisplay desktop override, and rewrites only the stock imv Ctrl+e binding. Custom imv shortcuts stay untouched.
  • Clipboard open of image entries and the capture skill/docs now point at Omasnap.

Elsewhen migration works on dev checkouts (upstream 0d5232ed)

  • Migration 1789581661 still relies on the packaged plugin at /usr/share/omarchy/shell/plugins/omacom.elsewhen for real installs.
  • When $OMARCHY_PATH is a git checkout (not /usr/share/omarchy), it creates a user symlink so the running shell can discover the packaged plugin. Existing checkouts, directories, and custom symlinks stay intact. The migration still leaves the shell restart to omarchy update.

Test and docs cleanup

Small command fixes

Fork-only adaptation

  • lock-face-test.sh now allows the isolated OWE feedLoader while still forbidding a plugin Item next to the password field. Face card, Howdy PAM, and lock/polkit chrome are unchanged.

Tests

Passed locally on this branch:

  • ./test/cli
  • test/shell.d/elsewhen-default-migration-test.sh
  • test/shell.d/omasnap-test.sh
  • test/shell.d/owe-integration-test.sh
  • test/shell.d/video-background-test.sh
  • test/shell.d/clipboard-test.sh (image entries open in Omasnap)
  • test/shell.d/network-qr-test.sh
  • test/shell.d/launch-about-test.sh
  • test/shell.d/update-pacman-test.sh
  • test/shell.d/test-runner-test.sh
  • test/shell.d/default-apps-test.sh
  • test/shell.d/menu-test.sh
  • test/shell.d/config-test.sh
  • test/shell.d/lock-face-test.sh
  • test/shell.d/apply-lock-test.sh
  • test/shell.d/face-overlay-test.sh
  • test/shell.d/polkit-face-test.sh

Skipped here (no compositor / no Quickshell): owe-lock-test.sh, screenshot-sanity-test.sh, lock-fingerprint-indicator-test.sh, lock-password-overflow-test.sh.

locate-test.sh still fails in this sandbox on updatedb --debug-pruning against a temp tree; the same command fails on current quattro (74996039) so it is not a regression from this sync.

Open in Web View Automation 

dhh and others added 16 commits September 21, 2026 23:04
Replace the shell's desktop video path with OWE
…-test

Retire the shipped Copy URL migration test
Point shell documentation to the canonical reference
Remove obsolete repository scan from locate test
…onment

Isolate About tests from inherited NO_COLOR
…ronment

Isolate pacman tests from inherited LC_ALL
…environment

Fall back to connected Wi-Fi when QR route lookup fails
Report skipped checks separately in shell tests
…se-on-retroarch-remove

Drop libretro-database-git when removing RetroArch
Dropbox install not flagged as needing sudo
…ditor-uses-subl

Use subl for the Sublime Text default editor
The lock view now isolates the OWE video feed behind a Loader. Keep the
fork-only assertion that face chrome is not loaded as a plugin Item, and
require that the only Loader is LockFeedSurface.

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
@coderabbitai

coderabbitai Bot commented Sep 21, 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: e075175c-422a-45ea-b41f-f68eb9eef2b6

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.

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.

5 participants