Skip to content

Merge upstream quattro (Codex limits, aether.nvim, leftover no-animations/SSH/YT6801) - #55

Merged
mark-groves merged 25 commits into
quattrofrom
cursor/upstream-changes-pr-8139
Sep 30, 2026
Merged

mark-groves merged 25 commits into
quattrofrom
cursor/upstream-changes-pr-8139

Conversation

@cursor

@cursor cursor Bot commented Sep 29, 2026 •

Copy link
Copy Markdown

Cherry-picks leftover draft PR #53 plus the 2 new non-merge omacom/omarchy quattro commits onto this fork's quattro (7afb44b6, after the #47 face-card merge). Upstream moved from e332dc97 to 8b4eae66 (non-merge tip 199ac6fc). That's 13 first-parent / 24 non-merge commits since PR #52's 3faafba2. Commits are applied oldest-first, one fork commit per upstream commit, no full merge.

Leftover sync PR #53 is still an open draft and is remade here. Face draft #54 stays off quattro.

New since last check (2026-09-28 / e332dc97)

Leftover from PR #53 (still not on quattro)

Conflicts / fork-only

All leftover overlap files auto-applied again. Fork-only lines stayed; leftover overlap added/removed line counts are unchanged.

  • bin/omarchy-remove-security-fingerprint: kept omarchy-pam-pair-drop / omarchy-apply-polkit-pam; added UID-safe template deletion.
  • default/omarchy/omarchy-menu.jsonc: kept Face / Cursor / Grok entries; added Animations toggle and SSH Agent setup/remove.
  • install/omarchy-other.packages: kept fork linux / linux-headers; dropped yt6801-dkms.
  • shell/plugins/agents/Panel.qml: kept Cursor limit-window extras; wrapped meter animations in Style.duration.
  • shell/plugins/polkit/PolkitAgent.qml: kept face chrome; wrapped shake plus the fork face/password fades in Style.duration.
  • test/cli: kept fork theme assertions; added Hunk sync coverage.
  • New Codex / neovim.tpl files match upstream after apply. The fork Cursor usage collector is untouched.

Fork delta check

  • git diff --name-only <upstream tip> <fork tip> is still 155 files before (3faafba2 vs quattro) and after (8b4eae66 vs this branch).
  • Leftover overlap files keep the same added/removed line counts. This covers the face card, Howdy PAM, Cursor paths, and menu entries.

Tests

  • ./test/cli passes, including the Hunk sync cases.
  • Focused shell tests for this batch pass: Codex limits-when-account/read-hangs, fingerprint template cleanup, SSH firewall cleanup, SSH agent removal, default-browser lookup, notifications collapse, terminal cwd, animations toggle, YT6801 cutover, keybindings menu, launch-browser, menu, polkit-face, agents-panel, face-overlay, lock-face, pkg-drop, shell-ipc-socket.
  • browser-handoff-test.sh still cannot run here (socat / /usr/bin/chromium missing). Same sandbox skip as Merge upstream quattro (no-animations VMs, browser handoff, SSH agent, YT6801) #53, not a sync regression.

Not done: a visual check on real hardware. There is no compositor in the cloud sandbox.

Open in Web View Automation 

Note

Medium Risk
Touches authentication cleanup (fingerprint paths), firewall/SSH rules, PCI driver migration, and browser singleton handoff—mostly scripted with tests, but hardware and security paths warrant careful review on real systems.

Overview
This batch speeds up everyday desktop actions and hardens a few security/migration paths.

Performance: Default browser resolution reads mimeapps.list directly instead of xdg-settings. Chromium-based launches try a singleton-socket handoff before spawning a new process. Super+Return passes the focused terminal PID so new terminals skip an extra hyprctl round-trip. Bash startup drops fzf’s heavy completion wrapper and uses starship --print-full-init.

VM / animations: VMs install with Hyprland animations/blur/transparency off; users can toggle via menu/omarchy-toggle-animations. The Quickshell UI honors Hyprland’s animations:enabled through Style.duration() and reduceMotion.

Codex usage: The collector fetches account/rateLimits/read first so limits still appear when Codex 0.158 never answers account/read.

Notifications: Identical toasts from the same app (matching summary, body, image, and click target) replace the on-screen copy instead of stacking.

Security & packages: Optional gcr-ssh-agent setup/remove in the menu. SSH server removal deletes standard UFW SSH rules (failures propagate). Fingerprint removal resolves the invoking user by UID and deletes /var/lib/fprint/$user. omarchy-pkg-drop fails cleanly when pacman -Qq fails.

Hardware: YT6801 Ethernet moves from yt6801-dkms to in-kernel dwmac-motorcomm via a retry-safe migration; fresh installs no longer ship the DKMS package.

Other: Neovim theme plugin source is omacom/aether.nvim. Theme changes nudge Hunk via SIGWINCH. Keybindings menu can run Lua terminal binds via o.bind_commands.

Reviewed by Cursor Bugbot for commit f9f9863. Configure here.

AFOliveira and others added 25 commits September 29, 2026 23:03
…9399)

* Add SSH Agent as an optional service install

Enables gcr-ssh-agent (already shipped via the gnome-keyring dependency)
so passphrase-protected SSH keys work from any context: the agent prompts
graphically on first use, with opt-in passphrase storage in the keyring.
Adds install/remove commands and Install > Service / Remove > Service
menu entries.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BReZWvvLsDRUaqgjiRzvZ5

* Clear the agent's SSH_AUTH_SOCK when removing the SSH agent service

The socket's ExecStartPost exports SSH_AUTH_SOCK into the user manager with set-environment, which disabling the socket does not undo, so apps launched after removal still pointed at a stopped agent. The environment.d file also has to be deleted before disable reloads the manager, or the generator re-exports it. Only an SSH_AUTH_SOCK pointing at gcr is cleared, so another agent's stays.

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

* Move SSH Agent setup to Setup > Security

Turning on an SSH agent is security configuration of the machine rather than installing software, so it sits with SSHD and the other Setup > Security entries. It hides once enabled, as Sudoless Docker does, and Remove > Service > SSH Agent turns it back off.

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

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: David Heinemeier Hansson <david@hey.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
)

* Read the default browser from mimeapps.list when launching

omarchy-launch-browser and omarchy-launch-webapp asked xdg-settings for the
default browser on every launch, ~72ms through several POSIX shell scripts.
The new omarchy-cmd-default-browser reads the http handler from the
config-dir mimeapps.list files the way xdg-mime does, desktop-specific list
first, taking the first listed entry whose command is installed, in ~10ms.
With nothing set there it falls back to xdg-settings as before.

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

* Let the first copy of a browser entry decide whether it is installed

A user-local entry whose browser is gone could be rescued by a system copy
of the same ID, which the launchers never read. xdg-mime judges the first
copy found, as the launchers use it, so do the same.

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

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…13521)

To open a new terminal in the focused terminal's directory, the launcher
asked Hyprland for the active window with hyprctl, ~10ms on every
SUPER+RETURN. The binding now reads the pid from hl.get_active_window() and
passes it as --pid. Without one, from the menu or a shell, the launcher asks
Hyprland as before.

The bind is now a Lua function, which Hyprland reports only as __lua, so
o.bind_commands records the command it stands for and the keybindings menu
still launches a terminal when the entry is picked.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…macom#13522)

* Collapse identical notifications from the same sender into one toast

A web app open in several tabs fires one notification per tab for a single
reminder, stacking identical toasts. A new notification matching an on-screen
toast's app, summary, and body now replaces it like a replaces_id update.

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

* Only collapse live duplicates that share image and click target

Screen recording toasts share text but preview and open different files, and
replayed history rows share images with entries still in history.

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

* Compare a notification's current content when collapsing duplicates

A replaces_id update can land while the insert is deferred, so the initial
snapshot may no longer describe what the notification says.

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

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…acom#13530)

* Hand browser and web app launches to the running browser directly

With a Chromium-based browser already running, each launch started a second
browser process only to pass its command line over the profile's singleton
socket and exit, ~165ms before the running browser even heard of it.
omarchy-cmd-browser-handoff sends that message itself with socat and waits
for the ACK, so a web app opens in ~210ms instead of ~430ms.

It hands off only what it can do exactly as the browser would: the packaged
browser binary rather than a wrapper, a flags file holding nothing beyond the
process flags Omarchy ships, no other data directory, and a socket we own.
Anything else, or no answer, launches the browser as before.

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

* Hand Brave Origin launches to the running browser too

/usr/bin/brave-origin is the package's own launcher, reading
brave-origin-flags.conf, with the profile in BraveSoftware/Brave-Origin.
A web app now opens in ~158ms instead of ~345ms.

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

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
A machine without a GPU, like most VMs, renders through llvmpipe on the
CPU, where every animated frame and every translucent window costs. In a
VM, opening and closing a terminal took ~5s of CPU; a panel ~3.4s.

omarchy toggle animations (also under Toggle > Animations) places a Hyprland
flag that turns off animations, blur and shadows and makes windows opaque.
The shell follows Hyprland's animations:enabled, rereading it on every
config reload: its one-shot animations run for Style.duration(ms), which
is then 0, and its spinners, pulses and title marquee hold still. A new
install in a VM starts with the flag in place.

Measured in the ISO test VM (llvmpipe), CPU per interaction:
terminal open+close 5000ms -> 481ms, workspace switch 1670ms -> 409ms,
audio panel 3446ms -> 796ms, volume OSD 2324ms -> 584ms, menu 2028ms ->
1241ms.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
fzf's completion.bash rewraps the completions of ~76 commands on every
interactive shell start, costing ~25ms once bash-completion is loaded. Keep
only the key bindings (Ctrl-R, Ctrl-T, Alt-C); **<Tab> fuzzy completion goes.

`starship init bash` only prints a line that runs starship again with
--print-full-init, so call that directly and start the binary once.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Upstream no-animations mode zeros Style.duration. The fork's face and
password opacity fades were still hardcoded, so they would keep running
in VMs.

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
Codex 0.158's app-server can leave account/read unanswered, and asking it
first lost the limits whenever it did, leaving the agents panel showing
"Codex limits unavailable". The limits name the plan themselves, so they're
asked first and account/read is only a short fallback when they don't.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Sep 29, 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: 3c2c8368-c489-4d13-95d1-6b1b905fa9b7

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

Autopilot is currently an internal CodeRabbit preview.


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.

@mark-groves
mark-groves marked this pull request as ready for review September 30, 2026 22:28
@cursor

cursor Bot commented Sep 30, 2026

Copy link
Copy Markdown
Author

Bugbot couldn't run - usage limit reached

Bugbot is counted against Cursor usage for this user or team, and this run hit a usage or spend limit.

A user or team admin can review and increase usage limits in the Cursor dashboard.

(requestId: serverGenReqId_4c0fd08b-84f3-4c26-98d4-557eb3411c49)

@mark-groves
mark-groves merged commit 879977c into quattro Sep 30, 2026
3 checks passed
@mark-groves
mark-groves deleted the cursor/upstream-changes-pr-8139 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.

6 participants