Repository navigation
Merge upstream quattro (theme wallpaper memory, VS Code reload, leftover OWE/Omasnap) - #48
Merged
28 commits merged intoSep 27, 2026
Merged
28 commits merged into
28 commits merged 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
…sible-hover-states Fix invisible hover and active states in the generated VS Code theme
…ible-states Fix invisible VSCode status bar labels and current line
Point catppuccin theme at its flavour colorscheme
Make VS Code-family editors reload the Omarchy theme when it changes
…wallpapers Remember the selected wallpaper for each theme
Upstream now writes a real theme file and versions the local extension from palette content so VS Code reloads. The CLI fixture still expected a symlink to 1.0.0. 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 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 #45 (which already includes leftover PR #42) plus the 5 new first-parent / 7 non-merge omacom/omarchy
quattrocommits since that sync onto this fork’s currentquattro(13502987, face holds on swapped frames from #46).Upstream moved from
d3cfd53bto28ceaae7. 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 #45 and the new first-parent commits only. #45 and #42 are still open and are 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 / #43 / #46. The OWE lock-feed Loader stays isolated; the face card and presented/swapped-frame holds remain on the lock and polkit surfaces.
omarchy-theme-set-vscodestill does not theme Cursor.New since PR #45
Themes remember wallpaper choices (upstream omacom#7718)
~/.local/state/omarchy/theme-backgrounds/<theme>and restores it the next time that theme is selected.theme-background-memory-test.shcovers restore, cycle, shared names, missing files, and staged selection.VS Code-family editors reload the Omarchy theme (upstream omacom#10134)
omarchy-color-theme.jsonintocurrent/theme.omarchy-theme-setswaps that directory withrm+mv, so the symlink dangled and VS Code kept the old palette.1.0.<cksum of the palette>so an identical theme keeps the cache and a new one invalidates it.package.jsonsets_watch: trueso same-inode rewrites fire the watcher./usr/bin/cursoris the GUI launcher).VS Code hover, line, and badge contrast (upstream omacom#10016, omacom#9964)
Catppuccin Neovim uses mocha (upstream omacom#12864)
themes/catppuccin/neovim.luanow setscolorscheme = "catppuccin-mocha". The newercatppuccin-nvimname only exists in plugin checkouts from March 2026 onward; mocha loads on old and new ones.theme-neovim-colorscheme-test.shforbids the newer-only name in stock themes.Leftover from PR #45 (still not on quattro)
Elsewhen migration survives an absent shell and actually re-runs (upstream omacom#12853, omacom#12861)
omarchy-shell -q). The migration is renamed to1790042972so machines that already ran1789581661get the stranded-link repair. Dev checkouts still get the user symlink; packaged installs still rely on/usr/share/omarchy/shell/plugins/omacom.elsewhen.Command operands are literals (upstream omacom#11495)
--. Fingerprint setup and menu guards follow the same delimiter.Terminal clipboard shortcuts (upstream omacom#12915)
SUPER+Aselects all. In a terminal,SUPER+C/SUPER+VsendCTRL+SHIFT+C/CTRL+SHIFT+Vso they do not interrupt the shell.Sublime / Emacs icons and OCaml sudo (upstream omacom#10033, omacom#10217)
omarchy-remove-dev-env ocamlrequires sudo--no-updateand invalidates cached credentials around the privileged step.OWE video, Omasnap, and test/docs cleanup (leftover from #42)
owe/owe-lockfeedown desktop video and the lock feed.omasnapreplaces Satty/Tensaku. Copy-URL / kernel / locate / About / pacman / network-QR / skip-reporting test cleanup, RetroArchlibretro-database-gitdrop, Dropbox sudo flag, Sublimesubldefault.Fork-only adaptations
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 — including presented-frame and swapped-frame holds from fix(shell): play face results on presented frames #43/fix(shell): play face holds on swapped frames #46 — are unchanged.test/clino longer expects a symlink to1.0.0. It now asserts a copied theme file,_watch: true, and a content-hashed extension version, matching upstream Make VS Code-family editors reload the Omarchy theme when it changes omacom/omarchy#10134.Tests
Passed locally on this branch:
./test/clitest/shell.d/theme-background-memory-test.shtest/shell.d/theme-neovim-colorscheme-test.shtest/shell.d/theme-staging-test.shtest/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/face-playback-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.locate-test.shstill fails in this sandbox onupdatedb --debug-pruningagainst a temp tree; the same command fails on currentquattro(13502987) so it is not a regression from this sync.