aboutsummaryrefslogtreecommitdiffstats
path: root/templates/terminal
diff options
context:
space:
mode:
authorDanilo M. <danix@danix.xyz>2026-09-11 11:00:29 +0200
committerDanilo M. <danix@danix.xyz>2026-09-11 11:00:29 +0200
commit8b01ab032314edd9bc138d8a34f1095e900f2327 (patch)
treea1d5f1be2531feef18afa9ea18ef0f8c5c9ca54b /templates/terminal
parentf87f02b0a62cbf951475fa50b917b0263db97f50 (diff)
downloadunified-desktop-theme-8b01ab032314edd9bc138d8a34f1095e900f2327.tar.gz
unified-desktop-theme-8b01ab032314edd9bc138d8a34f1095e900f2327.zip
feat: move kitty and neovim to Catppuccin Macchiato
These were deliberately left until last: wallpaper-derived colours in kitty's ANSI slots were the original readability problem, since nothing in a wallpaper guarantees color4 stays legible against color0. A hand-tuned palette is safe for the opposite reason, so the move is onto Macchiato rather than back onto pywal. current-theme.conf was a symlink into the wal cache and is now a real file. wal.sh no longer recreates that symlink, which would have silently reverted the theme on the next wallpaper change. Neovim read the same pywal output via colorscheme pywal and now uses the catppuccin/nvim plugin. Its airline theme was base16_dracula, matching nothing; it is now base16, which derives from the active colorscheme. Measured before committing: every ANSI slot clears 4.5:1 against its own background in both themes except color0, which is the near-background slot in both. color8, used by some colourschemes for comments, does drop from 3.83:1 to 2.38:1, but the Catppuccin neovim plugin sets its own comment colour rather than using ANSI 8, confirmed on screen. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01G6aeE37K4GHBsaM51yLTTq
Diffstat (limited to 'templates/terminal')
-rw-r--r--templates/terminal/README.md43
-rw-r--r--templates/terminal/kitty-macchiato.conf84
2 files changed, 127 insertions, 0 deletions
diff --git a/templates/terminal/README.md b/templates/terminal/README.md
new file mode 100644
index 0000000..6e33872
--- /dev/null
+++ b/templates/terminal/README.md
@@ -0,0 +1,43 @@
+# Kitty and Neovim
+
+Both were left alone through the earlier phases, because this is where the
+readability problem that shaped the whole design actually lived: wallpaper
+derived colours were being written into kitty's sixteen ANSI slots, and nothing
+in a wallpaper guarantees that `color4` stays legible against `color0`.
+
+They are now on Catppuccin Macchiato, which is safe for the opposite reason:
+the palette is hand tuned, so the ANSI slots have deliberate relationships
+rather than accidental ones.
+
+## What changed
+
+- `~/.config/kitty/current-theme.conf` was a symlink into `~/.cache/wal/`. It
+ is now a real file holding the upstream `catppuccin/kitty` macchiato theme.
+- `~/bin/wal.sh` no longer recreates that symlink. It did so on every wallpaper
+ change, which would have silently reverted the theme.
+- Neovim used `colorscheme pywal`, reading the same pywal output. It now uses
+ the `catppuccin/nvim` plugin at the macchiato flavour.
+- vim-airline was on `base16_dracula`, matching nothing. It is now `base16`,
+ which derives its colours from the active colorscheme. There is no Catppuccin
+ theme in vim-airline-themes, and adding a second status line plugin was not
+ worth it.
+
+## Contrast, measured
+
+Against each theme's own background, every ANSI slot clears 4.5:1 in both the
+old preset and Macchiato, except `color0`, which is the near background "black"
+slot in both and is meant to be low.
+
+The one real regression is `color8`, the bright black slot many colourschemes
+use for comments: 3.83:1 before, 2.38:1 now. It does not bite here because the
+Catppuccin neovim plugin sets its own comment colour instead of using ANSI 8,
+which was verified on screen. It would matter for a terminal program that
+insists on ANSI 8 for dim text.
+
+Foreground on background drops from 21:1 (pure white on pure black) to 9.92:1.
+Both are well clear of the threshold; Macchiato is softer by design.
+
+## Not changed
+
+Kitty's font is still `CommitMono Nerd Font Mono`. Terminal font choice is
+personal and was not part of the theming brief.
diff --git a/templates/terminal/kitty-macchiato.conf b/templates/terminal/kitty-macchiato.conf
new file mode 100644
index 0000000..92fa1c0
--- /dev/null
+++ b/templates/terminal/kitty-macchiato.conf
@@ -0,0 +1,84 @@
+# vim:ft=kitty
+
+## name: Catppuccin Kitty Macchiato
+## author: Catppuccin Org
+## license: MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/themes/macchiato.conf
+## blurb: Soothing pastel theme for the high-spirited!
+
+
+
+# The basic colors
+foreground #cad3f5
+background #24273a
+selection_foreground #24273a
+selection_background #f4dbd6
+
+# Cursor colors
+cursor #f4dbd6
+cursor_text_color #24273a
+
+# Scrollbar colors
+scrollbar_handle_color #939ab7
+scrollbar_track_color #494d64
+
+# URL color when hovering with mouse
+url_color #f4dbd6
+
+# Kitty window border colors
+active_border_color #b7bdf8
+inactive_border_color #6e738d
+bell_border_color #eed49f
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground #181926
+active_tab_background #c6a0f6
+inactive_tab_foreground #cad3f5
+inactive_tab_background #1e2030
+tab_bar_background #181926
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #24273a
+mark1_background #b7bdf8
+mark2_foreground #24273a
+mark2_background #c6a0f6
+mark3_foreground #24273a
+mark3_background #7dc4e4
+
+# The 16 terminal colors
+
+# black
+color0 #494d64
+color8 #5b6078
+
+# red
+color1 #ed8796
+color9 #ed8796
+
+# green
+color2 #a6da95
+color10 #a6da95
+
+# yellow
+color3 #eed49f
+color11 #eed49f
+
+# blue
+color4 #8aadf4
+color12 #8aadf4
+
+# magenta
+color5 #f5bde6
+color13 #f5bde6
+
+# cyan
+color6 #8bd5ca
+color14 #8bd5ca
+
+# white
+color7 #b8c0e0
+color15 #a5adcb