Repository navigation
Merge upstream quattro (Elsewhen repair, literal operands, leftover OWE/Omasnap) - #45
Closed
cursor[bot] wants to merge 22 commits into
Closed
cursor[bot] wants to merge 22 commits into
cursor[bot] wants to merge 22 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>
…-shell Let the Elsewhen migration survive a shell it cannot reach
Rename the Elsewhen migration so the link repair reaches machines that already ran it
…teral Treat command operands as literal values
Add select all and standard terminal clipboard shortcuts
…macs-icons Add editor icons for Sublime Text and Emacs
…-update Isolate OCaml cleanup authorization
|
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 23, 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 leftover PR #42 plus the 6 new first-parent omacom/omarchy
quattrocommits since that sync onto this fork’s currentquattro(4a167a6e, pstack Grok 4.7 / Opus 5.5 from #44).Upstream moved from
b8c382datod3cfd53b. 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 leftover #42 and the new first-parent commits only. #42 is still open and is superseded here.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 / #44. The OWE lock-feed Loader was merged into the fork lock view without dropping the face card.
New since PR #42
Elsewhen migration survives an absent shell (upstream omacom#12853)
omarchy-shell shell rescanPluginsexits 1 when no shell answers, andomarchy-migrateruns underset -e, so a TTY/ssh update (or one whose shell went down while QML was replaced) died at "omarchy-shell is not running" and re-failed every retry.omarchy-shell -q), matchingomarchy-bar put. The update still restarts the shell after migrations. An unknown widget on a live shell still leaves the migration pending.Elsewhen stranded-link repair actually re-runs (upstream omacom#12861)
plugins/toshell/plugins/left~/.config/omarchy/plugins/omacom.elsewhenpointing at the old path. Machines that already applied1789581661never ran the repair, becauseomarchy-migratekeys completion on the filename.1790042972so it runs again everywhere. Each step is idempotent: package add is a no-op once installed, both link branches are guarded, rescan is best-effort, and the bar put keeps an existing placement./usr/share/omarchyis re-pointed; a user-made link is left alone. Dev checkouts still get the user symlink when$OMARCHY_PATHis not/usr/share/omarchy.Command operands are literals (upstream omacom#11495)
omarchy-cmd-present/omarchy-cmd-missing,omarchy-pkg-*,omarchy-hw-match,omarchy-restart-app,omarchy-launch-editor,omarchy-hook-install, and fingerprint setup now pass operands after--so an option-shaped name is not parsed as a flag.command-operand-boundaries-test.shcovers the helpers. Fingerprint and menu-guard tests follow the same delimiter.Terminal clipboard shortcuts (upstream omacom#12915)
SUPER+Aselects all (CTRL+A).SUPER+C/SUPER+Vstill copy/paste, but in a terminal they sendCTRL+SHIFT+C/CTRL+SHIFT+Vso they do not interrupt the shell. Cut staysSUPER+X→CTRL+X. Clipboard manager is stillSUPER+CTRL+V.Sublime Text and Emacs icons (upstream omacom#10033)
) and Emacs () glyphs. Cursor stays on the editor menu.OCaml removal keeps a cold sudo (upstream omacom#10217)
omarchy-remove-dev-env ocamlnow requires sudo--no-update, invalidates cached credentials around the privileged step, and refuses to run if that sudo cannot do it. Newremove-dev-env-sudo-security-test.shproves the boundary when user namespaces are available.Leftover from PR #42 (still not on quattro)
OWE owns desktop video backgrounds and the lock feed (upstream omacom#12429)
oweandowe-lockfeed.qt6-multimedia/qt6-multimedia-ffmpegleave the default set; the workshop 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.Screenshots move to Omasnap (upstream omacom#9446)
omasnapreplaces Satty and Tensaku.omarchy-capture-screenshotis a thin compatibility wrapper.1788129995installs Omasnap, dropssatty/tensaku, removes a leftoverNoDisplaydesktop override, and rewrites only the stock imv Ctrl+e binding.Elsewhen on dev checkouts (upstream
0d5232ed, now inside1790042972)/usr/share/omarchy/shell/plugins/omacom.elsewhen.Test and docs cleanup, small command fixes
shell/README.mdis now a pointer (Point shell documentation to the canonical reference omacom/omarchy#12740). Kernel and locate tests drop stale history assertions (Remove stale migration filename assertion omacom/omarchy#12744, Remove obsolete repository scan from locate test omacom/omarchy#12745). About, pacman, and network-QR tests isolate inheritedNO_COLOR/LC_ALL(Isolate About tests from inherited NO_COLOR omacom/omarchy#12746–Fall back to connected Wi-Fi when QR route lookup fails omacom/omarchy#12748). Shell tests report skipped checks separately (Report skipped checks separately in shell tests omacom/omarchy#12758). README no longer links the Omarchy 3 learn.omacom.io mirror (Remove link to Omarchy 3 manual omacom/omarchy#10280).libretro-database-git(Drop libretro-database-git when removing RetroArch omacom/omarchy#12839). Dropbox install is# omarchy:requires-sudo=true(Dropbox install not flagged as needing sudo omacom/omarchy#9125). Sublime Text defaults persist and check assubl(Use subl for the Sublime Text default editor omacom/omarchy#9656).Fork-only adaptation
lock-face-test.shstill allows the isolated OWEfeedLoaderwhile 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.shtest/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.shtest/shell.d/command-operand-boundaries-test.shtest/shell.d/fingerprint-driver-migration-test.shtest/shell.d/fingerprint-package-test.shtest/shell.d/menu-guards-test.shremove-dev-env-sudo-security-test.shskipped the namespace proof here (unsharecould not runnewuidmap); that is an environment limit, not a sync regression.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.shstill fails in this sandbox onupdatedb --debug-pruningagainst a temp tree; the same command fails on currentquattro(4a167a6e) so it is not a regression from this sync.