fix: renaming colors -> done with cp3-5

dev-remaster
Pocco81 3 years ago
parent 3287db1dd3
commit b4a8c28131

@ -12,7 +12,7 @@ function M.get(cp)
hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.green} hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.green}
hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.orange} hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.orange}
hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.blue} hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.blue}
hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.magenta} hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.catppuccino5}
end end
return hi return hi

@ -30,8 +30,8 @@ function M.get(cp)
return { return {
LightspeedLabel = {catppuccino2 = cp.catppuccino2_search, fg = cp.fg}, LightspeedLabel = {catppuccino2 = cp.catppuccino2_search, fg = cp.fg},
LightspeedOverlapped = {catppuccino2 = cp.catppuccino2_visual, fg = cp.fg}, LightspeedOverlapped = {catppuccino2 = cp.catppuccino2_visual, fg = cp.fg},
LightspeedLabelDistant = {catppuccino2 = cp.magenta_br, fg = cp.fg}, LightspeedLabelDistant = {catppuccino2 = cp.catppuccino4, fg = cp.fg},
LightspeedLabelDistantOverlapped = {catppuccino2 = cp.magenta_br, fg = cp.fg}, LightspeedLabelDistantOverlapped = {catppuccino2 = cp.catppuccino4, fg = cp.fg},
LightspeedShortcut = {catppuccino2 = cp.catppuccino2, fg = cp.orange, style = "italic"}, LightspeedShortcut = {catppuccino2 = cp.catppuccino2, fg = cp.orange, style = "italic"},
LightspeedShortcutOverlapped = {catppuccino2 = cp.catppuccino2, fg = cp.orange, style = "bold"}, LightspeedShortcutOverlapped = {catppuccino2 = cp.catppuccino2, fg = cp.orange, style = "bold"},
LightspeedMaskedChar = {catppuccino2 = cp.catppuccino2, fg = cp.red, style = "undercurl"}, LightspeedMaskedChar = {catppuccino2 = cp.catppuccino2, fg = cp.red, style = "undercurl"},

@ -3,7 +3,7 @@ local M = {}
function M.get(cp) function M.get(cp)
return { return {
LspTroubleText = { fg = cp.fg_alt }, LspTroubleText = { fg = cp.fg_alt },
LspTroubleCount = { fg = cp.magenta, catppuccino2 = cp.fg_gutter }, LspTroubleCount = { fg = cp.catppuccino5, catppuccino2 = cp.fg_gutter },
LspTroubleNormal = { fg = cp.fg_sidebar, catppuccino2 = cp.catppuccino2_sidebar }, LspTroubleNormal = { fg = cp.fg_sidebar, catppuccino2 = cp.catppuccino2_sidebar },
} }
end end

@ -5,7 +5,7 @@ function M.get(cp)
markdownHeadingDelimiter = { fg = cp.orange, style = "bold" }, markdownHeadingDelimiter = { fg = cp.orange, style = "bold" },
markdownCode = { fg = cp.catppuccino3 }, markdownCode = { fg = cp.catppuccino3 },
markdownCodeBlock = { fg = cp.catppuccino3 }, markdownCodeBlock = { fg = cp.catppuccino3 },
markdownH1 = { fg = cp.magenta, style = "bold" }, markdownH1 = { fg = cp.catppuccino5, style = "bold" },
markdownH2 = { fg = cp.blue, style = "bold" }, markdownH2 = { fg = cp.blue, style = "bold" },
markdownLinkText = { fg = cp.blue, style = "underline" }, markdownLinkText = { fg = cp.blue, style = "underline" },
} }

@ -3,8 +3,8 @@ local util = require("catppuccino.utils.util")
function M.get(cp) function M.get(cp)
return { return {
NeogitBranch = { fg = cp.magenta }, NeogitBranch = { fg = cp.catppuccino5 },
NeogitRemote = { fg = cp.pink }, NeogitRemote = { fg = cp.catppuccino5 },
NeogitHunkHeader = { catppuccino2 = cp.catppuccino2_highlight, fg = cp.fg }, NeogitHunkHeader = { catppuccino2 = cp.catppuccino2_highlight, fg = cp.fg },
NeogitHunkHeaderHighlight = { catppuccino2 = cp.fg_gutter, fg = cp.blue }, NeogitHunkHeaderHighlight = { catppuccino2 = cp.fg_gutter, fg = cp.blue },
NeogitDiffContextHighlight = { catppuccino2 = util.darken(cp.fg_gutter, 0.5), fg = cp.fg_alt }, NeogitDiffContextHighlight = { catppuccino2 = util.darken(cp.fg_gutter, 0.5), fg = cp.fg_alt },

@ -18,14 +18,14 @@ function M.get(cp)
NvimTreeIndentMarker = { fg = cp.comment }, NvimTreeIndentMarker = { fg = cp.comment },
NvimTreeVertSplit = { fg = cp.black, catppuccino2 = cp.black }, NvimTreeVertSplit = { fg = cp.black, catppuccino2 = cp.black },
NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, NvimTreeRootFolder = { fg = root_dir_color, style = "bold" },
NvimTreeSymlink = { fg = cp.magenta }, NvimTreeSymlink = { fg = cp.catppuccino5 },
NvimTreeStatuslineNc = { fg = cp.black, catppuccino2 = cp.black }, NvimTreeStatuslineNc = { fg = cp.black, catppuccino2 = cp.black },
NvimTreeGitDirty = { fg = cp.diff.change }, NvimTreeGitDirty = { fg = cp.diff.change },
NvimTreeGitNew = { fg = cp.diff.add }, NvimTreeGitNew = { fg = cp.diff.add },
NvimTreeGitDeleted = { fg = cp.diff.delete }, NvimTreeGitDeleted = { fg = cp.diff.delete },
NvimTreeSpecialFile = { fg = cp.catppuccino3 }, NvimTreeSpecialFile = { fg = cp.catppuccino3 },
NvimTreeImageFile = { fg = cp.fg_sidebar }, NvimTreeImageFile = { fg = cp.fg_sidebar },
NvimTreeOpenedFile = { fg = cp.magenta }, NvimTreeOpenedFile = { fg = cp.catppuccino5 },
} }
end end

@ -17,22 +17,22 @@ function M.get(cp)
TSNote = { fg = cp.catppuccino2, catppuccino2 = cp.info }, TSNote = { fg = cp.catppuccino2, catppuccino2 = cp.info },
TSWarning = { fg = cp.catppuccino2, catppuccino2 = cp.warning }, TSWarning = { fg = cp.catppuccino2, catppuccino2 = cp.warning },
TSDanger = { fg = cp.catppuccino2, catppuccino2 = cp.error }, TSDanger = { fg = cp.catppuccino2, catppuccino2 = cp.error },
TSConstructor = { fg = cp.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. TSConstructor = { fg = cp.catppuccino5 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
TSConditional = { fg = cp.red, style = cnf.styles.keywords }, -- For keywords related to conditionnals. TSConditional = { fg = cp.red, style = cnf.styles.keywords }, -- For keywords related to conditionnals.
TSConstant = { fg = cp.orange }, -- For constants TSConstant = { fg = cp.orange }, -- For constants
TSConstBuiltin = { fg = cp.orange_br, style = cnf.styles.keywords }, -- For constant that are built in the language: `nil` in Lua. TSConstBuiltin = { fg = cp.orange_br, style = cnf.styles.keywords }, -- For constant that are built in the language: `nil` in Lua.
-- TSConstMacro = { }; -- For constants that are defined by macros: `NULL` in cp. -- TSConstMacro = { }; -- For constants that are defined by macros: `NULL` in cp.
-- TSError = { }; -- For syntax/parser errors. -- TSError = { }; -- For syntax/parser errors.
TSException = { fg = cp.magenta_br, style = cnf.styles.keywords }, -- For exception related keywords. TSException = { fg = cp.catppuccino4, style = cnf.styles.keywords }, -- For exception related keywords.
TSField = { fg = cp.red }, -- For fields. TSField = { fg = cp.red }, -- For fields.
rustTSField = { fg = util.darken(cp.catppuccino0, 0.75) }, -- For fields. rustTSField = { fg = util.darken(cp.catppuccino0, 0.75) }, -- For fields.
-- TSFloat = { }; -- For floats. -- TSFloat = { }; -- For floats.
TSFunction = { fg = cp.blue, style = cnf.styles.functions }, -- For function (calls and definitions). TSFunction = { fg = cp.blue, style = cnf.styles.functions }, -- For function (calls and definitions).
TSFuncBuiltin = { fg = cp.catppuccino3 }, -- For builtin functions: `table.insert` in Lua. TSFuncBuiltin = { fg = cp.catppuccino3 }, -- For builtin functions: `table.insert` in Lua.
TSFuncMacro = { fg = cp.red }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp. TSFuncMacro = { fg = cp.red }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp.
TSInclude = { fg = cp.magenta, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. TSInclude = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
TSKeyword = { fg = cp.magenta, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories. TSKeyword = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories.
TSKeywordFunction = { fg = cp.magenta_br, style = cnf.styles.keywords }, -- For keywords used to define a fuction. TSKeywordFunction = { fg = cp.catppuccino4, style = cnf.styles.keywords }, -- For keywords used to define a fuction.
TSKeywordOperator = { fg = cp.catppuccino3, style = cnf.styles.keywords }, -- For `new` keyword operator TSKeywordOperator = { fg = cp.catppuccino3, style = cnf.styles.keywords }, -- For `new` keyword operator
TSLabel = { fg = cp.blue }, -- For labels: `label:` in C and `:label:` in Lua. TSLabel = { fg = cp.blue }, -- For labels: `label:` in C and `:label:` in Lua.
-- TSMethod = { }; -- For method calls and definitions. -- TSMethod = { }; -- For method calls and definitions.
@ -50,7 +50,7 @@ function M.get(cp)
TSRepeat = { fg = cp.red, style = cnf.styles.keywords }, -- For keywords related to loops. TSRepeat = { fg = cp.red, style = cnf.styles.keywords }, -- For keywords related to loops.
-- TSString = { }; -- For strings. -- TSString = { }; -- For strings.
TSStringRegex = { fg = cp.blue, style = cnf.styles.strings }, -- For regexes. TSStringRegex = { fg = cp.blue, style = cnf.styles.strings }, -- For regexes.
TSStringEscape = { fg = cp.magenta, style = cnf.styles.strings }, -- For escape characters within a string. TSStringEscape = { fg = cp.catppuccino5, 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.catppuccino3, style = cnf.styles.keywords }, -- For builtin types. TSTypeBuiltin = { fg = cp.catppuccino3, style = cnf.styles.keywords }, -- For builtin types.

@ -6,7 +6,7 @@ function M.get(cp)
rainbowcol2 = {catppuccino2 = cp.catppuccino2, fg = cp.green}, rainbowcol2 = {catppuccino2 = cp.catppuccino2, fg = cp.green},
rainbowcol3 = {catppuccino2 = cp.catppuccino2, fg = cp.yellow}, rainbowcol3 = {catppuccino2 = cp.catppuccino2, fg = cp.yellow},
rainbowcol4 = {catppuccino2 = cp.catppuccino2, fg = cp.blue}, rainbowcol4 = {catppuccino2 = cp.catppuccino2, fg = cp.blue},
rainbowcol5 = {catppuccino2 = cp.catppuccino2, fg = cp.magenta}, rainbowcol5 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino5},
rainbowcol6 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino3}, rainbowcol6 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino3},
rainbowcol7 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino0}, rainbowcol7 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino0},
} }

@ -2,7 +2,7 @@ local M = {}
function M.get(cp) function M.get(cp)
return { return {
Sneak = { fg = cp.catppuccino2_highlight, catppuccino2 = cp.magenta }, Sneak = { fg = cp.catppuccino2_highlight, catppuccino2 = cp.catppuccino5 },
SneakScope = { catppuccino2 = cp.catppuccino2_visual }, SneakScope = { catppuccino2 = cp.catppuccino2_visual },
} }
end end

@ -4,7 +4,7 @@ function M.get(cp)
return { return {
WhichKey = { fg = cp.catppuccino3 }, WhichKey = { fg = cp.catppuccino3 },
WhichKeyGroup = { fg = cp.blue }, WhichKeyGroup = { fg = cp.blue },
WhichKeyDesc = { fg = cp.magenta }, WhichKeyDesc = { fg = cp.catppuccino5 },
WhichKeySeperator = { fg = cp.comment }, WhichKeySeperator = { fg = cp.comment },
WhichKeySeparator = { fg = cp.comment }, WhichKeySeparator = { fg = cp.comment },
WhichKeyFloat = { catppuccino2 = cp.catppuccino2_sidebar }, WhichKeyFloat = { catppuccino2 = cp.catppuccino2_sidebar },

@ -91,16 +91,16 @@ local function get_base()
Boolean = { fg = cp.orange_br }, -- a boolean constant: TRUE, false Boolean = { fg = cp.orange_br }, -- a boolean constant: TRUE, false
Identifier = { fg = cp.catppuccino3, style = cnf.styles.variables }, -- (preferred) any variable name Identifier = { fg = cp.catppuccino3, style = cnf.styles.variables }, -- (preferred) any variable name
Function = { fg = cp.blue, style = cnf.styles.functions }, -- function name (also: methods for classes) Function = { fg = cp.blue, style = cnf.styles.functions }, -- function name (also: methods for classes)
Statement = { fg = cp.magenta_br }, -- (preferred) any statement Statement = { fg = cp.catppuccino4 }, -- (preferred) any statement
Conditional = { fg = cp.red }, -- if, then, else, endif, switch, etcp. Conditional = { fg = cp.red }, -- if, then, else, endif, switch, etcp.
Repeat = { fg = cp.red }, -- for, do, while, etcp. Repeat = { fg = cp.red }, -- for, do, while, etcp.
Label = { fg = cp.magenta_br }, -- case, default, etcp. Label = { fg = cp.catppuccino4 }, -- case, default, etcp.
Operator = { fg = cp.fg_alt }, -- "sizeof", "+", "*", etcp. Operator = { fg = cp.fg_alt }, -- "sizeof", "+", "*", etcp.
Keyword = { fg = cp.magenta, style = cnf.styles.keywords }, -- any other keyword Keyword = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- any other keyword
-- Exception = { }, -- try, catch, throw -- Exception = { }, -- try, catch, throw
PreProc = { fg = cp.pink }, -- (preferred) generic Preprocessor PreProc = { fg = cp.catppuccino5 }, -- (preferred) generic Preprocessor
Include = { fg = cp.pink }, -- preprocessor #include Include = { fg = cp.catppuccino5 }, -- 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.
@ -126,7 +126,7 @@ local function get_base()
Todo = { catppuccino2 = cp.yellow, fg = cp.catppuccino2, style = "bold" }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX Todo = { catppuccino2 = cp.yellow, fg = cp.catppuccino2, style = "bold" }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
qfLineNr = { fg = cp.yellow }, qfLineNr = { fg = cp.yellow },
qfFileName = { fg = cp.blue }, qfFileName = { fg = cp.blue },
htmlH1 = { fg = cp.magenta, style = "bold" }, htmlH1 = { fg = cp.catppuccino5, style = "bold" },
htmlH2 = { fg = cp.blue, style = "bold" }, htmlH2 = { fg = cp.blue, style = "bold" },
-- mkdHeading = { fg = cp.orange, style = "bold" }, -- mkdHeading = { fg = cp.orange, style = "bold" },
-- mkdCode = { catppuccino2 = cp.terminal_black, fg = cp.fg }, -- mkdCode = { catppuccino2 = cp.terminal_black, fg = cp.fg },
@ -149,7 +149,7 @@ local function get_base()
diffNewFile = { fg = cp.orange }, diffNewFile = { fg = cp.orange },
diffFile = { fg = cp.blue }, diffFile = { fg = cp.blue },
diffLine = { fg = cp.comment }, diffLine = { fg = cp.comment },
diffIndexLine = { fg = cp.magenta }, diffIndexLine = { fg = cp.catppuccino5 },
DiffAdd = { fg = cp.diff.add, catppuccino2 = cp.catppuccino2 }, -- diff mode: Added line |diff.txt| DiffAdd = { fg = cp.diff.add, catppuccino2 = cp.catppuccino2 }, -- diff mode: Added line |diff.txt|
DiffChange = { fg = cp.diff.change, catppuccino2 = cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| DiffChange = { fg = cp.diff.change, catppuccino2 = cp.catppuccino2 }, -- diff mode: Changed line |diff.txt|
DiffDelete = { fg = cp.diff.delete, catppuccino2 = cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| DiffDelete = { fg = cp.diff.delete, catppuccino2 = cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt|

Loading…
Cancel
Save