Skip to content

Merge upstream quattro (Fastfetch swap spacing, leftover wallpaper/VS Code/OWE) - #49

Merged
29 commits merged into
quattrofrom
cursor/upstream-changes-pr-49bd
Sep 27, 2026
Merged

29 commits merged into
quattrofrom
cursor/upstream-changes-pr-49bd

Conversation

@cursor

@cursor cursor Bot commented Sep 24, 2026

Copy link
Copy Markdown

Cherry-picks leftover PR #48 (which already includes leftover PR #45 and PR #42) plus the 1 new first-parent / 1 non-merge omacom/omarchy quattro commit since that sync onto this fork’s current quattro (13502987, face holds on swapped frames from #46).

Upstream moved from 28ceaae7 to 93e8cd56. A raw git merge of upstream quattro is still not a fast-forward — earlier cherry-pick syncs already landed those commits — so this is leftover #48 plus the new first-parent commit only. #48, #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-vscode still does not theme Cursor.

New since PR #48

Fastfetch swap label spacing (upstream omacom#12774)

  • The Hardware section’s swap key had a trailing space (└ └󰇡 ) that the other tree keys do not. Fastfetch then rendered an extra gap before the colon.
  • The key is now └ └󰇡, matching disk/memory and the software-section └ └ key. Fixes omacom/omarchy#12742.

Leftover from PR #48 (still not on quattro)

Themes remember wallpaper choices (upstream omacom#7718)

  • Switching themes writes the outgoing background path under ~/.local/state/omarchy/theme-backgrounds/<theme> and restores it the next time that theme is selected.
  • Re-applying the current theme still cycles to the next image. Shared filenames across themes do not steal another theme’s remembered file. A missing or escaped path falls back to the first image. External backgrounds (outside the theme tree) are remembered too.
  • Invalid theme names cannot climb out of the state directory. theme-background-memory-test.sh covers restore, cycle, shared names, missing files, and staged selection.

VS Code-family editors reload the Omarchy theme (upstream omacom#10134)

  • The generated local extension used to symlink omarchy-color-theme.json into current/theme. omarchy-theme-set swaps that directory with rm + mv, so the symlink dangled and VS Code kept the old palette.
  • The theme file is now a real copy. The extension version is 1.0.<cksum of the palette> so an identical theme keeps the cache and a new one invalidates it. package.json sets _watch: true so same-inode rewrites fire the watcher.
  • Cursor is still not themed (/usr/bin/cursor is the GUI launcher).

VS Code hover, line, and badge contrast (upstream omacom#10016, omacom#9964)

  • Hover and active chrome that used the same colour as the background (toolbar, secondary buttons, settings rows, notebook cells, activity bar) now use muted mixes so they are visible.
  • The current line gets a mixed background/border instead of a transparent one. Status-bar prominent/remote/error/warning badges keep readable foregrounds at rest and on hover.

Catppuccin Neovim uses mocha (upstream omacom#12864)

  • Stock themes/catppuccin/neovim.lua now sets colorscheme = "catppuccin-mocha". The newer catppuccin-nvim name only exists in plugin checkouts from March 2026 onward; mocha loads on old and new ones. theme-neovim-colorscheme-test.sh forbids the newer-only name in stock themes.

Elsewhen, literals, clipboard, icons, OCaml, OWE, Omasnap (leftover from #45/#42)

  • Elsewhen rescan is best-effort (omarchy-shell -q). The migration is renamed to 1790042972 so machines that already ran 1789581661 get the stranded-link repair.
  • Presence/package/hardware/restart/editor/hook helpers pass operands after --.
  • SUPER+A selects all. In a terminal, SUPER+C / SUPER+V send CTRL+SHIFT+C / CTRL+SHIFT+V.
  • Default-editor menus use the Sublime and Emacs glyphs. omarchy-remove-dev-env ocaml requires sudo --no-update.
  • owe / owe-lockfeed own desktop video and the lock feed. omasnap replaces Satty/Tensaku. Copy-URL / kernel / locate / About / pacman / network-QR / skip-reporting test cleanup, RetroArch libretro-database-git drop, Dropbox sudo flag, Sublime subl default.

Fork-only adaptations

Tests

Passed locally on this branch:

  • ./test/cli
  • test/shell.d/launch-about-test.sh
  • test/shell.d/theme-background-memory-test.sh
  • test/shell.d/theme-neovim-colorscheme-test.sh
  • test/shell.d/theme-staging-test.sh
  • 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
  • test/shell.d/network-qr-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/face-playback-test.sh
  • test/shell.d/polkit-face-test.sh
  • test/shell.d/command-operand-boundaries-test.sh
  • test/shell.d/fingerprint-driver-migration-test.sh
  • test/shell.d/fingerprint-package-test.sh
  • test/shell.d/menu-guards-test.sh

remove-dev-env-sudo-security-test.sh skipped the namespace proof here (unshare could not run newuidmap); that is an environment limit, not a sync regression.

Skipped here (no compositor / no Quickshell): owe-lock-test.sh, screenshot-sanity-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 (13502987) so it is not a regression from this sync.

Open in Web View Automation 

dhh and others added 29 commits September 23, 2026 23:19
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>
…-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>
@coderabbitai

coderabbitai Bot commented Sep 24, 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: 2d2ba55b-a6f9-4647-9738-adc69db99c0f

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.

@cursor
cursor Bot marked this pull request as ready for review September 24, 2026 23:10
@mark-groves mark-groves closed this pull request by merging all changes into quattro in 381d6f9 Sep 27, 2026
@mark-groves
mark-groves deleted the cursor/upstream-changes-pr-49bd branch October 17, 2026 23:22
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.

Fastfetch configuration contains a typing mistake

8 participants