Skip to content

Merge upstream quattro (USB and Thunderbolt approval, gliff, Starship) - #68

Merged
mark-groves merged 22 commits into
quattrofrom
cursor/upstream-changes-pr-6126
Oct 10, 2026
Merged

mark-groves merged 22 commits into
quattrofrom
cursor/upstream-changes-pr-6126

Conversation

@cursor

@cursor cursor Bot commented Oct 9, 2026

Copy link
Copy Markdown

Cherry-picks upstream omacom/omarchy quattro onto this fork's quattro (01efd386). Upstream moved from 50d687a1 to 61263219. This branch also carries the 8 commits from still-open PR #66, which never landed on quattro. 12 new first-parent commits (35 non-merge commits inside them) are applied oldest-first, one fork commit per first-parent commit, no full merge. Merge commits are taken with -m 1.

New since last check (2026-10-08 / 50d687a1)

  • New USB devices need approval (Require approval for new USB and Thunderbolt devices by default omacom/omarchy#11874). USBGuard trusts whatever was connected at install, then blocks new accessories until you allow them once, always, or not at all. Always-allow follows the device identity across ports. Setup/Remove > Security > USB Device Authorization turns the policy on and off. On a first-boot account setup, protection starts after that wizard so the keyboard used to create the account still works. Identifiers can be forged; approval is not proof of identity.
  • USB at boot is optional. Setup > Security > USB at Boot sets usbcore.authorized_default=0 and rewrites current and Limine snapshot entries, after adding currently connected devices to the trusted policy. A trusted keyboard is still unavailable at an earlier disk-unlock prompt. Older snapshots from before USBGuard stay without USB. Secure Boot changes need signing keys and free space; a failed sign restores the previous boot files. Remove > Security > USB at Boot restores early-boot USB and leaves USBGuard running.
  • Thunderbolt and USB4 PCIe accessories need approval too (Require approval for new USB and Thunderbolt devices by default omacom/omarchy#11874). Bolt stays in manual mode. Devices present at setup are trusted; new ones get a persistent Allow once / Always allow / Keep blocked notification. Secure-mode permanent approval stores the accessory key. If a connected device has no saved key, protection is deferred so existing keyboards and storage keep working, with a notice to finish setup after disconnecting them. Firmware security none is reported as a bypass. Setup/Remove > Security > Thunderbolt and Thunderbolt Boot sit next to the USB entries. Boot protection clears supported firmware allowlists and is only for machines that can unlock and recover without Thunderbolt accessories.
  • Gliff ships by default, with a bar indicator while someone is connected (Install gliff by default and show when a remote session is active omacom/omarchy#14712). gliff is in the base package set (migration 1791542175 for existing installs). A first-party omarchy.remote-session service watches Hyprland screencast events, probes the current user's gliff-server, and shows the client address from its environment. The RemoteSession indicator lights in the urgent color while a session is active. There is no connect/disconnect toast. The probe polls every two seconds during a session because Hyprland's stop event fires when frames pause, not when the server exits.
  • Starship is a default theme (Add Starship as a default theme omacom/omarchy#14705). Four SpaceX launch photographs (starbase, Flight 14 dawn, engine cluster, morning pad) at full 6016×3384, compressed to WebP, with the basic palette and standard Omarchy styling. The photographs stay copyright SpaceX.
  • Extra themes can be deleted from the theme picker (Delete extra themes from the theme picker omacom/omarchy#14713). Delete on a user-installed theme opens the shared confirmation dialog and runs omarchy-theme-remove. Stock themes and user overrides of them are not deletable. Delete stays disabled until the stock listing succeeds. Apply and another delete are held from removal exit until the refreshed rows load, so Enter cannot apply the theme that was just deleted. Selection lands on the theme before the deleted one.
  • The image picker appears immediately, with no backdrop (Show the image picker instantly, with no backdrop omacom/omarchy#14709). The carousel fade and geometry transitions are gone. The reveal waits until every visible preview has decoded and two frames have pre-rendered, or 400ms, whichever comes first. The fullscreen scrim and its theme tokens are gone. Only Escape is accepted before the picker is visible.
  • Background reveal is a little slower. The wallpaper reveal animation is Style.duration(840) instead of 420.
  • Push-to-talk stops even if other keys were pressed during the hold (Continue tracking hold shortcuts even when other keys are pressed during the hold omacom/omarchy#14645). Hyprland drops a release bind when another key or mouse button is released while the hold key is down, so typing or clicking during F9 or Right Alt never ran omarchy-dictation stop. o.bind_hold pairs a press with a transparent, modifier-ignoring, non-consuming release that runs only after its own press. Dictation's hold keys use it. Shift+F9 still reaches the app.
  • Network panel header actions are square (Fix lopsided cursor highlight on network panel header actions omacom/omarchy#8787). The QR and speed-test buttons use PanelActionButton, sized on whole pixels, so the highlight is no longer a wide box around a square icon.
  • Offline Node unpacks the tarball for the machine's architecture (Unpack the bundled Node tarball for the machine's architecture omacom/omarchy#14637). aarch64 takes linux-arm64; everything else takes linux-x64. A factory snapshot that never staged a tarball still falls through to the network at first boot instead of failing the whole boot.
  • Factory reset elevates the packaged command (Pin factory-reset elevation to the packaged command omacom/omarchy#13047). omarchy-system-factory-reset refuses to run when the checkout copy differs from /usr/bin/omarchy-system-factory-reset, and a non-root invocation always sudos that packaged path (gum theme vars forwarded) rather than the dev checkout.
  • Wallpaper links are repaired after the WebP conversion (Repair wallpaper links after bundled WebP conversion omacom/omarchy#14603). Migration 1791470456 retargets a selected .jpg/.jpeg/.png background at the .webp replacement when the original file is gone and the WebP is present, including the current-theme backgrounds path.
  • Boot no longer waits on the console to answer (Fix the 1-in-10 black screen at boot, where systemd waits on the console omacom/omarchy#14771). systemd.tty.term.console=dumb is on the Limine default command line so systemd skips the size query that, with Plymouth holding the screen, leaves about 1 boot in 10 on a black screen until a keypress. Migration 1791581004 rebuilds the boot image when the running kernel does not already have the parameter, and records that rebuild so another user does not repeat it.

Still included from open PR #66

PR #66 is not on quattro. Those commits are the base of this branch, so merging this supersedes #66:

Fork-only lines kept

Fork delta check

git diff --name-only vs upstream 61263219 is still 157 files, the same set as after #66 vs 50d687a1.

Tests

  • ./test/cli passes, including metadata for the new USB and Thunderbolt commands.
  • Image picker, background reveal (840ms), menu, menu guards, dictation, bar, passwordless-sudo indicator, remote-session, bind-hold, WebP background migration, console boot migration, factory-reset elevation, USB authorization, USB policy, USB factory-reset, and Thunderbolt policy tests pass. The Thunderbolt UMockdev integration skips without BOLT_TEST_SOURCE. The remote-session service test skips with no Wayland compositor.

Not run here: mise-work-path-test.sh (no mise on this image, so the per-architecture Node unpack check did not execute), and usb-boot-archives-test.sh / usb-boot-enrollment-test.sh (they copy /usr/lib/systemd/boot/efi/linuxx64.efi.stub and /usr/share/limine/BOOTX64.EFI, which this image does not have). No visual check of the picker, Starship theme, or bar indicator. There is no compositor in the cloud sandbox.

Open in Web View Automation 

dhh and others added 20 commits October 8, 2026 23:04
Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
* Add selectable dictation backends

* Move dictation migration after repository priority update

* Extract backend-specific dictation installers

* Keep dictation installer dispatcher executable

* Call dictation backend installers directly

* Drop legacy Superwhisper migration and runtime cleanup

* Separate dictation defaults from generic recording protocol

* Add backend-specific dictation removers

* Preserve existing Voxtype selection during upgrade

* Make dictation backend selection safe and retryable

* Show the dictation indicator only for selected Voxtype

* Allow switching away from stopped Superwhisper

* Remove the built-in bar dictation indicator

* Store default dictation selection under defaults

* Rename dictation backend selector to use

* Move dictation removers into their own menu category
* Ship Superwhisper cloud dictation by default

* Rely on Superwhisper cloud defaults without first-run setup
…rchitecture

Unpack the bundled Node tarball for the machine's architecture
…#8787)

* Fix lopsided cursor highlight on network panel header actions

The QR and speed-test header buttons used raw Button components with
asymmetric horizontal/vertical padding, producing a highlight box wider
than tall around their near-square icons. Swap them for
PanelActionButton, the canonical square inline-action component already
used elsewhere in the kit (e.g. connectPwBtn), which sizes itself
symmetrically around the icon.

Fixes omacom#8782

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* Center icons in PanelActionButton on whole pixels

A fractional size and anchors.centerIn put the glyph on half-pixel
coordinates, so it rounded a pixel off the center of the fill: the
speed-test icon sat low in the network header. Round the size, make it
odd so odd-width glyphs get even margins, and place the icon on whole
pixels.

Co-authored-by: Fabian Behrendt <7931874+fabianbehrendt@users.noreply.github.com>

---------

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: Fabian Behrendt <7931874+fabianbehrendt@users.noreply.github.com>
* Add Starship as a default theme

Adapted from Starship To Orbit by Erik Johansson (@erikrjohansson).
https://github.com/erikrjohansson/omarchy-starship-to-orbit-theme
Copyright (c) 2026 Erik Johansson.

Retain the basic palette and three SpaceX launch photographs, with
standard Omarchy styling. Compress the backgrounds to WebP while
preserving their full 6016 x 3384 resolution.

The photographs remain copyright SpaceX and are not covered by MIT.

* Add engine cluster background to Starship

* Use Flight 14 dawn and reorder Starship backgrounds
Remove the carousel's fade and geometry transitions, hold the reveal until every visible preview has decoded and two frames have pre-rendered (falling back to revealing anyway after 400ms), and drop the fullscreen scrim and its theme tokens so the picker sits directly on the desktop. Only Escape is accepted before the picker is visible.
* Delete extra themes from the theme picker

Delete on an extra (user-installed) theme opens the shared faded confirmation dialog; confirming runs omarchy-theme-remove and selection lands on the theme before the deleted one. Stock themes and user overrides of them are not offered for deletion, apply/re-ask are blocked while a removal runs, and row refreshes queue so a deletion never leaves the list stale.

* Fail closed on theme deletion until stock themes are known

Keep Delete disabled until the stock listing finishes successfully, so a stock override cannot look deletable in the startup window. Also hold theme apply (and further delete asks) from removal exit until the refreshed rows load, so Enter cannot apply the just-deleted theme in the gap.
…macom#14645)

Hyprland skips a release bind once any other key or mouse button is
released while its key is held (KeybindManager::shadowKeybinds), and
when the modifiers changed since the press. That is what makes a bind
like "bindr = SUPER, SUPER_L" tap-only, but it means typing or clicking
while holding F9 or Right Alt never runs omarchy-dictation stop, so the
recording keeps going.

o.bind_hold binds a press and a release action together. The release
half is transparent (it can't be shadowed), ignores modifiers, and is
non-consuming, so it doesn't take the key from apps when pressed with
other modifiers (Shift+F9 still reaches the app). It runs only after its
own press ran, so releasing the key without the rest of a chord does
nothing. Dictation's push-to-talk keys use it.

Co-authored-by: superduck00 <294879536+superduck00@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…acom#14712)

* Install gliff by default

Gliff is the Hyprland remote desktop over SSH. Ship it in the base
package set for new installs, with a migration for existing ones.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* Show a bar indicator while a gliff remote session is active

The machine being controlled should make it obvious that someone is on
it. A first-party remote-session service watches Hyprland's screencast
events, which gliff-server triggers through ext-image-copy-capture, and
probes for the server process, picking up the ssh client address from
its environment. The RemoteSession indicator in the default tray lights
up in the urgent colour while a session runs, and a notification
announces each session start and end.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* Address review of the remote session indicator

Probe only the current user's gliff-server processes, forward refresh
through the third-party service proxy so cloned indicator widgets can
re-probe, exercise the Hyprland screencast event path in the service
test with a grim capture instead of calling refresh by hand, and
describe the indicator as status only in the manual.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* Drop the remote session notifications

The bar indicator is the signal; a toast on every connect and
disconnect is noise on top of it.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* Tighten remote session detection after review

Hyprland reports a screencast stopped as soon as frames pause for half a
second and says nothing more when the server later exits, so poll every
two seconds while a session is active instead of trusting a stop event.
Match only the screencast event, not its screencastv2 twin, and debounce
the burst around one transition so it costs one probe. Move the probe
into its own script that the service and the test both run, poll for
state in the service test instead of fixed delays, and drop the unused
session count.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…uthorization

Require approval for new USB and Thunderbolt devices by default.

Reported-by: Jurre van Bergen me@jurrevanbergen.nl
…kaged-path-20260923

Pin factory-reset elevation to the packaged command
…ound-links

Repair wallpaper links after bundled WebP conversion
Fix the 1-in-10 black screen at boot, where systemd waits on the console
@coderabbitai

coderabbitai Bot commented Oct 9, 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: d8cf864c-cca7-476d-8686-45806e533015

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
  • Autofix · 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 9, 2026 23:08
cursoragent and others added 2 commits October 10, 2026 03:38
…anges-pr-6126

Keep quattro's Qt 6.12 palette qualifications on the fork-only face, lock,
and polkit files, including the face-card glass from #65. Keep upstream's
image picker: no scrim, theme delete, and Commons.Color on the colors that remain.

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
Setup copies those two action files from default/polkit. The test records
those exact destinations and still flags every other unowned /usr write.

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
@mark-groves
mark-groves merged commit 7748388 into quattro Oct 10, 2026
2 checks passed
@mark-groves
mark-groves deleted the cursor/upstream-changes-pr-6126 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.

7 participants