From 4e404da2b7d1616c6c499d66035211272d804c1e Mon Sep 17 00:00:00 2001 From: Anandakrishnan CV Date: Tue, 22 Sep 2026 08:05:58 +0530 Subject: [PATCH 1/2] Point catppuccin theme at its flavour colorscheme --- test/shell.d/theme-neovim-colorscheme-test.sh | 16 ++++++++++++++++ themes/catppuccin/neovim.lua | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 test/shell.d/theme-neovim-colorscheme-test.sh diff --git a/test/shell.d/theme-neovim-colorscheme-test.sh b/test/shell.d/theme-neovim-colorscheme-test.sh new file mode 100755 index 00000000..7d748616 --- /dev/null +++ b/test/shell.d/theme-neovim-colorscheme-test.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +source "$(dirname "${BASH_SOURCE[0]}")/base-test.sh" + +# The pinned catppuccin/nvim plugin no longer ships a colorscheme named +# catppuccin-nvim (its colors/ holds catppuccin{,-latte,-frappe,-macchiato,-mocha}). +# The base catppuccin theme is the mocha flavour, mirroring how +# catppuccin-latte uses its flavour-qualified name (#12721). +if matches=$(grep -rn 'catppuccin-nvim' "$ROOT/themes/"); then + fail "stock themes reference no removed catppuccin colorscheme" "$matches" +fi +pass "stock themes reference no removed catppuccin colorscheme" + +grep -Fq 'colorscheme = "catppuccin-mocha"' "$ROOT/themes/catppuccin/neovim.lua" || + fail "catppuccin theme uses its flavour colorscheme" +pass "catppuccin theme uses its flavour colorscheme" diff --git a/themes/catppuccin/neovim.lua b/themes/catppuccin/neovim.lua index f0d503f9..930d8644 100644 --- a/themes/catppuccin/neovim.lua +++ b/themes/catppuccin/neovim.lua @@ -7,7 +7,7 @@ return { { "LazyVim/LazyVim", opts = { - colorscheme = "catppuccin-nvim", + colorscheme = "catppuccin-mocha", }, }, } From 8d6a7382693536c4c70d3119debc128635c751e9 Mon Sep 17 00:00:00 2001 From: Anandakrishnan CV Date: Wed, 23 Sep 2026 10:57:42 +0530 Subject: [PATCH 2/2] Describe mocha as compatible with older plugin checkouts --- test/shell.d/theme-neovim-colorscheme-test.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/shell.d/theme-neovim-colorscheme-test.sh b/test/shell.d/theme-neovim-colorscheme-test.sh index 7d748616..a1c4a8a8 100755 --- a/test/shell.d/theme-neovim-colorscheme-test.sh +++ b/test/shell.d/theme-neovim-colorscheme-test.sh @@ -2,14 +2,13 @@ source "$(dirname "${BASH_SOURCE[0]}")/base-test.sh" -# The pinned catppuccin/nvim plugin no longer ships a colorscheme named -# catppuccin-nvim (its colors/ holds catppuccin{,-latte,-frappe,-macchiato,-mocha}). -# The base catppuccin theme is the mocha flavour, mirroring how -# catppuccin-latte uses its flavour-qualified name (#12721). +# The catppuccin-nvim colorscheme name only exists in newer plugin checkouts +# (added upstream in March 2026); catppuccin-mocha loads on old and new ones +# alike, so the stock theme uses the flavour name (#12721). if matches=$(grep -rn 'catppuccin-nvim' "$ROOT/themes/"); then - fail "stock themes reference no removed catppuccin colorscheme" "$matches" + fail "stock themes avoid the newer-only catppuccin colorscheme name" "$matches" fi -pass "stock themes reference no removed catppuccin colorscheme" +pass "stock themes avoid the newer-only catppuccin colorscheme name" grep -Fq 'colorscheme = "catppuccin-mocha"' "$ROOT/themes/catppuccin/neovim.lua" || fail "catppuccin theme uses its flavour colorscheme"