Repository navigation
Merge upstream quattro (Superwhisper dictation, OPR priority, Qt 6.12 palette) - #66
Merged
8 commits merged intoOct 10, 2026
Merged
8 commits merged into
8 commits merged into
Conversation
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
|
Important Review skippedBot user detected. To trigger a single review, invoke the ⚙️ Run configuration
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 |
Author
|
Superseded by #68. |
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 the 8 new first-parent / 8 non-merge omacom/omarchy
quattrocommits onto this fork'squattro(01efd386, after merged PR #63). Upstream moved from902fd8aeto50d687a1. 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-binand select it inconfig/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 (migration1791479273).omarchy dictation start|stop|toggle, which talks toomarchy-dictation-<backend>. HoldRight AltorF9, or toggle withSuper + 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,F9leaves AltGr free for typing.omarchy default dictationprints the selection, stored in~/.config/omarchy/defaults/dictation.setup-user, then if Superwhisper is holdingRightAltit parks that hold (onRightSuperwhen there is no toggle, otherwise clears it). It then sets Superwhisper's native toggle toAlt + Spaceand 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.~/.config/<backend>/shortcuts.luawithout editing Hyprland config. Extra backends needomarchy-dictation-<name>andomarchy-install-dictation-<name>.[omarchy]now sits above[core]in the stable, rc, and edge pacman configs, so OPR wins when the same package exists in Arch. Migration1791403252moves the existing[omarchy]section rather than replacingpacman.conf, so channel URLs, custom repos, and administrator options survive. It writespacman.conf.bakonly when the order changes, then runsomarchy-update-system-pkgseven when the file was already ordered, so a failed upgrade can be retried. The custom-repo sample now inserts its Include above[omarchy].Colortype, so shell and plugin QML importqs.Commons as Commonsand read the palette asCommons.Color. The unqualified import stays forStyle,Util, andBorder. Third-party plugins that use bareColorneed the same change; fixing the host shell does not change a plugin's import scope.Fork-only lines kept
shell.qmlstill loadsFaceChrome.pluginRegistryandAuthServiceStore. Palette reloads go throughCommons.Color.FacePlayback,FaceChromeCanvas, presentation glyphs and hints). Their palette reads areCommons.Color, including the fork-only error colors.install/omarchy-other.packagesstill listslinuxandlinux-headers.superwhisper-binwas added only to the base package list.Fork delta check
git diff --name-onlyvs upstream50d687a1is still 157 files, the same set as after #63 vs902fd8ae.Tests
./test/clipasses, including metadata for the newdictationgroup.Not done: a visual check of dictation or the Qt 6.12 palette. There is no compositor in the cloud sandbox.