Repository navigation
Merge upstream quattro (Hermes desktop agent, OM-SEC-12, leftover Fastfetch/OWE) - #50
Merged
36 commits merged intoSep 27, 2026
Merged
36 commits merged into
36 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>
Only force NVIDIA VA-API/GLX env when NVIDIA drives the display
Install Hermes for the default agent as the desktop app's self-updating runtime Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
…ycles-20260923 Guard against cyclic theme colour references
…-inhibitor-identity [codex] OM-SEC-12: Bind update inhibitor cleanup to process identity Reported-by: Afonso "AFOliveira" Oliveira Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
Migrate remote Neovim providers to reliable clipboard yanks and paste
Official product updates still run after mise, each behind a cold sudo boundary. 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 #49 (which already includes leftover #48, #45, and #42) plus the 6 new first-parent / 45 non-merge omacom/omarchy
quattrocommits since that sync onto this fork’s currentquattro(13502987, face holds on swapped frames from #46).Upstream moved from
93e8cd56to7b336b1b. A rawgit mergeof upstreamquattrois still not a fast-forward — earlier cherry-pick syncs already landed those commits — so this is leftover #49 plus the new first-parent commits only. #49, #48, #45, and #42 are still open and are superseded here. Face draft #47 is left alone.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 #49
Hybrid NVIDIA VA-API/GLX (upstream omacom#11690)
omarchy-hw-nvidia-displayreads cached sysfsboot_vga(notlspci, which wakes a runtime-suspended GPU). Hyprland now appliesLIBVA_DRIVER_NAME/__GLX_VENDOR_LIBRARY_NAMEonly when NVIDIA actually drives the display.1790282866marks reboot-required on hybrid machines so the old inherited env is cleared.Hermes Desktop is the default-agent runtime (upstream omacom#12844)
~/.hermes. Nothing is stubbed through mise; provision no longer callsomarchy-install-hermes-cli || true.-m hermes_cliprocess) before dropping the package, and refuses before any user data is touched.1790017600retires the old mise wrapper and environment.omarchy-install-cursor-agent), notomarchy-mise-install cursor-agent.manual/17-ai.mdnames both exceptions.Omasnap autosaves by default (upstream omacom#13218)
[output] autosave = falsein~/.config/omasnap/omasnap.confto turn saving off.Cyclic theme colour references (upstream omacom#13046)
shell/Commons/Color.qmlnow tracks visited roles and returns the supplied fallback instead of recursing forever.color-reference-test.shcovers two-entry cycles, self-references, gradient first-stop cycles, and long acyclic chains.OM-SEC-12: bind update inhibitor cleanup to process identity (upstream omacom#9467)
#!/bin/bash -p),OMARCHY_PATHmust match the running entrypoint, command-scoped--no-updatesudo, fail-closed expiry, and inhibitor cleanup bound to owned process identity (PID, start time, owner, token).omarchy updatereorders: migrate → orphans / logs / status → service restart → AUR → post-update hook → mise, each user-controlled step behind a cold credential boundary. The reboot prompt is last.omarchy-update-grok-botandomarchy-update-cursorstill run after mise, each with their own revoke. Both are stubbed insudo-boundary-test.shso the copied updater can finish.Remote Neovim clipboard yanks (upstream omacom#11486)
1788996284upgrades known Omarchyremote_clipboard.luaproviders atomically (backup + version guard). Custom, symlink-managed, and unrelated files are left alone. Needsomarchy-nvim2026.9.21-2 or newer before it will mark an unrepaired provider complete.Leftover from PR #49 (still not on quattro)
Fastfetch swap label spacing (upstream omacom#12774)
Themes remember wallpaper choices (upstream omacom#7718)
~/.local/state/omarchy/theme-backgrounds/<theme>and restores it next time. Re-applying the current theme still cycles.VS Code-family theme reload and contrast (upstream omacom#10134, omacom#10016, omacom#9964)
1.0.<cksum>, and sets_watch: true. Hover/line/badge chrome uses muted mixes so it stays visible. Cursor is still not themed.Catppuccin Neovim uses mocha (upstream omacom#12864)
colorscheme = "catppuccin-mocha"so old and new plugin checkouts both load.Elsewhen, literals, clipboard, icons, OCaml, OWE, Omasnap (leftover from #45/#42)
omarchy-shell -q). Migration renamed to1790042972so the stranded-link repair re-runs.--.SUPER+Aselects all. In a terminal,SUPER+C/SUPER+VsendCTRL+SHIFT+C/CTRL+SHIFT+V.omarchy-remove-dev-env ocamlrequires sudo--no-update.owe/owe-lockfeedown desktop video and the lock feed.omasnapreplaces Satty/Tensaku.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/clistill asserts a copied theme file,_watch: true, and a content-hashed extension version.Tests
Passed locally on this branch:
./test/clitest/shell.d/hw-nvidia-test.shtest/shell.d/hermes-cli-test.shtest/shell.d/hermes-desktop-install-test.shtest/shell.d/hermes-mise-migration-test.shtest/shell.d/hermes-remove-test.shtest/shell.d/preinstalls-test.shtest/shell.d/color-reference-test.shtest/shell.d/neovim-remote-yanks-test.shtest/shell.d/update-sequence-test.shtest/shell.d/update-disk-space-test.shtest/shell.d/update-hook-security-test.shtest/shell.d/update-restart-phases-test.shtest/shell.d/update-user-path-test.shtest/shell.d/security-entrypoint-symlink-test.shtest/shell.d/security-source-root-test.shtest/shell.d/channel-sudo-boundary-test.shtest/shell.d/channel-test.shtest/shell.d/nopasswd-sudo-expiry-test.shtest/shell.d/restart-shell-test.shSandbox limits, not sync regressions:
update-lock-test.shhardcodes/run/user/$UID, which does not exist here.update-stay-awake-security-test.shneeds a private mode-0700 XDG runtime that is not under/tmp(OM-SEC-12 refuses/tmpas an inhibitor path).passwordless-grant-lifecycle-test.shneeds a companionomarchy-pkgscheckout whoseomarchy-settings.installdefinespre_remove;/home/ubuntu/omarchy-pkgsis older than this PR.remove-dev-env-sudo-security-test.shstill skips the namespace proof whenunsharecannot runnewuidmap.locate-test.shstill fails onupdatedb --debug-pruningagainst a temp tree; same on currentquattro(13502987).Skipped here (no compositor / no Quickshell):
owe-lock-test.sh,screenshot-sanity-test.sh.