Skip to content

Sync upstream quattro through b20d7876 - #138

Merged
mark-groves merged 28 commits into
quattrofrom
cursor/upstream-changes-pr-b20d
Nov 20, 2026
Merged

mark-groves merged 28 commits into
quattrofrom
cursor/upstream-changes-pr-b20d

Conversation

@cursor

@cursor cursor Bot commented Nov 19, 2026

Copy link
Copy Markdown

What changes

Upstream quattro moved from d54cde78f (omacom#19308, already on this fork as #137) to b20d7876f. Twenty-nine first-parent commits. Twenty-eight are replayed. Three of the four merges are replayed as single commits.

One merge is not replayed: omacom#19432 only updates the Muse launcher hash inside .github/workflows/i18n-sync.yml. That workflow stays absent, so the commit has nothing else to bring.

Two conflicts. In default/i18n/en/menu.json (omacom#19413) the Face entry stays and Git's catalog key moves from setup.config.git to setup.git with the menu. In shell/plugins/agents/Panel.qml (omacom#19433) a local model's update still indexes shownProviders, so a paused collector and a duplicate unified pool stay hidden, and the new update action is included. The English catalogs, the other shell catalogs, default/omarchy/omarchy-menu.jsonc, docs/i18n.md, manual/17-ai.md, shell/Commons/Color.qml, shell/plugins/agents/Main.qml, and agents-panel-test.sh auto-merged. A single three-way merge of the range matches this branch on every other path. Fork delta vs b20d7876f is 253 paths, the same set as quattro vs d54cde78f. On the 193 paths upstream did not touch, nothing differs. Face, Grok Bot, and Cursor stay. shownProviders stays. linux and linux-headers stay. The translation-sync workflow stays absent. cursor-agent stays out of the mise tool list. Hermes stays on its own installer and gets no second launcher. Lazy counts stay 20 auto_update and 30 lazy. Power profiles still write through busctl. The Cursor tarball wording stays.

Verification

Passed: agents-panel-test.sh (139), apple-silicon-quirks-test.sh (6), camera-test.sh (8), default-agent-test.sh (62), default-apps-test.sh (21), dgx-spark-boot-test.sh (3), first-run-test.sh (4), games-vibes-test.sh (6), gb10-sleep-test.sh (7), i18n-test.sh (409, one skip), launch-tui-test.sh (2), locale-env-test.sh (4), locale-setup-test.sh (7), locale-sudoers-test.sh (4), menu-test.sh (116), omarchy-kernel-test.sh (13), omarchy-make-app-scaffold-test.sh (6), platform-app-hooks-test.sh (8), provision-user-test.sh (4), sudoers-test.sh (6, one skip), theme-intro-switch-test.sh (12), ./test/cli (138).

No compositor, so Game Vibes, Fantasi, the region menu, the local-model lines, and the terminal colours were not drawn.

Screenshots

No visible change captured: this run has no compositor, so the cracktro, Fantasi, the region menu, and the local-model lines were not drawn.

Open in Web View Automation 

dhh and others added 28 commits November 19, 2026 23:03
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
The list of games is now a 16-bit demo-scene intro on a CRT, drawn by
Fable 5.2: copper bars, a wobbling logo, bobs, a checkerboard floor and
a sine scroller, all in the theme's colours. Under each game it shows a
line from the game's description meta, which the shipped games, the
template and the web-game skill now carry. Coming back from a game lands
on the one played, however it was opened.

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…acom#19413)

Git sits directly under Security instead of inside Config, and first run no
longer nudges new installs to set up Git and GitHub.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
…l makes (omacom#19356)

* Open Fantasi on the clicked image model even when it's already open

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

* Open Fantasi from a video model's line and launcher too

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

* Say what each local model makes, and open music models in Fantasi too

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

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* Let look page's --theme replace a palette already in the address

It added a second palette to the fragment and the page read the first,
so a Game Vibes address, which carries the current theme, kept that
theme whatever --theme said.

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

* Add the Game Vibes launcher to existing installs

The launcher ships with the default ones, which only reaches new users.

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

* Build the Game Vibes list when it opens, in one command

omarchy-games-vibes-install only rebuilt a list that every launch
rebuilt anyway, and wrote a second copy of the launcher. Launching now
does both: it writes the list, and gives the shipped launcher this
home's window class the first time. --url prints the address instead of
opening it, so an agent looks at a game the way a player reaches it.
Copying a game no longer rebuilds the list.

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

* Straighten out the web-game skill

A game of the user's own is changed where it is; only a game Omarchy
ships is copied first, since copying one's own under its name fails.
Agents no longer write the current theme into each game, which Game
Vibes hands over as it opens. Bloom may change the frame's one render
call it needs, the note on what a page opened from a file can load says
what is true, and the check that the score rises is for games that run
on their own, not turn-based ones.

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

* Finish the bloom recipe, and drop every old palette

Bloom needs OutputPass last for the right colours, a real-time game's
score only has to rise when the keys pressed score, and look page's
--theme now removes each palette in the address, not just the first.

Co-Authored-By: Codex XHigh <noreply@openai.com>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Codex XHigh <noreply@openai.com>
* Remove Direct Boot

Limine already hides its menu and boots Omarchy after a second, so an EFI
entry that skips it gains nothing. Drop Setup > Direct Boot, its helper, the
kernel switcher's guard, and the DGX Spark's UKI exception, and remove any
Direct Boot entry an install still has so it boots through Limine again.

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

* Retry an unreadable Direct Boot cleanup and restore the Spark's non-UKI boot

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

* Retry an interrupted Spark rebuild in the Direct Boot cleanup

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

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* Remove Direct Boot

Limine already hides its menu and boots Omarchy after a second, so an EFI
entry that skips it gains nothing. Drop Setup > Direct Boot, its helper, the
kernel switcher's guard, and the DGX Spark's UKI exception, and remove any
Direct Boot entry an install still has so it boots through Limine again.

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

* Retry an unreadable Direct Boot cleanup and restore the Spark's non-UKI boot

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

* Move Reset Computer to Remove > Factory Reset

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

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* Open Game Vibes full screen

It's a console for little games, so it starts full screen, and its
hints say Super + W closes it and Super + F makes it a window.

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

* Size Game Vibes' hints to the window

Full screen on a large display left them too small to read.

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

* Keep Game Vibes' shortcuts from breaking across lines

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

* Show Game Vibes' keys as a deck of pixel keycaps

The instructions were two plain text boxes over a cracktro. They're now
drawn on its canvas: a control deck of keycaps in a bitmap font, a
section each for moving, coming back, the Super keys and making a game,
with caps that sink and light as their keys are pressed. The scroller
no longer repeats them, and a narrow window keeps the canvas wide enough
to hold the deck.

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

* Shrink Game Vibes' pixels when a window is too short for it

In a short window the deck wrapped and covered the selected game's name
and blurb. The pixel scale now steps down until the picture fits above
the deck.

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

---------

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
* Add Death Wish to Game Vibes

A pixel precision platformer: ten rooms of spikes and saws, wall jumps,
instant respawns, saved progress and best times per room.

solve.js proves every room can be beaten with the game's own physics.

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

* Keep short jump taps and room positions in single-room replays

A jump pressed and released within one frame now still reaches the
physics as a short hop. solve.js --replay with a room filter keeps each
room's inputs at its own position, so #from=N reads the right ones.

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

---------

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
* Keep the kernel's default free-memory watermark on GB10

Omarchy's vm.watermark_scale_factor=125 keeps ~1.25% of memory free so
kswapd reclaims ahead of allocations. On a GB10's 128 GB that is ~3 GiB
held free out of memory the GPU shares: next to the desktop, a loaded
DeepSeek V4.1 Flash rank had 4.3 GiB more available at the kernel's
default of 10, which DGX OS ships, and that room is what lets the model
draft its replies.

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

* Apply the GB10 watermark on an image's first boot

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

---------

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

* Give the shell palette the theme's yellow as a warning colour

The palette carried the theme's red as urgent but dropped its yellow, so
a caution short of urgent had no colour to follow the theme with.

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

* Say what a local model takes in RAM instead of drawing a memory bar

A bar of one model's share of the machine said nothing about whether
another would fit. A running model now says "Using 11 GB RAM", and a
stopped one "Needs 14 GB RAM", in the theme's yellow when there isn't
room for it now, from the catalog's measured peak for this machine.

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

* Fade the local models that aren't running

A stopped model's mark and name were as bright as the running one's, so
the panel didn't show at a glance which was on. Its play button and RAM
line keep their colour.

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

* Sit a local model's RAM line close under its name

It took the section's full row gap and read as a separate row rather
than as part of the model above it.

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

* Fade a stopped local model's RAM line with its name

It stayed bright under a faded name. A line warning that the model won't
fit keeps its full colour.

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

* Keep the RAM line in place at large spacing scales

Its pull up under the name grew with the spacing scale while the text
didn't, so at scale 2 the row could reach zero height and drop out of
the column's layout. The pull now stops short of the whole line.

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

---------

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

* Install a Game Vibes game from a git repository, like a theme

omarchy games vibes install <git-repo-url> clones a shared game into
~/Games/vibes, named after its repository, and opens it. It never writes
over a game made here, drops the repository's symlinks, and refuses one
without an index.html. Remove and update commands match the theme ones,
all three are in the menu, and the web-game skill says how to share a
game so it installs this way.

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

* Keep a game through a failed reinstall, and report failed updates

A reinstall deleted the game before cloning its replacement, so a lost
connection lost the game: the clone is now made and checked first. The
remove picker lists what Game Vibes lists, whatever the home folder is
called. A pull that fails makes the update fail, and the Update row
shows only for games the command updates.

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

* Guard game installs against each other, and clean up after a failed pull

Two installs taking the same name could replace one another, and a game
made during a download could be lost: installs now run one at a time and
ask again whose folder it is before replacing it. A pull that fails can
still bring in symlinks, so they're dropped either way. The Update row's
check follows a ~/Games/vibes that is itself a link.

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

* Release the install lock before opening the game

It was held while the installed game stayed open, so a second install
waited until the first game was closed.

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

* Call the install row Game Vibes, after Minecraft

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

---------

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
omacom#19425)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…m#19419)

* Show Fantasi's own icon on the button that opens a model in it

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

* Reload Fantasi's icon in the panel when the icon set is redrawn

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

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
* Let the locale helper generate regional English locales

The root helper now also reads the packaged region registry, so Formats
can generate en_GB, en_DK and friends without a password, through the
same code-only sudoers grant.

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

* Add omarchy-region to set formats apart from the language

Sets LC_TIME, LC_NUMERIC, LC_MONETARY, LC_MEASUREMENT and LC_PAPER in
uwsm's env and the running session, leaving LANG and LC_MESSAGES to the
language. omarchy-menu-region picks one by a sample of how it writes
dates and numbers. Locale generation and the session hand-off move to
omarchy-locale-session, shared with omarchy-language.

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

* Gather Language, Formats and Timezone under Setup > Region

Timezone moves over from Update, and Language from Setup's top level,
keeping their translations.

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

* Give the Formats notifications their glyph

-g takes the next argument as the glyph, so without one the headline
was swallowed.

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

* Find omarchy-locale-session on PATH

Like omarchy-shell-config, so reading the language works wherever
omarchy-language runs, including against a bare OMARCHY_PATH.

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

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Drop a local model's error from the panel once its logs are opened
Offer a local model's update in the agents panel

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
Split out omarchy-make-* and omarchy-contribute skills
)

* Add live backgrounds to theme wallpapers

A still can have a loop under the same name in backgrounds/loops/, which
plays in its place while live backgrounds are on. From omacom#15745, without
the loop videos, which now live in omacom/omarchy-themes-loops.

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

* Ship the theme loops from omarchy-themes-loops

Install the package by default and on existing machines, and stage a
theme's packaged loops on a dev link the same way as its intros.

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

* Give no loop to stills that share a name

A loop shared by road.jpg and road.webp could not map back to the one
that started it, so turning it off could switch images.

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

* Let OWE play the theme loops

OWE now plays a still's backgrounds/loops/<stem>.mp4 in its place while
animations are on (omacom/owe#50), with the background link still
naming the still. Omarchy no longer needs its own loop handling: the
live backgrounds toggle, the link swap to the loop and back, and every
reader mapping a loop back to its still. What stays is shipping the
loops and staging them on a dev link.

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

---------

Co-authored-by: z8 <yam@kernelius.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…omacom#19442)

* Bring the omarchy skill up to date with current features and defaults

The skill's examples assumed alacritty, chromium and nautilus, while the
defaults are foot, Chrome and Folio, and it had no word on the default
app commands, web apps, environment variables, toggles, language,
power, network, security or snapshots. Two new topic guides cover them
(apps.md and system.md); the existing guides gain the newer binding
forms, look-and-feel and monitor commands, keyboard layouts, the rest
of the bar commands, the dock, icons and the boot screen. Also fixes
stale claims: rotation has a command, omarchy reinstall reinstalls
packages too, a night light schedule needs hyprsunset in autostart,
and the post-update and pre-refresh-pacman hooks run where they do.

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

* Fix the shipped bindings.lua hints and the manual's file manager name

The preinstalled-bindings flag only takes effect in hyprland.lua before
Omarchy's defaults load, the SSH example now opens the default terminal
instead of alacritty, and the manual calls the file manager Folio, the
one Omarchy ships.

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

* Say browser installs don't switch the default and Files always opens Folio

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

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…9498)

* Enable PipeWire camera when installing Chrome on Snapdragon

* Keep the PipeWire camera wherever the browser flags are rewritten

Installing Chromium, refreshing its flags and resetting the configs each
write a fresh flags file, and only the video decoding settings were put
back afterwards. The camera setting now goes back with them, and a
migration restores both on installs that lost them.

* Drop the migration and source checks from the camera test

The testing guide gives migrations no suite test, and a scan of the
scripts for a command name restates the implementation. The refresh and
the browser installs are tested by running them.
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Keep colors in terminal windows opened by an agent's command

An agent runs its commands with NO_COLOR=1 and PAGER=cat. A window opened
from there through omarchy-launch-tui inherited both and came up without
colors. The pair stops at the launcher. NO_COLOR or a pager set alone is
the user's own and stays.

* Quote the strings the launcher compares against
@mark-groves
mark-groves merged commit b0126d6 into quattro Nov 20, 2026
5 checks passed
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.

4 participants