From 815672eb3d7a9a52df0f509de76e9030f17cb357 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Sun, 20 Mar 2022 18:51:06 -0500 Subject: [PATCH 01/28] feat: added storm palette --- lua/catppuccin/api/colors.lua | 2 +- .../core/integrations/treesitter.lua | 32 +++++++++++-------- lua/catppuccin/core/mapper.lua | 10 +++--- lua/catppuccin/core/palettes/dawn.lua | 0 .../{color_palette.lua => palettes/dusk.lua} | 0 lua/catppuccin/core/palettes/init.lua | 12 +++++++ lua/catppuccin/core/palettes/storm.lua | 26 +++++++++++++++ 7 files changed, 62 insertions(+), 20 deletions(-) create mode 100644 lua/catppuccin/core/palettes/dawn.lua rename lua/catppuccin/core/{color_palette.lua => palettes/dusk.lua} (100%) create mode 100644 lua/catppuccin/core/palettes/init.lua create mode 100644 lua/catppuccin/core/palettes/storm.lua diff --git a/lua/catppuccin/api/colors.lua b/lua/catppuccin/api/colors.lua index 4dc14bb..7231428 100644 --- a/lua/catppuccin/api/colors.lua +++ b/lua/catppuccin/api/colors.lua @@ -1,7 +1,7 @@ local M = {} function M.get_colors() - return require("catppuccin.core.color_palette") + return require("catppuccin.core.palettes.init").get_palette() end return M diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index 7ff2aaa..b0097d5 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -1,10 +1,10 @@ local M = {} function M.get(cp) - local delimeters = cp.gray1 + local delimeters = cp.gray2 local operators = cp.sky local cl = cp.mauve -- conditionals, loops - local keywords = cp.red + local keywords = cp.mauve local math_logic = cp.peach return { @@ -28,18 +28,18 @@ function M.get(cp) TSConstant = { fg = cp.peach }, -- For constants TSConditional = { fg = cl, style = "bold" }, -- For keywords related to conditionnals. TSRepeat = { fg = cl, style = "bold" }, -- For keywords related to loops. - TSException = { fg = cp.peach, style = cnf.styles.keywords }, -- For exception related keywords. + TSException = { fg = cp.mauve, style = cnf.styles.keywords }, -- For exception related keywords. -- builtin - TSConstBuiltin = { fg = cp.lavender, style = cnf.styles.keywords }, -- For constant that are built in the language: nil in Lua. - TSFuncBuiltin = { fg = cp.peach, style = "italic" }, -- For builtin functions: table.insert in Lua. + TSConstBuiltin = { fg = cp.teal, style = cnf.styles.keywords }, -- For constant that are built in the language: nil in Lua. + TSFuncBuiltin = { fg = cp.teal, style = "italic" }, -- For builtin functions: table.insert in Lua. TSTypeBuiltin = { fg = cp.yellow, style = "italic" }, -- For builtin types. - TSVariableBuiltin = { fg = cp.teal, style = "italic" }, -- Variable names that are defined by the languages, like this or self. + TSVariableBuiltin = { fg = cp.red, style = "italic" }, -- Variable names that are defined by the languages, like this or self. TSFunction = { fg = cp.blue, style = cnf.styles.functions }, -- For function (calls and definitions). TSFuncMacro = { fg = cp.red }, -- For macro defined functions (calls and definitions): each macro_rules in Ruscp. - TSParameter = { fg = cp.rosewater, style = "italic" }, -- For parameters of a function. - TSKeywordFunction = { fg = cp.maroon, style = cnf.styles.keywords }, -- For keywords used to define a fuction. + TSParameter = { fg = cp.yellow, style = "italic" }, -- For parameters of a function. + TSKeywordFunction = { fg = cp.red, style = cnf.styles.keywords }, -- For keywords used to define a fuction. TSKeyword = { fg = keywords, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories. TSKeywordReturn = { fg = cp.pink }, -- TSAnnotation = { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. @@ -58,7 +58,7 @@ function M.get(cp) -- TSNone = { }; -- TODO: docs -- TSParameterReference= { }; -- For references to parameters of a function. tomlTSProperty = { fg = cp.blue }, -- Differentiates between string and properties - TSPunctDelimiter = { fg = cp.teal }, -- For delimiters ie: . + TSPunctDelimiter = { fg = cp.sky }, -- For delimiters ie: . TSPunctBracket = { fg = delimeters }, -- For brackets and parenthesis. TSString = { fg = cp.green }, -- For strings. TSStringRegex = { fg = cp.peach, style = cnf.styles.strings }, -- For regexes. @@ -86,15 +86,16 @@ function M.get(cp) TSStringEscape = { fg = cp.pink, style = cnf.styles.strings }, -- For escape characters within a string. -- bash - bashTSFuncBuiltin = { fg = cp.red, style = "italic" }, - bashTSParameter = { fg = cp.yellow, style = "italic" }, + -- bashTSFuncBuiltin = { fg = cp.red, style = "italic" }, + -- bashTSParameter = { fg = cp.yellow, style = "italic" }, -- lua - luaTSField = { fg = cp.lavender }, - luaTSConstructor = { fg = cp.flamingo }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. + luaTSField = { fg = cp.rosewater }, + -- luaTSConstructor = { fg = cp.flamingo }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. + luaTSFuncBuiltin = { fg = cp.teal, style = "italic" }, -- For builtin functions: table.insert in Lua. -- java - javaTSConstant = { fg = cp.teal }, + -- javaTSConstant = { fg = cp.teal }, -- typescript typescriptTSProperty = { fg = cp.lavender, style = "italic" }, -- Same as TSField. @@ -105,6 +106,9 @@ function M.get(cp) -- cpp cppTSProperty = { fg = cp.white }, + + -- yaml + yamlTSField = { fg = cp.blue }, -- For fields. } end diff --git a/lua/catppuccin/core/mapper.lua b/lua/catppuccin/core/mapper.lua index 90131e4..a026c81 100644 --- a/lua/catppuccin/core/mapper.lua +++ b/lua/catppuccin/core/mapper.lua @@ -1,5 +1,5 @@ local colors_util = require("catppuccin.utils.colors") -local color_palette = require("catppuccin.core.color_palette") +local cp local M = {} @@ -9,7 +9,7 @@ local function get_properties() background = "dark", } - if colors_util.assert_brightness(color_palette.black2) then + if colors_util.assert_brightness(cp.black2) then props["background"] = "light" end @@ -17,7 +17,6 @@ local function get_properties() end local function get_base() - local cp = color_palette cp.none = "NONE" return { @@ -191,7 +190,7 @@ local function get_integrations() final_integrations = vim.tbl_deep_extend( "force", final_integrations, - require("catppuccin.core.integrations." .. integration).get(color_palette) + require("catppuccin.core.integrations." .. integration).get(cp) ) end end @@ -205,11 +204,12 @@ local function get_integrations() end local function get_terminal() - return color_palette + return cp end function M.apply() _G.cnf = require("catppuccin.config").options + cp = require("catppuccin.core.palettes.init").get_palette() local theme = {} theme.properties = get_properties() -- nvim settings diff --git a/lua/catppuccin/core/palettes/dawn.lua b/lua/catppuccin/core/palettes/dawn.lua new file mode 100644 index 0000000..e69de29 diff --git a/lua/catppuccin/core/color_palette.lua b/lua/catppuccin/core/palettes/dusk.lua similarity index 100% rename from lua/catppuccin/core/color_palette.lua rename to lua/catppuccin/core/palettes/dusk.lua diff --git a/lua/catppuccin/core/palettes/init.lua b/lua/catppuccin/core/palettes/init.lua new file mode 100644 index 0000000..71bd5b2 --- /dev/null +++ b/lua/catppuccin/core/palettes/init.lua @@ -0,0 +1,12 @@ +local M = {} + +function M.get_palette() + local flvr = vim.g.catppuccin_flavour + + if flvr == "dusk" or flvr == "dawn" or flvr == "storm" then + return require("catppuccin.core.palettes." .. flvr) + end + return require("catppuccin.core.palettes.dusk") +end + +return M diff --git a/lua/catppuccin/core/palettes/storm.lua b/lua/catppuccin/core/palettes/storm.lua new file mode 100644 index 0000000..554d43d --- /dev/null +++ b/lua/catppuccin/core/palettes/storm.lua @@ -0,0 +1,26 @@ +local color_palette = { + rosewater = "#F5DFDA", -- Rosewater + flamingo = "#F2CBCB", -- Flamingo -- done + mauve = "#C6A4F8", -- Mauve -- done + pink = "#F5BFE7", -- Pink -- done + red = "#F586A2", -- Red -- done + maroon = "#EB9DA4", -- Maroon -- done + peach = "#FCB081", -- Peach -- done + yellow = "#F8DEA9", -- Yellow -- done + green = "#A9E4A3", -- Green -- done + blue = "#8CB3FA", -- Blue -- done + sky = "#89DCFD", -- Sky -- done + teal = "#88DFD2", -- Teal -- done + lavender = "#C7CBFD", -- Lavender -- done + white = "#D2DAF1", -- White -- done + gray2 = "#B9C0DB", -- Gray2 + gray1 = "#6F7599", -- Gray1 + gray0 = "#5E6487", -- Gray0 + black4 = "#3E435E", -- Black4 + black3 = "#2B3045", -- Black3 + black2 = "#24273A", -- Black2 -- done + black1 = "#1F2233", -- Black1 + black0 = "#1A1B26", -- Black0 +} + +return color_palette From 287a224c0f1fd0f614c85712a93bbe7df93eb3fe Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Mon, 21 Mar 2022 09:51:31 -0500 Subject: [PATCH 02/28] fix #95 --- .../core/integrations/treesitter.lua | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index b0097d5..37f6013 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -26,22 +26,22 @@ function M.get(cp) TSConstructor = { fg = cp.lavender }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. TSConstant = { fg = cp.peach }, -- For constants - TSConditional = { fg = cl, style = "bold" }, -- For keywords related to conditionnals. - TSRepeat = { fg = cl, style = "bold" }, -- For keywords related to loops. - TSException = { fg = cp.mauve, style = cnf.styles.keywords }, -- For exception related keywords. + TSConditional = { fg = cl, style = cnf.styles.keywords or "NONE" }, -- For keywords related to conditionnals. + TSRepeat = { fg = cl, style = cnf.styles.keywords or "NONE" }, -- For keywords related to loops. + TSException = { fg = cp.mauve, style = cnf.styles.keywords or "NONE" }, -- For exception related keywords. -- builtin - TSConstBuiltin = { fg = cp.teal, style = cnf.styles.keywords }, -- For constant that are built in the language: nil in Lua. + TSConstBuiltin = { fg = cp.teal, style = cnf.styles.keywords or "NONE" }, -- For constant that are built in the language: nil in Lua. TSFuncBuiltin = { fg = cp.teal, style = "italic" }, -- For builtin functions: table.insert in Lua. TSTypeBuiltin = { fg = cp.yellow, style = "italic" }, -- For builtin types. TSVariableBuiltin = { fg = cp.red, style = "italic" }, -- Variable names that are defined by the languages, like this or self. - TSFunction = { fg = cp.blue, style = cnf.styles.functions }, -- For function (calls and definitions). - TSFuncMacro = { fg = cp.red }, -- For macro defined functions (calls and definitions): each macro_rules in Ruscp. + TSFunction = { fg = cp.blue, style = cnf.styles.functions or "NONE" }, -- For function (calls and definitions). + TSFuncMacro = { fg = cp.red, style = cnf.styles.functions or "NONE" }, -- For macro defined functions (calls and definitions): each macro_rules in Ruscp. TSParameter = { fg = cp.yellow, style = "italic" }, -- For parameters of a function. - TSKeywordFunction = { fg = cp.red, style = cnf.styles.keywords }, -- For keywords used to define a fuction. - TSKeyword = { fg = keywords, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories. - TSKeywordReturn = { fg = cp.pink }, + TSKeywordFunction = { fg = cp.red, style = cnf.styles.keywords or "NONE" }, -- For keywords used to define a fuction. + TSKeyword = { fg = keywords, style = cnf.styles.keywords or "NONE" }, -- For keywords that don't fall in previous categories. + TSKeywordReturn = { fg = cp.pink, style = cnf.styles.keywords or "NONE" }, -- TSAnnotation = { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. -- TSAttribute = { }; -- (unstable) TODO: docs -- TSCharacter = { }; -- For characters. @@ -60,11 +60,11 @@ function M.get(cp) tomlTSProperty = { fg = cp.blue }, -- Differentiates between string and properties TSPunctDelimiter = { fg = cp.sky }, -- For delimiters ie: . TSPunctBracket = { fg = delimeters }, -- For brackets and parenthesis. - TSString = { fg = cp.green }, -- For strings. - TSStringRegex = { fg = cp.peach, style = cnf.styles.strings }, -- For regexes. + TSString = { fg = cp.green, style = cnf.styles.strings or "NONE" }, -- For strings. + TSStringRegex = { fg = cp.peach, style = cnf.styles.strings or "NONE" }, -- For regexes. -- TSSymbol = { }; -- For identifiers referring to symbols or atoms. TSType = { fg = cp.yellow }, -- For types. - TSVariable = { fg = cp.white, style = cnf.styles.variables }, -- Any variable name that does not have another highlighcp. + TSVariable = { fg = cp.white, style = cnf.styles.variables or "NONE" }, -- Any variable name that does not have another highlighcp. TSTagAttribute = { fg = cp.mauve, style = "italic" }, -- Tags like html tag names. TSTag = { fg = cp.peach }, -- Tags like html tag names. TSTagDelimiter = { fg = cp.maroon }, -- Tag delimiter like < > / From 88ba42acdad370f5df4b0be383197c98905f1e3d Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Mon, 21 Mar 2022 09:57:11 -0500 Subject: [PATCH 03/28] added fields for numbers and booleans as per #95 --- README.md | 2 ++ lua/catppuccin/config.lua | 2 ++ lua/catppuccin/core/integrations/treesitter.lua | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 93ce6cc..9c006f5 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,8 @@ styles = { keywords = "italic", strings = "NONE", variables = "italic", + numbers = "bold", + booleans = "bold" }, integrations = { treesitter = true, diff --git a/lua/catppuccin/config.lua b/lua/catppuccin/config.lua index 306a043..f1c7de4 100644 --- a/lua/catppuccin/config.lua +++ b/lua/catppuccin/config.lua @@ -10,6 +10,8 @@ config.options = { keywords = "italic", strings = "NONE", variables = "italic", + numbers = "bold", + booleans = "bold", }, integrations = { treesitter = true, diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index 37f6013..fcb7194 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -15,14 +15,14 @@ function M.get(cp) -- you explicitly want to support Treesitter's improved syntax awareness. TSField = { fg = cp.rosewater }, -- For fields. TSProperty = { fg = cp.yellow, style = "italic" }, -- Same as TSField. - TSInclude = { fg = cp.teal, style = "italic" }, -- For includes: #include in C, use or extern crate in Rust, or require in Lua. + TSInclude = { fg = cp.teal, style = cnf.styles.keywords or "NONE" }, -- For includes: #include in C, use or extern crate in Rust, or require in Lua. TSOperator = { fg = operators, style = "bold" }, -- For any operator: +, but also -> and * in cp. TSKeywordOperator = { fg = operators, style = "bold" }, -- For new keyword operator TSPunctSpecial = { fg = cp.maroon, style = "bold" }, -- For special punctutation that does not fall in the catagories before. - TSFloat = { fg = math_logic, style = "bold,italic" }, -- For floats. - TSNumber = { fg = math_logic, style = "bold,italic" }, -- For all numbers - TSBoolean = { fg = math_logic, style = "bold,italic" }, -- For booleans. + TSFloat = { fg = math_logic, style = cnf.styles.numbers or "NONE" }, -- For floats. + TSNumber = { fg = math_logic, style = cnf.styles.numbers or "NONE" }, -- For all numbers + TSBoolean = { fg = math_logic, style = cnf.styles.booleans or "NONE" }, -- For booleans. TSConstructor = { fg = cp.lavender }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. TSConstant = { fg = cp.peach }, -- For constants From ce24388b1acb342fe3bf6a37ac974d0ed36f518d Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Mon, 21 Mar 2022 10:02:37 -0500 Subject: [PATCH 04/28] specified how to switch between flavours --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9c006f5..ee00202 100644 --- a/README.md +++ b/README.md @@ -183,11 +183,13 @@ After setting things up, you can load catppuccin like so: ```vim " Vim Script +let g:catppuccin_flavour = "dusk" colorscheme catppuccin ``` ```lua -- Lua +vim.g.catppuccin_flavour = "storm" vim.cmd[[colorscheme catppuccin]] ``` From 4c3c3832f216d8e2472c7ac09f13b933a72a9bd7 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Mon, 21 Mar 2022 22:02:07 -0500 Subject: [PATCH 05/28] feat: added dawn palette --- lua/catppuccin/core/palettes/dawn.lua | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lua/catppuccin/core/palettes/dawn.lua b/lua/catppuccin/core/palettes/dawn.lua index e69de29..2753926 100644 --- a/lua/catppuccin/core/palettes/dawn.lua +++ b/lua/catppuccin/core/palettes/dawn.lua @@ -0,0 +1,28 @@ +local color_palette = { + rosewater = "#E09D90", -- Rosewater + flamingo = "#E79C9C", -- Flamingo + mauve = "#AC61DF", -- Mauve -- done + pink = "#EF9AD9", -- Pink -- done + red = "#E84746", -- Red -- done - + maroon = "#c96765", -- Maroon -- done + peach = "#E99726", -- Peach -- done - + yellow = "#EABE24", -- Yellow -- done - + green = "#89B517", -- Green -- done - + blue = "#4877D7", -- Blue -- done - + sky = "#3FC4D9", -- Sky -- done + teal = "#149C9B", -- Teal -- done - + lavender = "#939AFB", -- Lavender -- done + white = "#343b58", -- White -- works? + gray2 = "#424968", -- Gray2 + gray1 = "#505677", -- Gray1 + gray0 = "#606689", -- Gray0 -- done - + black4 = "#cfd8dc", -- Black4 + black3 = "#eff3f4", -- Black3 + black2 = "#FCFCFC", -- Black2 -- done + black1 = "#F3F3F3", -- Black1 + black0 = "#D3D0D2", -- Black0 +} + +-- NOTE: we might have to remake our current naming convention for gray# and black# + +return color_palette From 45c531aa8db314b88e07445e0cd6b1ca6e684270 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Mon, 21 Mar 2022 22:18:09 -0500 Subject: [PATCH 06/28] fix: black1 on dawn palette --- lua/catppuccin/core/palettes/dawn.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/catppuccin/core/palettes/dawn.lua b/lua/catppuccin/core/palettes/dawn.lua index 2753926..5fd0796 100644 --- a/lua/catppuccin/core/palettes/dawn.lua +++ b/lua/catppuccin/core/palettes/dawn.lua @@ -19,7 +19,7 @@ local color_palette = { black4 = "#cfd8dc", -- Black4 black3 = "#eff3f4", -- Black3 black2 = "#FCFCFC", -- Black2 -- done - black1 = "#F3F3F3", -- Black1 + black1 = "#EDEDED", -- Black1 black0 = "#D3D0D2", -- Black0 } From 8a3b8925cd87e395d1e48e3d0fc81c69533584d2 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Sat, 9 Apr 2022 14:31:12 -0500 Subject: [PATCH 07/28] feat (storm): improved UI and LSP related integrations and made syntax less ambiguous --- lua/catppuccin/config.lua | 3 + .../core/integrations/native_lsp.lua | 13 ++-- lua/catppuccin/core/integrations/nvimtree.lua | 5 +- .../core/integrations/treesitter.lua | 64 +++++++++++-------- lua/catppuccin/core/palettes/storm.lua | 50 +++++++++++---- 5 files changed, 87 insertions(+), 48 deletions(-) diff --git a/lua/catppuccin/config.lua b/lua/catppuccin/config.lua index f1c7de4..bb515b4 100644 --- a/lua/catppuccin/config.lua +++ b/lua/catppuccin/config.lua @@ -12,6 +12,9 @@ config.options = { variables = "italic", numbers = "bold", booleans = "bold", + operators = "NONE", + properties = "NONE", + types = "NONE" }, integrations = { treesitter = true, diff --git a/lua/catppuccin/core/integrations/native_lsp.lua b/lua/catppuccin/core/integrations/native_lsp.lua index 983756d..c7bf11c 100644 --- a/lua/catppuccin/core/integrations/native_lsp.lua +++ b/lua/catppuccin/core/integrations/native_lsp.lua @@ -1,4 +1,5 @@ local M = {} +local util = require("catppuccin.utils.util") function M.get(cp) @@ -8,7 +9,8 @@ function M.get(cp) local error = cp.red local warning = cp.yellow local info = cp.sky - local hint = cp.rosewater + local hint = cp.teal + local darkening_percentage = 0.095 return { -- These groups are for the native LSP cliencp. Some other LSP clients may @@ -18,10 +20,11 @@ function M.get(cp) LspReferenceRead = { bg = cp.black4 }, -- used for highlighting "read" references LspReferenceWrite = { bg = cp.black4 }, -- used for highlighting "write" references -- hightlight diagnostics in numberline - DiagnosticError = { fg = error, style = virtual_text.errors }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticWarn = { fg = warning, style = virtual_text.warnings }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticInfo = { fg = info, style = virtual_text.information }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticHint = { fg = hint, style = virtual_text.hints }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticError = { bg = util.darken(error, darkening_percentage, cp.black2), fg = error, style = virtual_text.errors }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticWarn = { bg = util.darken(warning, darkening_percentage, cp.black2), fg = warning, style = virtual_text.warnings }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticInfo = { bg = util.darken(info, darkening_percentage, cp.black2), fg = info, style = virtual_text.information }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticHint = { bg = util.darken(hint, darkening_percentage, cp.black2), fg = hint, style = virtual_text.hints }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + -- util. -- for nvim nightly DiagnosticUnderlineError = { style = underlines.errors, sp = error }, diff --git a/lua/catppuccin/core/integrations/nvimtree.lua b/lua/catppuccin/core/integrations/nvimtree.lua index ec81bba..72663a3 100644 --- a/lua/catppuccin/core/integrations/nvimtree.lua +++ b/lua/catppuccin/core/integrations/nvimtree.lua @@ -4,9 +4,8 @@ function M.get(cp) local config = require("catppuccin.config").options local nvimtree = config.integrations.nvimtree - local root_dir_color = cp.pink - - if nvimtree.show_root then + local root_dir_color = cp.black1 + if nvimtree.show_root == true then root_dir_color = cp.blue end diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index fcb7194..d1add2c 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -1,5 +1,7 @@ local M = {} +------ HERERE RERESFD SFDSF + function M.get(cp) local delimeters = cp.gray2 local operators = cp.sky @@ -13,35 +15,39 @@ function M.get(cp) -- By default, most of these groups link to an appropriate Vim group, -- TSError -> Error for example, so you do not have to define these unless -- you explicitly want to support Treesitter's improved syntax awareness. - TSField = { fg = cp.rosewater }, -- For fields. - TSProperty = { fg = cp.yellow, style = "italic" }, -- Same as TSField. - TSInclude = { fg = cp.teal, style = cnf.styles.keywords or "NONE" }, -- For includes: #include in C, use or extern crate in Rust, or require in Lua. - TSOperator = { fg = operators, style = "bold" }, -- For any operator: +, but also -> and * in cp. - TSKeywordOperator = { fg = operators, style = "bold" }, -- For new keyword operator - TSPunctSpecial = { fg = cp.maroon, style = "bold" }, -- For special punctutation that does not fall in the catagories before. + TSField = { fg = cp.teal }, -- For fields. + TSProperty = { fg = cp.teal, style = cnf.styles.properties or "NONE" }, -- Same as TSField. + + TSInclude = { fg = cp.mauve, style = cnf.styles.keywords or "NONE" }, -- For includes: #include in C, use or extern crate in Rust, or require in Lua. + TSOperator = { fg = operators, style = cnf.styles.operators or "NONE" }, -- For any operator: +, but also -> and * in cp. + TSKeywordOperator = { fg = cp.mauve, style = cnf.styles.operators or "NONE" }, -- For new keyword operator + TSPunctSpecial = { fg = cp.sky, style = cnf.styles.operators or "NONE" }, -- For special punctutation that does not fall in the catagories before. TSFloat = { fg = math_logic, style = cnf.styles.numbers or "NONE" }, -- For floats. TSNumber = { fg = math_logic, style = cnf.styles.numbers or "NONE" }, -- For all numbers TSBoolean = { fg = math_logic, style = cnf.styles.booleans or "NONE" }, -- For booleans. - TSConstructor = { fg = cp.lavender }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. + TSConstructor = { fg = cp.sapphire }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. TSConstant = { fg = cp.peach }, -- For constants TSConditional = { fg = cl, style = cnf.styles.keywords or "NONE" }, -- For keywords related to conditionnals. TSRepeat = { fg = cl, style = cnf.styles.keywords or "NONE" }, -- For keywords related to loops. TSException = { fg = cp.mauve, style = cnf.styles.keywords or "NONE" }, -- For exception related keywords. -- builtin - TSConstBuiltin = { fg = cp.teal, style = cnf.styles.keywords or "NONE" }, -- For constant that are built in the language: nil in Lua. - TSFuncBuiltin = { fg = cp.teal, style = "italic" }, -- For builtin functions: table.insert in Lua. - TSTypeBuiltin = { fg = cp.yellow, style = "italic" }, -- For builtin types. - TSVariableBuiltin = { fg = cp.red, style = "italic" }, -- Variable names that are defined by the languages, like this or self. + TSConstBuiltin = { fg = cp.peach, style = cnf.styles.keywords or "NONE" }, -- For constant that are built in the language: nil in Lua. + TSFuncBuiltin = { fg = cp.sapphire, style = cnf.styles.functions or "NONE" }, -- For builtin functions: table.insert in Lua. + + TSNamespace = { fg = cp.blue, style = "italic" }, -- For identifiers referring to modules and namespaces. + TSType = { fg = cp.cotton, style = cnf.styles.types or "NONE" }, -- For types. + TSTypeBuiltin = { fg = cp.cotton, style = cnf.styles.properties or "italic" }, -- For builtin types. + TSVariableBuiltin = { fg = cp.red }, -- Variable names that are defined by the languages, like this or self. TSFunction = { fg = cp.blue, style = cnf.styles.functions or "NONE" }, -- For function (calls and definitions). - TSFuncMacro = { fg = cp.red, style = cnf.styles.functions or "NONE" }, -- For macro defined functions (calls and definitions): each macro_rules in Ruscp. + TSFuncMacro = { fg = cp.teal, style = cnf.styles.functions or "NONE" }, -- For macro defined functions (calls and definitions): each macro_rules in Ruscp. TSParameter = { fg = cp.yellow, style = "italic" }, -- For parameters of a function. - TSKeywordFunction = { fg = cp.red, style = cnf.styles.keywords or "NONE" }, -- For keywords used to define a fuction. + TSKeywordFunction = { fg = cp.mauve, style = cnf.styles.keywords or "NONE" }, -- For keywords used to define a fuction. TSKeyword = { fg = keywords, style = cnf.styles.keywords or "NONE" }, -- For keywords that don't fall in previous categories. - TSKeywordReturn = { fg = cp.pink, style = cnf.styles.keywords or "NONE" }, + TSKeywordReturn = { fg = cp.mauve, style = cnf.styles.keywords or "NONE" }, -- TSAnnotation = { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. -- TSAttribute = { }; -- (unstable) TODO: docs -- TSCharacter = { }; -- For characters. @@ -52,22 +58,20 @@ function M.get(cp) -- TSConstMacro = { }; -- For constants that are defined by macros: NULL in cp. -- TSError = { fg = cp.red }, -- For syntax/parser errors. -- rustTSField = { fg = cp.black4 }, -- For fields. - TSLabel = { fg = cp.blue }, -- For labels: label: in C and :label: in Lua. - TSMethod = { fg = cp.blue, style = "italic" }, -- For method calls and definitions. - TSNamespace = { fg = cp.rosewater, style = "italic" }, -- For identifiers referring to modules and namespaces. + TSLabel = { fg = cp.sapphire }, -- For labels: label: in C and :label: in Lua. + TSMethod = { fg = cp.blue, style = cnf.styles.functions or "NONE" }, -- For method calls and definitions. -- TSNone = { }; -- TODO: docs -- TSParameterReference= { }; -- For references to parameters of a function. tomlTSProperty = { fg = cp.blue }, -- Differentiates between string and properties - TSPunctDelimiter = { fg = cp.sky }, -- For delimiters ie: . + TSPunctDelimiter = { fg = cp.gray2 }, -- For delimiters ie: . TSPunctBracket = { fg = delimeters }, -- For brackets and parenthesis. TSString = { fg = cp.green, style = cnf.styles.strings or "NONE" }, -- For strings. TSStringRegex = { fg = cp.peach, style = cnf.styles.strings or "NONE" }, -- For regexes. -- TSSymbol = { }; -- For identifiers referring to symbols or atoms. - TSType = { fg = cp.yellow }, -- For types. TSVariable = { fg = cp.white, style = cnf.styles.variables or "NONE" }, -- Any variable name that does not have another highlighcp. - TSTagAttribute = { fg = cp.mauve, style = "italic" }, -- Tags like html tag names. - TSTag = { fg = cp.peach }, -- Tags like html tag names. - TSTagDelimiter = { fg = cp.maroon }, -- Tag delimiter like < > / + TSTagAttribute = { fg = cp.teal, style = "italic" }, -- Tags like html tag names. + TSTag = { fg = cp.mauve }, -- Tags like html tag names. + TSTagDelimiter = { fg = cp.sky }, -- Tag delimiter like < > / TSText = { fg = cp.white }, -- For strings considerated text in a markup language. -- TSEmphasis = { }; -- For text to be represented with emphasis. -- TSUnderline = { }; -- For text to be represented with an underline. @@ -90,19 +94,23 @@ function M.get(cp) -- bashTSParameter = { fg = cp.yellow, style = "italic" }, -- lua - luaTSField = { fg = cp.rosewater }, - -- luaTSConstructor = { fg = cp.flamingo }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. - luaTSFuncBuiltin = { fg = cp.teal, style = "italic" }, -- For builtin functions: table.insert in Lua. + + jsonTSLabel = { fg = cp.blue }, -- For labels: label: in C and :label: in Lua. + -- luaTSField = { fg = cp.rosewater }, + luaTSConstructor = { fg = cp.lavender }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. + -- luaTSFuncBuiltin = { fg = cp.teal, style = "italic" }, -- For builtin functions: table.insert in Lua. -- java + -- javaTSField = { fg = cp.red }, + -- javaTSType = { fg = cp.yellow }, -- current Java TS parser doesn't distinguish types properly -- javaTSConstant = { fg = cp.teal }, -- typescript - typescriptTSProperty = { fg = cp.lavender, style = "italic" }, -- Same as TSField. + -- typescriptTSProperty = { fg = cp.lavender, style = "italic" }, -- Same as TSField. -- css - cssTSType = { fg = cp.lavender }, - cssTSProperty = { fg = cp.yellow, style = "italic" }, -- Same as TSField. + -- cssTSType = { fg = cp.lavender }, + -- cssTSProperty = { fg = cp.yellow, style = "italic" }, -- Same as TSField. -- cpp cppTSProperty = { fg = cp.white }, diff --git a/lua/catppuccin/core/palettes/storm.lua b/lua/catppuccin/core/palettes/storm.lua index 554d43d..3901e50 100644 --- a/lua/catppuccin/core/palettes/storm.lua +++ b/lua/catppuccin/core/palettes/storm.lua @@ -1,18 +1,44 @@ local color_palette = { - rosewater = "#F5DFDA", -- Rosewater + pink = "#F5BFE7", -- Pink -- done -- cotton flamingo = "#F2CBCB", -- Flamingo -- done - mauve = "#C6A4F8", -- Mauve -- done - pink = "#F5BFE7", -- Pink -- done - red = "#F586A2", -- Red -- done - maroon = "#EB9DA4", -- Maroon -- done - peach = "#FCB081", -- Peach -- done - yellow = "#F8DEA9", -- Yellow -- done - green = "#A9E4A3", -- Green -- done - blue = "#8CB3FA", -- Blue -- done + cotton = "#F3DCAC", + yellow = "#F1D0D8", -- Yellow -- done - + -- cotton = "#B6FFEA", + rosewater = "#F5DFDA", -- Rosewater + mauve = "#C59FF6", -- Mauve -- done - + red = "#F67E98", -- Red -- done + maroon = "#F1949B", -- Maroon -- done + peach = "#FEA571", -- Peach -- done - - + green = "#9CDA83", -- Green -- done - + -- sapphire = "#2AC3DE", + -- sapphire = "#99FFCD", + -- sapphire = "#F8DEA9", + -- sapphire = "#B6FFCE", + -- sapphire = "#2AC3DE", + + -- green = "#98C379", -- Green -- done - + sapphire = "#34C3DC", + -- cotton = "#E7F0C3", + -- cotton = "#CAF2D7", + -- cotton = "#CDF0EA", + -- cotton = "#F0D9FF", + -- cotton = "#F6AE99", + -- cotton = "#C1FFD7", + -- cotton = "#F3E6E3", + -- cotton = "#FFBA92", + + + + + + + -- sapphire = "#2AC3DE", + + blue = "#83ABF9", -- Blue -- done + teal = "#78DCCC", -- Teal -- done sky = "#89DCFD", -- Sky -- done - teal = "#88DFD2", -- Teal -- done - lavender = "#C7CBFD", -- Lavender -- done - white = "#D2DAF1", -- White -- done + lavender = "#C1CAFE", -- Lavender -- done + white = "#C5CFF5", -- White -- done gray2 = "#B9C0DB", -- Gray2 gray1 = "#6F7599", -- Gray1 gray0 = "#5E6487", -- Gray0 From d0030f494628539d2d385c367b54514bd99d6136 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Tue, 12 Apr 2022 19:01:22 -0500 Subject: [PATCH 08/28] BREAKING CHANGE: every palette was updated --- .../core/integrations/treesitter.lua | 17 +++-- lua/catppuccin/core/mapper.lua | 2 +- lua/catppuccin/core/palettes/dawn.lua | 48 ++++++------- lua/catppuccin/core/palettes/dusk.lua | 46 ++++++------ lua/catppuccin/core/palettes/storm.lua | 70 ++++++------------- 5 files changed, 80 insertions(+), 103 deletions(-) diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index d1add2c..bb9ebce 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -1,9 +1,7 @@ local M = {} ------- HERERE RERESFD SFDSF - function M.get(cp) - local delimeters = cp.gray2 + -- local delimeters = cp.gray2 local operators = cp.sky local cl = cp.mauve -- conditionals, loops local keywords = cp.mauve @@ -35,16 +33,16 @@ function M.get(cp) -- builtin TSConstBuiltin = { fg = cp.peach, style = cnf.styles.keywords or "NONE" }, -- For constant that are built in the language: nil in Lua. - TSFuncBuiltin = { fg = cp.sapphire, style = cnf.styles.functions or "NONE" }, -- For builtin functions: table.insert in Lua. + TSFuncBuiltin = { fg = cp.peach, style = cnf.styles.functions or "NONE" }, -- For builtin functions: table.insert in Lua. TSNamespace = { fg = cp.blue, style = "italic" }, -- For identifiers referring to modules and namespaces. - TSType = { fg = cp.cotton, style = cnf.styles.types or "NONE" }, -- For types. - TSTypeBuiltin = { fg = cp.cotton, style = cnf.styles.properties or "italic" }, -- For builtin types. + TSType = { fg = cp.yellow, style = cnf.styles.types or "NONE" }, -- For types. + TSTypeBuiltin = { fg = cp.yellow, style = cnf.styles.properties or "italic" }, -- For builtin types. TSVariableBuiltin = { fg = cp.red }, -- Variable names that are defined by the languages, like this or self. TSFunction = { fg = cp.blue, style = cnf.styles.functions or "NONE" }, -- For function (calls and definitions). TSFuncMacro = { fg = cp.teal, style = cnf.styles.functions or "NONE" }, -- For macro defined functions (calls and definitions): each macro_rules in Ruscp. - TSParameter = { fg = cp.yellow, style = "italic" }, -- For parameters of a function. + TSParameter = { fg = cp.maroon, style = "italic" }, -- For parameters of a function. TSKeywordFunction = { fg = cp.mauve, style = cnf.styles.keywords or "NONE" }, -- For keywords used to define a fuction. TSKeyword = { fg = keywords, style = cnf.styles.keywords or "NONE" }, -- For keywords that don't fall in previous categories. TSKeywordReturn = { fg = cp.mauve, style = cnf.styles.keywords or "NONE" }, @@ -55,7 +53,7 @@ function M.get(cp) TSNote = { fg = cp.black2, bg = cp.blue }, TSWarning = { fg = cp.black2, bg = cp.yellow }, TSDanger = { fg = cp.black2, bg = cp.red }, - -- TSConstMacro = { }; -- For constants that are defined by macros: NULL in cp. + TSConstMacro = { fg = cp.mauve }; -- For constants that are defined by macros: NULL in cp. -- TSError = { fg = cp.red }, -- For syntax/parser errors. -- rustTSField = { fg = cp.black4 }, -- For fields. TSLabel = { fg = cp.sapphire }, -- For labels: label: in C and :label: in Lua. @@ -64,7 +62,8 @@ function M.get(cp) -- TSParameterReference= { }; -- For references to parameters of a function. tomlTSProperty = { fg = cp.blue }, -- Differentiates between string and properties TSPunctDelimiter = { fg = cp.gray2 }, -- For delimiters ie: . - TSPunctBracket = { fg = delimeters }, -- For brackets and parenthesis. + -- TSPunctBracket = { fg = delimeters }, -- For brackets and parenthesis. + TSPunctBracket = { fg = cp.gray2 }, -- For brackets and parenthesis. TSString = { fg = cp.green, style = cnf.styles.strings or "NONE" }, -- For strings. TSStringRegex = { fg = cp.peach, style = cnf.styles.strings or "NONE" }, -- For regexes. -- TSSymbol = { }; -- For identifiers referring to symbols or atoms. diff --git a/lua/catppuccin/core/mapper.lua b/lua/catppuccin/core/mapper.lua index a026c81..f811d1e 100644 --- a/lua/catppuccin/core/mapper.lua +++ b/lua/catppuccin/core/mapper.lua @@ -38,7 +38,7 @@ local function get_base() SignColumnSB = { bg = cp.black0, fg = cp.black4 }, -- column where |signs| are displayed Substitute = { bg = cp.black4, fg = cp.pink }, -- |:substitute| replacement text highlighting LineNr = { fg = cp.black4 }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. - CursorLineNr = { fg = cp.green }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. + CursorLineNr = { fg = cp.lavender }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. MatchParen = { fg = cp.peach, style = "bold" }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| ModeMsg = { fg = cp.white, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") MsgArea = { fg = cp.white }, -- Area for messages and cmdline diff --git a/lua/catppuccin/core/palettes/dawn.lua b/lua/catppuccin/core/palettes/dawn.lua index 5fd0796..b890789 100644 --- a/lua/catppuccin/core/palettes/dawn.lua +++ b/lua/catppuccin/core/palettes/dawn.lua @@ -1,28 +1,28 @@ local color_palette = { - rosewater = "#E09D90", -- Rosewater - flamingo = "#E79C9C", -- Flamingo - mauve = "#AC61DF", -- Mauve -- done - pink = "#EF9AD9", -- Pink -- done - red = "#E84746", -- Red -- done - - maroon = "#c96765", -- Maroon -- done - peach = "#E99726", -- Peach -- done - - yellow = "#EABE24", -- Yellow -- done - - green = "#89B517", -- Green -- done - - blue = "#4877D7", -- Blue -- done - - sky = "#3FC4D9", -- Sky -- done - teal = "#149C9B", -- Teal -- done - - lavender = "#939AFB", -- Lavender -- done - white = "#343b58", -- White -- works? - gray2 = "#424968", -- Gray2 - gray1 = "#505677", -- Gray1 - gray0 = "#606689", -- Gray0 -- done - - black4 = "#cfd8dc", -- Black4 - black3 = "#eff3f4", -- Black3 - black2 = "#FCFCFC", -- Black2 -- done - black1 = "#EDEDED", -- Black1 - black0 = "#D3D0D2", -- Black0 + rosewater = "#E5AC9F", + flamingo = "#DF7F7F", + pink = "#EC83D0", + mauve = "#8F46EF", + red = "#D20F39", + maroon = "#E63B4A", + peach = "#FE6811", + yellow = "#E49320", + green = "#509E31", + teal = "#289886", + sky = "#04A5E5", + blue = "#1D65F5", + sapphire = "#209FB5", + lavender = "#7287FD", + white = "#575279", + gray2 = "#6E6A8B", + gray1 = "#86819C", + gray0 = "#9D99AE", + black5 = "#B5B1BF", + black4 = "#CCC9D1", + black3 = "#E6E3E5", + black2 = "#FBF8F4", + black1 = "#EDEDED", + black0 = "#D3D0D2", } --- NOTE: we might have to remake our current naming convention for gray# and black# - return color_palette diff --git a/lua/catppuccin/core/palettes/dusk.lua b/lua/catppuccin/core/palettes/dusk.lua index 02dcedb..3586956 100644 --- a/lua/catppuccin/core/palettes/dusk.lua +++ b/lua/catppuccin/core/palettes/dusk.lua @@ -1,26 +1,28 @@ local color_palette = { - rosewater = "#F5E0DC", -- Rosewater - flamingo = "#F2CDCD", -- Flamingo - mauve = "#DDB6F2", -- Mauve - pink = "#F5C2E7", -- Pink - red = "#F28FAD", -- Red - maroon = "#E8A2AF", -- Maroon - peach = "#F8BD96", -- Peach - yellow = "#FAE3B0", -- Yellow - green = "#ABE9B3", -- Green - blue = "#96CDFB", -- Blue - sky = "#89DCEB", -- Sky - teal = "#B5E8E0", -- Teal - lavender = "#C9CBFF", -- Lavender - white = "#D9E0EE", -- White - gray2 = "#C3BAC6", -- Gray2 - gray1 = "#988BA2", -- Gray1 - gray0 = "#6E6C7E", -- Gray0 - black4 = "#575268", -- Black4 - black3 = "#302D41", -- Black3 - black2 = "#1E1E2E", -- Black2 - black1 = "#1A1826", -- Black1 - black0 = "#161320", -- Black0 + rosewater = "#F5E0DC", + flamingo = "#F2CDCD", + pink = "#F5C2E7", + mauve = "#CBA6F7", + red = "#F38BA8", + maroon = "#EBA0AC", + peach = "#FAB387", + yellow = "#F9E2AF", + green = "#A6E3A1", + teal = "#94E2D5", + sky = "#89DCEB", + blue = "#90C1FB", + sapphire = "#74C7EC", + lavender = "#C9CBFF", + white = "#C6D0F5", + gray2 = "#ADB5D8", + gray1 = "#959BBA", + gray0 = "#7C809D", + black5 = "#63657F", + black4 = "#4B4B62", + black3 = "#323044", + black2 = "#1E1E2E", + black1 = "#181825", + black0 = "#101019", } return color_palette diff --git a/lua/catppuccin/core/palettes/storm.lua b/lua/catppuccin/core/palettes/storm.lua index 3901e50..49f8cb9 100644 --- a/lua/catppuccin/core/palettes/storm.lua +++ b/lua/catppuccin/core/palettes/storm.lua @@ -1,52 +1,28 @@ local color_palette = { - pink = "#F5BFE7", -- Pink -- done -- cotton - flamingo = "#F2CBCB", -- Flamingo -- done - cotton = "#F3DCAC", - yellow = "#F1D0D8", -- Yellow -- done - - -- cotton = "#B6FFEA", - rosewater = "#F5DFDA", -- Rosewater - mauve = "#C59FF6", -- Mauve -- done - - red = "#F67E98", -- Red -- done - maroon = "#F1949B", -- Maroon -- done - peach = "#FEA571", -- Peach -- done - - - green = "#9CDA83", -- Green -- done - - -- sapphire = "#2AC3DE", - -- sapphire = "#99FFCD", - -- sapphire = "#F8DEA9", - -- sapphire = "#B6FFCE", - -- sapphire = "#2AC3DE", - - -- green = "#98C379", -- Green -- done - + rosewater = "#F5DFDA", + flamingo = "#F2CBCB", + pink = "#F5BFE7", + mauve = "#C59FF6", + red = "#F67E98", + maroon = "#F1949B", + peach = "#FEA571", + yellow = "#F2DAA8", + green = "#A1DF8E", + teal = "#85E0D1", + sky = "#89DCFD", + blue = "#83ABF9", sapphire = "#34C3DC", - -- cotton = "#E7F0C3", - -- cotton = "#CAF2D7", - -- cotton = "#CDF0EA", - -- cotton = "#F0D9FF", - -- cotton = "#F6AE99", - -- cotton = "#C1FFD7", - -- cotton = "#F3E6E3", - -- cotton = "#FFBA92", - - - - - - - -- sapphire = "#2AC3DE", - - blue = "#83ABF9", -- Blue -- done - teal = "#78DCCC", -- Teal -- done - sky = "#89DCFD", -- Sky -- done - lavender = "#C1CAFE", -- Lavender -- done - white = "#C5CFF5", -- White -- done - gray2 = "#B9C0DB", -- Gray2 - gray1 = "#6F7599", -- Gray1 - gray0 = "#5E6487", -- Gray0 - black4 = "#3E435E", -- Black4 - black3 = "#2B3045", -- Black3 - black2 = "#24273A", -- Black2 -- done - black1 = "#1F2233", -- Black1 - black0 = "#1A1B26", -- Black0 + lavender = "#C2CBFE", + white = "#C5CFF5", + gray2 = "#A6AFD2", + gray1 = "#8289AA", + gray0 = "#5F6587", + black5 = "#4F5473", + black4 = "#3E435E", + black3 = "#2B3045", + black2 = "#24273A", + black1 = "#1F2233", + black0 = "#1A1B26", } return color_palette From e4aa82995c7063cf8a363c7d8b6c21e032195bd2 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Tue, 12 Apr 2022 19:41:50 -0500 Subject: [PATCH 09/28] decreased brightness of yellow by 1% --- lua/catppuccin/core/palettes/storm.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/catppuccin/core/palettes/storm.lua b/lua/catppuccin/core/palettes/storm.lua index 49f8cb9..2e51ae0 100644 --- a/lua/catppuccin/core/palettes/storm.lua +++ b/lua/catppuccin/core/palettes/storm.lua @@ -6,7 +6,7 @@ local color_palette = { red = "#F67E98", maroon = "#F1949B", peach = "#FEA571", - yellow = "#F2DAA8", + yellow = "#F1D8A4", green = "#A1DF8E", teal = "#85E0D1", sky = "#89DCFD", From f2f251ba4036deb2fb24547c121162e9e5e9bb93 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 13 Apr 2022 16:28:44 -0500 Subject: [PATCH 10/28] feat (dawn): gave more contrast to some colors --- lua/catppuccin/core/palettes/dawn.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lua/catppuccin/core/palettes/dawn.lua b/lua/catppuccin/core/palettes/dawn.lua index b890789..8995ed3 100644 --- a/lua/catppuccin/core/palettes/dawn.lua +++ b/lua/catppuccin/core/palettes/dawn.lua @@ -1,14 +1,14 @@ local color_palette = { - rosewater = "#E5AC9F", - flamingo = "#DF7F7F", + rosewater = "#DC907F", + flamingo = "#DD7878", pink = "#EC83D0", - mauve = "#8F46EF", - red = "#D20F39", + mauve = "#822FEE", + red = "#BB0D33", maroon = "#E63B4A", - peach = "#FE6811", + peach = "#FE640B", yellow = "#E49320", - green = "#509E31", - teal = "#289886", + green = "#40A02B", + teal = "#179299", sky = "#04A5E5", blue = "#1D65F5", sapphire = "#209FB5", From a65da724e431749ea516efd79ad598fe5b1dba27 Mon Sep 17 00:00:00 2001 From: Jorge Befan Date: Thu, 14 Apr 2022 00:17:53 +0200 Subject: [PATCH 11/28] improving colors for Typescript and TSX on TreeSitter integration --- lua/catppuccin/core/integrations/treesitter.lua | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index bb9ebce..d359d4c 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -105,11 +105,22 @@ function M.get(cp) -- javaTSConstant = { fg = cp.teal }, -- typescript - -- typescriptTSProperty = { fg = cp.lavender, style = "italic" }, -- Same as TSField. + + -- typescript + typescriptTSProperty = { fg = cp.lavender, style = "italic" }, -- Same as TSField. + typescriptTSConstructor = { fg = cp.lavender }, + typescriptTSTagProperty = { fg = cp.cotton }, + + -- TSX (React with Typescript) + tsxTSConstructor = { fg = cp.lavender }, + tsxTSTagDelimiter = { fg = cp.maroon }, + tsxTSTagAttribute = { fg = cp.mauve }, + tsxTSTagProperty = { fg = cp.cotton }, + -- css -- cssTSType = { fg = cp.lavender }, - -- cssTSProperty = { fg = cp.yellow, style = "italic" }, -- Same as TSField. + cssTSProperty = { fg = cp.cotton, style = "italic" }, -- Same as TSField. -- cpp cppTSProperty = { fg = cp.white }, From 42e1701ad2f418872c1d21e80f2637a1cba9872c Mon Sep 17 00:00:00 2001 From: Jorge Befan Date: Thu, 14 Apr 2022 00:21:04 +0200 Subject: [PATCH 12/28] improving colors for Typescript and TSX on TreeSitter integration --- lua/catppuccin/core/integrations/treesitter.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index d359d4c..d792ead 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -106,7 +106,7 @@ function M.get(cp) -- typescript - -- typescript + -- typescript typescriptTSProperty = { fg = cp.lavender, style = "italic" }, -- Same as TSField. typescriptTSConstructor = { fg = cp.lavender }, typescriptTSTagProperty = { fg = cp.cotton }, @@ -122,6 +122,7 @@ function M.get(cp) -- cssTSType = { fg = cp.lavender }, cssTSProperty = { fg = cp.cotton, style = "italic" }, -- Same as TSField. + -- cpp cppTSProperty = { fg = cp.white }, From 120a5f193fac3e423071765227704fe7650ec097 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 13 Apr 2022 21:13:42 -0500 Subject: [PATCH 13/28] cleared out some highlights --- .../core/integrations/treesitter.lua | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index d792ead..558df2c 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -92,36 +92,18 @@ function M.get(cp) -- bashTSFuncBuiltin = { fg = cp.red, style = "italic" }, -- bashTSParameter = { fg = cp.yellow, style = "italic" }, - -- lua - + -- json jsonTSLabel = { fg = cp.blue }, -- For labels: label: in C and :label: in Lua. - -- luaTSField = { fg = cp.rosewater }, - luaTSConstructor = { fg = cp.lavender }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. - -- luaTSFuncBuiltin = { fg = cp.teal, style = "italic" }, -- For builtin functions: table.insert in Lua. - -- java - -- javaTSField = { fg = cp.red }, - -- javaTSType = { fg = cp.yellow }, -- current Java TS parser doesn't distinguish types properly - -- javaTSConstant = { fg = cp.teal }, - - -- typescript + -- lua + luaTSConstructor = { fg = cp.lavender }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. -- typescript - typescriptTSProperty = { fg = cp.lavender, style = "italic" }, -- Same as TSField. typescriptTSConstructor = { fg = cp.lavender }, - typescriptTSTagProperty = { fg = cp.cotton }, - -- TSX (React with Typescript) + -- TSX (Typescript React) tsxTSConstructor = { fg = cp.lavender }, - tsxTSTagDelimiter = { fg = cp.maroon }, tsxTSTagAttribute = { fg = cp.mauve }, - tsxTSTagProperty = { fg = cp.cotton }, - - - -- css - -- cssTSType = { fg = cp.lavender }, - cssTSProperty = { fg = cp.cotton, style = "italic" }, -- Same as TSField. - -- cpp cppTSProperty = { fg = cp.white }, From bf6acc8912b552becc6247805e64d7e04415dc0a Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 13 Apr 2022 21:14:31 -0500 Subject: [PATCH 14/28] feat (storm): increased saturation of lavender --- lua/catppuccin/core/palettes/storm.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/catppuccin/core/palettes/storm.lua b/lua/catppuccin/core/palettes/storm.lua index 2e51ae0..56658d9 100644 --- a/lua/catppuccin/core/palettes/storm.lua +++ b/lua/catppuccin/core/palettes/storm.lua @@ -12,7 +12,7 @@ local color_palette = { sky = "#89DCFD", blue = "#83ABF9", sapphire = "#34C3DC", - lavender = "#C2CBFE", + lavender = "#B8C1FE", white = "#C5CFF5", gray2 = "#A6AFD2", gray1 = "#8289AA", From dbfe78fb4f4680871e806ce3d9066bf426bb4e6f Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 13 Apr 2022 21:23:38 -0500 Subject: [PATCH 15/28] feat (dusk): increased contrast ratio between white and lavender --- lua/catppuccin/core/palettes/dusk.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/catppuccin/core/palettes/dusk.lua b/lua/catppuccin/core/palettes/dusk.lua index 3586956..6d56528 100644 --- a/lua/catppuccin/core/palettes/dusk.lua +++ b/lua/catppuccin/core/palettes/dusk.lua @@ -12,7 +12,7 @@ local color_palette = { sky = "#89DCEB", blue = "#90C1FB", sapphire = "#74C7EC", - lavender = "#C9CBFF", + lavender = "#B4BEFE", white = "#C6D0F5", gray2 = "#ADB5D8", gray1 = "#959BBA", From 8faded23143de5352c5c5258e3c27886eccddd95 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Mon, 18 Apr 2022 08:25:15 -0500 Subject: [PATCH 16/28] feat: color variantion per palette --- lua/catppuccin/core/mapper.lua | 4 ++-- lua/catppuccin/core/palettes/dawn.lua | 16 ++++++++-------- lua/catppuccin/utils/colors.lua | 9 +++++++++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lua/catppuccin/core/mapper.lua b/lua/catppuccin/core/mapper.lua index f811d1e..83349ca 100644 --- a/lua/catppuccin/core/mapper.lua +++ b/lua/catppuccin/core/mapper.lua @@ -27,7 +27,7 @@ local function get_base() lCursor = { fg = cp.black2, bg = cp.white }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') CursorIM = { fg = cp.black2, bg = cp.white }, -- like Cursor, but used when in IME mode |CursorIM| CursorColumn = { bg = cp.black1 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. - CursorLine = { bg = cp.black3 }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. + CursorLine = { bg = colors_util.vary_color({dawn = cp.black1}, cp.black3) }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. Directory = { fg = cp.blue }, -- directory names (and other special names in listings) EndOfBuffer = { fg = cp.black2 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. ErrorMsg = { fg = cp.red, style = "bold,italic" }, -- error messages on the command line @@ -37,7 +37,7 @@ local function get_base() SignColumn = { bg = cnf.transparent_background and cp.none or cp.black2, fg = cp.black4 }, -- column where |signs| are displayed SignColumnSB = { bg = cp.black0, fg = cp.black4 }, -- column where |signs| are displayed Substitute = { bg = cp.black4, fg = cp.pink }, -- |:substitute| replacement text highlighting - LineNr = { fg = cp.black4 }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. + LineNr = { fg = colors_util.vary_color({dawn = cp.black0}, cp.black4) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. CursorLineNr = { fg = cp.lavender }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. MatchParen = { fg = cp.peach, style = "bold" }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| ModeMsg = { fg = cp.white, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") diff --git a/lua/catppuccin/core/palettes/dawn.lua b/lua/catppuccin/core/palettes/dawn.lua index 8995ed3..028c0fe 100644 --- a/lua/catppuccin/core/palettes/dawn.lua +++ b/lua/catppuccin/core/palettes/dawn.lua @@ -14,15 +14,15 @@ local color_palette = { sapphire = "#209FB5", lavender = "#7287FD", white = "#575279", - gray2 = "#6E6A8B", - gray1 = "#86819C", - gray0 = "#9D99AE", - black5 = "#B5B1BF", - black4 = "#CCC9D1", - black3 = "#E6E3E5", + gray2 = "#6C6789", + gray1 = "#817C98", + gray0 = "#9691A8", + black5 = "#AAA6B7", + black4 = "#BEBAC6", + black0 = "#D0CDD4", + black3 = "#E1DCE0", + black1 = "#ECEBEB", black2 = "#FBF8F4", - black1 = "#EDEDED", - black0 = "#D3D0D2", } return color_palette diff --git a/lua/catppuccin/utils/colors.lua b/lua/catppuccin/utils/colors.lua index 4e38058..8d894d7 100644 --- a/lua/catppuccin/utils/colors.lua +++ b/lua/catppuccin/utils/colors.lua @@ -27,4 +27,13 @@ function M.assert_brightness(color) return false -- dull end +function M.vary_color(palettes, default) + local flvr = vim.g.catppuccin_flavour + + if palettes[flvr] ~= nil then + return palettes[flvr] + end + return default +end + return M From 21bbd6ca56033422b26dbb3694c99d20a20c63d9 Mon Sep 17 00:00:00 2001 From: Merlin Attila Fejzuli Date: Tue, 19 Apr 2022 00:32:00 +0200 Subject: [PATCH 17/28] README added requirement notice to feline integration section The feline integration needs the kyazdani42/nvim-web-devicons plugin to function properly, therefore the reader should be warned about the requirement. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee00202..b21fb4a 100644 --- a/README.md +++ b/README.md @@ -222,7 +222,7 @@ If you'd like to know which highlight groups are being affected by catppuccin, c ##### Special Integrations -- **Feline.nvim**: Catppuccin provides this integration as a component that you can select on your Feline config: +- **Feline.nvim**: First make sure that the [kyazdani42/nvim-web-devicons](https://github.com/kyazdani42/nvim-web-devicons/) plugin is installed. Then update your Feline config to use the Catppuccin components: ```lua require("feline").setup({ From b7708e58e26de8a6b672264f28381ac74f1bf53e Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Fri, 22 Apr 2022 17:11:02 -0500 Subject: [PATCH 18/28] refactor: colors + addition of ctp noon --- lua/catppuccin/core/mapper.lua | 3 ++- lua/catppuccin/core/palettes/dusk.lua | 12 +++++------ lua/catppuccin/core/palettes/init.lua | 2 +- lua/catppuccin/core/palettes/noon.lua | 28 ++++++++++++++++++++++++++ lua/catppuccin/core/palettes/storm.lua | 16 +++++++-------- 5 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 lua/catppuccin/core/palettes/noon.lua diff --git a/lua/catppuccin/core/mapper.lua b/lua/catppuccin/core/mapper.lua index 83349ca..6ab1213 100644 --- a/lua/catppuccin/core/mapper.lua +++ b/lua/catppuccin/core/mapper.lua @@ -1,4 +1,5 @@ local colors_util = require("catppuccin.utils.colors") +local util = require("catppuccin.utils.util") local cp local M = {} @@ -27,7 +28,7 @@ local function get_base() lCursor = { fg = cp.black2, bg = cp.white }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') CursorIM = { fg = cp.black2, bg = cp.white }, -- like Cursor, but used when in IME mode |CursorIM| CursorColumn = { bg = cp.black1 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. - CursorLine = { bg = colors_util.vary_color({dawn = cp.black1}, cp.black3) }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. + CursorLine = { bg = colors_util.vary_color({dawn = cp.black1}, util.darken(cp.black3, 0.64, cp.black2)) }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. Directory = { fg = cp.blue }, -- directory names (and other special names in listings) EndOfBuffer = { fg = cp.black2 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. ErrorMsg = { fg = cp.red, style = "bold,italic" }, -- error messages on the command line diff --git a/lua/catppuccin/core/palettes/dusk.lua b/lua/catppuccin/core/palettes/dusk.lua index 6d56528..4f1e92d 100644 --- a/lua/catppuccin/core/palettes/dusk.lua +++ b/lua/catppuccin/core/palettes/dusk.lua @@ -14,12 +14,12 @@ local color_palette = { sapphire = "#74C7EC", lavender = "#B4BEFE", white = "#C6D0F5", - gray2 = "#ADB5D8", - gray1 = "#959BBA", - gray0 = "#7C809D", - black5 = "#63657F", - black4 = "#4B4B62", - black3 = "#323044", + gray2 = "#AEB7D9", + gray1 = "#969DBC", + gray0 = "#7E84A0", + black5 = "#666A83", + black4 = "#4E5167", + black3 = "#36374A", black2 = "#1E1E2E", black1 = "#181825", black0 = "#101019", diff --git a/lua/catppuccin/core/palettes/init.lua b/lua/catppuccin/core/palettes/init.lua index 71bd5b2..797a0f8 100644 --- a/lua/catppuccin/core/palettes/init.lua +++ b/lua/catppuccin/core/palettes/init.lua @@ -3,7 +3,7 @@ local M = {} function M.get_palette() local flvr = vim.g.catppuccin_flavour - if flvr == "dusk" or flvr == "dawn" or flvr == "storm" then + if flvr == "dusk" or flvr == "dawn" or flvr == "storm" or flvr == "noon" then return require("catppuccin.core.palettes." .. flvr) end return require("catppuccin.core.palettes.dusk") diff --git a/lua/catppuccin/core/palettes/noon.lua b/lua/catppuccin/core/palettes/noon.lua new file mode 100644 index 0000000..5936111 --- /dev/null +++ b/lua/catppuccin/core/palettes/noon.lua @@ -0,0 +1,28 @@ +local color_palette = { + rosewater = "#F5E0DC", -- not ready + flamingo = "#F2CDCD", + pink = "#F5C2E7", + mauve = "#CB9DDF", -- g + + red = "#E78284", -- g +? + maroon = "#EA999C", -- g + peach = "#EE9E76", -- g + + yellow = "#E1C38A", -- g + + green = "#A9CA87", -- g + + teal = "#81C8BE", -- g + + sky = "#99D1DB", -- g? + + blue = "#90AAE9", -- g +? + sapphire = "#85C1DC", -- gotta tweak this one + lavender = "#BFB7E4", -- g + white = "#C6CEEF", -- g + gray2 = "#B1B8D7", + gray1 = "#9BA2BF", + gray0 = "#868CA7", + black5 = "#707590", + black4 = "#5B5F78", -- + black3 = "#454960", -- + black2 = "#303348", -- + black1 = "#252737", + black0 = "#181A25", +} + +return color_palette diff --git a/lua/catppuccin/core/palettes/storm.lua b/lua/catppuccin/core/palettes/storm.lua index 56658d9..5241ef1 100644 --- a/lua/catppuccin/core/palettes/storm.lua +++ b/lua/catppuccin/core/palettes/storm.lua @@ -14,15 +14,15 @@ local color_palette = { sapphire = "#34C3DC", lavender = "#B8C1FE", white = "#C5CFF5", - gray2 = "#A6AFD2", - gray1 = "#8289AA", - gray0 = "#5F6587", - black5 = "#4F5473", - black4 = "#3E435E", - black3 = "#2B3045", + gray2 = "#AEB7DA", + gray1 = "#979FC0", + gray0 = "#8087A5", + black5 = "#696F8A", + black4 = "#52576F", + black3 = "#3B3F55", black2 = "#24273A", - black1 = "#1F2233", - black0 = "#1A1B26", + black1 = "#1F2232", + black0 = "#181926", } return color_palette From 7e09ac4bb2edb61e487757ddbf74ff6e6ec9d55b Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Sun, 24 Apr 2022 20:47:33 -0500 Subject: [PATCH 19/28] feat: renamed flavours --- lua/catppuccin/core/mapper.lua | 4 +-- lua/catppuccin/core/palettes/dawn.lua | 28 ++++++++++---------- lua/catppuccin/core/palettes/frappe.lua | 28 ++++++++++++++++++++ lua/catppuccin/core/palettes/init.lua | 4 +-- lua/catppuccin/core/palettes/latte.lua | 30 ++++++++++++++++++++++ lua/catppuccin/core/palettes/macchiato.lua | 28 ++++++++++++++++++++ lua/catppuccin/core/palettes/moccha.lua | 28 ++++++++++++++++++++ lua/catppuccin/core/palettes/noon.lua | 8 +++--- 8 files changed, 137 insertions(+), 21 deletions(-) create mode 100644 lua/catppuccin/core/palettes/frappe.lua create mode 100644 lua/catppuccin/core/palettes/latte.lua create mode 100644 lua/catppuccin/core/palettes/macchiato.lua create mode 100644 lua/catppuccin/core/palettes/moccha.lua diff --git a/lua/catppuccin/core/mapper.lua b/lua/catppuccin/core/mapper.lua index 6ab1213..941a33e 100644 --- a/lua/catppuccin/core/mapper.lua +++ b/lua/catppuccin/core/mapper.lua @@ -28,7 +28,7 @@ local function get_base() lCursor = { fg = cp.black2, bg = cp.white }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') CursorIM = { fg = cp.black2, bg = cp.white }, -- like Cursor, but used when in IME mode |CursorIM| CursorColumn = { bg = cp.black1 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. - CursorLine = { bg = colors_util.vary_color({dawn = cp.black1}, util.darken(cp.black3, 0.64, cp.black2)) }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. + CursorLine = { bg = colors_util.vary_color({latte = util.lighten(cp.black1, 0.70, cp.black2)}, util.darken(cp.black3, 0.64, cp.black2)) }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. Directory = { fg = cp.blue }, -- directory names (and other special names in listings) EndOfBuffer = { fg = cp.black2 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. ErrorMsg = { fg = cp.red, style = "bold,italic" }, -- error messages on the command line @@ -38,7 +38,7 @@ local function get_base() SignColumn = { bg = cnf.transparent_background and cp.none or cp.black2, fg = cp.black4 }, -- column where |signs| are displayed SignColumnSB = { bg = cp.black0, fg = cp.black4 }, -- column where |signs| are displayed Substitute = { bg = cp.black4, fg = cp.pink }, -- |:substitute| replacement text highlighting - LineNr = { fg = colors_util.vary_color({dawn = cp.black0}, cp.black4) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. + LineNr = { fg = colors_util.vary_color({latte = cp.black0}, cp.black4) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. CursorLineNr = { fg = cp.lavender }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. MatchParen = { fg = cp.peach, style = "bold" }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| ModeMsg = { fg = cp.white, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") diff --git a/lua/catppuccin/core/palettes/dawn.lua b/lua/catppuccin/core/palettes/dawn.lua index 028c0fe..59b1635 100644 --- a/lua/catppuccin/core/palettes/dawn.lua +++ b/lua/catppuccin/core/palettes/dawn.lua @@ -2,27 +2,29 @@ local color_palette = { rosewater = "#DC907F", flamingo = "#DD7878", pink = "#EC83D0", - mauve = "#822FEE", + mauve = "#9247ED", -- red = "#BB0D33", maroon = "#E63B4A", peach = "#FE640B", yellow = "#E49320", - green = "#40A02B", - teal = "#179299", + green = "#53A947", -- + teal = "#23979F", sky = "#04A5E5", - blue = "#1D65F5", + blue = "#3474EE", sapphire = "#209FB5", lavender = "#7287FD", white = "#575279", - gray2 = "#6C6789", - gray1 = "#817C98", - gray0 = "#9691A8", - black5 = "#AAA6B7", - black4 = "#BEBAC6", - black0 = "#D0CDD4", - black3 = "#E1DCE0", - black1 = "#ECEBEB", - black2 = "#FBF8F4", + gray2 = "#696486", + gray1 = "#7B7794", + gray0 = "#8E89A1", + black5 = "#A09BAE", + black4 = "#B2AEBC", + black0 = "#C4C0C9", + black3 = "#D7D2D6", + black1 = "#E9E5E4", + black2 = "#FBF7F1", } + + return color_palette diff --git a/lua/catppuccin/core/palettes/frappe.lua b/lua/catppuccin/core/palettes/frappe.lua new file mode 100644 index 0000000..d5d82c6 --- /dev/null +++ b/lua/catppuccin/core/palettes/frappe.lua @@ -0,0 +1,28 @@ +local color_palette = { + rosewater = "#F5E0DC", -- not ready + flamingo = "#F2CDCD", + pink = "#F5C2E7", + mauve = "#CA9EE6", -- g + + red = "#E78284", -- g +? + maroon = "#EA999C", -- g + peach = "#EE9E76", -- g + + yellow = "#E5C890", -- g + + green = "#A6D189", -- g + + teal = "#81C8BE", -- g + + sky = "#99D1DB", -- g? + + blue = "#8CAAEE", -- g +? + sapphire = "#85C1DC", -- gotta tweak this one + lavender = "#BFB7E4", -- g + white = "#C6CEEF", -- g + gray2 = "#B1B8D7", + gray1 = "#9BA2BF", + gray0 = "#868CA7", + black5 = "#707590", + black4 = "#5B5F78", -- + black3 = "#454960", -- + black2 = "#303348", -- + black1 = "#252737", + black0 = "#181A25", +} + +return color_palette diff --git a/lua/catppuccin/core/palettes/init.lua b/lua/catppuccin/core/palettes/init.lua index 797a0f8..d7a71f6 100644 --- a/lua/catppuccin/core/palettes/init.lua +++ b/lua/catppuccin/core/palettes/init.lua @@ -3,10 +3,10 @@ local M = {} function M.get_palette() local flvr = vim.g.catppuccin_flavour - if flvr == "dusk" or flvr == "dawn" or flvr == "storm" or flvr == "noon" then + if flvr == "moccha" or flvr == "latte" or flvr == "macchiato" or flvr == "frappe" then return require("catppuccin.core.palettes." .. flvr) end - return require("catppuccin.core.palettes.dusk") + return require("catppuccin.core.palettes.moccha") end return M diff --git a/lua/catppuccin/core/palettes/latte.lua b/lua/catppuccin/core/palettes/latte.lua new file mode 100644 index 0000000..59b1635 --- /dev/null +++ b/lua/catppuccin/core/palettes/latte.lua @@ -0,0 +1,30 @@ +local color_palette = { + rosewater = "#DC907F", + flamingo = "#DD7878", + pink = "#EC83D0", + mauve = "#9247ED", -- + red = "#BB0D33", + maroon = "#E63B4A", + peach = "#FE640B", + yellow = "#E49320", + green = "#53A947", -- + teal = "#23979F", + sky = "#04A5E5", + blue = "#3474EE", + sapphire = "#209FB5", + lavender = "#7287FD", + white = "#575279", + gray2 = "#696486", + gray1 = "#7B7794", + gray0 = "#8E89A1", + black5 = "#A09BAE", + black4 = "#B2AEBC", + black0 = "#C4C0C9", + black3 = "#D7D2D6", + black1 = "#E9E5E4", + black2 = "#FBF7F1", +} + + + +return color_palette diff --git a/lua/catppuccin/core/palettes/macchiato.lua b/lua/catppuccin/core/palettes/macchiato.lua new file mode 100644 index 0000000..5241ef1 --- /dev/null +++ b/lua/catppuccin/core/palettes/macchiato.lua @@ -0,0 +1,28 @@ +local color_palette = { + rosewater = "#F5DFDA", + flamingo = "#F2CBCB", + pink = "#F5BFE7", + mauve = "#C59FF6", + red = "#F67E98", + maroon = "#F1949B", + peach = "#FEA571", + yellow = "#F1D8A4", + green = "#A1DF8E", + teal = "#85E0D1", + sky = "#89DCFD", + blue = "#83ABF9", + sapphire = "#34C3DC", + lavender = "#B8C1FE", + white = "#C5CFF5", + gray2 = "#AEB7DA", + gray1 = "#979FC0", + gray0 = "#8087A5", + black5 = "#696F8A", + black4 = "#52576F", + black3 = "#3B3F55", + black2 = "#24273A", + black1 = "#1F2232", + black0 = "#181926", +} + +return color_palette diff --git a/lua/catppuccin/core/palettes/moccha.lua b/lua/catppuccin/core/palettes/moccha.lua new file mode 100644 index 0000000..4f1e92d --- /dev/null +++ b/lua/catppuccin/core/palettes/moccha.lua @@ -0,0 +1,28 @@ +local color_palette = { + rosewater = "#F5E0DC", + flamingo = "#F2CDCD", + pink = "#F5C2E7", + mauve = "#CBA6F7", + red = "#F38BA8", + maroon = "#EBA0AC", + peach = "#FAB387", + yellow = "#F9E2AF", + green = "#A6E3A1", + teal = "#94E2D5", + sky = "#89DCEB", + blue = "#90C1FB", + sapphire = "#74C7EC", + lavender = "#B4BEFE", + white = "#C6D0F5", + gray2 = "#AEB7D9", + gray1 = "#969DBC", + gray0 = "#7E84A0", + black5 = "#666A83", + black4 = "#4E5167", + black3 = "#36374A", + black2 = "#1E1E2E", + black1 = "#181825", + black0 = "#101019", +} + +return color_palette diff --git a/lua/catppuccin/core/palettes/noon.lua b/lua/catppuccin/core/palettes/noon.lua index 5936111..d5d82c6 100644 --- a/lua/catppuccin/core/palettes/noon.lua +++ b/lua/catppuccin/core/palettes/noon.lua @@ -2,15 +2,15 @@ local color_palette = { rosewater = "#F5E0DC", -- not ready flamingo = "#F2CDCD", pink = "#F5C2E7", - mauve = "#CB9DDF", -- g + + mauve = "#CA9EE6", -- g + red = "#E78284", -- g +? maroon = "#EA999C", -- g peach = "#EE9E76", -- g + - yellow = "#E1C38A", -- g + - green = "#A9CA87", -- g + + yellow = "#E5C890", -- g + + green = "#A6D189", -- g + teal = "#81C8BE", -- g + sky = "#99D1DB", -- g? + - blue = "#90AAE9", -- g +? + blue = "#8CAAEE", -- g +? sapphire = "#85C1DC", -- gotta tweak this one lavender = "#BFB7E4", -- g white = "#C6CEEF", -- g From 4dcb70647dda2f242b682c9e31cc2031a48c8bb4 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Mon, 25 Apr 2022 19:35:12 -0500 Subject: [PATCH 20/28] fix: previous colors slipped in! --- lua/catppuccin/core/palettes/dawn.lua | 30 -------------------------- lua/catppuccin/core/palettes/dusk.lua | 28 ------------------------ lua/catppuccin/core/palettes/noon.lua | 28 ------------------------ lua/catppuccin/core/palettes/storm.lua | 28 ------------------------ 4 files changed, 114 deletions(-) delete mode 100644 lua/catppuccin/core/palettes/dawn.lua delete mode 100644 lua/catppuccin/core/palettes/dusk.lua delete mode 100644 lua/catppuccin/core/palettes/noon.lua delete mode 100644 lua/catppuccin/core/palettes/storm.lua diff --git a/lua/catppuccin/core/palettes/dawn.lua b/lua/catppuccin/core/palettes/dawn.lua deleted file mode 100644 index 59b1635..0000000 --- a/lua/catppuccin/core/palettes/dawn.lua +++ /dev/null @@ -1,30 +0,0 @@ -local color_palette = { - rosewater = "#DC907F", - flamingo = "#DD7878", - pink = "#EC83D0", - mauve = "#9247ED", -- - red = "#BB0D33", - maroon = "#E63B4A", - peach = "#FE640B", - yellow = "#E49320", - green = "#53A947", -- - teal = "#23979F", - sky = "#04A5E5", - blue = "#3474EE", - sapphire = "#209FB5", - lavender = "#7287FD", - white = "#575279", - gray2 = "#696486", - gray1 = "#7B7794", - gray0 = "#8E89A1", - black5 = "#A09BAE", - black4 = "#B2AEBC", - black0 = "#C4C0C9", - black3 = "#D7D2D6", - black1 = "#E9E5E4", - black2 = "#FBF7F1", -} - - - -return color_palette diff --git a/lua/catppuccin/core/palettes/dusk.lua b/lua/catppuccin/core/palettes/dusk.lua deleted file mode 100644 index 4f1e92d..0000000 --- a/lua/catppuccin/core/palettes/dusk.lua +++ /dev/null @@ -1,28 +0,0 @@ -local color_palette = { - rosewater = "#F5E0DC", - flamingo = "#F2CDCD", - pink = "#F5C2E7", - mauve = "#CBA6F7", - red = "#F38BA8", - maroon = "#EBA0AC", - peach = "#FAB387", - yellow = "#F9E2AF", - green = "#A6E3A1", - teal = "#94E2D5", - sky = "#89DCEB", - blue = "#90C1FB", - sapphire = "#74C7EC", - lavender = "#B4BEFE", - white = "#C6D0F5", - gray2 = "#AEB7D9", - gray1 = "#969DBC", - gray0 = "#7E84A0", - black5 = "#666A83", - black4 = "#4E5167", - black3 = "#36374A", - black2 = "#1E1E2E", - black1 = "#181825", - black0 = "#101019", -} - -return color_palette diff --git a/lua/catppuccin/core/palettes/noon.lua b/lua/catppuccin/core/palettes/noon.lua deleted file mode 100644 index d5d82c6..0000000 --- a/lua/catppuccin/core/palettes/noon.lua +++ /dev/null @@ -1,28 +0,0 @@ -local color_palette = { - rosewater = "#F5E0DC", -- not ready - flamingo = "#F2CDCD", - pink = "#F5C2E7", - mauve = "#CA9EE6", -- g + - red = "#E78284", -- g +? - maroon = "#EA999C", -- g - peach = "#EE9E76", -- g + - yellow = "#E5C890", -- g + - green = "#A6D189", -- g + - teal = "#81C8BE", -- g + - sky = "#99D1DB", -- g? + - blue = "#8CAAEE", -- g +? - sapphire = "#85C1DC", -- gotta tweak this one - lavender = "#BFB7E4", -- g - white = "#C6CEEF", -- g - gray2 = "#B1B8D7", - gray1 = "#9BA2BF", - gray0 = "#868CA7", - black5 = "#707590", - black4 = "#5B5F78", -- - black3 = "#454960", -- - black2 = "#303348", -- - black1 = "#252737", - black0 = "#181A25", -} - -return color_palette diff --git a/lua/catppuccin/core/palettes/storm.lua b/lua/catppuccin/core/palettes/storm.lua deleted file mode 100644 index 5241ef1..0000000 --- a/lua/catppuccin/core/palettes/storm.lua +++ /dev/null @@ -1,28 +0,0 @@ -local color_palette = { - rosewater = "#F5DFDA", - flamingo = "#F2CBCB", - pink = "#F5BFE7", - mauve = "#C59FF6", - red = "#F67E98", - maroon = "#F1949B", - peach = "#FEA571", - yellow = "#F1D8A4", - green = "#A1DF8E", - teal = "#85E0D1", - sky = "#89DCFD", - blue = "#83ABF9", - sapphire = "#34C3DC", - lavender = "#B8C1FE", - white = "#C5CFF5", - gray2 = "#AEB7DA", - gray1 = "#979FC0", - gray0 = "#8087A5", - black5 = "#696F8A", - black4 = "#52576F", - black3 = "#3B3F55", - black2 = "#24273A", - black1 = "#1F2232", - black0 = "#181926", -} - -return color_palette From 833ff1a98af8c9e6a3a33df8e8deb235d4bd7292 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Sun, 1 May 2022 22:45:32 -0500 Subject: [PATCH 21/28] feat: new naming convention and better color transitions --- lua/catppuccin/config.lua | 16 +-- lua/catppuccin/core/integrations/barbar.lua | 34 +++--- .../core/integrations/bufferline.lua | 20 ++-- lua/catppuccin/core/integrations/cmp.lua | 10 +- lua/catppuccin/core/integrations/feline.lua | 4 +- lua/catppuccin/core/integrations/gitsigns.lua | 6 +- lua/catppuccin/core/integrations/hop.lua | 8 +- .../core/integrations/indent_blankline.lua | 4 +- .../core/integrations/lightspeed.lua | 28 ++--- lua/catppuccin/core/integrations/lsp_saga.lua | 4 +- .../core/integrations/lsp_trouble.lua | 4 +- .../core/integrations/native_lsp.lua | 16 +-- lua/catppuccin/core/integrations/neogit.lua | 10 +- lua/catppuccin/core/integrations/neotree.lua | 4 +- lua/catppuccin/core/integrations/nvimtree.lua | 12 +- .../core/integrations/symbols_outline.lua | 2 +- .../core/integrations/telescope.lua | 2 +- .../core/integrations/treesitter.lua | 26 ++-- .../core/integrations/ts_rainbow.lua | 2 +- .../core/integrations/vim_sneak.lua | 4 +- .../core/integrations/which_key.lua | 8 +- lua/catppuccin/core/mapper.lua | 112 +++++++++--------- lua/catppuccin/core/palettes/frappe.lua | 53 +++++---- lua/catppuccin/core/palettes/latte.lua | 41 ++++--- lua/catppuccin/core/palettes/macchiato.lua | 53 +++++---- lua/catppuccin/core/palettes/moccha.lua | 25 ++-- lua/catppuccin/main.lua | 11 +- lua/catppuccin/utils/colors.lua | 2 +- lua/catppuccin/utils/data.lua | 11 ++ lua/catppuccin/utils/util.lua | 10 +- lua/lightline/colorscheme/catppuccin.lua | 30 ++--- lua/lualine/themes/catppuccin.lua | 28 ++--- plugin/catppuccin.vim | 15 +++ 33 files changed, 330 insertions(+), 285 deletions(-) create mode 100644 lua/catppuccin/utils/data.lua create mode 100644 plugin/catppuccin.vim diff --git a/lua/catppuccin/config.lua b/lua/catppuccin/config.lua index bb515b4..db44af1 100644 --- a/lua/catppuccin/config.lua +++ b/lua/catppuccin/config.lua @@ -6,15 +6,17 @@ config.options = { term_colors = false, styles = { comments = "italic", - functions = "italic", - keywords = "italic", + conditionals = "italic", + loops = "NONE", + functions = "NONE", + keywords = "NONE", strings = "NONE", - variables = "italic", - numbers = "bold", - booleans = "bold", - operators = "NONE", + variables = "NONE", + numbers = "NONE", + booleans = "NONE", properties = "NONE", - types = "NONE" + types = "NONE", + operators = "NONE", }, integrations = { treesitter = true, diff --git a/lua/catppuccin/core/integrations/barbar.lua b/lua/catppuccin/core/integrations/barbar.lua index 3304ad1..5a236e8 100644 --- a/lua/catppuccin/core/integrations/barbar.lua +++ b/lua/catppuccin/core/integrations/barbar.lua @@ -2,23 +2,23 @@ local M = {} function M.get(cp) return { - BufferCurrent = { bg = cp.black4, fg = cp.white }, - BufferCurrentIndex = { bg = cp.black4, fg = cp.blue }, - BufferCurrentMod = { bg = cp.black4, fg = cp.yellow }, - BufferCurrentSign = { bg = cp.black4, fg = cp.blue }, - BufferCurrentTarget = { bg = cp.black4, fg = cp.red }, - BufferVisible = { bg = cp.black1, fg = cp.white }, - BufferVisibleIndex = { bg = cp.black1, fg = cp.blue }, - BufferVisibleMod = { bg = cp.black1, fg = cp.yellow }, - BufferVisibleSign = { bg = cp.black1, fg = cp.blue }, - BufferVisibleTarget = { bg = cp.black1, fg = cp.red }, - BufferInactive = { bg = cp.black1, fg = cp.gray0 }, - BufferInactiveIndex = { bg = cp.black1, fg = cp.gray0 }, - BufferInactiveMod = { bg = cp.black1, fg = cp.yellow }, - BufferInactiveSign = { bg = cp.black1, fg = cp.blue }, - BufferInactiveTarget = { bg = cp.black1, fg = cp.red }, - BufferTabpages = { bg = cp.black1, fg = cp.none }, - BufferTabpage = { bg = cp.black1, fg = cp.blue }, + BufferCurrent = { bg = cp.surface1, fg = cp.text }, + BufferCurrentIndex = { bg = cp.surface1, fg = cp.blue }, + BufferCurrentMod = { bg = cp.surface1, fg = cp.yellow }, + BufferCurrentSign = { bg = cp.surface1, fg = cp.blue }, + BufferCurrentTarget = { bg = cp.surface1, fg = cp.red }, + BufferVisible = { bg = cp.base1, fg = cp.text }, + BufferVisibleIndex = { bg = cp.base1, fg = cp.blue }, + BufferVisibleMod = { bg = cp.base1, fg = cp.yellow }, + BufferVisibleSign = { bg = cp.base1, fg = cp.blue }, + BufferVisibleTarget = { bg = cp.base1, fg = cp.red }, + BufferInactive = { bg = cp.base1, fg = cp.overlay0 }, + BufferInactiveIndex = { bg = cp.base1, fg = cp.overlay0 }, + BufferInactiveMod = { bg = cp.base1, fg = cp.yellow }, + BufferInactiveSign = { bg = cp.base1, fg = cp.blue }, + BufferInactiveTarget = { bg = cp.base1, fg = cp.red }, + BufferTabpages = { bg = cp.base1, fg = cp.none }, + BufferTabpage = { bg = cp.base1, fg = cp.blue }, } end diff --git a/lua/catppuccin/core/integrations/bufferline.lua b/lua/catppuccin/core/integrations/bufferline.lua index ce86eb2..b6be5c4 100644 --- a/lua/catppuccin/core/integrations/bufferline.lua +++ b/lua/catppuccin/core/integrations/bufferline.lua @@ -2,25 +2,25 @@ local M = {} function M.get(cp) - local inactive_bg = cp.black1 + local inactive_bg = cp.base1 return { - BufferLineFill = { bg = cp.black0 }, - BufferLineBackground = { fg = cp.white, bg = inactive_bg }, -- others - BufferLineBufferVisible = { fg = cp.black4, bg = inactive_bg }, - BufferLineBufferSelected = { fg = cp.white, bg = cp.black2, style = "bold,italic" }, -- current - BufferLineTab = { fg = cp.black4, bg = cp.black2 }, + BufferLineFill = { bg = cp.base0 }, + BufferLineBackground = { fg = cp.text, bg = inactive_bg }, -- others + BufferLineBufferVisible = { fg = cp.surface1, bg = inactive_bg }, + BufferLineBufferSelected = { fg = cp.text, bg = cp.base2, style = "bold,italic" }, -- current + BufferLineTab = { fg = cp.surface1, bg = cp.base2 }, BufferLineTabSelected = { fg = cp.red, bg = cp.blue }, BufferLineTabClose = { fg = cp.red, bg = inactive_bg }, - BufferLineIndicatorSelected = { fg = cp.peach, bg = cp.black2 }, + BufferLineIndicatorSelected = { fg = cp.peach, bg = cp.base2 }, -- separators BufferLineSeparator = { fg = inactive_bg, bg = inactive_bg }, BufferLineSeparatorVisible = { fg = inactive_bg, bg = inactive_bg }, BufferLineSeparatorSelected = { fg = inactive_bg, bg = inactive_bg }, -- close buttons - BufferLineCloseButton = { fg = cp.black4, bg = inactive_bg }, - BufferLineCloseButtonVisible = { fg = cp.black4, bg = inactive_bg }, - BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.black2 }, + BufferLineCloseButton = { fg = cp.surface1, bg = inactive_bg }, + BufferLineCloseButtonVisible = { fg = cp.surface1, bg = inactive_bg }, + BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.base2 }, } end diff --git a/lua/catppuccin/core/integrations/cmp.lua b/lua/catppuccin/core/integrations/cmp.lua index ebc8d9a..57b0afb 100644 --- a/lua/catppuccin/core/integrations/cmp.lua +++ b/lua/catppuccin/core/integrations/cmp.lua @@ -2,12 +2,12 @@ local M = {} function M.get(cp) return { - CmpItemAbbr = { fg = cp.gray2 }, - CmpItemAbbrDeprecated = { fg = cp.gray0, style = "strikethrough" }, + CmpItemAbbr = { fg = cp.overlay2 }, + CmpItemAbbrDeprecated = { fg = cp.overlay0, style = "strikethrough" }, CmpItemKind = { fg = cp.blue }, - CmpItemMenu = { fg = cp.white }, - CmpItemAbbrMatch = { fg = cp.white, style = "bold" }, - CmpItemAbbrMatchFuzzy = { fg = cp.white, style = "bold" }, + CmpItemMenu = { fg = cp.text }, + CmpItemAbbrMatch = { fg = cp.text, style = "bold" }, + CmpItemAbbrMatchFuzzy = { fg = cp.text, style = "bold" }, -- kind support CmpItemKindSnippet = { fg = cp.mauve }, diff --git a/lua/catppuccin/core/integrations/feline.lua b/lua/catppuccin/core/integrations/feline.lua index 0444e04..1a7ff19 100644 --- a/lua/catppuccin/core/integrations/feline.lua +++ b/lua/catppuccin/core/integrations/feline.lua @@ -30,9 +30,9 @@ local clrs = require("catppuccin.core.color_palette") -- settings local sett = { - bkg = clrs.black3, + bkg = clrs.surface0, diffs = clrs.mauve, - extras = clrs.gray1, + extras = clrs.overlay1, curr_file = clrs.maroon, curr_dir = clrs.flamingo, } diff --git a/lua/catppuccin/core/integrations/gitsigns.lua b/lua/catppuccin/core/integrations/gitsigns.lua index 8c6fc20..5b6d078 100644 --- a/lua/catppuccin/core/integrations/gitsigns.lua +++ b/lua/catppuccin/core/integrations/gitsigns.lua @@ -2,9 +2,9 @@ local M = {} function M.get(cp) return { - GitSignsAdd = { fg = cp.green, bg = cnf.transparent_background and cp.none or cp.black2 }, -- diff mode: Added line |diff.txt| - GitSignsChange = { fg = cp.yellow, bg = cnf.transparent_background and cp.none or cp.black2 }, -- diff mode: Changed line |diff.txt| - GitSignsDelete = { fg = cp.red, bg = cnf.transparent_background and cp.none or cp.black2 }, -- diff mode: Deleted line |diff.txt| + GitSignsAdd = { fg = cp.green, bg = cnf.transparent_background and cp.none or cp.base2 }, -- diff mode: Added line |diff.txt| + GitSignsChange = { fg = cp.yellow, bg = cnf.transparent_background and cp.none or cp.base2 }, -- diff mode: Changed line |diff.txt| + GitSignsDelete = { fg = cp.red, bg = cnf.transparent_background and cp.none or cp.base2 }, -- diff mode: Deleted line |diff.txt| } end diff --git a/lua/catppuccin/core/integrations/hop.lua b/lua/catppuccin/core/integrations/hop.lua index 102050c..ac49c9a 100644 --- a/lua/catppuccin/core/integrations/hop.lua +++ b/lua/catppuccin/core/integrations/hop.lua @@ -2,10 +2,10 @@ local M = {} function M.get(cp) return { - HopNextKey = { bg = cp.black2, fg = cp.peach, style = "bold,underline" }, - HopNextKey1 = { bg = cp.black2, fg = cp.blue, style = "bold" }, - HopNextKey2 = { bg = cp.black2, fg = cp.teal, style = "bold,italic" }, - HopUnmatched = { bg = cp.black2, fg = cp.gray0 }, + HopNextKey = { bg = cp.base2, fg = cp.peach, style = "bold,underline" }, + HopNextKey1 = { bg = cp.base2, fg = cp.blue, style = "bold" }, + HopNextKey2 = { bg = cp.base2, fg = cp.teal, style = "bold,italic" }, + HopUnmatched = { bg = cp.base2, fg = cp.overlay0 }, } end diff --git a/lua/catppuccin/core/integrations/indent_blankline.lua b/lua/catppuccin/core/integrations/indent_blankline.lua index df43707..3fe3bde 100644 --- a/lua/catppuccin/core/integrations/indent_blankline.lua +++ b/lua/catppuccin/core/integrations/indent_blankline.lua @@ -3,8 +3,8 @@ local M = {} function M.get(cp) local hi = { - IndentBlanklineChar = { fg = cp.black3 }, - IndentBlanklineContextChar = { fg = cp.white }, + IndentBlanklineChar = { fg = cp.surface0 }, + IndentBlanklineContextChar = { fg = cp.text }, } if cnf.integrations.indent_blankline.colored_indent_levels then diff --git a/lua/catppuccin/core/integrations/lightspeed.lua b/lua/catppuccin/core/integrations/lightspeed.lua index 0565df4..ae69ac1 100644 --- a/lua/catppuccin/core/integrations/lightspeed.lua +++ b/lua/catppuccin/core/integrations/lightspeed.lua @@ -28,20 +28,20 @@ function M.get(cp) end return { - LightspeedLabel = {bg = cp.black4, fg = cp.white}, - LightspeedOverlapped = {bg = cp.black4, fg = cp.white}, - LightspeedLabelDistant = {bg = cp.mauve, fg = cp.white}, - LightspeedLabelDistantOverlapped = {bg = cp.mauve, fg = cp.white}, - LightspeedShortcut = {bg = cp.black2, fg = cp.peach, style = "italic"}, - LightspeedShortcutOverlapped = {bg = cp.black2, fg = cp.peach, style = "bold"}, - LightspeedMaskedChar = {bg = cp.black2, fg = cp.red, style = "undercurl"}, - LightspeedGreyWash = {bg = cp.black2, fg = cp.gray0}, - LightspeedUnlabeledMatch = {bg = cp.black2, fg = cp.red, style = "underline"}, - LightspeedOneCharMatch = {bg = cp.black2, fg = cp.red, style = "underline"}, - LightspeedUniqueChar = {bg = cp.black2, fg = cp.green, style = "strikethrough"}, - LightspeedPendingOpArea = {bg = cp.black2, fg = cp.green, style = "strikethrough"}, - LightspeedPendingChangeOpArea = {bg = cp.black2, fg = cp.green, style = "strikethrough"}, - LightspeedCursor = {fg = cp.black2, bg = cp.white}, + LightspeedLabel = {bg = cp.surface1, fg = cp.text}, + LightspeedOverlapped = {bg = cp.surface1, fg = cp.text}, + LightspeedLabelDistant = {bg = cp.mauve, fg = cp.text}, + LightspeedLabelDistantOverlapped = {bg = cp.mauve, fg = cp.text}, + LightspeedShortcut = {bg = cp.base2, fg = cp.peach, style = "italic"}, + LightspeedShortcutOverlapped = {bg = cp.base2, fg = cp.peach, style = "bold"}, + LightspeedMaskedChar = {bg = cp.base2, fg = cp.red, style = "undercurl"}, + LightspeedGreyWash = {bg = cp.base2, fg = cp.overlay0}, + LightspeedUnlabeledMatch = {bg = cp.base2, fg = cp.red, style = "underline"}, + LightspeedOneCharMatch = {bg = cp.base2, fg = cp.red, style = "underline"}, + LightspeedUniqueChar = {bg = cp.base2, fg = cp.green, style = "strikethrough"}, + LightspeedPendingOpArea = {bg = cp.base2, fg = cp.green, style = "strikethrough"}, + LightspeedPendingChangeOpArea = {bg = cp.base2, fg = cp.green, style = "strikethrough"}, + LightspeedCursor = {fg = cp.base2, bg = cp.text}, } end diff --git a/lua/catppuccin/core/integrations/lsp_saga.lua b/lua/catppuccin/core/integrations/lsp_saga.lua index b32cf43..4731cec 100644 --- a/lua/catppuccin/core/integrations/lsp_saga.lua +++ b/lua/catppuccin/core/integrations/lsp_saga.lua @@ -6,14 +6,14 @@ function M.get(cp) DiagnosticWarning = { fg = cp.yellow }, DiagnosticInformation = { fg = cp.blue }, DiagnosticHint = { fg = cp.hint }, - LspFloatWinNormal = { bg = cp.black0 }, + LspFloatWinNormal = { bg = cp.base0 }, LspFloatWinBorder = { fg = cp.blue }, LspSagaBorderTitle = { fg = cp.flamingo }, LspSagaHoverBorder = { fg = cp.blue }, LspSagaRenameBorder = { fg = cp.teal }, LspSagaDefPreviewBorder = { fg = cp.teal }, LspSagaCodeActionBorder = { fg = cp.blue }, - LspSagaFinderSelection = { fg = cp.black4 }, + LspSagaFinderSelection = { fg = cp.surface1 }, LspSagaCodeActionTitle = { fg = cp.blue1 }, LspSagaCodeActionContent = { fg = cp.purple }, LspSagaSignatureHelpBorder = { fg = cp.red }, diff --git a/lua/catppuccin/core/integrations/lsp_trouble.lua b/lua/catppuccin/core/integrations/lsp_trouble.lua index 3f3e4c5..040f5bc 100644 --- a/lua/catppuccin/core/integrations/lsp_trouble.lua +++ b/lua/catppuccin/core/integrations/lsp_trouble.lua @@ -3,8 +3,8 @@ local M = {} function M.get(cp) return { LspTroubleText = { fg = cp.green }, - LspTroubleCount = { fg = cp.pink, bg = cp.black4 }, - LspTroubleNormal = { fg = cp.white, bg = cp.black0 }, + LspTroubleCount = { fg = cp.pink, bg = cp.surface1 }, + LspTroubleNormal = { fg = cp.text, bg = cp.base0 }, } end diff --git a/lua/catppuccin/core/integrations/native_lsp.lua b/lua/catppuccin/core/integrations/native_lsp.lua index c7bf11c..022d796 100644 --- a/lua/catppuccin/core/integrations/native_lsp.lua +++ b/lua/catppuccin/core/integrations/native_lsp.lua @@ -16,14 +16,14 @@ function M.get(cp) -- These groups are for the native LSP cliencp. Some other LSP clients may -- use these groups, or use their own. Consult your LSP client's -- documentation. - LspReferenceText = { bg = cp.black4 }, -- used for highlighting "text" references - LspReferenceRead = { bg = cp.black4 }, -- used for highlighting "read" references - LspReferenceWrite = { bg = cp.black4 }, -- used for highlighting "write" references + LspReferenceText = { bg = cp.surface1 }, -- used for highlighting "text" references + LspReferenceRead = { bg = cp.surface1 }, -- used for highlighting "read" references + LspReferenceWrite = { bg = cp.surface1 }, -- used for highlighting "write" references -- hightlight diagnostics in numberline - DiagnosticError = { bg = util.darken(error, darkening_percentage, cp.black2), fg = error, style = virtual_text.errors }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticWarn = { bg = util.darken(warning, darkening_percentage, cp.black2), fg = warning, style = virtual_text.warnings }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticInfo = { bg = util.darken(info, darkening_percentage, cp.black2), fg = info, style = virtual_text.information }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticHint = { bg = util.darken(hint, darkening_percentage, cp.black2), fg = hint, style = virtual_text.hints }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticError = { bg = util.darken(error, darkening_percentage, cp.base2), fg = error, style = virtual_text.errors }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticWarn = { bg = util.darken(warning, darkening_percentage, cp.base2), fg = warning, style = virtual_text.warnings }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticInfo = { bg = util.darken(info, darkening_percentage, cp.base2), fg = info, style = virtual_text.information }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticHint = { bg = util.darken(hint, darkening_percentage, cp.base2), fg = hint, style = virtual_text.hints }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default -- util. -- for nvim nightly @@ -54,7 +54,7 @@ function M.get(cp) LspDiagnosticsUnderlineWarning = { style = underlines.warnings, sp = warning }, -- Used to underline "Warning" diagnostics LspDiagnosticsUnderlineInformation = { style = underlines.information, sp = info }, -- Used to underline "Information" diagnostics LspDiagnosticsUnderlineHint = { style = underlines.hints, sp = hint }, -- Used to underline "Hint" diagnostics - LspCodeLens = { fg = cp.gray0 }, -- virtual text of the codelens + LspCodeLens = { fg = cp.overlay0 }, -- virtual text of the codelens } end diff --git a/lua/catppuccin/core/integrations/neogit.lua b/lua/catppuccin/core/integrations/neogit.lua index 5da1fc7..71b289b 100644 --- a/lua/catppuccin/core/integrations/neogit.lua +++ b/lua/catppuccin/core/integrations/neogit.lua @@ -4,11 +4,11 @@ function M.get(cp) return { NeogitBranch = { fg = cp.pink }, NeogitRemote = { fg = cp.pink }, - NeogitHunkHeader = { bg = cp.blue, fg = cp.white }, - NeogitHunkHeaderHighlight = { bg = cp.black2, fg = cp.blue }, - NeogitDiffContextHighlight = { bg = cp.black1, fg = cp.gray2 }, - NeogitDiffDeleteHighlight = { bg = cp.black1, fg = cp.red }, - NeogitDiffAddHighlight = { bg = cp.black1, fg = cp.green }, + NeogitHunkHeader = { bg = cp.blue, fg = cp.text }, + NeogitHunkHeaderHighlight = { bg = cp.base2, fg = cp.blue }, + NeogitDiffContextHighlight = { bg = cp.base1, fg = cp.overlay2 }, + NeogitDiffDeleteHighlight = { bg = cp.base1, fg = cp.red }, + NeogitDiffAddHighlight = { bg = cp.base1, fg = cp.green }, } end diff --git a/lua/catppuccin/core/integrations/neotree.lua b/lua/catppuccin/core/integrations/neotree.lua index 3dadc0a..d4dc1fa 100644 --- a/lua/catppuccin/core/integrations/neotree.lua +++ b/lua/catppuccin/core/integrations/neotree.lua @@ -13,8 +13,8 @@ function M.get(cp) return { NeoTreeDirectoryName = { fg = cp.blue }, NeoTreeDirectoryIcon = { fg = cp.blue }, - NeoTreeNormal = { fg = cp.white, bg = neotree.transparent_panel and "NONE" or cp.black1 }, - NeoTreeIndentMarker = { fg = cp.gray0 }, + NeoTreeNormal = { fg = cp.text, bg = neotree.transparent_panel and "NONE" or cp.base1 }, + NeoTreeIndentMarker = { fg = cp.overlay0 }, NeoTreeRootName = { fg = root_dir_color, style = "bold" }, NeoTreeSymbolicLinkTarget = { fg = cp.pink }, NeoTreeGitModified = { fg = cp.yellow }, diff --git a/lua/catppuccin/core/integrations/nvimtree.lua b/lua/catppuccin/core/integrations/nvimtree.lua index 72663a3..505aecd 100644 --- a/lua/catppuccin/core/integrations/nvimtree.lua +++ b/lua/catppuccin/core/integrations/nvimtree.lua @@ -4,7 +4,7 @@ function M.get(cp) local config = require("catppuccin.config").options local nvimtree = config.integrations.nvimtree - local root_dir_color = cp.black1 + local root_dir_color = cp.base1 if nvimtree.show_root == true then root_dir_color = cp.blue end @@ -13,19 +13,19 @@ function M.get(cp) return { NvimTreeFolderName = { fg = cp.blue }, NvimTreeFolderIcon = { fg = cp.blue }, - NvimTreeNormal = { fg = cp.white, bg = nvimtree.transparent_panel and "NONE" or cp.black1 }, + NvimTreeNormal = { fg = cp.text, bg = nvimtree.transparent_panel and "NONE" or cp.base1 }, NvimTreeOpenedFolderName = { fg = cp.blue }, NvimTreeEmptyFolderName = { fg = cp.blue }, - NvimTreeIndentMarker = { fg = cp.gray0 }, - NvimTreeVertSplit = { fg = cp.black2, bg = cp.black2 }, + NvimTreeIndentMarker = { fg = cp.overlay0 }, + NvimTreeVertSplit = { fg = cp.base2, bg = cp.base2 }, NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, NvimTreeSymlink = { fg = cp.pink }, - NvimTreeStatuslineNc = { fg = cp.black1, bg = cp.black1 }, + NvimTreeStatuslineNc = { fg = cp.base1, bg = cp.base1 }, NvimTreeGitDirty = { fg = cp.yellow }, NvimTreeGitNew = { fg = cp.blue }, NvimTreeGitDeleted = { fg = cp.red }, NvimTreeSpecialFile = { fg = cp.flamingo }, - NvimTreeImageFile = { fg = cp.white }, + NvimTreeImageFile = { fg = cp.text }, NvimTreeOpenedFile = { fg = cp.pink }, } end diff --git a/lua/catppuccin/core/integrations/symbols_outline.lua b/lua/catppuccin/core/integrations/symbols_outline.lua index a660d43..200e175 100644 --- a/lua/catppuccin/core/integrations/symbols_outline.lua +++ b/lua/catppuccin/core/integrations/symbols_outline.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - FocusedSymbol = { fg = cp.yellow, bg = cp.black2 }, + FocusedSymbol = { fg = cp.yellow, bg = cp.base2 }, } end diff --git a/lua/catppuccin/core/integrations/telescope.lua b/lua/catppuccin/core/integrations/telescope.lua index 1072dde..d32a76a 100644 --- a/lua/catppuccin/core/integrations/telescope.lua +++ b/lua/catppuccin/core/integrations/telescope.lua @@ -4,7 +4,7 @@ function M.get(cp) return { TelescopeBorder = { fg = cp.blue }, TelescopeSelectionCaret = { fg = cp.flamingo }, - TelescopeSelection = { fg = cp.white, bg = cp.black3, style = "bold" }, + TelescopeSelection = { fg = cp.text, bg = cp.surface0, style = "bold" }, TelescopeMatching = { fg = cp.blue }, } end diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index 558df2c..9de875d 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -1,7 +1,7 @@ local M = {} function M.get(cp) - -- local delimeters = cp.gray2 + -- local delimeters = cp.overlay2 local operators = cp.sky local cl = cp.mauve -- conditionals, loops local keywords = cp.mauve @@ -27,8 +27,8 @@ function M.get(cp) TSConstructor = { fg = cp.sapphire }, -- For constructor calls and definitions: = { } in Lua, and Java constructors. TSConstant = { fg = cp.peach }, -- For constants - TSConditional = { fg = cl, style = cnf.styles.keywords or "NONE" }, -- For keywords related to conditionnals. - TSRepeat = { fg = cl, style = cnf.styles.keywords or "NONE" }, -- For keywords related to loops. + TSConditional = { fg = cl, style = cnf.styles.conditionals or "NONE" }, -- For keywords related to conditionnals. + TSRepeat = { fg = cl, style = cnf.styles.loops or "NONE" }, -- For keywords related to loops. TSException = { fg = cp.mauve, style = cnf.styles.keywords or "NONE" }, -- For exception related keywords. -- builtin @@ -49,29 +49,29 @@ function M.get(cp) -- TSAnnotation = { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. -- TSAttribute = { }; -- (unstable) TODO: docs -- TSCharacter = { }; -- For characters. - -- TSgray0 = { }; -- For gray0 blocks. - TSNote = { fg = cp.black2, bg = cp.blue }, - TSWarning = { fg = cp.black2, bg = cp.yellow }, - TSDanger = { fg = cp.black2, bg = cp.red }, + -- TSoverlay0 = { }; -- For overlay0 blocks. + TSNote = { fg = cp.base2, bg = cp.blue }, + TSWarning = { fg = cp.base2, bg = cp.yellow }, + TSDanger = { fg = cp.base2, bg = cp.red }, TSConstMacro = { fg = cp.mauve }; -- For constants that are defined by macros: NULL in cp. -- TSError = { fg = cp.red }, -- For syntax/parser errors. - -- rustTSField = { fg = cp.black4 }, -- For fields. + -- rustTSField = { fg = cp.surface1 }, -- For fields. TSLabel = { fg = cp.sapphire }, -- For labels: label: in C and :label: in Lua. TSMethod = { fg = cp.blue, style = cnf.styles.functions or "NONE" }, -- For method calls and definitions. -- TSNone = { }; -- TODO: docs -- TSParameterReference= { }; -- For references to parameters of a function. tomlTSProperty = { fg = cp.blue }, -- Differentiates between string and properties - TSPunctDelimiter = { fg = cp.gray2 }, -- For delimiters ie: . + TSPunctDelimiter = { fg = cp.overlay2 }, -- For delimiters ie: . -- TSPunctBracket = { fg = delimeters }, -- For brackets and parenthesis. - TSPunctBracket = { fg = cp.gray2 }, -- For brackets and parenthesis. + TSPunctBracket = { fg = cp.overlay2 }, -- For brackets and parenthesis. TSString = { fg = cp.green, style = cnf.styles.strings or "NONE" }, -- For strings. TSStringRegex = { fg = cp.peach, style = cnf.styles.strings or "NONE" }, -- For regexes. -- TSSymbol = { }; -- For identifiers referring to symbols or atoms. - TSVariable = { fg = cp.white, style = cnf.styles.variables or "NONE" }, -- Any variable name that does not have another highlighcp. + TSVariable = { fg = cp.text, style = cnf.styles.variables or "NONE" }, -- Any variable name that does not have another highlighcp. TSTagAttribute = { fg = cp.teal, style = "italic" }, -- Tags like html tag names. TSTag = { fg = cp.mauve }, -- Tags like html tag names. TSTagDelimiter = { fg = cp.sky }, -- Tag delimiter like < > / - TSText = { fg = cp.white }, -- For strings considerated text in a markup language. + TSText = { fg = cp.text }, -- For strings considerated text in a markup language. -- TSEmphasis = { }; -- For text to be represented with emphasis. -- TSUnderline = { }; -- For text to be represented with an underline. -- TSStrike = { }; -- For strikethrough texcp. @@ -106,7 +106,7 @@ function M.get(cp) tsxTSTagAttribute = { fg = cp.mauve }, -- cpp - cppTSProperty = { fg = cp.white }, + cppTSProperty = { fg = cp.text }, -- yaml yamlTSField = { fg = cp.blue }, -- For fields. diff --git a/lua/catppuccin/core/integrations/ts_rainbow.lua b/lua/catppuccin/core/integrations/ts_rainbow.lua index 1e4b74a..3ba2a14 100644 --- a/lua/catppuccin/core/integrations/ts_rainbow.lua +++ b/lua/catppuccin/core/integrations/ts_rainbow.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) local transparent_background = require("catppuccin.config").options.transparent_background - local bg_highlight = transparent_background and "NONE" or cp.black2 + local bg_highlight = transparent_background and "NONE" or cp.base2 return { rainbowcol1 = {bg = bg_highlight, fg = cp.red}, rainbowcol2 = {bg = bg_highlight, fg = cp.teal}, diff --git a/lua/catppuccin/core/integrations/vim_sneak.lua b/lua/catppuccin/core/integrations/vim_sneak.lua index 9dd5ec4..4c8f9cb 100644 --- a/lua/catppuccin/core/integrations/vim_sneak.lua +++ b/lua/catppuccin/core/integrations/vim_sneak.lua @@ -2,8 +2,8 @@ local M = {} function M.get(cp) return { - Sneak = { fg = cp.gray2, bg = cp.pink }, - SneakScope = { bg = cp.white }, + Sneak = { fg = cp.overlay2, bg = cp.pink }, + SneakScope = { bg = cp.text }, } end diff --git a/lua/catppuccin/core/integrations/which_key.lua b/lua/catppuccin/core/integrations/which_key.lua index d14136c..10b8056 100644 --- a/lua/catppuccin/core/integrations/which_key.lua +++ b/lua/catppuccin/core/integrations/which_key.lua @@ -5,10 +5,10 @@ function M.get(cp) WhichKey = { fg = cp.flamingo }, WhichKeyGroup = { fg = cp.blue }, WhichKeyDesc = { fg = cp.pink }, - WhichKeySeperator = { fg = cp.gray0 }, - WhichKeySeparator = { fg = cp.gray0 }, - WhichKeyFloat = { bg = cp.black0 }, - WhichKeyValue = { fg = cp.gray0 }, + WhichKeySeperator = { fg = cp.overlay0 }, + WhichKeySeparator = { fg = cp.overlay0 }, + WhichKeyFloat = { bg = cp.base0 }, + WhichKeyValue = { fg = cp.overlay0 }, } end diff --git a/lua/catppuccin/core/mapper.lua b/lua/catppuccin/core/mapper.lua index 941a33e..89e8255 100644 --- a/lua/catppuccin/core/mapper.lua +++ b/lua/catppuccin/core/mapper.lua @@ -10,7 +10,7 @@ local function get_properties() background = "dark", } - if colors_util.assert_brightness(cp.black2) then + if colors_util.assert_brightness(cp.base2) then props["background"] = "light" end @@ -21,65 +21,65 @@ local function get_base() cp.none = "NONE" return { - Comment = { fg = cp.gray0, style = cnf.styles.comments }, -- just comments - ColorColumn = { bg = cp.black3 }, -- used for the columns set with 'colorcolumn' - Conceal = { fg = cp.gray1 }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor = { fg = cp.black2, bg = cp.white }, -- character under the cursor - lCursor = { fg = cp.black2, bg = cp.white }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') - CursorIM = { fg = cp.black2, bg = cp.white }, -- like Cursor, but used when in IME mode |CursorIM| - CursorColumn = { bg = cp.black1 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. - CursorLine = { bg = colors_util.vary_color({latte = util.lighten(cp.black1, 0.70, cp.black2)}, util.darken(cp.black3, 0.64, cp.black2)) }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. + Comment = { fg = cp.surface2, style = cnf.styles.comments }, -- just comments + ColorColumn = { bg = cp.surface0 }, -- used for the columns set with 'colorcolumn' + Conceal = { fg = cp.overlay1 }, -- placeholder characters substituted for concealed text (see 'conceallevel') + Cursor = { fg = cp.base2, bg = cp.text }, -- character under the cursor + lCursor = { fg = cp.base2, bg = cp.text }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + CursorIM = { fg = cp.base2, bg = cp.text }, -- like Cursor, but used when in IME mode |CursorIM| + CursorColumn = { bg = cp.base1 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. + CursorLine = { bg = colors_util.vary_color({latte = util.lighten(cp.base1, 0.70, cp.base2)}, util.darken(cp.surface0, 0.64, cp.base2)) }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. Directory = { fg = cp.blue }, -- directory names (and other special names in listings) - EndOfBuffer = { fg = cp.black2 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. + EndOfBuffer = { fg = cp.base2 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. ErrorMsg = { fg = cp.red, style = "bold,italic" }, -- error messages on the command line - VertSplit = { fg = cp.black0 }, -- the column separating vertically split windows - Folded = { fg = cp.blue, bg = cp.black4 }, -- line used for closed folds - FoldColumn = { bg = cp.black2, fg = cp.gray0 }, -- 'foldcolumn' - SignColumn = { bg = cnf.transparent_background and cp.none or cp.black2, fg = cp.black4 }, -- column where |signs| are displayed - SignColumnSB = { bg = cp.black0, fg = cp.black4 }, -- column where |signs| are displayed - Substitute = { bg = cp.black4, fg = cp.pink }, -- |:substitute| replacement text highlighting - LineNr = { fg = colors_util.vary_color({latte = cp.black0}, cp.black4) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. + VertSplit = { fg = cp.base0 }, -- the column separating vertically split windows + Folded = { fg = cp.blue, bg = cp.surface1 }, -- line used for closed folds + FoldColumn = { bg = cp.base2, fg = cp.overlay0 }, -- 'foldcolumn' + SignColumn = { bg = cnf.transparent_background and cp.none or cp.base2, fg = cp.surface1 }, -- column where |signs| are displayed + SignColumnSB = { bg = cp.base0, fg = cp.surface1 }, -- column where |signs| are displayed + Substitute = { bg = cp.surface1, fg = cp.pink }, -- |:substitute| replacement text highlighting + LineNr = { fg = colors_util.vary_color({latte = cp.base0}, cp.surface1) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. CursorLineNr = { fg = cp.lavender }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. MatchParen = { fg = cp.peach, style = "bold" }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| - ModeMsg = { fg = cp.white, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") - MsgArea = { fg = cp.white }, -- Area for messages and cmdline + ModeMsg = { fg = cp.text, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") + MsgArea = { fg = cp.text }, -- Area for messages and cmdline MsgSeparator = {}, -- Separator for scrolled messages, `msgsep` flag of 'display' MoreMsg = { fg = cp.blue }, -- |more-prompt| - NonText = { fg = cp.gray0 }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. - Normal = { fg = cp.white, bg = cnf.transparent_background and cp.none or cp.black2 }, -- normal text - NormalNC = { fg = cp.white, bg = cnf.transparent_background and cp.none or cp.black2 }, -- normal text in non-current windows - NormalSB = { fg = cp.white, bg = cp.black0 }, -- normal text in non-current windows - NormalFloat = { fg = cp.white, bg = cp.black1 }, -- Normal text in floating windows. + NonText = { fg = cp.overlay0 }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. + Normal = { fg = cp.text, bg = cnf.transparent_background and cp.none or cp.base2 }, -- normal text + NormalNC = { fg = cp.text, bg = cnf.transparent_background and cp.none or cp.base2 }, -- normal text in non-current windows + NormalSB = { fg = cp.text, bg = cp.base0 }, -- normal text in non-current windows + NormalFloat = { fg = cp.text, bg = cp.base1 }, -- Normal text in floating windows. FloatBorder = { fg = cp.blue }, - Pmenu = { bg = cp.black3, fg = cp.gray2 }, -- Popup menu: normal item. - PmenuSel = { fg = cp.white, bg = cp.black4, style = "bold" }, -- Popup menu: selected item. - PmenuSbar = { bg = cp.black4 }, -- Popup menu: scrollbar. - PmenuThumb = { bg = cp.gray0 }, -- Popup menu: Thumb of the scrollbar. + Pmenu = { bg = cp.surface0, fg = cp.overlay2 }, -- Popup menu: normal item. + PmenuSel = { fg = cp.text, bg = cp.surface1, style = "bold" }, -- Popup menu: selected item. + PmenuSbar = { bg = cp.surface1 }, -- Popup menu: scrollbar. + PmenuThumb = { bg = cp.overlay0 }, -- Popup menu: Thumb of the scrollbar. Question = { fg = cp.blue }, -- |hit-enter| prompt and yes/no questions - QuickFixLine = { bg = cp.black4, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. - Search = { bg = cp.black4, fg = cp.pink, style = "bold" }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand oucp. - IncSearch = { bg = cp.pink, fg = cp.black4 }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" - SpecialKey = { fg = cp.white }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| + QuickFixLine = { bg = cp.surface1, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. + Search = { bg = cp.surface1, fg = cp.pink, style = "bold" }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand oucp. + IncSearch = { bg = cp.pink, fg = cp.surface1 }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + SpecialKey = { fg = cp.text }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' textspace. |hl-Whitespace| SpellBad = { sp = cp.red, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. SpellCap = { sp = cp.yellow, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal = { sp = cp.blue, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare = { sp = cp.green, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine = { fg = cp.white, bg = cp.black1 }, -- status line of current window - StatusLineNC = { fg = cp.black4, bg = cp.black1 }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. - TabLine = { bg = cp.black1, fg = cp.black4 }, -- tab pages line, not active tab page label + StatusLine = { fg = cp.text, bg = cp.base1 }, -- status line of current window + StatusLineNC = { fg = cp.surface1, bg = cp.base1 }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + TabLine = { bg = cp.base1, fg = cp.surface1 }, -- tab pages line, not active tab page label TabLineFill = { bg = cp.black }, -- tab pages line, where there are no labels - TabLineSel = { fg = cp.green, bg = cp.black4 }, -- tab pages line, active tab page label + TabLineSel = { fg = cp.green, bg = cp.surface1 }, -- tab pages line, active tab page label Title = { fg = cp.blue, style = "bold" }, -- titles for output from ":set all", ":autocmd" etcp. - Visual = { bg = cp.black4, style = "bold" }, -- Visual mode selection - VisualNOS = { bg = cp.black4, style = "bold" }, -- Visual mode selection when vim is "Not Owning the Selection". + Visual = { bg = cp.surface1, style = "bold" }, -- Visual mode selection + VisualNOS = { bg = cp.surface1, style = "bold" }, -- Visual mode selection when vim is "Not Owning the Selection". WarningMsg = { fg = cp.yellow }, -- warning messages - Whitespace = { fg = cp.black4 }, -- "nbsp", "space", "tab" and "trail" in 'listchars' - WildMenu = { bg = cp.gray0 }, -- current match in 'wildmenu' completion + Whitespace = { fg = cp.surface1 }, -- "nbsp", "space", "tab" and "trail" in 'listchars' + WildMenu = { bg = cp.overlay0 }, -- current match in 'wildmenu' completion -- These groups are not listed as default vim groups, -- but they are defacto standard group names for syntax highlighting. - -- gray0ed out groups should chain up to their "preferred" group by + -- overlay0ed out groups should chain up to their "preferred" group by -- default, - -- Ungray0 and edit if you want more specific syntax highlighting. + -- Unoverlay0 and edit if you want more specific syntax highlighting. -- code itself @@ -113,7 +113,7 @@ local function get_base() -- SpecialChar = { }, -- special character in a constant -- Tag = { }, -- you can use CTRL-] on this -- Delimiter = { }, -- character that needs attention - -- Specialgray0= { }, -- special things inside a gray0 + -- Specialoverlay0= { }, -- special things inside a overlay0 -- Debug = { }, -- debugging statements Underlined = { style = "underline" }, -- (preferred) text that stands out, HTML links @@ -123,24 +123,24 @@ local function get_base() -- Ignore = { }, -- (preferred) left blank, hidden |hl-Ignore| Error = { fg = cp.red }, -- (preferred) any erroneous construct - Todo = { bg = cp.yellow, fg = cp.black2, style = "bold" }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Todo = { bg = cp.yellow, fg = cp.base2, style = "bold" }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX qfLineNr = { fg = cp.yellow }, qfFileName = { fg = cp.blue }, htmlH1 = { fg = cp.pink, style = "bold" }, htmlH2 = { fg = cp.blue, style = "bold" }, -- mkdHeading = { fg = cp.peach, style = "bold" }, - -- mkdCode = { bg = cp.terminal_black, fg = cp.white }, - mkdCodeDelimiter = { bg = cp.black2, fg = cp.white }, + -- mkdCode = { bg = cp.terminal_black, fg = cp.text }, + mkdCodeDelimiter = { bg = cp.base2, fg = cp.text }, mkdCodeStart = { fg = cp.flamingo, style = "bold" }, mkdCodeEnd = { fg = cp.flamingo, style = "bold" }, -- mkdLink = { fg = cp.blue, style = "underline" }, -- debugging - debugPC = { bg = cp.black0 }, -- used for highlighting the current line in terminal-debug - debugBreakpoint = { bg = cp.black2, fg = cp.gray0 }, -- used for breakpoint colors in terminal-debug + debugPC = { bg = cp.base0 }, -- used for highlighting the current line in terminal-debug + debugBreakpoint = { bg = cp.base2, fg = cp.overlay0 }, -- used for breakpoint colors in terminal-debug -- illuminate - illuminatedWord = { bg = cp.black4 }, - illuminatedCurWord = { bg = cp.black4 }, + illuminatedWord = { bg = cp.surface1 }, + illuminatedCurWord = { bg = cp.surface1 }, -- diff diffAdded = { fg = cp.green }, diffRemoved = { fg = cp.red }, @@ -148,12 +148,12 @@ local function get_base() diffOldFile = { fg = cp.yellow }, diffNewFile = { fg = cp.peach }, diffFile = { fg = cp.blue }, - diffLine = { fg = cp.gray0 }, + diffLine = { fg = cp.overlay0 }, diffIndexLine = { fg = cp.pink }, - DiffAdd = { fg = cp.green, bg = cp.black2 }, -- diff mode: Added line |diff.txt| - DiffChange = { fg = cp.yellow, bg = cp.black2 }, -- diff mode: Changed line |diff.txt| - DiffDelete = { fg = cp.red, bg = cp.black2 }, -- diff mode: Deleted line |diff.txt| - DiffText = { fg = cp.blue, bg = cp.black2 }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd = { fg = cp.green, bg = cp.base2 }, -- diff mode: Added line |diff.txt| + DiffChange = { fg = cp.yellow, bg = cp.base2 }, -- diff mode: Changed line |diff.txt| + DiffDelete = { fg = cp.red, bg = cp.base2 }, -- diff mode: Deleted line |diff.txt| + DiffText = { fg = cp.blue, bg = cp.base2 }, -- diff mode: Changed text within a changed line |diff.txt| -- NeoVim healthError = { fg = cp.red }, healthSuccess = { fg = cp.teal }, @@ -166,7 +166,7 @@ local function get_base() GlyphPalette3 = { fg = cp.yellow }, GlyphPalette4 = { fg = cp.blue }, GlyphPalette6 = { fg = cp.teal }, - GlyphPalette7 = { fg = cp.white }, + GlyphPalette7 = { fg = cp.text }, GlyphPalette9 = { fg = cp.red }, } end diff --git a/lua/catppuccin/core/palettes/frappe.lua b/lua/catppuccin/core/palettes/frappe.lua index d5d82c6..5d24b9c 100644 --- a/lua/catppuccin/core/palettes/frappe.lua +++ b/lua/catppuccin/core/palettes/frappe.lua @@ -1,28 +1,33 @@ +-- NOTE: references for Catppuccin Frappé +-- monochromatic: https://coolors.co/c6ceef-b1b8d7-9ba2bf-868ca7-707590-5b5f78-454960-303348-252737-181a25 +-- analogous 1: https://coolors.co/f2d5cf-eebebe-f4b8e4-ca9ee6-ea999c-e78284-ef9f76 +-- analogous 2: https://coolors.co/bfb7e4-8caaee-99d1db-e5c890-85c1dc-a6d189-81c8be + local color_palette = { - rosewater = "#F5E0DC", -- not ready - flamingo = "#F2CDCD", - pink = "#F5C2E7", - mauve = "#CA9EE6", -- g + - red = "#E78284", -- g +? - maroon = "#EA999C", -- g - peach = "#EE9E76", -- g + - yellow = "#E5C890", -- g + - green = "#A6D189", -- g + - teal = "#81C8BE", -- g + - sky = "#99D1DB", -- g? + - blue = "#8CAAEE", -- g +? - sapphire = "#85C1DC", -- gotta tweak this one - lavender = "#BFB7E4", -- g - white = "#C6CEEF", -- g - gray2 = "#B1B8D7", - gray1 = "#9BA2BF", - gray0 = "#868CA7", - black5 = "#707590", - black4 = "#5B5F78", -- - black3 = "#454960", -- - black2 = "#303348", -- - black1 = "#252737", - black0 = "#181A25", + rosewater = "#F2D5CF", + flamingo = "#EEBEBE", + pink = "#F4B8E4", + mauve = "#CA9EE6", + red = "#E78284", + maroon = "#EA999C", + peach = "#EF9F76", + yellow = "#E5C890", + green = "#A6D189", + teal = "#81C8BE", + sky = "#99D1DB", + blue = "#8CAAEE", + sapphire = "#85C1DC", + lavender = "#BFB7E4", + text = "#C6CEEF", + overlay2 = "#B1B8D7", + overlay1 = "#9BA2BF", + overlay0 = "#868CA7", + surface2 = "#707590", + surface1 = "#5B5F78", + surface0 = "#454960", + base2 = "#303348", + base1 = "#252737", + base0 = "#181A25", } return color_palette diff --git a/lua/catppuccin/core/palettes/latte.lua b/lua/catppuccin/core/palettes/latte.lua index 59b1635..aa81dc7 100644 --- a/lua/catppuccin/core/palettes/latte.lua +++ b/lua/catppuccin/core/palettes/latte.lua @@ -1,30 +1,33 @@ +-- NOTE: references for Catppuccin Latte +-- monochromatic: https://coolors.co/fbf8f4-e9e6e6-d7d3d9-c4c1cb-b2aebd-a09cb0-8e89a2-7b7794-696487-575279 +-- analogous 1: https://coolors.co/de9584-dd7878-ec83d0-822fee-e64553-bb0d33-fe640b +-- analogous 2: https://coolors.co/7287fd-2a6ef5-04a5e5-e49320-209fb5-40a02b-179299 + local color_palette = { - rosewater = "#DC907F", + rosewater = "#DE9584", flamingo = "#DD7878", pink = "#EC83D0", - mauve = "#9247ED", -- - red = "#BB0D33", - maroon = "#E63B4A", + mauve = "#8839EF", + red = "#D20F39", + maroon = "#E64553", peach = "#FE640B", yellow = "#E49320", - green = "#53A947", -- - teal = "#23979F", + green = "#40A02B", + teal = "#179299", sky = "#04A5E5", - blue = "#3474EE", + blue = "#2A6EF5", sapphire = "#209FB5", lavender = "#7287FD", - white = "#575279", - gray2 = "#696486", - gray1 = "#7B7794", - gray0 = "#8E89A1", - black5 = "#A09BAE", - black4 = "#B2AEBC", - black0 = "#C4C0C9", - black3 = "#D7D2D6", - black1 = "#E9E5E4", - black2 = "#FBF7F1", + text = "#575279", + overlay2 = "#696487", + overlay1 = "#7B7794", + overlay0 = "#8E89A2", + surface2 = "#A09BAF", + surface1 = "#B2AEBD", + base0 = "#C4C0CA", + surface0 = "#D7D2D8", + base1 = "#E9E5E5", + base2 = "#FBF7F3", } - - return color_palette diff --git a/lua/catppuccin/core/palettes/macchiato.lua b/lua/catppuccin/core/palettes/macchiato.lua index 5241ef1..408da7f 100644 --- a/lua/catppuccin/core/palettes/macchiato.lua +++ b/lua/catppuccin/core/palettes/macchiato.lua @@ -1,28 +1,33 @@ +-- NOTE: references for Catppuccin Macchiato +-- monochromatic: https://coolors.co/c5cff5-aeb7da-979fc0-8087a5-696f8a-52576f-3b3f55-24273a-181926-0c0d13 +-- analogous 1: https://coolors.co/f4dbd6-f0c6c6-f5bde6-c6a0f6-ee99a0-ed8796-f5a97f +-- analogous 2: https://coolors.co/bfb7e4-8caaee-99d1db-e5c890-85c1dc-a6d189-81c8be + local color_palette = { - rosewater = "#F5DFDA", - flamingo = "#F2CBCB", - pink = "#F5BFE7", - mauve = "#C59FF6", - red = "#F67E98", - maroon = "#F1949B", - peach = "#FEA571", - yellow = "#F1D8A4", - green = "#A1DF8E", - teal = "#85E0D1", - sky = "#89DCFD", - blue = "#83ABF9", - sapphire = "#34C3DC", - lavender = "#B8C1FE", - white = "#C5CFF5", - gray2 = "#AEB7DA", - gray1 = "#979FC0", - gray0 = "#8087A5", - black5 = "#696F8A", - black4 = "#52576F", - black3 = "#3B3F55", - black2 = "#24273A", - black1 = "#1F2232", - black0 = "#181926", + rosewater = "#F4DBD6", + flamingo = "#F0C6C6", + pink = "#F5BDE6", + mauve = "#C6A0F6", + red = "#ED8796", + maroon = "#EE99A0", + peach = "#F5A97F", + yellow = "#EED49F", + green = "#A6DA95", + teal = "#8BD5CA", + sky = "#91D7E3", + blue = "#86AEF8", + sapphire = "#7DC4E4", + lavender = "#B9BEF8", + text = "#C5CFF5", + overlay2 = "#AEB7DA", + overlay1 = "#979FC0", + overlay0 = "#8087A5", + surface2 = "#696F8A", + surface1 = "#52576F", + surface0 = "#3B3F55", + base2 = "#24273A", + base1 = "#181926", + base0 = "#0C0D13", } return color_palette diff --git a/lua/catppuccin/core/palettes/moccha.lua b/lua/catppuccin/core/palettes/moccha.lua index 4f1e92d..97f6265 100644 --- a/lua/catppuccin/core/palettes/moccha.lua +++ b/lua/catppuccin/core/palettes/moccha.lua @@ -1,3 +1,8 @@ +-- NOTE: references for Catppuccin Moccha +-- monochromatic: https://coolors.co/c6d0f5-aeb7d9-969dbc-7e84a0-666a83-4e5167-36374a-1e1e2e-12121c-07070a +-- analogous 1: https://coolors.co/f5e0dc-f2cdcd-f5c2e7-cba6f7-eba0ac-f38ba8-fab387 +-- analogous 2: https://coolors.co/bfb7e4-8caaee-99d1db-e5c890-85c1dc-a6d189-81c8be + local color_palette = { rosewater = "#F5E0DC", flamingo = "#F2CDCD", @@ -13,16 +18,16 @@ local color_palette = { blue = "#90C1FB", sapphire = "#74C7EC", lavender = "#B4BEFE", - white = "#C6D0F5", - gray2 = "#AEB7D9", - gray1 = "#969DBC", - gray0 = "#7E84A0", - black5 = "#666A83", - black4 = "#4E5167", - black3 = "#36374A", - black2 = "#1E1E2E", - black1 = "#181825", - black0 = "#101019", + text = "#C6D0F5", + overlay2 = "#AEB7D9", + overlay1 = "#969DBC", + overlay0 = "#7E84A0", + surface2 = "#666A83", + surface1 = "#4E5167", + surface0 = "#36374A", + base2 = "#1E1E2E", + base1 = "#12121C", + base0 = "#07070A", } return color_palette diff --git a/lua/catppuccin/main.lua b/lua/catppuccin/main.lua index ded0cde..97286ef 100644 --- a/lua/catppuccin/main.lua +++ b/lua/catppuccin/main.lua @@ -1,6 +1,11 @@ local M = {} local utils = require("catppuccin.utils.util") +local flavours = {"latte", "frappe", "macchiato", "moccha"} + +function M.cli_flavour_completion() + return vim.tbl_keys(require("catppuccin.utils.data").set_of(flavours)) +end local function load() local catppuccin = require("catppuccin") @@ -18,17 +23,11 @@ local function load() end end -local function clear() - vim.cmd("hi clear") -end - function M.main(option) option = option or "load" if option == "load" then load() - elseif option == "clear" then - clear() else print("catppuccin: option was not recognized") end diff --git a/lua/catppuccin/utils/colors.lua b/lua/catppuccin/utils/colors.lua index 8d894d7..4d53851 100644 --- a/lua/catppuccin/utils/colors.lua +++ b/lua/catppuccin/utils/colors.lua @@ -6,7 +6,7 @@ local function color_is_bright(r, g, b) if luminance > 0.5 then return true -- Bright colors, black font else - return false -- Dark colors, white font + return false -- Dark colors, text font end end diff --git a/lua/catppuccin/utils/data.lua b/lua/catppuccin/utils/data.lua new file mode 100644 index 0000000..241f04f --- /dev/null +++ b/lua/catppuccin/utils/data.lua @@ -0,0 +1,11 @@ +local M = {} + +function M.set_of(list) + local set = {} + for i = 1, #list do + set[list[i]] = true + end + return set +end + +return M diff --git a/lua/catppuccin/utils/util.lua b/lua/catppuccin/utils/util.lua index 27390fa..073a60f 100644 --- a/lua/catppuccin/utils/util.lua +++ b/lua/catppuccin/utils/util.lua @@ -78,7 +78,7 @@ function util.string_to_color(colors, value, default) return value end - local acceptable_colors = { "black", "red", "green", "blue", "magenta", "cyan", "white", "orange", "pink" } + local acceptable_colors = { "black", "red", "green", "blue", "magenta", "cyan", "text", "orange", "pink" } for _, ac in ipairs(acceptable_colors) do if string.match(value, ac) then return colors[value] @@ -117,8 +117,8 @@ function util.properties(tbl) end function util.terminal(cp) - g.terminal_color_0 = cp.gray0 - g.terminal_color_8 = cp.gray1 + g.terminal_color_0 = cp.overlay0 + g.terminal_color_8 = cp.overlay1 g.terminal_color_1 = cp.red g.terminal_color_9 = cp.red @@ -138,8 +138,8 @@ function util.terminal(cp) g.terminal_color_6 = cp.sky g.terminal_color_14 = cp.sky - g.terminal_color_7 = cp.white - g.terminal_color_15 = cp.white + g.terminal_color_7 = cp.text + g.terminal_color_15 = cp.text end function util.load(theme) diff --git a/lua/lightline/colorscheme/catppuccin.lua b/lua/lightline/colorscheme/catppuccin.lua index 49a413f..0c35a64 100644 --- a/lua/lightline/colorscheme/catppuccin.lua +++ b/lua/lightline/colorscheme/catppuccin.lua @@ -2,36 +2,36 @@ local cp = require("catppuccin.core.color_palette") local catppuccin = {} catppuccin.normal = { - left = { { cp.black1, cp.blue }, { cp.blue, cp.black2 } }, - middle = { { cp.blue, cp.black4 } }, - right = { { cp.gray0, cp.black2 }, { cp.blue, cp.black3 } }, - error = { { cp.black1, cp.red } }, - warning = { { cp.black1, cp.yellow } }, + left = { { cp.base1, cp.blue }, { cp.blue, cp.base2 } }, + middle = { { cp.blue, cp.surface1 } }, + right = { { cp.overlay0, cp.base2 }, { cp.blue, cp.surface0 } }, + error = { { cp.base1, cp.red } }, + warning = { { cp.base1, cp.yellow } }, } catppuccin.insert = { - left = { { cp.black1, cp.teal }, { cp.blue, cp.black2 } }, + left = { { cp.base1, cp.teal }, { cp.blue, cp.base2 } }, } catppuccin.visual = { - left = { { cp.black1, cp.mauve }, { cp.blue, cp.black2 } }, + left = { { cp.base1, cp.mauve }, { cp.blue, cp.base2 } }, } catppuccin.replace = { - left = { { cp.black1, cp.red }, { cp.blue, cp.black2 } }, + left = { { cp.base1, cp.red }, { cp.blue, cp.base2 } }, } catppuccin.inactive = { - left = { { cp.blue, cp.black2 }, { cp.gray0, cp.black2 } }, - middle = { { cp.black4, cp.black2 } }, - right = { { cp.black4, cp.black2 }, { cp.gray0, cp.black2 } }, + left = { { cp.blue, cp.base2 }, { cp.overlay0, cp.base2 } }, + middle = { { cp.surface1, cp.base2 } }, + right = { { cp.surface1, cp.base2 }, { cp.overlay0, cp.base2 } }, } catppuccin.tabline = { - left = { { cp.gray0, cp.black2 }, { cp.gray0, cp.black2 } }, - middle = { { cp.black4, cp.black2 } }, - right = { { cp.black4, cp.black2 }, { cp.gray0, cp.black2 } }, - tabsel = { { cp.blue, cp.black4 }, { cp.gray0, cp.black2 } }, + left = { { cp.overlay0, cp.base2 }, { cp.overlay0, cp.base2 } }, + middle = { { cp.surface1, cp.base2 } }, + right = { { cp.surface1, cp.base2 }, { cp.overlay0, cp.base2 } }, + tabsel = { { cp.blue, cp.surface1 }, { cp.overlay0, cp.base2 } }, } return catppuccin diff --git a/lua/lualine/themes/catppuccin.lua b/lua/lualine/themes/catppuccin.lua index 5dff200..a7a2d26 100644 --- a/lua/lualine/themes/catppuccin.lua +++ b/lua/lualine/themes/catppuccin.lua @@ -2,35 +2,35 @@ local cp = require("catppuccin.core.color_palette") local catppuccin = {} catppuccin.normal = { - a = { bg = cp.blue, fg = cp.black1, gui = "bold" }, - b = { bg = cp.black4, fg = cp.blue }, - c = { bg = cp.black1, fg = cp.white }, + a = { bg = cp.blue, fg = cp.base1, gui = "bold" }, + b = { bg = cp.surface1, fg = cp.blue }, + c = { bg = cp.base1, fg = cp.text }, } catppuccin.insert = { - a = { bg = cp.green, fg = cp.black2, gui = "bold" }, - b = { bg = cp.black4, fg = cp.teal }, + a = { bg = cp.green, fg = cp.base2, gui = "bold" }, + b = { bg = cp.surface1, fg = cp.teal }, } catppuccin.command = { - a = { bg = cp.peach, fg = cp.black2, gui = "bold" }, - b = { bg = cp.black4, fg = cp.peach }, + a = { bg = cp.peach, fg = cp.base2, gui = "bold" }, + b = { bg = cp.surface1, fg = cp.peach }, } catppuccin.visual = { - a = { bg = cp.mauve, fg = cp.black2, gui = "bold" }, - b = { bg = cp.black4, fg = cp.mauve }, + a = { bg = cp.mauve, fg = cp.base2, gui = "bold" }, + b = { bg = cp.surface1, fg = cp.mauve }, } catppuccin.replace = { - a = { bg = cp.red, fg = cp.black2, gui = "bold" }, - b = { bg = cp.black4, fg = cp.red }, + a = { bg = cp.red, fg = cp.base2, gui = "bold" }, + b = { bg = cp.surface1, fg = cp.red }, } catppuccin.inactive = { - a = { bg = cp.black1, fg = cp.blue }, - b = { bg = cp.black1, fg = cp.black4, gui = "bold" }, - c = { bg = cp.black1, fg = cp.gray0 }, + a = { bg = cp.base1, fg = cp.blue }, + b = { bg = cp.base1, fg = cp.surface1, gui = "bold" }, + c = { bg = cp.base1, fg = cp.overlay0 }, } return catppuccin diff --git a/plugin/catppuccin.vim b/plugin/catppuccin.vim new file mode 100644 index 0000000..4951cd1 --- /dev/null +++ b/plugin/catppuccin.vim @@ -0,0 +1,15 @@ +if exists('g:loaded_catppuccin') | finish | endif + +function! s:FlavourCompletion(...) abort + return join(sort(luaeval("require'catppuccin.main'.cli_flavour_completion()")), "\n") +endfunction + +function! s:ApplyFlavour(args) abort + let l:flavour = matchstr(a:args[0], "[a-z]*") + let g:catppuccin_flavour = flavour + colorscheme catppuccin +endfunction + +command! -nargs=1 -complete=custom,s:FlavourCompletion Catppuccin call s:ApplyFlavour([]) + +let g:loaded_catppuccin = 1 From 97fc19265200392c27c0444e38f971b64e941d2b Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 11 May 2022 22:37:47 -0500 Subject: [PATCH 22/28] BREAKING CHANGE: changed color naming convention --- lua/catppuccin/core/integrations/barbar.lua | 24 ++++----- .../core/integrations/bufferline.lua | 14 ++--- lua/catppuccin/core/integrations/gitsigns.lua | 6 +-- lua/catppuccin/core/integrations/hop.lua | 8 +-- .../core/integrations/lightspeed.lua | 20 +++---- lua/catppuccin/core/integrations/lsp_saga.lua | 2 +- .../core/integrations/lsp_trouble.lua | 2 +- .../core/integrations/native_lsp.lua | 16 +++--- lua/catppuccin/core/integrations/neogit.lua | 8 +-- lua/catppuccin/core/integrations/neotree.lua | 2 +- lua/catppuccin/core/integrations/nvimtree.lua | 8 +-- .../core/integrations/symbols_outline.lua | 2 +- .../core/integrations/treesitter.lua | 6 +-- .../core/integrations/ts_rainbow.lua | 2 +- .../core/integrations/which_key.lua | 2 +- lua/catppuccin/core/mapper.lua | 54 +++++++++---------- lua/catppuccin/core/palettes/frappe.lua | 14 ++--- lua/catppuccin/core/palettes/latte.lua | 22 ++++---- lua/catppuccin/core/palettes/macchiato.lua | 7 +-- lua/catppuccin/core/palettes/moccha.lua | 8 +-- lua/catppuccin/utils/util.lua | 2 +- lua/lightline/colorscheme/catppuccin.lua | 28 +++++----- lua/lualine/themes/catppuccin.lua | 18 +++---- 23 files changed, 141 insertions(+), 134 deletions(-) diff --git a/lua/catppuccin/core/integrations/barbar.lua b/lua/catppuccin/core/integrations/barbar.lua index 5a236e8..1996a46 100644 --- a/lua/catppuccin/core/integrations/barbar.lua +++ b/lua/catppuccin/core/integrations/barbar.lua @@ -7,18 +7,18 @@ function M.get(cp) BufferCurrentMod = { bg = cp.surface1, fg = cp.yellow }, BufferCurrentSign = { bg = cp.surface1, fg = cp.blue }, BufferCurrentTarget = { bg = cp.surface1, fg = cp.red }, - BufferVisible = { bg = cp.base1, fg = cp.text }, - BufferVisibleIndex = { bg = cp.base1, fg = cp.blue }, - BufferVisibleMod = { bg = cp.base1, fg = cp.yellow }, - BufferVisibleSign = { bg = cp.base1, fg = cp.blue }, - BufferVisibleTarget = { bg = cp.base1, fg = cp.red }, - BufferInactive = { bg = cp.base1, fg = cp.overlay0 }, - BufferInactiveIndex = { bg = cp.base1, fg = cp.overlay0 }, - BufferInactiveMod = { bg = cp.base1, fg = cp.yellow }, - BufferInactiveSign = { bg = cp.base1, fg = cp.blue }, - BufferInactiveTarget = { bg = cp.base1, fg = cp.red }, - BufferTabpages = { bg = cp.base1, fg = cp.none }, - BufferTabpage = { bg = cp.base1, fg = cp.blue }, + BufferVisible = { bg = cp.mantle, fg = cp.text }, + BufferVisibleIndex = { bg = cp.mantle, fg = cp.blue }, + BufferVisibleMod = { bg = cp.mantle, fg = cp.yellow }, + BufferVisibleSign = { bg = cp.mantle, fg = cp.blue }, + BufferVisibleTarget = { bg = cp.mantle, fg = cp.red }, + BufferInactive = { bg = cp.mantle, fg = cp.overlay0 }, + BufferInactiveIndex = { bg = cp.mantle, fg = cp.overlay0 }, + BufferInactiveMod = { bg = cp.mantle, fg = cp.yellow }, + BufferInactiveSign = { bg = cp.mantle, fg = cp.blue }, + BufferInactiveTarget = { bg = cp.mantle, fg = cp.red }, + BufferTabpages = { bg = cp.mantle, fg = cp.none }, + BufferTabpage = { bg = cp.mantle, fg = cp.blue }, } end diff --git a/lua/catppuccin/core/integrations/bufferline.lua b/lua/catppuccin/core/integrations/bufferline.lua index b6be5c4..5819ca1 100644 --- a/lua/catppuccin/core/integrations/bufferline.lua +++ b/lua/catppuccin/core/integrations/bufferline.lua @@ -2,17 +2,17 @@ local M = {} function M.get(cp) - local inactive_bg = cp.base1 + local inactive_bg = cp.mantle return { - BufferLineFill = { bg = cp.base0 }, - BufferLineBackground = { fg = cp.text, bg = inactive_bg }, -- others + BufferLineFill = { bg = cp.crust }, + BufferLineBackcrust = { fg = cp.text, bg = inactive_bg }, -- others BufferLineBufferVisible = { fg = cp.surface1, bg = inactive_bg }, - BufferLineBufferSelected = { fg = cp.text, bg = cp.base2, style = "bold,italic" }, -- current - BufferLineTab = { fg = cp.surface1, bg = cp.base2 }, + BufferLineBufferSelected = { fg = cp.text, bg = cp.base, style = "bold,italic" }, -- current + BufferLineTab = { fg = cp.surface1, bg = cp.base }, BufferLineTabSelected = { fg = cp.red, bg = cp.blue }, BufferLineTabClose = { fg = cp.red, bg = inactive_bg }, - BufferLineIndicatorSelected = { fg = cp.peach, bg = cp.base2 }, + BufferLineIndicatorSelected = { fg = cp.peach, bg = cp.base }, -- separators BufferLineSeparator = { fg = inactive_bg, bg = inactive_bg }, BufferLineSeparatorVisible = { fg = inactive_bg, bg = inactive_bg }, @@ -20,7 +20,7 @@ function M.get(cp) -- close buttons BufferLineCloseButton = { fg = cp.surface1, bg = inactive_bg }, BufferLineCloseButtonVisible = { fg = cp.surface1, bg = inactive_bg }, - BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.base2 }, + BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.base }, } end diff --git a/lua/catppuccin/core/integrations/gitsigns.lua b/lua/catppuccin/core/integrations/gitsigns.lua index 5b6d078..19b0130 100644 --- a/lua/catppuccin/core/integrations/gitsigns.lua +++ b/lua/catppuccin/core/integrations/gitsigns.lua @@ -2,9 +2,9 @@ local M = {} function M.get(cp) return { - GitSignsAdd = { fg = cp.green, bg = cnf.transparent_background and cp.none or cp.base2 }, -- diff mode: Added line |diff.txt| - GitSignsChange = { fg = cp.yellow, bg = cnf.transparent_background and cp.none or cp.base2 }, -- diff mode: Changed line |diff.txt| - GitSignsDelete = { fg = cp.red, bg = cnf.transparent_background and cp.none or cp.base2 }, -- diff mode: Deleted line |diff.txt| + GitSignsAdd = { fg = cp.green, bg = cnf.transparent_background and cp.none or cp.base }, -- diff mode: Added line |diff.txt| + GitSignsChange = { fg = cp.yellow, bg = cnf.transparent_background and cp.none or cp.base }, -- diff mode: Changed line |diff.txt| + GitSignsDelete = { fg = cp.red, bg = cnf.transparent_background and cp.none or cp.base }, -- diff mode: Deleted line |diff.txt| } end diff --git a/lua/catppuccin/core/integrations/hop.lua b/lua/catppuccin/core/integrations/hop.lua index ac49c9a..72cd3cf 100644 --- a/lua/catppuccin/core/integrations/hop.lua +++ b/lua/catppuccin/core/integrations/hop.lua @@ -2,10 +2,10 @@ local M = {} function M.get(cp) return { - HopNextKey = { bg = cp.base2, fg = cp.peach, style = "bold,underline" }, - HopNextKey1 = { bg = cp.base2, fg = cp.blue, style = "bold" }, - HopNextKey2 = { bg = cp.base2, fg = cp.teal, style = "bold,italic" }, - HopUnmatched = { bg = cp.base2, fg = cp.overlay0 }, + HopNextKey = { bg = cp.base, fg = cp.peach, style = "bold,underline" }, + HopNextKey1 = { bg = cp.base, fg = cp.blue, style = "bold" }, + HopNextKey2 = { bg = cp.base, fg = cp.teal, style = "bold,italic" }, + HopUnmatched = { bg = cp.base, fg = cp.overlay0 }, } end diff --git a/lua/catppuccin/core/integrations/lightspeed.lua b/lua/catppuccin/core/integrations/lightspeed.lua index ae69ac1..757482c 100644 --- a/lua/catppuccin/core/integrations/lightspeed.lua +++ b/lua/catppuccin/core/integrations/lightspeed.lua @@ -32,16 +32,16 @@ function M.get(cp) LightspeedOverlapped = {bg = cp.surface1, fg = cp.text}, LightspeedLabelDistant = {bg = cp.mauve, fg = cp.text}, LightspeedLabelDistantOverlapped = {bg = cp.mauve, fg = cp.text}, - LightspeedShortcut = {bg = cp.base2, fg = cp.peach, style = "italic"}, - LightspeedShortcutOverlapped = {bg = cp.base2, fg = cp.peach, style = "bold"}, - LightspeedMaskedChar = {bg = cp.base2, fg = cp.red, style = "undercurl"}, - LightspeedGreyWash = {bg = cp.base2, fg = cp.overlay0}, - LightspeedUnlabeledMatch = {bg = cp.base2, fg = cp.red, style = "underline"}, - LightspeedOneCharMatch = {bg = cp.base2, fg = cp.red, style = "underline"}, - LightspeedUniqueChar = {bg = cp.base2, fg = cp.green, style = "strikethrough"}, - LightspeedPendingOpArea = {bg = cp.base2, fg = cp.green, style = "strikethrough"}, - LightspeedPendingChangeOpArea = {bg = cp.base2, fg = cp.green, style = "strikethrough"}, - LightspeedCursor = {fg = cp.base2, bg = cp.text}, + LightspeedShortcut = {bg = cp.base, fg = cp.peach, style = "italic"}, + LightspeedShortcutOverlapped = {bg = cp.base, fg = cp.peach, style = "bold"}, + LightspeedMaskedChar = {bg = cp.base, fg = cp.red, style = "undercurl"}, + LightspeedGreyWash = {bg = cp.base, fg = cp.overlay0}, + LightspeedUnlabeledMatch = {bg = cp.base, fg = cp.red, style = "underline"}, + LightspeedOneCharMatch = {bg = cp.base, fg = cp.red, style = "underline"}, + LightspeedUniqueChar = {bg = cp.base, fg = cp.green, style = "strikethrough"}, + LightspeedPendingOpArea = {bg = cp.base, fg = cp.green, style = "strikethrough"}, + LightspeedPendingChangeOpArea = {bg = cp.base, fg = cp.green, style = "strikethrough"}, + LightspeedCursor = {fg = cp.base, bg = cp.text}, } end diff --git a/lua/catppuccin/core/integrations/lsp_saga.lua b/lua/catppuccin/core/integrations/lsp_saga.lua index 4731cec..246a26d 100644 --- a/lua/catppuccin/core/integrations/lsp_saga.lua +++ b/lua/catppuccin/core/integrations/lsp_saga.lua @@ -6,7 +6,7 @@ function M.get(cp) DiagnosticWarning = { fg = cp.yellow }, DiagnosticInformation = { fg = cp.blue }, DiagnosticHint = { fg = cp.hint }, - LspFloatWinNormal = { bg = cp.base0 }, + LspFloatWinNormal = { bg = cp.crust }, LspFloatWinBorder = { fg = cp.blue }, LspSagaBorderTitle = { fg = cp.flamingo }, LspSagaHoverBorder = { fg = cp.blue }, diff --git a/lua/catppuccin/core/integrations/lsp_trouble.lua b/lua/catppuccin/core/integrations/lsp_trouble.lua index 040f5bc..62b5a74 100644 --- a/lua/catppuccin/core/integrations/lsp_trouble.lua +++ b/lua/catppuccin/core/integrations/lsp_trouble.lua @@ -4,7 +4,7 @@ function M.get(cp) return { LspTroubleText = { fg = cp.green }, LspTroubleCount = { fg = cp.pink, bg = cp.surface1 }, - LspTroubleNormal = { fg = cp.text, bg = cp.base0 }, + LspTroubleNormal = { fg = cp.text, bg = cp.crust }, } end diff --git a/lua/catppuccin/core/integrations/native_lsp.lua b/lua/catppuccin/core/integrations/native_lsp.lua index 022d796..0a59c19 100644 --- a/lua/catppuccin/core/integrations/native_lsp.lua +++ b/lua/catppuccin/core/integrations/native_lsp.lua @@ -20,10 +20,10 @@ function M.get(cp) LspReferenceRead = { bg = cp.surface1 }, -- used for highlighting "read" references LspReferenceWrite = { bg = cp.surface1 }, -- used for highlighting "write" references -- hightlight diagnostics in numberline - DiagnosticError = { bg = util.darken(error, darkening_percentage, cp.base2), fg = error, style = virtual_text.errors }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticWarn = { bg = util.darken(warning, darkening_percentage, cp.base2), fg = warning, style = virtual_text.warnings }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticInfo = { bg = util.darken(info, darkening_percentage, cp.base2), fg = info, style = virtual_text.information }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - DiagnosticHint = { bg = util.darken(hint, darkening_percentage, cp.base2), fg = hint, style = virtual_text.hints }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticError = { bg = util.darken(error, darkening_percentage, cp.base), fg = error, style = virtual_text.errors }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default + DiagnosticWarn = { bg = util.darken(warning, darkening_percentage, cp.base), fg = warning, style = virtual_text.warnings }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default + DiagnosticInfo = { bg = util.darken(info, darkening_percentage, cp.base), fg = info, style = virtual_text.information }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default + DiagnosticHint = { bg = util.darken(hint, darkening_percentage, cp.base), fg = hint, style = virtual_text.hints }, -- Used as the mantle highlight group. Other Diagnostic highlights link to this by default -- util. -- for nvim nightly @@ -32,10 +32,10 @@ function M.get(cp) DiagnosticUnderlineInfo = { style = underlines.information, sp = info }, DiagnosticUnderlineHint = { style = underlines.hints, sp = hint }, - LspDiagnosticsDefaultError = { fg = error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultWarning = { fg = warning }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultInformation = { fg = info }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - LspDiagnosticsDefaultHint = { fg = hint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultError = { fg = error }, -- Used as the mantle highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultWarning = { fg = warning }, -- Used as the mantle highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultInformation = { fg = info }, -- Used as the mantle highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultHint = { fg = hint }, -- Used as the mantle highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspSignatureActiveParameter = { fg = cp.peach }, -- LspDiagnosticsFloatingError = { }, -- Used to color "Error" diagnostic messages in diagnostics float -- LspDiagnosticsFloatingWarning = { }, -- Used to color "Warning" diagnostic messages in diagnostics float diff --git a/lua/catppuccin/core/integrations/neogit.lua b/lua/catppuccin/core/integrations/neogit.lua index 71b289b..e368b60 100644 --- a/lua/catppuccin/core/integrations/neogit.lua +++ b/lua/catppuccin/core/integrations/neogit.lua @@ -5,10 +5,10 @@ function M.get(cp) NeogitBranch = { fg = cp.pink }, NeogitRemote = { fg = cp.pink }, NeogitHunkHeader = { bg = cp.blue, fg = cp.text }, - NeogitHunkHeaderHighlight = { bg = cp.base2, fg = cp.blue }, - NeogitDiffContextHighlight = { bg = cp.base1, fg = cp.overlay2 }, - NeogitDiffDeleteHighlight = { bg = cp.base1, fg = cp.red }, - NeogitDiffAddHighlight = { bg = cp.base1, fg = cp.green }, + NeogitHunkHeaderHighlight = { bg = cp.base, fg = cp.blue }, + NeogitDiffContextHighlight = { bg = cp.mantle, fg = cp.overlay2 }, + NeogitDiffDeleteHighlight = { bg = cp.mantle, fg = cp.red }, + NeogitDiffAddHighlight = { bg = cp.mantle, fg = cp.green }, } end diff --git a/lua/catppuccin/core/integrations/neotree.lua b/lua/catppuccin/core/integrations/neotree.lua index d4dc1fa..2bc12a6 100644 --- a/lua/catppuccin/core/integrations/neotree.lua +++ b/lua/catppuccin/core/integrations/neotree.lua @@ -13,7 +13,7 @@ function M.get(cp) return { NeoTreeDirectoryName = { fg = cp.blue }, NeoTreeDirectoryIcon = { fg = cp.blue }, - NeoTreeNormal = { fg = cp.text, bg = neotree.transparent_panel and "NONE" or cp.base1 }, + NeoTreeNormal = { fg = cp.text, bg = neotree.transparent_panel and "NONE" or cp.mantle }, NeoTreeIndentMarker = { fg = cp.overlay0 }, NeoTreeRootName = { fg = root_dir_color, style = "bold" }, NeoTreeSymbolicLinkTarget = { fg = cp.pink }, diff --git a/lua/catppuccin/core/integrations/nvimtree.lua b/lua/catppuccin/core/integrations/nvimtree.lua index 505aecd..3e83973 100644 --- a/lua/catppuccin/core/integrations/nvimtree.lua +++ b/lua/catppuccin/core/integrations/nvimtree.lua @@ -4,7 +4,7 @@ function M.get(cp) local config = require("catppuccin.config").options local nvimtree = config.integrations.nvimtree - local root_dir_color = cp.base1 + local root_dir_color = cp.mantle if nvimtree.show_root == true then root_dir_color = cp.blue end @@ -13,14 +13,14 @@ function M.get(cp) return { NvimTreeFolderName = { fg = cp.blue }, NvimTreeFolderIcon = { fg = cp.blue }, - NvimTreeNormal = { fg = cp.text, bg = nvimtree.transparent_panel and "NONE" or cp.base1 }, + NvimTreeNormal = { fg = cp.text, bg = nvimtree.transparent_panel and "NONE" or cp.mantle }, NvimTreeOpenedFolderName = { fg = cp.blue }, NvimTreeEmptyFolderName = { fg = cp.blue }, NvimTreeIndentMarker = { fg = cp.overlay0 }, - NvimTreeVertSplit = { fg = cp.base2, bg = cp.base2 }, + NvimTreeVertSplit = { fg = cp.base, bg = cp.base }, NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, NvimTreeSymlink = { fg = cp.pink }, - NvimTreeStatuslineNc = { fg = cp.base1, bg = cp.base1 }, + NvimTreeStatuslineNc = { fg = cp.mantle, bg = cp.mantle }, NvimTreeGitDirty = { fg = cp.yellow }, NvimTreeGitNew = { fg = cp.blue }, NvimTreeGitDeleted = { fg = cp.red }, diff --git a/lua/catppuccin/core/integrations/symbols_outline.lua b/lua/catppuccin/core/integrations/symbols_outline.lua index 200e175..5b9e53f 100644 --- a/lua/catppuccin/core/integrations/symbols_outline.lua +++ b/lua/catppuccin/core/integrations/symbols_outline.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - FocusedSymbol = { fg = cp.yellow, bg = cp.base2 }, + FocusedSymbol = { fg = cp.yellow, bg = cp.base }, } end diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index 9de875d..011ac2b 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -50,9 +50,9 @@ function M.get(cp) -- TSAttribute = { }; -- (unstable) TODO: docs -- TSCharacter = { }; -- For characters. -- TSoverlay0 = { }; -- For overlay0 blocks. - TSNote = { fg = cp.base2, bg = cp.blue }, - TSWarning = { fg = cp.base2, bg = cp.yellow }, - TSDanger = { fg = cp.base2, bg = cp.red }, + TSNote = { fg = cp.base, bg = cp.blue }, + TSWarning = { fg = cp.base, bg = cp.yellow }, + TSDanger = { fg = cp.base, bg = cp.red }, TSConstMacro = { fg = cp.mauve }; -- For constants that are defined by macros: NULL in cp. -- TSError = { fg = cp.red }, -- For syntax/parser errors. -- rustTSField = { fg = cp.surface1 }, -- For fields. diff --git a/lua/catppuccin/core/integrations/ts_rainbow.lua b/lua/catppuccin/core/integrations/ts_rainbow.lua index 3ba2a14..1197c36 100644 --- a/lua/catppuccin/core/integrations/ts_rainbow.lua +++ b/lua/catppuccin/core/integrations/ts_rainbow.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) local transparent_background = require("catppuccin.config").options.transparent_background - local bg_highlight = transparent_background and "NONE" or cp.base2 + local bg_highlight = transparent_background and "NONE" or cp.base return { rainbowcol1 = {bg = bg_highlight, fg = cp.red}, rainbowcol2 = {bg = bg_highlight, fg = cp.teal}, diff --git a/lua/catppuccin/core/integrations/which_key.lua b/lua/catppuccin/core/integrations/which_key.lua index 10b8056..fd80ee8 100644 --- a/lua/catppuccin/core/integrations/which_key.lua +++ b/lua/catppuccin/core/integrations/which_key.lua @@ -7,7 +7,7 @@ function M.get(cp) WhichKeyDesc = { fg = cp.pink }, WhichKeySeperator = { fg = cp.overlay0 }, WhichKeySeparator = { fg = cp.overlay0 }, - WhichKeyFloat = { bg = cp.base0 }, + WhichKeyFloat = { bg = cp.crust }, WhichKeyValue = { fg = cp.overlay0 }, } end diff --git a/lua/catppuccin/core/mapper.lua b/lua/catppuccin/core/mapper.lua index 89e8255..10d2571 100644 --- a/lua/catppuccin/core/mapper.lua +++ b/lua/catppuccin/core/mapper.lua @@ -10,7 +10,7 @@ local function get_properties() background = "dark", } - if colors_util.assert_brightness(cp.base2) then + if colors_util.assert_brightness(cp.base) then props["background"] = "light" end @@ -24,21 +24,21 @@ local function get_base() Comment = { fg = cp.surface2, style = cnf.styles.comments }, -- just comments ColorColumn = { bg = cp.surface0 }, -- used for the columns set with 'colorcolumn' Conceal = { fg = cp.overlay1 }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor = { fg = cp.base2, bg = cp.text }, -- character under the cursor - lCursor = { fg = cp.base2, bg = cp.text }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') - CursorIM = { fg = cp.base2, bg = cp.text }, -- like Cursor, but used when in IME mode |CursorIM| - CursorColumn = { bg = cp.base1 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. - CursorLine = { bg = colors_util.vary_color({latte = util.lighten(cp.base1, 0.70, cp.base2)}, util.darken(cp.surface0, 0.64, cp.base2)) }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. + Cursor = { fg = cp.base, bg = cp.text }, -- character under the cursor + lCursor = { fg = cp.base, bg = cp.text }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + CursorIM = { fg = cp.base, bg = cp.text }, -- like Cursor, but used when in IME mode |CursorIM| + CursorColumn = { bg = cp.mantle }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. + CursorLine = { bg = colors_util.vary_color({latte = util.lighten(cp.mantle, 0.70, cp.base)}, util.darken(cp.surface0, 0.64, cp.base)) }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if forecrust (ctermfg OR guifg) is not secp. Directory = { fg = cp.blue }, -- directory names (and other special names in listings) - EndOfBuffer = { fg = cp.base2 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. + EndOfBuffer = { fg = cp.base }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. ErrorMsg = { fg = cp.red, style = "bold,italic" }, -- error messages on the command line - VertSplit = { fg = cp.base0 }, -- the column separating vertically split windows + VertSplit = { fg = cp.crust }, -- the column separating vertically split windows Folded = { fg = cp.blue, bg = cp.surface1 }, -- line used for closed folds - FoldColumn = { bg = cp.base2, fg = cp.overlay0 }, -- 'foldcolumn' - SignColumn = { bg = cnf.transparent_background and cp.none or cp.base2, fg = cp.surface1 }, -- column where |signs| are displayed - SignColumnSB = { bg = cp.base0, fg = cp.surface1 }, -- column where |signs| are displayed + FoldColumn = { bg = cp.base, fg = cp.overlay0 }, -- 'foldcolumn' + SignColumn = { bg = cnf.transparent_background and cp.none or cp.base, fg = cp.surface1 }, -- column where |signs| are displayed + SignColumnSB = { bg = cp.crust, fg = cp.surface1 }, -- column where |signs| are displayed Substitute = { bg = cp.surface1, fg = cp.pink }, -- |:substitute| replacement text highlighting - LineNr = { fg = colors_util.vary_color({latte = cp.base0}, cp.surface1) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. + LineNr = { fg = cp.surface1 }, -- colors_util.vary_color({latte = cp.crust}, cp.surface1) }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. CursorLineNr = { fg = cp.lavender }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. MatchParen = { fg = cp.peach, style = "bold" }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| ModeMsg = { fg = cp.text, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") @@ -46,10 +46,10 @@ local function get_base() MsgSeparator = {}, -- Separator for scrolled messages, `msgsep` flag of 'display' MoreMsg = { fg = cp.blue }, -- |more-prompt| NonText = { fg = cp.overlay0 }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. - Normal = { fg = cp.text, bg = cnf.transparent_background and cp.none or cp.base2 }, -- normal text - NormalNC = { fg = cp.text, bg = cnf.transparent_background and cp.none or cp.base2 }, -- normal text in non-current windows - NormalSB = { fg = cp.text, bg = cp.base0 }, -- normal text in non-current windows - NormalFloat = { fg = cp.text, bg = cp.base1 }, -- Normal text in floating windows. + Normal = { fg = cp.text, bg = cnf.transparent_background and cp.none or cp.base }, -- normal text + NormalNC = { fg = cp.text, bg = cnf.transparent_background and cp.none or cp.base }, -- normal text in non-current windows + NormalSB = { fg = cp.text, bg = cp.crust }, -- normal text in non-current windows + NormalFloat = { fg = cp.text, bg = cp.mantle }, -- Normal text in floating windows. FloatBorder = { fg = cp.blue }, Pmenu = { bg = cp.surface0, fg = cp.overlay2 }, -- Popup menu: normal item. PmenuSel = { fg = cp.text, bg = cp.surface1, style = "bold" }, -- Popup menu: selected item. @@ -64,9 +64,9 @@ local function get_base() SpellCap = { sp = cp.yellow, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal = { sp = cp.blue, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare = { sp = cp.green, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine = { fg = cp.text, bg = cp.base1 }, -- status line of current window - StatusLineNC = { fg = cp.surface1, bg = cp.base1 }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. - TabLine = { bg = cp.base1, fg = cp.surface1 }, -- tab pages line, not active tab page label + StatusLine = { fg = cp.text, bg = cp.mantle }, -- status line of current window + StatusLineNC = { fg = cp.surface1, bg = cp.mantle }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + TabLine = { bg = cp.mantle, fg = cp.surface1 }, -- tab pages line, not active tab page label TabLineFill = { bg = cp.black }, -- tab pages line, where there are no labels TabLineSel = { fg = cp.green, bg = cp.surface1 }, -- tab pages line, active tab page label Title = { fg = cp.blue, style = "bold" }, -- titles for output from ":set all", ":autocmd" etcp. @@ -123,21 +123,21 @@ local function get_base() -- Ignore = { }, -- (preferred) left blank, hidden |hl-Ignore| Error = { fg = cp.red }, -- (preferred) any erroneous construct - Todo = { bg = cp.yellow, fg = cp.base2, style = "bold" }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Todo = { bg = cp.yellow, fg = cp.base, style = "bold" }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX qfLineNr = { fg = cp.yellow }, qfFileName = { fg = cp.blue }, htmlH1 = { fg = cp.pink, style = "bold" }, htmlH2 = { fg = cp.blue, style = "bold" }, -- mkdHeading = { fg = cp.peach, style = "bold" }, -- mkdCode = { bg = cp.terminal_black, fg = cp.text }, - mkdCodeDelimiter = { bg = cp.base2, fg = cp.text }, + mkdCodeDelimiter = { bg = cp.base, fg = cp.text }, mkdCodeStart = { fg = cp.flamingo, style = "bold" }, mkdCodeEnd = { fg = cp.flamingo, style = "bold" }, -- mkdLink = { fg = cp.blue, style = "underline" }, -- debugging - debugPC = { bg = cp.base0 }, -- used for highlighting the current line in terminal-debug - debugBreakpoint = { bg = cp.base2, fg = cp.overlay0 }, -- used for breakpoint colors in terminal-debug + debugPC = { bg = cp.crust }, -- used for highlighting the current line in terminal-debug + debugBreakpoint = { bg = cp.base, fg = cp.overlay0 }, -- used for breakpoint colors in terminal-debug -- illuminate illuminatedWord = { bg = cp.surface1 }, illuminatedCurWord = { bg = cp.surface1 }, @@ -150,10 +150,10 @@ local function get_base() diffFile = { fg = cp.blue }, diffLine = { fg = cp.overlay0 }, diffIndexLine = { fg = cp.pink }, - DiffAdd = { fg = cp.green, bg = cp.base2 }, -- diff mode: Added line |diff.txt| - DiffChange = { fg = cp.yellow, bg = cp.base2 }, -- diff mode: Changed line |diff.txt| - DiffDelete = { fg = cp.red, bg = cp.base2 }, -- diff mode: Deleted line |diff.txt| - DiffText = { fg = cp.blue, bg = cp.base2 }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd = { fg = cp.green, bg = cp.base }, -- diff mode: Added line |diff.txt| + DiffChange = { fg = cp.yellow, bg = cp.base }, -- diff mode: Changed line |diff.txt| + DiffDelete = { fg = cp.red, bg = cp.base }, -- diff mode: Deleted line |diff.txt| + DiffText = { fg = cp.blue, bg = cp.base }, -- diff mode: Changed text within a changed line |diff.txt| -- NeoVim healthError = { fg = cp.red }, healthSuccess = { fg = cp.teal }, diff --git a/lua/catppuccin/core/palettes/frappe.lua b/lua/catppuccin/core/palettes/frappe.lua index 5d24b9c..f572c94 100644 --- a/lua/catppuccin/core/palettes/frappe.lua +++ b/lua/catppuccin/core/palettes/frappe.lua @@ -22,12 +22,14 @@ local color_palette = { overlay2 = "#B1B8D7", overlay1 = "#9BA2BF", overlay0 = "#868CA7", - surface2 = "#707590", - surface1 = "#5B5F78", - surface0 = "#454960", - base2 = "#303348", - base1 = "#252737", - base0 = "#181A25", + surface2 = "#70768E", + surface1 = "#5B6076", + surface0 = "#454A5E", + + crust = "#232634", + mantle = "#292C3C", + base = "#303446", + } return color_palette diff --git a/lua/catppuccin/core/palettes/latte.lua b/lua/catppuccin/core/palettes/latte.lua index aa81dc7..5ec3d4e 100644 --- a/lua/catppuccin/core/palettes/latte.lua +++ b/lua/catppuccin/core/palettes/latte.lua @@ -18,16 +18,18 @@ local color_palette = { blue = "#2A6EF5", sapphire = "#209FB5", lavender = "#7287FD", - text = "#575279", - overlay2 = "#696487", - overlay1 = "#7B7794", - overlay0 = "#8E89A2", - surface2 = "#A09BAF", - surface1 = "#B2AEBD", - base0 = "#C4C0CA", - surface0 = "#D7D2D8", - base1 = "#E9E5E5", - base2 = "#FBF7F3", + + text = "#4C4F69", + overlay2 = "#60627B", + overlay1 = "#71738A", + overlay0 = "#838599", + surface2 = "#9497A8", + surface1 = "#A6A8B8", + surface0 = "#B7BAC7", + + crust = "#C9CCD6", + mantle = "#DADDE5", + base = "#EFF1F5", } return color_palette diff --git a/lua/catppuccin/core/palettes/macchiato.lua b/lua/catppuccin/core/palettes/macchiato.lua index 408da7f..2a07b62 100644 --- a/lua/catppuccin/core/palettes/macchiato.lua +++ b/lua/catppuccin/core/palettes/macchiato.lua @@ -25,9 +25,10 @@ local color_palette = { surface2 = "#696F8A", surface1 = "#52576F", surface0 = "#3B3F55", - base2 = "#24273A", - base1 = "#181926", - base0 = "#0C0D13", + + crust = "#181926", + mantle = "#1E2030", + base = "#24273A", } return color_palette diff --git a/lua/catppuccin/core/palettes/moccha.lua b/lua/catppuccin/core/palettes/moccha.lua index 97f6265..efab9b1 100644 --- a/lua/catppuccin/core/palettes/moccha.lua +++ b/lua/catppuccin/core/palettes/moccha.lua @@ -18,6 +18,7 @@ local color_palette = { blue = "#90C1FB", sapphire = "#74C7EC", lavender = "#B4BEFE", + text = "#C6D0F5", overlay2 = "#AEB7D9", overlay1 = "#969DBC", @@ -25,9 +26,10 @@ local color_palette = { surface2 = "#666A83", surface1 = "#4E5167", surface0 = "#36374A", - base2 = "#1E1E2E", - base1 = "#12121C", - base0 = "#07070A", + + crust = "#11111B", + mantle = "#181825", + base = "#1E1E2E", } return color_palette diff --git a/lua/catppuccin/utils/util.lua b/lua/catppuccin/utils/util.lua index 073a60f..c65324a 100644 --- a/lua/catppuccin/utils/util.lua +++ b/lua/catppuccin/utils/util.lua @@ -21,7 +21,7 @@ local hex_to_rgb = function(hex_str) return { tonumber(red, 16), tonumber(green, 16), tonumber(blue, 16) } end ----@param fg string foreground color +---@param fg string forecrust color ---@param bg string background color ---@param alpha number number between 0 and 1. 0 results in bg, 1 results in fg function util.blend(fg, bg, alpha) diff --git a/lua/lightline/colorscheme/catppuccin.lua b/lua/lightline/colorscheme/catppuccin.lua index 0c35a64..ec03573 100644 --- a/lua/lightline/colorscheme/catppuccin.lua +++ b/lua/lightline/colorscheme/catppuccin.lua @@ -2,36 +2,36 @@ local cp = require("catppuccin.core.color_palette") local catppuccin = {} catppuccin.normal = { - left = { { cp.base1, cp.blue }, { cp.blue, cp.base2 } }, + left = { { cp.mantle, cp.blue }, { cp.blue, cp.base } }, middle = { { cp.blue, cp.surface1 } }, - right = { { cp.overlay0, cp.base2 }, { cp.blue, cp.surface0 } }, - error = { { cp.base1, cp.red } }, - warning = { { cp.base1, cp.yellow } }, + right = { { cp.overlay0, cp.base }, { cp.blue, cp.surface0 } }, + error = { { cp.mantle, cp.red } }, + warning = { { cp.mantle, cp.yellow } }, } catppuccin.insert = { - left = { { cp.base1, cp.teal }, { cp.blue, cp.base2 } }, + left = { { cp.mantle, cp.teal }, { cp.blue, cp.base } }, } catppuccin.visual = { - left = { { cp.base1, cp.mauve }, { cp.blue, cp.base2 } }, + left = { { cp.mantle, cp.mauve }, { cp.blue, cp.base } }, } catppuccin.replace = { - left = { { cp.base1, cp.red }, { cp.blue, cp.base2 } }, + left = { { cp.mantle, cp.red }, { cp.blue, cp.base } }, } catppuccin.inactive = { - left = { { cp.blue, cp.base2 }, { cp.overlay0, cp.base2 } }, - middle = { { cp.surface1, cp.base2 } }, - right = { { cp.surface1, cp.base2 }, { cp.overlay0, cp.base2 } }, + left = { { cp.blue, cp.base }, { cp.overlay0, cp.base } }, + middle = { { cp.surface1, cp.base } }, + right = { { cp.surface1, cp.base }, { cp.overlay0, cp.base } }, } catppuccin.tabline = { - left = { { cp.overlay0, cp.base2 }, { cp.overlay0, cp.base2 } }, - middle = { { cp.surface1, cp.base2 } }, - right = { { cp.surface1, cp.base2 }, { cp.overlay0, cp.base2 } }, - tabsel = { { cp.blue, cp.surface1 }, { cp.overlay0, cp.base2 } }, + left = { { cp.overlay0, cp.base }, { cp.overlay0, cp.base } }, + middle = { { cp.surface1, cp.base } }, + right = { { cp.surface1, cp.base }, { cp.overlay0, cp.base } }, + tabsel = { { cp.blue, cp.surface1 }, { cp.overlay0, cp.base } }, } return catppuccin diff --git a/lua/lualine/themes/catppuccin.lua b/lua/lualine/themes/catppuccin.lua index a7a2d26..94627a3 100644 --- a/lua/lualine/themes/catppuccin.lua +++ b/lua/lualine/themes/catppuccin.lua @@ -2,35 +2,35 @@ local cp = require("catppuccin.core.color_palette") local catppuccin = {} catppuccin.normal = { - a = { bg = cp.blue, fg = cp.base1, gui = "bold" }, + a = { bg = cp.blue, fg = cp.mantle, gui = "bold" }, b = { bg = cp.surface1, fg = cp.blue }, - c = { bg = cp.base1, fg = cp.text }, + c = { bg = cp.mantle, fg = cp.text }, } catppuccin.insert = { - a = { bg = cp.green, fg = cp.base2, gui = "bold" }, + a = { bg = cp.green, fg = cp.base, gui = "bold" }, b = { bg = cp.surface1, fg = cp.teal }, } catppuccin.command = { - a = { bg = cp.peach, fg = cp.base2, gui = "bold" }, + a = { bg = cp.peach, fg = cp.base, gui = "bold" }, b = { bg = cp.surface1, fg = cp.peach }, } catppuccin.visual = { - a = { bg = cp.mauve, fg = cp.base2, gui = "bold" }, + a = { bg = cp.mauve, fg = cp.base, gui = "bold" }, b = { bg = cp.surface1, fg = cp.mauve }, } catppuccin.replace = { - a = { bg = cp.red, fg = cp.base2, gui = "bold" }, + a = { bg = cp.red, fg = cp.base, gui = "bold" }, b = { bg = cp.surface1, fg = cp.red }, } catppuccin.inactive = { - a = { bg = cp.base1, fg = cp.blue }, - b = { bg = cp.base1, fg = cp.surface1, gui = "bold" }, - c = { bg = cp.base1, fg = cp.overlay0 }, + a = { bg = cp.mantle, fg = cp.blue }, + b = { bg = cp.mantle, fg = cp.surface1, gui = "bold" }, + c = { bg = cp.mantle, fg = cp.overlay0 }, } return catppuccin From 84befbf803b176fb398b7d6f3af0b7383ffa1c6e Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 11 May 2022 22:45:58 -0500 Subject: [PATCH 23/28] fix: frappe --- lua/catppuccin/core/palettes/frappe.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/catppuccin/core/palettes/frappe.lua b/lua/catppuccin/core/palettes/frappe.lua index f572c94..054d99f 100644 --- a/lua/catppuccin/core/palettes/frappe.lua +++ b/lua/catppuccin/core/palettes/frappe.lua @@ -19,12 +19,12 @@ local color_palette = { sapphire = "#85C1DC", lavender = "#BFB7E4", text = "#C6CEEF", - overlay2 = "#B1B8D7", - overlay1 = "#9BA2BF", - overlay0 = "#868CA7", - surface2 = "#70768E", - surface1 = "#5B6076", - surface0 = "#454A5E", + overlay2 = "#AFB6D4", + overlay1 = "#979EBA", + overlay0 = "#80869F", + surface2 = "#696E84", + surface1 = "#525669", + surface0 = "#3A3E4F", crust = "#232634", mantle = "#292C3C", From feaf3736c1cd825a1699903183d2c5032b8a7a39 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 11 May 2022 22:55:33 -0500 Subject: [PATCH 24/28] fix: latte --- lua/catppuccin/core/palettes/latte.lua | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lua/catppuccin/core/palettes/latte.lua b/lua/catppuccin/core/palettes/latte.lua index 5ec3d4e..5073974 100644 --- a/lua/catppuccin/core/palettes/latte.lua +++ b/lua/catppuccin/core/palettes/latte.lua @@ -18,17 +18,16 @@ local color_palette = { blue = "#2A6EF5", sapphire = "#209FB5", lavender = "#7287FD", - text = "#4C4F69", - overlay2 = "#60627B", - overlay1 = "#71738A", - overlay0 = "#838599", - surface2 = "#9497A8", - surface1 = "#A6A8B8", - surface0 = "#B7BAC7", + overlay2 = "#60637B", + overlay1 = "#74788D", + overlay0 = "#888C9F", + surface2 = "#9DA1B1", + surface1 = "#B1B5C3", + surface0 = "#C5CAD5", - crust = "#C9CCD6", - mantle = "#DADDE5", + crust = "#D9DEE7", + mantle = "#E4E8EE", base = "#EFF1F5", } From e223eaacb17b31ffc57dbbd5bc0c90a33d0df06b Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Sun, 15 May 2022 10:15:48 -0500 Subject: [PATCH 25/28] cleanup + addition of subtexts --- lua/catppuccin/core/palettes/frappe.lua | 20 ++++++------ lua/catppuccin/core/palettes/init.lua | 4 +-- lua/catppuccin/core/palettes/latte.lua | 19 ++++++----- lua/catppuccin/core/palettes/macchiato.lua | 19 ++++++----- lua/catppuccin/core/palettes/mocha.lua | 37 ++++++++++++++++++++++ lua/catppuccin/main.lua | 2 +- 6 files changed, 73 insertions(+), 28 deletions(-) create mode 100644 lua/catppuccin/core/palettes/mocha.lua diff --git a/lua/catppuccin/core/palettes/frappe.lua b/lua/catppuccin/core/palettes/frappe.lua index 054d99f..c2bcc40 100644 --- a/lua/catppuccin/core/palettes/frappe.lua +++ b/lua/catppuccin/core/palettes/frappe.lua @@ -18,18 +18,20 @@ local color_palette = { blue = "#8CAAEE", sapphire = "#85C1DC", lavender = "#BFB7E4", + text = "#C6CEEF", - overlay2 = "#AFB6D4", - overlay1 = "#979EBA", - overlay0 = "#80869F", - surface2 = "#696E84", - surface1 = "#525669", - surface0 = "#3A3E4F", + subtext1 = "#B5BDDC", + subtext0 = "#A5ACC9", + overlay2 = "#949BB7", + overlay1 = "#838AA4", + overlay0 = "#737891", + surface2 = "#62677E", + surface1 = "#51566C", + surface0 = "#414559", - crust = "#232634", - mantle = "#292C3C", base = "#303446", - + mantle = "#292C3C", + crust = "#232634", } return color_palette diff --git a/lua/catppuccin/core/palettes/init.lua b/lua/catppuccin/core/palettes/init.lua index d7a71f6..fc01b70 100644 --- a/lua/catppuccin/core/palettes/init.lua +++ b/lua/catppuccin/core/palettes/init.lua @@ -3,10 +3,10 @@ local M = {} function M.get_palette() local flvr = vim.g.catppuccin_flavour - if flvr == "moccha" or flvr == "latte" or flvr == "macchiato" or flvr == "frappe" then + if flvr == "mocha" or flvr == "latte" or flvr == "macchiato" or flvr == "frappe" then return require("catppuccin.core.palettes." .. flvr) end - return require("catppuccin.core.palettes.moccha") + return require("catppuccin.core.palettes.mocha") end return M diff --git a/lua/catppuccin/core/palettes/latte.lua b/lua/catppuccin/core/palettes/latte.lua index 5073974..9863c9d 100644 --- a/lua/catppuccin/core/palettes/latte.lua +++ b/lua/catppuccin/core/palettes/latte.lua @@ -18,16 +18,19 @@ local color_palette = { blue = "#2A6EF5", sapphire = "#209FB5", lavender = "#7287FD", + text = "#4C4F69", - overlay2 = "#60637B", - overlay1 = "#74788D", - overlay0 = "#888C9F", - surface2 = "#9DA1B1", - surface1 = "#B1B5C3", - surface0 = "#C5CAD5", + subtext1 = "#5C5F77", + subtext0 = "#6C6F85", + overlay2 = "#7C7F93", + overlay1 = "#8C8FA1", + overlay0 = "#9CA0B0", + surface2 = "#ACB0BE", + surface1 = "#BCC0CC", + surface0 = "#CCD0DA", - crust = "#D9DEE7", - mantle = "#E4E8EE", + crust = "#DCE0E8", + mantle = "#E6E9EF", base = "#EFF1F5", } diff --git a/lua/catppuccin/core/palettes/macchiato.lua b/lua/catppuccin/core/palettes/macchiato.lua index 2a07b62..82fa073 100644 --- a/lua/catppuccin/core/palettes/macchiato.lua +++ b/lua/catppuccin/core/palettes/macchiato.lua @@ -18,17 +18,20 @@ local color_palette = { blue = "#86AEF8", sapphire = "#7DC4E4", lavender = "#B9BEF8", + text = "#C5CFF5", - overlay2 = "#AEB7DA", - overlay1 = "#979FC0", - overlay0 = "#8087A5", - surface2 = "#696F8A", - surface1 = "#52576F", - surface0 = "#3B3F55", + subtext1 = "#B3BCE0", + subtext0 = "#A1AACB", + overlay2 = "#8F97B7", + overlay1 = "#7D84A2", + overlay0 = "#6C728D", + surface2 = "#5A5F78", + surface1 = "#484C64", + surface0 = "#363A4F", - crust = "#181926", - mantle = "#1E2030", base = "#24273A", + mantle = "#1E2030", + crust = "#181926", } return color_palette diff --git a/lua/catppuccin/core/palettes/mocha.lua b/lua/catppuccin/core/palettes/mocha.lua new file mode 100644 index 0000000..481215e --- /dev/null +++ b/lua/catppuccin/core/palettes/mocha.lua @@ -0,0 +1,37 @@ +-- NOTE: references for Catppuccin Mocha +-- monochromatic: https://coolors.co/c6d0f5-aeb7d9-969dbc-7e84a0-666a83-4e5167-36374a-1e1e2e-12121c-07070a +-- analogous 1: https://coolors.co/f5e0dc-f2cdcd-f5c2e7-cba6f7-eba0ac-f38ba8-fab387 +-- analogous 2: https://coolors.co/bfb7e4-8caaee-99d1db-e5c890-85c1dc-a6d189-81c8be + +local color_palette = { + rosewater = "#F5E0DC", + flamingo = "#F2CDCD", + pink = "#F5C2E7", + mauve = "#CBA6F7", + red = "#F38BA8", + maroon = "#EBA0AC", + peach = "#FAB387", + yellow = "#F9E2AF", + green = "#A6E3A1", + teal = "#94E2D5", + sky = "#89DCEB", + blue = "#90C1FB", + sapphire = "#74C7EC", + lavender = "#B4BEFE", + + text = "#C6D0F5", + subtext1 = "#B3BCDF", + subtext0 = "#A1A8C9", + overlay2 = "#8E95B3", + overlay1 = "#7B819D", + overlay0 = "#696D86", + surface2 = "#565970", + surface1 = "#43465A", + surface0 = "#313244", + + base = "#1E1E2E", + mantle = "#181825", + crust = "#11111B", +} + +return color_palette diff --git a/lua/catppuccin/main.lua b/lua/catppuccin/main.lua index 97286ef..16fc21c 100644 --- a/lua/catppuccin/main.lua +++ b/lua/catppuccin/main.lua @@ -1,7 +1,7 @@ local M = {} local utils = require("catppuccin.utils.util") -local flavours = {"latte", "frappe", "macchiato", "moccha"} +local flavours = {"latte", "frappe", "macchiato", "mocha"} function M.cli_flavour_completion() return vim.tbl_keys(require("catppuccin.utils.data").set_of(flavours)) From 2bad356d2946cdc8406d5c1f133f832f68335528 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 25 May 2022 21:43:24 -0500 Subject: [PATCH 26/28] Ctp v0.2.0 --- lua/catppuccin/core/palettes/frappe.lua | 4 ++-- lua/catppuccin/core/palettes/latte.lua | 8 ++++---- lua/catppuccin/core/palettes/macchiato.lua | 4 ++-- lua/catppuccin/core/palettes/mocha.lua | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lua/catppuccin/core/palettes/frappe.lua b/lua/catppuccin/core/palettes/frappe.lua index c2bcc40..d5e619e 100644 --- a/lua/catppuccin/core/palettes/frappe.lua +++ b/lua/catppuccin/core/palettes/frappe.lua @@ -15,9 +15,9 @@ local color_palette = { green = "#A6D189", teal = "#81C8BE", sky = "#99D1DB", - blue = "#8CAAEE", sapphire = "#85C1DC", - lavender = "#BFB7E4", + blue = "#8CAAEE", + lavender = "#BABBF1", text = "#C6CEEF", subtext1 = "#B5BDDC", diff --git a/lua/catppuccin/core/palettes/latte.lua b/lua/catppuccin/core/palettes/latte.lua index 9863c9d..bfd72a5 100644 --- a/lua/catppuccin/core/palettes/latte.lua +++ b/lua/catppuccin/core/palettes/latte.lua @@ -4,19 +4,19 @@ -- analogous 2: https://coolors.co/7287fd-2a6ef5-04a5e5-e49320-209fb5-40a02b-179299 local color_palette = { - rosewater = "#DE9584", + rosewater = "#dc8a78", flamingo = "#DD7878", - pink = "#EC83D0", + pink = "#ea76cb", mauve = "#8839EF", red = "#D20F39", maroon = "#E64553", peach = "#FE640B", - yellow = "#E49320", + yellow = "#df8e1d", green = "#40A02B", teal = "#179299", sky = "#04A5E5", - blue = "#2A6EF5", sapphire = "#209FB5", + blue = "#1e66f5", lavender = "#7287FD", text = "#4C4F69", diff --git a/lua/catppuccin/core/palettes/macchiato.lua b/lua/catppuccin/core/palettes/macchiato.lua index 82fa073..3d13330 100644 --- a/lua/catppuccin/core/palettes/macchiato.lua +++ b/lua/catppuccin/core/palettes/macchiato.lua @@ -15,9 +15,9 @@ local color_palette = { green = "#A6DA95", teal = "#8BD5CA", sky = "#91D7E3", - blue = "#86AEF8", sapphire = "#7DC4E4", - lavender = "#B9BEF8", + blue = "#8AADF4", + lavender = "#B7BDF8", text = "#C5CFF5", subtext1 = "#B3BCE0", diff --git a/lua/catppuccin/core/palettes/mocha.lua b/lua/catppuccin/core/palettes/mocha.lua index 481215e..561cd5f 100644 --- a/lua/catppuccin/core/palettes/mocha.lua +++ b/lua/catppuccin/core/palettes/mocha.lua @@ -15,8 +15,8 @@ local color_palette = { green = "#A6E3A1", teal = "#94E2D5", sky = "#89DCEB", - blue = "#90C1FB", sapphire = "#74C7EC", + blue = "#87B0F9", lavender = "#B4BEFE", text = "#C6D0F5", From e9a38bfa66b29bbebf789506d0c7b8f0a2b1cca8 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 25 May 2022 21:43:53 -0500 Subject: [PATCH 27/28] removed moccha --- lua/catppuccin/core/palettes/moccha.lua | 35 ------------------------- 1 file changed, 35 deletions(-) delete mode 100644 lua/catppuccin/core/palettes/moccha.lua diff --git a/lua/catppuccin/core/palettes/moccha.lua b/lua/catppuccin/core/palettes/moccha.lua deleted file mode 100644 index efab9b1..0000000 --- a/lua/catppuccin/core/palettes/moccha.lua +++ /dev/null @@ -1,35 +0,0 @@ --- NOTE: references for Catppuccin Moccha --- monochromatic: https://coolors.co/c6d0f5-aeb7d9-969dbc-7e84a0-666a83-4e5167-36374a-1e1e2e-12121c-07070a --- analogous 1: https://coolors.co/f5e0dc-f2cdcd-f5c2e7-cba6f7-eba0ac-f38ba8-fab387 --- analogous 2: https://coolors.co/bfb7e4-8caaee-99d1db-e5c890-85c1dc-a6d189-81c8be - -local color_palette = { - rosewater = "#F5E0DC", - flamingo = "#F2CDCD", - pink = "#F5C2E7", - mauve = "#CBA6F7", - red = "#F38BA8", - maroon = "#EBA0AC", - peach = "#FAB387", - yellow = "#F9E2AF", - green = "#A6E3A1", - teal = "#94E2D5", - sky = "#89DCEB", - blue = "#90C1FB", - sapphire = "#74C7EC", - lavender = "#B4BEFE", - - text = "#C6D0F5", - overlay2 = "#AEB7D9", - overlay1 = "#969DBC", - overlay0 = "#7E84A0", - surface2 = "#666A83", - surface1 = "#4E5167", - surface0 = "#36374A", - - crust = "#11111B", - mantle = "#181825", - base = "#1E1E2E", -} - -return color_palette From 7c74945cf384c61d37745c66eaf605f5eaa00ffa Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 25 May 2022 21:47:45 -0500 Subject: [PATCH 28/28] doc: updated deafult config --- README.md | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b21fb4a..de2309d 100644 --- a/README.md +++ b/README.md @@ -86,12 +86,17 @@ transparent_background = false, term_colors = false, styles = { comments = "italic", - functions = "italic", - keywords = "italic", + conditionals = "italic", + loops = "NONE", + functions = "NONE", + keywords = "NONE", strings = "NONE", - variables = "italic", - numbers = "bold", - booleans = "bold" + variables = "NONE", + numbers = "NONE", + booleans = "NONE", + properties = "NONE", + types = "NONE", + operators = "NONE", }, integrations = { treesitter = true, @@ -147,7 +152,7 @@ integrations = { } ``` -The way you setup the settings on your configuration varies on whether you are using vimL for this or Lua. +The way you setup the settings on your configuration varies based on whether you are using vimL for this or Lua.
For init.lua @@ -183,16 +188,20 @@ After setting things up, you can load catppuccin like so: ```vim " Vim Script -let g:catppuccin_flavour = "dusk" +let g:catppuccin_flavour = "dusk" " latte, frappe, macchiato, mocha colorscheme catppuccin ``` ```lua -- Lua -vim.g.catppuccin_flavour = "storm" +vim.g.catppuccin_flavour = "frappe" -- latte, frappe, macchiato, mocha vim.cmd[[colorscheme catppuccin]] ``` +Remember that if you want to switch your Catppuccin flavour "on the fly" you may use the `:Catppuccin ` command. + +> Note: the command has autocompletion enabled, so you can just press tab to cycle through the flavours + ### Configuration Although settings already have self-explanatory names, here is where you can find info about each one of them and their classifications!