Fixing a Merge Commit on Master (Restoring Linear History)

The Problem

A merge commit landed on master, breaking the project's linear history requirement.

*   5fc5d7ecc Merge remote-tracking branch 'origin/develop'  (HEAD → master)
|\
| * 1172ababb fix: rescue PaymentError and render error from Stripe (#5469)

peterberkenbosch / omarchy-aur-maintenance.md

Created April 21, 2026 18:54

Omarchy AUR package maintenance: slack-desktop & heroku-cli

Cleaning up stale AUR packages on Omarchy

I ran omarchy-update today and noticed a couple of packages weren't getting the love they deserved. One was an orphaned foreign package no longer in the AUR, and another was stuck on an outdated AUR build. Here's how I fixed it — and automated it for the future.

The diagnosis

First, I checked what foreign packages I had installed:

pacman -Qm

peterberkenbosch / omarchy-opencode-theme-fix.md

Created April 21, 2026 19:19

Omarchy + OpenCode theme sync: fixing light-on-light rendering in Ghostty

Fixing OpenCode's broken colors in Ghostty on Omarchy

The symptom

Running OpenCode inside Ghostty on Omarchy produced a near-unreadable light-gray-on-light-gray interface. The logo, prompt text, and status bar were all washed out. Switching Omarchy themes didn't help — the TUI stayed stuck in a light palette regardless of whether the system was using Catppuccin (dark), Tokyo Night, or anything else.

Diagnosis

First I checked what OpenCode thought the system theme was. Its tui.json was set to "theme": "system", which means it tries to auto-detect light vs dark mode.