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))