Repository navigation
Merge upstream quattro (OWE video, Omasnap, test/docs cleanup) - #42
Closed
cursor[bot] wants to merge 16 commits into
Closed
cursor[bot] wants to merge 16 commits into
cursor[bot] wants to merge 16 commits into
Conversation
Replace the shell's desktop video path with OWE
Use Omasnap for screenshots
…-test Retire the shipped Copy URL migration test
Point shell documentation to the canonical reference
Remove stale migration filename assertion
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
Remove link to Omarchy 3 manual
…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>
|
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 was referenced Sep 22, 2026
mark-groves
added a commit
that referenced
this pull request
Sep 27, 2026
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 15 new first-parent omacom/omarchy
quattrocommits since PR #39 onto this fork’s currentquattro(74996039, pstack Grok 4.7 from #41).Upstream moved from
45748a28(drop Elsewhen user plugin symlink) tob8c382da. 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 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)
oweandowe-lockfeed.qt6-multimedia/qt6-multimedia-ffmpegleave the default set; the shell no longer ships its own video player (shell/Ui/BackgroundVideo.qmlis gone).BackgroundMedia; while OWE is running it owns the video path. Migration1789764927installs the packages, hookstheme-setto/usr/share/owe/10-owe-sync, and enablesowed.service(starts it only when a graphical session is already up).shell/plugins/lock/poster.shviaffmpegthumbnailer) and loadsLockFeedSurface.qmlthrough an isolatedLoader, so a missing OWE module costs only the video, not the lock screen. Playback stops when displays blank or power-saver is on.39-backgrounds.mdnotes that OWE plays desktop video audio and that the lock feed is the lock-screen source.Screenshots move to Omasnap (upstream omacom#9446)
omasnapreplaces Satty and Tensaku as the default capture/annotate tool.omarchy-capture-screenshotis now a thin compatibility wrapper.1788129995installs Omasnap, dropssatty/tensaku, removes a leftoverNoDisplaydesktop override, and rewrites only the stock imv Ctrl+e binding. Custom imv shortcuts stay untouched.Elsewhen migration works on dev checkouts (upstream
0d5232ed)1789581661still relies on the packaged plugin at/usr/share/omarchy/shell/plugins/omacom.elsewhenfor real installs.$OMARCHY_PATHis 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 toomarchy update.Test and docs cleanup
shell/README.mdis now a pointer; the canonical reference staysdocs/omarchy-shell.md(Point shell documentation to the canonical reference omacom/omarchy#12740).NO_COLOR/LC_ALLand stub route discovery; Wi-Fi QR still falls back after a failed route lookup (Isolate About tests from inherited NO_COLOR omacom/omarchy#12746–Fall back to connected Wi-Fi when QR route lookup fails omacom/omarchy#12748).ok - … # SKIP) without failing the suite (Report skipped checks separately in shell tests omacom/omarchy#12758).Small command fixes
libretro-database-git(Drop libretro-database-git when removing RetroArch omacom/omarchy#12839).omarchy-install-service-dropboxis marked# omarchy:requires-sudo=true(Dropbox install not flagged as needing sudo omacom/omarchy#9125).subl(the binary sublime-text-4 actually ships). Storedsublime_textvalues still map tosubl. Cursor remains on the editor menu (Use subl for the Sublime Text default editor omacom/omarchy#9656).Fork-only adaptation
lock-face-test.shnow allows the isolated OWEfeedLoaderwhile 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/clitest/shell.d/elsewhen-default-migration-test.shtest/shell.d/omasnap-test.shtest/shell.d/owe-integration-test.shtest/shell.d/video-background-test.shtest/shell.d/clipboard-test.sh(image entries open in Omasnap)test/shell.d/network-qr-test.shtest/shell.d/launch-about-test.shtest/shell.d/update-pacman-test.shtest/shell.d/test-runner-test.shtest/shell.d/default-apps-test.shtest/shell.d/menu-test.shtest/shell.d/config-test.shtest/shell.d/lock-face-test.shtest/shell.d/apply-lock-test.shtest/shell.d/face-overlay-test.shtest/shell.d/polkit-face-test.shSkipped 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.shstill fails in this sandbox onupdatedb --debug-pruningagainst a temp tree; the same command fails on currentquattro(74996039) so it is not a regression from this sync.