From 7e09ac4bb2edb61e487757ddbf74ff6e6ec9d55b Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Sun, 24 Apr 2022 20:47:33 -0500 Subject: [PATCH] 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