Skip to content

Merge upstream quattro (linux-omarchy default kernel except T2) - #21

Merged
mark-groves merged 1 commit into
quattrofrom
cursor/upstream-changes-pr-bbbb
Sep 16, 2026
Merged

mark-groves merged 1 commit into
quattrofrom
cursor/upstream-changes-pr-bbbb

Conversation

@cursor

@cursor cursor Bot commented Sep 14, 2026

Copy link
Copy Markdown

Merges 3 new commits (2 non-merge) from omacom/omarchy quattro since last night's check (b679363b / draft PR #18). Upstream HEAD is now 86a2e583 (upstream #11845, merged 2026-09-14).

This is the only upstream movement since the 2026-09-13 cron. It replaces the Panther Lake-only kernel work that landed on draft PR #18 (1789095456 / linux-omarchy-ptl-novrr-mm). Merge this for kernel policy; leave #18 for the rest of yesterday's batch (kyber, pacman scope, qconsole, Cloudflare CLI, 1Password class, omacom URLs).

Fork-only Cursor work is untouched.

linux-omarchy is the default kernel (except T2 Macs)

  • Existing x86_64 installs migrate to linux-omarchy + headers via new migration 1789325478 — stock Linux, LTS, Zen, linux-ptl, and linux-omarchy-ptl-novrr-mm all get the generic kernel
  • T2 Macs are skipped if linux-t2 is installed or a *-t2* kernel is running (even if the package is gone); ARM is skipped (kernel is x86_64-only)
  • Old kernels stay installed for recovery; a reboot is requested after a successful boot-entry rebuild
  • /etc/default/limine is rewritten to BOOT_ORDER="linux-omarchy, linux-omarchy-*, *, *fallback, Snapshots" (exact name first — linux-omarchy-* does not match linux-omarchy). Central config wins over legacy Dell drop-ins and .pacnew leftovers; unrelated settings and kernel cmdline stay
  • Packaged Limine defaults are BOOT_ORDER="linux-t2, linux-omarchy, linux-omarchy-*, *, *fallback, Snapshots" so T2 stays first on those machines
  • Users who already completed the PTL migration still run this one (new filename + new machine-wide marker). Late updaters go straight here

Fresh installs leave kernel selection to the ISO

  • Upstream added then immediately removed install/hardware/kernel.sh — the ISO package list now ships linux-omarchy / linux-omarchy-headers instead of linux-ptl
  • Installer no longer swaps XPS Panther Lake onto a special kernel (install/hardware/intel/ptl-kernel.sh deleted)
  • NVIDIA and Cam Link header detection now matches linux-omarchy and the retired -bore / -ptl-novrr-mm variants

Conflict resolution

Tests

Focused suites passed: omarchy-kernel-migration-test.sh (variants, T2/ARM exclusions, old PTL markers, failure/retry, exact boot-entry match, Limine precedence), limine-defaults-test.sh, xps13-sidecar-amps-test.sh, t2-hardware-test.sh, and default-agent-test.sh (Cursor still official-tarball, no mise).

Still only on draft PR #18 (not in this PR)

Pacman systemd-run scope, kyber udev rule, centered qconsole, Plymouth late-display re-center, Cloudflare cf wrapper, 1Password 8.12 window class, omacom/omarchy URL rewrite, drop CODEOWNERS.

Open in Web View Automation 

Take upstream omacom#11845: migrate existing x86_64 systems to linux-omarchy, prefer it in Limine (T2 first), drop the installer PTL override, and leave fresh-install kernel selection to the ISO.

Co-authored-by: Mark Groves <mark-groves@users.noreply.github.com>
@coderabbitai

coderabbitai Bot commented Sep 14, 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: e5a6a2fc-8904-442e-b3f6-b86f1e1ce714

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

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 September 14, 2026 23:09
@mark-groves

Copy link
Copy Markdown
Owner

Independent shipping verification

Verdict: PASS+NOTES

This check ran on nexus-reborn as the local fallback after Cloud NEW_VM verifiers failed. This agent did not author the PR. Nothing was merged, rebased, or pushed. The host linux-omarchy migration was not run. Cursor was not themed.

Recorded patch

  • Head: 60825f7adf39551c8d78fcacb5ca224ca2e9702d
  • Parent (local quattro): e3ac2da538c7f5a27b9f0786aa82bc957e0c233f
  • Merge-base (also GitHub PR base): a50e189ff81468e4e14c070a0507e0696577b53a
  • git patch-id --stable of e3ac2da538c7f5a27b9f0786aa82bc957e0c233f...60825f7adf39551c8d78fcacb5ca224ca2e9702d: e8bc54d6d1ef276574e53a57faecfdfbf6f9579a

Forge: origin is on PATH and cannot resolve GitHub PR 21 (origin pr view 21 returns not found). This comment used GitHub MCP add_issue_comment as assigned. CodeRabbit reports success with "Review skipped". That is not a verdict.

Kernel policy

linux-omarchy is the default kernel except T2.

  • Packaged Limine BOOT_ORDER is linux-t2, linux-omarchy, linux-omarchy-*, *, *fallback, Snapshots.
  • Migration 1789325478.sh skips ARM, linux-t2, and a running *-t2* kernel. It adds linux-omarchy plus headers and does not remove old kernels. Central /etc/default/limine order is linux-omarchy, linux-omarchy-*, *, *fallback, Snapshots.
  • install/hardware/intel/ptl-kernel.sh is gone. ISO packages list linux-omarchy and linux-omarchy-headers.
  • NVIDIA and Cam Link header selectors use ^linux(-zen|-lts|-hardened|-t2|-ptl|-omarchy(-bore|-ptl-novrr-mm)?)?$. Expected on this PR.

Fork 22 merge-tree

git merge-tree --write-tree of quattro e3ac2da5 plus this head produced tree e2938ae670d6015fd954e4e64af0396152665190 with exit 0.

bin/omarchy-theme-set-vscode in that tree does not call set_theme "/usr/bin/cursor". It keeps the fork comment that names /usr/bin/cursor as the GUI launcher. The PR head itself still has the upstream set_theme "/usr/bin/cursor" line. Landing must keep quattro's fork file.

Focused tests

Worktree /tmp/omarchy-verify-21. Each file sourced test/shell.d/base-test.sh via bash test/shell.d/<file>.

  • omarchy-kernel-migration-test.sh: PASS, exit 0 (old kernels kept, T2 and ARM skipped, central BOOT_ORDER set)
  • limine-defaults-test.sh: PASS, exit 0
  • xps13-sidecar-amps-test.sh: PASS, exit 0
  • t2-hardware-test.sh: PASS, exit 0
  • default-agent-test.sh: PASS, exit 0 (Cursor stays official-tarball, no mise wrapper)

control-cli

tmux session pr21-verify-cli ran:

env -u GIT_INDEX_FILE OMARCHY_PATH=/tmp/omarchy-verify-21 /tmp/omarchy-verify-21/bin/omarchy-version

Output: dev (60825f7a)
Exit: 0

HEAD after all checks remains 60825f7adf39551c8d78fcacb5ca224ca2e9702d.

@mark-groves
mark-groves merged commit 651c9b1 into quattro Sep 16, 2026
2 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.

2 participants