From a3443964209a56d9ea6131e16ab6dcf0b41e26cb Mon Sep 17 00:00:00 2001 From: Prad Nukala Date: Fri, 16 Oct 2026 18:20:47 -0400 Subject: [PATCH] feat(theme): CherryBlossom atuin theme; document popup style --- docs/index.mdx | 2 +- docs/shell/atuin.mdx | 38 ++++++++++++++++++++------------------ docs/terminal/tmux.mdx | 2 ++ 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/docs/index.mdx b/docs/index.mdx index dde422e..ee74784 100644 --- a/docs/index.mdx +++ b/docs/index.mdx @@ -50,4 +50,4 @@ The default is `mac` on macOS and `desktop` everywhere else. See [Configuration] ## Theme -The terminal and agent palette is **CherryBlossom**, the custom Noctalia palette in [prdlk/noctalia](https://github.com/prdlk/noctalia) (`palettes/CherryBlossom.json`). Ghostty selects its `cherry-blossom` theme, tmux colors its tab bar and command palette with it, and omp selects its `cherry-blossom` dark theme. nvim, bat, atuin, and yazi still select **cyberdream**, and television selects `cyberdream-transparent`, a variant without a background. fish ships a cyberdream theme but does not select it. kitty takes its colors from the active Omarchy theme. The koda and ii-auto variants are also shipped for ghostty, kitty, and yazi. The font is **Victor Mono Nerd Font**. +The terminal and agent palette is **CherryBlossom**, the custom Noctalia palette in [prdlk/noctalia](https://github.com/prdlk/noctalia) (`palettes/CherryBlossom.json`). Ghostty selects its `cherry-blossom` theme, tmux colors its tab bar, popups, and command palette with it, atuin selects `cherry-blossom`, television selects `cherry-blossom-transparent` (no background, so the terminal's shows through), lazygit and lazydocker use its border and selection colors, and omp selects its `cherry-blossom` dark theme. nvim, bat, and yazi still select **cyberdream**; fish ships a cyberdream theme but does not select it. kitty takes its colors from the active Omarchy theme. The koda and ii-auto variants are also shipped for ghostty, kitty, and yazi. The font is **Victor Mono Nerd Font**. diff --git a/docs/shell/atuin.mdx b/docs/shell/atuin.mdx index 1001221..bb5498d 100644 --- a/docs/shell/atuin.mdx +++ b/docs/shell/atuin.mdx @@ -1,6 +1,6 @@ --- title: atuin -description: Shell history search with a daemon, directory-scoped up-arrow, tmux popups, a cyberdream theme, and the atuin AI inline command generator. +description: Shell history search with a daemon, directory-scoped up-arrow, tmux popups, a CherryBlossom theme, and the atuin AI inline command generator. --- [atuin](https://atuin.sh) replaces shell history search in fish, bash, and zsh. It also provides `atuin ai inline`, a natural-language command generator that the fish config binds to keys. @@ -8,7 +8,7 @@ description: Shell history search with a daemon, directory-scoped up-arrow, tmux | Source (repo) | Target | Notes | | --- | --- | --- | | `dot_config/atuin/private_config.toml` | `~/.config/atuin/config.toml` | `private_`: written as a regular `0600` file, not a symlink | -| `dot_config/atuin/themes/cyberdream.toml` | `~/.config/atuin/themes/cyberdream.toml` | symlink | +| `dot_config/atuin/themes/cherry-blossom.toml`, `dot_config/atuin/themes/cyberdream.toml` | `~/.config/atuin/themes/*.toml` | symlinks | chezmoi runs in symlink mode, but `private_` files are written as real files, so edits to `~/.config/atuin/config.toml` do not reach the repo on their own. Copy them back with `chezmoi re-add` (or `czs`, see [fish](/shell/fish#functions)). None of the files are templates, and they apply on every role. @@ -78,7 +78,7 @@ bash and zsh have no AI binding. | `daemon.enabled` | `true` | Uses the background daemon | | `daemon.autostart` | `true` | atuin starts and manages the daemon itself | | `pty_proxy.enabled` | `false` | `atuin init` does not re-exec the shell inside `atuin pty-proxy` | -| `theme.name` | `"cyberdream"` | Loads `themes/cyberdream.toml` | +| `theme.name` | `"cherry-blossom"` | Loads `themes/cherry-blossom.toml` | | `tmux.enabled` | `true` | Search opens in a tmux popup when inside tmux (tmux 3.2+) | | `tmux.width` / `tmux.height` | `"80%"` / `"60%"` | Popup size | | `ai.enabled` | `true` | Enables `atuin ai` | @@ -105,21 +105,23 @@ To apply these settings, move the keys above `[dotfiles]` (and `syntax_highlight ## Theme -`themes/cyberdream.toml` defines a theme named `cyberdream`, using the palette shared with [fish](/shell/fish#theme) and [Starship](/shell/starship#palette): +`themes/cherry-blossom.toml` defines the selected theme, from the CherryBlossom palette (`palettes/CherryBlossom.json` in [prdlk/noctalia](https://github.com/prdlk/noctalia)) shared with Ghostty, tmux, lazygit, and omp: | Key | Color | | --- | --- | -| `AlertInfo` | `#5ef1ff` | -| `AlertWarn` | `#f1ff5e` | -| `AlertError` | `#ff6e5e` | -| `Annotation` | `#7b8496` | -| `Guidance` | `#5ea1ff` | -| `Important` | `#ff5ef1` | -| `Title` | `#5ef1ff` | -| `Muted` | `#7b8496` | -| `SyntaxCommand` | `#5ea1ff` | -| `SyntaxFlag` | `#5ef1ff` | -| `SyntaxString` | `#5eff6c` | -| `SyntaxVariable` | `#ff5ef1` | -| `SyntaxOperator` | `#ff5ea0` | -| `SyntaxComment` | `#7b8496` | +| `AlertInfo` | `#a78266` | +| `AlertWarn` | `#ae825f` | +| `AlertError` | `#bf615d` | +| `Annotation` | `#a6958f` | +| `Guidance` | `#8f9aa0` | +| `Important` | `#cf716f` | +| `Title` | `#cf716f` | +| `Muted` | `#a6958f` | +| `SyntaxCommand` | `#cf716f` | +| `SyntaxFlag` | `#a78266` | +| `SyntaxString` | `#a6b084` | +| `SyntaxVariable` | `#c17e4a` | +| `SyntaxOperator` | `#ad6756` | +| `SyntaxComment` | `#a6958f` | + +`themes/cyberdream.toml` is still shipped (the palette shared with [fish](/shell/fish#theme) and [Starship](/shell/starship#palette)) but not selected. diff --git a/docs/terminal/tmux.mdx b/docs/terminal/tmux.mdx index 9c7335b..eb4e01e 100644 --- a/docs/terminal/tmux.mdx +++ b/docs/terminal/tmux.mdx @@ -67,6 +67,8 @@ The status line copies kitty's tab bar (`tab_bar_style powerline`, `tab_powerlin Colors are the user options `@tab-bg` (window background: the notch arrow and the session pill's text), `@tab-fg`, `@tab-active-bg`, and `@tab-active-fg`. They are a fixed CherryBlossom palette (the Noctalia custom palette in [prdlk/noctalia](https://github.com/prdlk/noctalia) `palettes/CherryBlossom.json`, the same one Ghostty's `cherry-blossom` theme uses), so the bar looks identical on every machine and does not depend on Omarchy. Active background = accent mixed 20% into background, the same derivation as the kitty tab bar: `#453130` from accent `#cf716f` over `#222120`. +Popups (`prefix g`, `prefix t`, `prefix ?`, tmux-palette) set `popup-style` to `bg=@tab-bg` and `popup-border-style` to `@tab-active-fg` on that background with rounded lines. The explicit background matters under Ghostty: `background-opacity` only applies to cells with the default background, so a default-bg popup shows the pane behind it through the blur. + ### Tab labels Each window reads `