Skip to content

[feat] tui: flexoki and flexoki-light themes - #180

Merged
gogoout merged 2 commits into
mainfrom
feat/flexoki
Sep 27, 2026
Merged

gogoout merged 2 commits into
mainfrom
feat/flexoki

Conversation

@gogoout

@gogoout gogoout commented Sep 26, 2026

Copy link
Copy Markdown
Member

Recreates #177 on top of #179, because GitHub cannot change the base of a stacked PR. The content is the same as #177, including its review fix. #177 has the review thread.

Stacked on #179. Change this PR's base to main before merging it, after #179 is merged. A squash merge into the Monokai branch would strand it there.

What changes

  • Two new themes: flexoki and flexoki-light, Steph Ango's Flexoki (MIT). There are now thirteen themes.
  • Bundled syntax themes. two-face does not ship Flexoki, so both syntax themes are bundled .tmTheme files, the mechanism from ADR 0040. They are written here from Flexoki's published palette and generated from one table, so both use the same token colours. Both credit Flexoki in their headers.
  • Seeds: Flexoki's 400 accents on the dark ground (#100F0F), and its 600 accents on paper (#FFFCF0).
  • Five inks moved to pass the legibility tests. Each seed file records the number that forced it:
    • Dark: the red #D14D41 (4.42:1) and the blue #4385BE are lifted, with hue kept. The blue fell to 2.81:1 when muted for a foreign hunk.
    • Light: the green #66800B (4.39:1) and the yellow #AD8301 (3.39:1) are darkened.
    • The light green also turns 4° toward green. The reviewed mark is this green made 0.10 darker, and Flexoki's own hue cannot reach the 0.10 chroma floor in sRGB at that lightness.
  • Search fill: Flexoki's orange on dark and its 400 yellow on light, so the fill differs from the skim tier's colour.

Docs

  • Every theme list is updated: both READMEs, docs/cli.md, spec/tui.md and spec/consumers.md.
  • Gallery entries are added, and ADR 0040 notes the two Flexoki themes.
  • assets/themes.sh records them. assets/themes/flexoki.png and flexoki-light.png are new.

Tests

  • cargo test, clippy -D warnings and fmt are clean.
  • The legibility, chroma, distinctness and own-colour tests run over both new themes.
  • The config tests and the theme dropdown test cover the two new names; the G key now lands on flexoki-light.
  • Privacy sweep of the diff and commit message: clean.

@gogoout
gogoout added this pull request to stack #181 September 27, 2026 00:11
Base automatically changed from feat/monokai-pro-main to main September 27, 2026 00:12
Steph Ango's Flexoki, dark and light. two-face does not ship it, so both
syntax themes are bundled .tmTheme files (ADR 0040), written here from
Flexoki's published palette (MIT) and generated from one table so the
scope mapping is the same in both.

The seeds take Flexoki's 400 accents on the dark ground and its 600
accents on paper. Five inks moved to clear the legibility tests, each
with the number that forced it in the seed file: the dark red and blue
are lifted, and the light green and yellow are darkened. The light green
also turns 4 degrees towards green, because the reviewed mark derived
from it cannot reach the chroma floor in Flexoki's own hue at that
lightness.
Review follow-up, as for monokai.tmTheme: the inert findHighlight key now
names the colour each seed actually fills a search hit with.
@gogoout
gogoout removed this pull request from stack #181 September 27, 2026 00:13
@gogoout
gogoout enabled auto-merge (squash) September 27, 2026 00:13
@gogoout
gogoout merged commit ec4b3e3 into main Sep 27, 2026
1 check 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.

1 participant