renamed catppuccino5 -> katppuccino4

dev-remaster
Pocco81 3 years ago
parent 81dadf31f5
commit c3f638376b

@ -3,7 +3,7 @@ local color_palette = {
katppuccino1 = "#16131F", -- Xiketic katppuccino1 = "#16131F", -- Xiketic
katppuccino2 = "#EA31B5", -- Fashion Fuchsia katppuccino2 = "#EA31B5", -- Fashion Fuchsia
katppuccino3 = "#AE9AD6", -- Blue Shell katppuccino3 = "#AE9AD6", -- Blue Shell
catppuccino5 = "#F0A8E4", -- Orchid Crayola katppuccino4 = "#F0A8E4", -- Orchid Crayola
catppuccino6 = "#E28D8D", -- New York Pink catppuccino6 = "#E28D8D", -- New York Pink
catppuccino7 = "#E7A988", -- Tumbleweed catppuccino7 = "#E7A988", -- Tumbleweed
catppuccino8 = "#ADD692", -- Granny Smith Apple catppuccino8 = "#ADD692", -- Granny Smith Apple

@ -12,7 +12,7 @@ function M.get(cp)
hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.catppuccino8} hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.catppuccino8}
hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.catppuccino7} hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.catppuccino7}
hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.catppuccino10} hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.catppuccino10}
hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.catppuccino5} hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.katppuccino4}
end end
return hi return hi

@ -3,7 +3,7 @@ local M = {}
function M.get(cp) function M.get(cp)
return { return {
LspTroubleText = { fg = cp.katppuccino0 }, LspTroubleText = { fg = cp.katppuccino0 },
LspTroubleCount = { fg = cp.catppuccino5, bg = cp.catppuccino13 }, LspTroubleCount = { fg = cp.katppuccino4, bg = cp.catppuccino13 },
LspTroubleNormal = { fg = cp.catppuccino11, bg = cp.catppuccino14 }, LspTroubleNormal = { fg = cp.catppuccino11, bg = cp.catppuccino14 },
} }
end end

@ -5,7 +5,7 @@ function M.get(cp)
markdownHeadingDelimiter = { fg = cp.catppuccino7, style = "bold" }, markdownHeadingDelimiter = { fg = cp.catppuccino7, style = "bold" },
markdownCode = { fg = cp.katppuccino2 }, markdownCode = { fg = cp.katppuccino2 },
markdownCodeBlock = { fg = cp.katppuccino2 }, markdownCodeBlock = { fg = cp.katppuccino2 },
markdownH1 = { fg = cp.catppuccino5, style = "bold" }, markdownH1 = { fg = cp.katppuccino4, style = "bold" },
markdownH2 = { fg = cp.catppuccino10, style = "bold" }, markdownH2 = { fg = cp.catppuccino10, style = "bold" },
markdownLinkText = { fg = cp.catppuccino10, style = "underline" }, markdownLinkText = { fg = cp.catppuccino10, style = "underline" },
} }

@ -2,8 +2,8 @@ local M = {}
function M.get(cp) function M.get(cp)
return { return {
NeogitBranch = { fg = cp.catppuccino5 }, NeogitBranch = { fg = cp.katppuccino4 },
NeogitRemote = { fg = cp.catppuccino5 }, NeogitRemote = { fg = cp.katppuccino4 },
NeogitHunkHeader = { bg = cp.catppuccino10, fg = cp.catppuccino11 }, NeogitHunkHeader = { bg = cp.catppuccino10, fg = cp.catppuccino11 },
NeogitHunkHeaderHighlight = { bg = cp.catppuccino13, fg = cp.catppuccino10 }, NeogitHunkHeaderHighlight = { bg = cp.catppuccino13, fg = cp.catppuccino10 },
NeogitDiffContextHighlight = { bg = cp.catppuccino16, fg = cp.katppuccino0 }, NeogitDiffContextHighlight = { bg = cp.catppuccino16, fg = cp.katppuccino0 },

@ -3,7 +3,7 @@ local M = {}
function M.get(cp) function M.get(cp)
local config = require("catppuccino.config").options local config = require("catppuccino.config").options
local root_dir_color = cp.catppuccino5 local root_dir_color = cp.katppuccino4
if config.integrations.nvimtree.show_root then if config.integrations.nvimtree.show_root then
root_dir_color = cp.catppuccino10 root_dir_color = cp.catppuccino10
@ -18,14 +18,14 @@ function M.get(cp)
NvimTreeIndentMarker = { fg = cp.catppuccino12 }, NvimTreeIndentMarker = { fg = cp.catppuccino12 },
NvimTreeVertSplit = { fg = cp.black, bg = cp.black }, NvimTreeVertSplit = { fg = cp.black, bg = cp.black },
NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, NvimTreeRootFolder = { fg = root_dir_color, style = "bold" },
NvimTreeSymlink = { fg = cp.catppuccino5 }, NvimTreeSymlink = { fg = cp.katppuccino4 },
NvimTreeStatuslineNc = { fg = cp.black, bg = cp.black }, NvimTreeStatuslineNc = { fg = cp.black, bg = cp.black },
NvimTreeGitDirty = { fg = cp.catppuccino9 }, NvimTreeGitDirty = { fg = cp.catppuccino9 },
NvimTreeGitNew = { fg = cp.catppuccino10 }, NvimTreeGitNew = { fg = cp.catppuccino10 },
NvimTreeGitDeleted = { fg = cp.catppuccino6 }, NvimTreeGitDeleted = { fg = cp.catppuccino6 },
NvimTreeSpecialFile = { fg = cp.katppuccino2 }, NvimTreeSpecialFile = { fg = cp.katppuccino2 },
NvimTreeImageFile = { fg = cp.catppuccino11 }, NvimTreeImageFile = { fg = cp.catppuccino11 },
NvimTreeOpenedFile = { fg = cp.catppuccino5 }, NvimTreeOpenedFile = { fg = cp.katppuccino4 },
} }
end end

@ -16,7 +16,7 @@ function M.get(cp)
TSNote = { fg = cp.katppuccino1, bg = cp.catppuccino10 }, TSNote = { fg = cp.katppuccino1, bg = cp.catppuccino10 },
TSWarning = { fg = cp.katppuccino1, bg = cp.catppuccino9 }, TSWarning = { fg = cp.katppuccino1, bg = cp.catppuccino9 },
TSDanger = { fg = cp.katppuccino1, bg = cp.catppuccino6 }, TSDanger = { fg = cp.katppuccino1, bg = cp.catppuccino6 },
TSConstructor = { fg = cp.catppuccino5 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. TSConstructor = { fg = cp.katppuccino4 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
TSConditional = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to conditionnals. TSConditional = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to conditionnals.
TSConstant = { fg = cp.catppuccino7 }, -- For constants TSConstant = { fg = cp.catppuccino7 }, -- For constants
TSConstBuiltin = { fg = cp.catppuccino7, style = cnf.styles.keywords }, -- For constant that are built in the language: `nil` in Lua. TSConstBuiltin = { fg = cp.catppuccino7, style = cnf.styles.keywords }, -- For constant that are built in the language: `nil` in Lua.
@ -29,8 +29,8 @@ function M.get(cp)
TSFunction = { fg = cp.catppuccino10, style = cnf.styles.functions }, -- For function (calls and definitions). TSFunction = { fg = cp.catppuccino10, style = cnf.styles.functions }, -- For function (calls and definitions).
TSFuncBuiltin = { fg = cp.katppuccino2 }, -- For builtin functions: `table.insert` in Lua. TSFuncBuiltin = { fg = cp.katppuccino2 }, -- For builtin functions: `table.insert` in Lua.
TSFuncMacro = { fg = cp.catppuccino6 }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp. TSFuncMacro = { fg = cp.catppuccino6 }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp.
TSInclude = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. TSInclude = { fg = cp.katppuccino4, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
TSKeyword = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories. TSKeyword = { fg = cp.katppuccino4, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories.
TSKeywordFunction = { fg = cp.katppuccino3, style = cnf.styles.keywords }, -- For keywords used to define a fuction. TSKeywordFunction = { fg = cp.katppuccino3, style = cnf.styles.keywords }, -- For keywords used to define a fuction.
TSKeywordOperator = { fg = cp.katppuccino2, style = cnf.styles.keywords }, -- For `new` keyword operator TSKeywordOperator = { fg = cp.katppuccino2, style = cnf.styles.keywords }, -- For `new` keyword operator
TSLabel = { fg = cp.catppuccino10 }, -- For labels: `label:` in C and `:label:` in Lua. TSLabel = { fg = cp.catppuccino10 }, -- For labels: `label:` in C and `:label:` in Lua.
@ -49,7 +49,7 @@ function M.get(cp)
TSRepeat = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to loops. TSRepeat = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to loops.
-- TSString = { }; -- For strings. -- TSString = { }; -- For strings.
TSStringRegex = { fg = cp.catppuccino10, style = cnf.styles.strings }, -- For regexes. TSStringRegex = { fg = cp.catppuccino10, style = cnf.styles.strings }, -- For regexes.
TSStringEscape = { fg = cp.catppuccino5, style = cnf.styles.strings }, -- For escape characters within a string. TSStringEscape = { fg = cp.katppuccino4, style = cnf.styles.strings }, -- For escape characters within a string.
-- TSSymbol = { }; -- For identifiers referring to symbols or atoms. -- TSSymbol = { }; -- For identifiers referring to symbols or atoms.
-- TSType = { }; -- For types. -- TSType = { }; -- For types.
TSTypeBuiltin = { fg = cp.katppuccino2, style = cnf.styles.keywords }, -- For builtin types. TSTypeBuiltin = { fg = cp.katppuccino2, style = cnf.styles.keywords }, -- For builtin types.

@ -6,7 +6,7 @@ function M.get(cp)
rainbowcol2 = {bg = cp.katppuccino1, fg = cp.catppuccino8}, rainbowcol2 = {bg = cp.katppuccino1, fg = cp.catppuccino8},
rainbowcol3 = {bg = cp.katppuccino1, fg = cp.catppuccino9}, rainbowcol3 = {bg = cp.katppuccino1, fg = cp.catppuccino9},
rainbowcol4 = {bg = cp.katppuccino1, fg = cp.catppuccino10}, rainbowcol4 = {bg = cp.katppuccino1, fg = cp.catppuccino10},
rainbowcol5 = {bg = cp.katppuccino1, fg = cp.catppuccino5}, rainbowcol5 = {bg = cp.katppuccino1, fg = cp.katppuccino4},
rainbowcol6 = {bg = cp.katppuccino1, fg = cp.katppuccino2}, rainbowcol6 = {bg = cp.katppuccino1, fg = cp.katppuccino2},
rainbowcol7 = {bg = cp.katppuccino1, fg = cp.katppuccino0}, rainbowcol7 = {bg = cp.katppuccino1, fg = cp.katppuccino0},
} }

@ -2,7 +2,7 @@ local M = {}
function M.get(cp) function M.get(cp)
return { return {
Sneak = { fg = cp.catppuccino16, bg = cp.catppuccino5 }, Sneak = { fg = cp.catppuccino16, bg = cp.katppuccino4 },
SneakScope = { bg = cp.catppuccino11 }, SneakScope = { bg = cp.catppuccino11 },
} }
end end

@ -4,7 +4,7 @@ function M.get(cp)
return { return {
WhichKey = { fg = cp.katppuccino2 }, WhichKey = { fg = cp.katppuccino2 },
WhichKeyGroup = { fg = cp.catppuccino10 }, WhichKeyGroup = { fg = cp.catppuccino10 },
WhichKeyDesc = { fg = cp.catppuccino5 }, WhichKeyDesc = { fg = cp.katppuccino4 },
WhichKeySeperator = { fg = cp.catppuccino12 }, WhichKeySeperator = { fg = cp.catppuccino12 },
WhichKeySeparator = { fg = cp.catppuccino12 }, WhichKeySeparator = { fg = cp.catppuccino12 },
WhichKeyFloat = { bg = cp.catppuccino14 }, WhichKeyFloat = { bg = cp.catppuccino14 },

@ -36,7 +36,7 @@ local function get_base()
FoldColumn = { bg = cp.katppuccino1, fg = cp.catppuccino12 }, -- 'foldcolumn' FoldColumn = { bg = cp.katppuccino1, fg = cp.catppuccino12 }, -- 'foldcolumn'
SignColumn = { bg = cnf.transparency and cp.none or cp.katppuccino1, fg = cp.catppuccino13 }, -- column where |signs| are displayed SignColumn = { bg = cnf.transparency and cp.none or cp.katppuccino1, fg = cp.catppuccino13 }, -- column where |signs| are displayed
SignColumnSB = { bg = cp.catppuccino14, fg = cp.catppuccino13 }, -- column where |signs| are displayed SignColumnSB = { bg = cp.catppuccino14, fg = cp.catppuccino13 }, -- column where |signs| are displayed
Substitute = { bg = cp.catppuccino13, fg = cp.catppuccino5 }, -- |:substitute| replacement text highlighting Substitute = { bg = cp.catppuccino13, fg = cp.katppuccino4 }, -- |:substitute| replacement text highlighting
LineNr = { fg = cp.catppuccino13 }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. LineNr = { fg = cp.catppuccino13 }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp.
CursorLineNr = { fg = cp.katppuccino0 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. CursorLineNr = { fg = cp.katppuccino0 }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline.
MatchParen = { fg = cp.catppuccino7, style = "bold" }, -- The character under the cursor or just before it, if it is a paicatppuccino6 bracket, and its match. |pi_paren.txt| MatchParen = { fg = cp.catppuccino7, style = "bold" }, -- The character under the cursor or just before it, if it is a paicatppuccino6 bracket, and its match. |pi_paren.txt|
@ -51,13 +51,13 @@ local function get_base()
NormalFloat = { fg = cp.catppuccino11, bg = cp.catppuccino14 }, -- Normal text in floating windows. NormalFloat = { fg = cp.catppuccino11, bg = cp.catppuccino14 }, -- Normal text in floating windows.
FloatBorder = { fg = cp.catppuccino10 }, FloatBorder = { fg = cp.catppuccino10 },
Pmenu = { bg = cp.catppuccino15, fg = cp.catppuccino11 }, -- Popup menu: normal item. Pmenu = { bg = cp.catppuccino15, fg = cp.catppuccino11 }, -- Popup menu: normal item.
PmenuSel = { fg = cp.catppuccino5, bg = cp.catppuccino13 }, -- Popup menu: selected item. PmenuSel = { fg = cp.katppuccino4, bg = cp.catppuccino13 }, -- Popup menu: selected item.
PmenuSbar = { bg = cp.catppuccino13 }, -- Popup menu: scrollbar. PmenuSbar = { bg = cp.catppuccino13 }, -- Popup menu: scrollbar.
PmenuThumb = { bg = cp.catppuccino12 }, -- Popup menu: Thumb of the scrollbar. PmenuThumb = { bg = cp.catppuccino12 }, -- Popup menu: Thumb of the scrollbar.
Question = { fg = cp.catppuccino10 }, -- |hit-enter| prompt and yes/no questions Question = { fg = cp.catppuccino10 }, -- |hit-enter| prompt and yes/no questions
QuickFixLine = { bg = cp.catppuccino13, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. QuickFixLine = { bg = cp.catppuccino13, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there.
Search = { bg = cp.catppuccino13, fg = cp.catppuccino5 }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand oucp. Search = { bg = cp.catppuccino13, fg = cp.katppuccino4 }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand oucp.
IncSearch = { bg = cp.catppuccino5, fg = cp.catppuccino13 }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" IncSearch = { bg = cp.katppuccino4, fg = cp.catppuccino13 }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c"
SpecialKey = { fg = cp.catppuccino11 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| SpecialKey = { fg = cp.catppuccino11 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace|
SpellBad = { sp = cp.catppuccino6, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. SpellBad = { sp = cp.catppuccino6, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise.
SpellCap = { sp = cp.catppuccino9, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellCap = { sp = cp.catppuccino9, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
@ -95,11 +95,11 @@ local function get_base()
Repeat = { fg = cp.catppuccino6 }, -- for, do, while, etcp. Repeat = { fg = cp.catppuccino6 }, -- for, do, while, etcp.
Label = { fg = cp.katppuccino3 }, -- case, default, etcp. Label = { fg = cp.katppuccino3 }, -- case, default, etcp.
Operator = { fg = cp.katppuccino2 }, -- "sizeof", "+", "*", etcp. Operator = { fg = cp.katppuccino2 }, -- "sizeof", "+", "*", etcp.
Keyword = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- any other keyword Keyword = { fg = cp.katppuccino4, style = cnf.styles.keywords }, -- any other keyword
-- Exception = { }, -- try, catch, throw -- Exception = { }, -- try, catch, throw
PreProc = { fg = cp.catppuccino5 }, -- (prefercatppuccino6) generic Preprocessor PreProc = { fg = cp.katppuccino4 }, -- (prefercatppuccino6) generic Preprocessor
Include = { fg = cp.catppuccino5 }, -- preprocessor #include Include = { fg = cp.katppuccino4 }, -- preprocessor #include
-- Define = { }, -- preprocessor #define -- Define = { }, -- preprocessor #define
-- Macro = { }, -- same as Define -- Macro = { }, -- same as Define
-- PreCondit = { }, -- preprocessor #if, #else, #endif, etcp. -- PreCondit = { }, -- preprocessor #if, #else, #endif, etcp.
@ -125,7 +125,7 @@ local function get_base()
Todo = { bg = cp.catppuccino9, fg = cp.katppuccino1, style = "bold" }, -- (prefercatppuccino6) anything that needs extra attention; mostly the keywords TODO FIXME and XXX Todo = { bg = cp.catppuccino9, fg = cp.katppuccino1, style = "bold" }, -- (prefercatppuccino6) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
qfLineNr = { fg = cp.catppuccino9 }, qfLineNr = { fg = cp.catppuccino9 },
qfFileName = { fg = cp.catppuccino10 }, qfFileName = { fg = cp.catppuccino10 },
htmlH1 = { fg = cp.catppuccino5, style = "bold" }, htmlH1 = { fg = cp.katppuccino4, style = "bold" },
htmlH2 = { fg = cp.catppuccino10, style = "bold" }, htmlH2 = { fg = cp.catppuccino10, style = "bold" },
-- mkdHeading = { fg = cp.catppuccino7, style = "bold" }, -- mkdHeading = { fg = cp.catppuccino7, style = "bold" },
-- mkdCode = { bg = cp.terminal_black, fg = cp.catppuccino11 }, -- mkdCode = { bg = cp.terminal_black, fg = cp.catppuccino11 },
@ -148,7 +148,7 @@ local function get_base()
diffNewFile = { fg = cp.catppuccino7 }, diffNewFile = { fg = cp.catppuccino7 },
diffFile = { fg = cp.catppuccino10 }, diffFile = { fg = cp.catppuccino10 },
diffLine = { fg = cp.catppuccino12 }, diffLine = { fg = cp.catppuccino12 },
diffIndexLine = { fg = cp.catppuccino5 }, diffIndexLine = { fg = cp.katppuccino4 },
DiffAdd = { fg = cp.catppuccino10, bg = cp.katppuccino1 }, -- diff mode: Added line |diff.txt| DiffAdd = { fg = cp.catppuccino10, bg = cp.katppuccino1 }, -- diff mode: Added line |diff.txt|
DiffChange = { fg = cp.catppuccino9, bg = cp.katppuccino1 }, -- diff mode: Changed line |diff.txt| DiffChange = { fg = cp.catppuccino9, bg = cp.katppuccino1 }, -- diff mode: Changed line |diff.txt|
DiffDelete = { fg = cp.catppuccino6, bg = cp.katppuccino1 }, -- diff mode: Deleted line |diff.txt| DiffDelete = { fg = cp.catppuccino6, bg = cp.katppuccino1 }, -- diff mode: Deleted line |diff.txt|
@ -212,7 +212,7 @@ local function get_terminal()
g.terminal_color_2 = cp.katppuccino2 g.terminal_color_2 = cp.katppuccino2
g.terminal_color_3 = cp.katppuccino2 g.terminal_color_3 = cp.katppuccino2
g.terminal_color_4 = cp.katppuccino3 g.terminal_color_4 = cp.katppuccino3
g.terminal_color_5 = cp.catppuccino5 g.terminal_color_5 = cp.katppuccino4
g.terminal_color_6 = cp.catppuccino6 g.terminal_color_6 = cp.catppuccino6
g.terminal_color_7 = cp.catppuccino7 g.terminal_color_7 = cp.catppuccino7
g.terminal_color_8 = cp.catppuccino8 g.terminal_color_8 = cp.catppuccino8

Loading…
Cancel
Save