Skip to content

Merge upstream quattro (Superwhisper dictation, OPR priority, Qt 6.12 palette) - #66

Merged
8 commits merged into
quattrofrom
cursor/upstream-changes-pr-50d6
Oct 10, 2026
Merged

8 commits merged into
quattrofrom
cursor/upstream-changes-pr-50d6

Conversation

@cursor

@cursor cursor Bot commented Oct 8, 2026

Copy link
Copy Markdown

Cherry-picks the 8 new first-parent / 8 non-merge omacom/omarchy quattro commits onto this fork's quattro (01efd386, after merged PR #63). Upstream moved from 902fd8ae to 50d687a1. 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-07 / 902fd8ae)

  • Superwhisper is the default dictation backend (Ship Superwhisper cloud dictation by default omacom/omarchy#14625, on top of Add selectable Voxtype and Superwhisper dictation omacom/omarchy#14552). Fresh installs ship superwhisper-bin and select it in config/omarchy/defaults/dictation, using cloud processing with no offline model download. The first-run Voxtype invitation hook is gone. Existing machines that already have Voxtype and no saved backend stay on Voxtype (migration 1791479273).
  • Voxtype and Superwhisper are selectable. Setup > Defaults > Dictation installs the chosen backend if needed and makes it the default. Recording goes through omarchy dictation start|stop|toggle, which talks to omarchy-dictation-<backend>. Hold Right Alt or F9, or toggle with Super + Ctrl + X. Those bindings load only when a backend is selected. Right Alt still works inside a modifier chord; Left Alt is for those chords. On AltGr layouts, F9 leaves AltGr free for typing. omarchy default dictation prints the selection, stored in ~/.config/omarchy/defaults/dictation.
  • Superwhisper's own Right Alt shortcut is moved aside. The installer runs setup-user, then if Superwhisper is holding RightAlt it parks that hold (on RightSuper when there is no toggle, otherwise clears it). It then sets Superwhisper's native toggle to Alt + Space and clears hold, so Omarchy keeps push-to-talk. Superwhisper still requires one native recording shortcut, and its cancel shortcut stays. Switching backends stops the previous one first and refuses the switch if that stop fails.
  • Remove lives under its own category. Remove > Dictation covers Superwhisper and Voxtype. Install > AI no longer has a Dictation row. Removing Superwhisper drops the package, its user-unit, and package-owned links, and clears the selection when it was the active backend. Preferences, history, and models stay. The built-in bar Dictation indicator is gone; the passwordless-sudo indicator stays. A backend can add desktop integration at ~/.config/<backend>/shortcuts.lua without editing Hyprland config. Extra backends need omarchy-dictation-<name> and omarchy-install-dictation-<name>.
  • Omarchy package repository comes first. [omarchy] now sits above [core] in the stable, rc, and edge pacman configs, so OPR wins when the same package exists in Arch. Migration 1791403252 moves the existing [omarchy] section rather than replacing pacman.conf, so channel URLs, custom repos, and administrator options survive. It writes pacman.conf.bak only when the order changes, then runs omarchy-update-system-pkgs even when the file was already ordered, so a failed upgrade can be retried. The custom-repo sample now inserts its Include above [omarchy].
  • Qt 6.12 palette qualification (Fix shell palette collision with Qt 6.12 omacom/omarchy#14553). Qt 6.12 adds its own Color type, so shell and plugin QML import qs.Commons as Commons and read the palette as Commons.Color. The unqualified import stays for Style, Util, and Border. Third-party plugins that use bare Color need the same change; fixing the host shell does not change a plugin's import scope.

Fork-only lines kept

  • Setup/Remove > Security > Face, and Update > Grok Bot / Cursor, stay in the menu beside the new Dictation entries. Superwhisper is listed before Voxtype.
  • shell.qml still loads FaceChrome.pluginRegistry and AuthServiceStore. Palette reloads go through Commons.Color.
  • Lock and polkit keep the face card (FacePlayback, FaceChromeCanvas, presentation glyphs and hints). Their palette reads are Commons.Color, including the fork-only error colors.
  • The passwordless-sudo bar indicator stays in the default indicator list after the Dictation indicator was removed.
  • install/omarchy-other.packages still lists linux and linux-headers. superwhisper-bin was added only to the base package list.

Fork delta check

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

Tests

  • ./test/cli passes, including metadata for the new dictation group.
  • Dictation, OPR priority migration, menu, menu guards, Hyprland binding conflicts, Hyprland default config, bar, and passwordless-sudo indicator tests pass.

Not done: a visual check of dictation or the Qt 6.12 palette. There is no compositor in the cloud sandbox.

Open in Web View Automation 

dhh and others added 8 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
@coderabbitai

coderabbitai Bot commented Oct 8, 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: 32e393da-a79a-4875-870f-1f9725c2127b

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 8, 2026 23:06
@mark-groves mark-groves closed this pull request by merging all changes into quattro in 7748388 Oct 10, 2026
@cursor

cursor Bot commented Oct 10, 2026

Copy link
Copy Markdown
Author

Superseded by #68.

@mark-groves
mark-groves deleted the cursor/upstream-changes-pr-50d6 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