Skip to content

Merge upstream quattro (T2 firmware fetcher, clipboard hangs, Elsewhen remove buttons) - #61

Merged
mark-groves merged 5 commits into
quattrofrom
cursor/upstream-changes-pr-790d
Oct 6, 2026
Merged

mark-groves merged 5 commits into
quattrofrom
cursor/upstream-changes-pr-790d

Conversation

@cursor

@cursor cursor Bot commented Oct 5, 2026

Copy link
Copy Markdown

Cherry-picks the 5 new first-parent / 7 non-merge omacom/omarchy quattro commits onto this fork's quattro (27c52d26, after merged PR #60). Upstream moved from 2f7302a7 to 81145eb1. Commits are applied oldest-first, one fork commit per first-parent commit, no full merge. No leftover sync PRs.

New since last check (2026-10-04 / 2f7302a7)

  • T2 firmware fetcher (Name apple-bcm-firmware-fetcher in the T2 package list omacom/omarchy#13963). apple-bcm-firmware is replaced by apple-bcm-firmware-fetcher in the T2 install script and the ISO package list. The fetcher reads Wi-Fi firmware off an on-disk macOS volume (the only legal source for T2 Broadcom firmware). A single-boot wipe of macOS has no such volume, so those machines still need firmware from a macOS copy or a downloaded recovery image. The superseded package is no longer added. The fork still keeps linux and linux-headers next to linux-omarchy in install/omarchy-other.packages.
  • Clipboard capture hangs (Prevent clipboard capture hangs omacom/omarchy#9488). capture.sh used to read the owner's pipe to EOF with no bound. A stalled owner (no close) left the watch callback alive, and wl-paste --watch stopped seeing further events. Every read now goes through a 2s bounded reader into a temp file; a copy cut off at the deadline is dropped, not kept as a partial entry. Watched text still survives a stalled --list-types query.
  • Elsewhen remove buttons (Give Elsewhen remove buttons a circular corner bubble omacom/omarchy#14258 + hover follow-up). City-row × buttons sit in a circular corner bubble that can straddle the row's top-right (panel clip margins opened for that). They only appear on row hover or while the button itself is hot, and they fade rather than staying visible on every removable city.
  • Navigation manual grammar (Fix grammar in navigation manual omacom/omarchy#13233). "That'll appears" → "That'll appear" for the Activity monitor floating-window sentence.

Fork-only lines kept

Fork delta check

Tests

  • ./test/cli passes.
  • test/shell.d/clipboard-test.sh passes, including the new stall / partial-copy / watched-owner-timeout cases.
  • test/shell.d/t2-hardware-test.sh passes, including the firmware-fetcher package-list assertions.
  • Elsewhen arc / globe / sun / migration tests pass. elsewhen-pointer-test.sh skips (qt6 qmltestrunner not on this image). elsewhen-greetings-test.sh and one elsewhen-model-test.sh assertion fail here because timedatectl needs systemd; same on quattro 27c52d26.

Not done: a visual check of the Elsewhen hover/× bubble on real hardware. There is no compositor in the cloud sandbox.

Open in Web View Automation 

cursoragent and others added 5 commits October 5, 2026 23:14
Fix grammar in navigation manual

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
* Bound clipboard capture reads

* Bound the watched clipboard read and drop copies cut off at the deadline

In watch mode capture.sh reads the copy from the owner's pipe on stdin, to EOF, with no bound. An owner that stalls without closing its end keeps the callback alive, and wl-paste --watch handles no further clipboard events until it exits. That matches omacom#9443, whose stuck capture.sh had no wl-paste child: --list-types never reads from the owner.

Every read now goes through one bounded reader into a temporary file, and the copy is recorded only when the read finished, so a snapshot that stalls halfway no longer records its first half.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Omarchybot <317366263+omarchybot@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…etcher

Name apple-bcm-firmware-fetcher in the T2 package list

Keep the fork linux / linux-headers ISO entries next to linux-omarchy.

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
@coderabbitai

coderabbitai Bot commented Oct 5, 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: eeb38ed1-4047-41ea-bb3c-06abee219392

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
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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 October 5, 2026 23:15
@mark-groves
mark-groves merged commit c4165b7 into quattro Oct 6, 2026
2 checks passed
@mark-groves
mark-groves deleted the cursor/upstream-changes-pr-790d 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.

2 participants