From 2412f7c8374d2f6a8bfd66ecf424153a37c814bf Mon Sep 17 00:00:00 2001 From: Valentin Bersier Date: Wed, 11 Jan 2023 03:14:40 +0100 Subject: [PATCH] Update catppuccin themes (#5404) --- runtime/themes/catppuccin_frappe.toml | 106 +--------------------- runtime/themes/catppuccin_latte.toml | 107 +---------------------- runtime/themes/catppuccin_macchiato.toml | 106 +--------------------- runtime/themes/catppuccin_mocha.toml | 42 +++++---- 4 files changed, 28 insertions(+), 333 deletions(-) diff --git a/runtime/themes/catppuccin_frappe.toml b/runtime/themes/catppuccin_frappe.toml index 89ae77c82..eb1d47194 100644 --- a/runtime/themes/catppuccin_frappe.toml +++ b/runtime/themes/catppuccin_frappe.toml @@ -1,108 +1,4 @@ -# Syntax highlighting -# ------------------- -"type" = "yellow" -"type.enum.variant" = "peach" - -"constructor" = "sapphire" - -"constant" = "peach" -"constant.character" = "teal" -"constant.character.escape" = "pink" - -"string" = "green" -"string.regexp" = "peach" -"string.special" = "pink" - -"comment" = { fg = "overlay1", modifiers = ["italic"] } - -"variable" = "text" -"variable.parameter" = { fg = "maroon", modifiers = ["italic"] } -"variable.builtin" = "red" -"variable.other.member" = "teal" - -"label" = "sapphire" # used for lifetimes - -"punctuation" = "overlay2" - -"keyword" = "mauve" -"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] } - -"operator" = "sky" - -"function" = "blue" -"function.builtin" = "peach" -"function.macro" = "teal" - -"tag" = "mauve" - -"namespace" = { fg = "blue", modifiers = ["italic"] } - -"special" = "blue" # fuzzy highlight - -"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] } -"markup.heading.1" = "lavender" -"markup.heading.2" = "mauve" -"markup.heading.3" = "green" -"markup.heading.4" = "yellow" -"markup.heading.5" = "pink" -"markup.heading.6" = "teal" -"markup.list" = "mauve" -"markup.bold" = { modifiers = ["bold"] } -"markup.italic" = { modifiers = ["italic"] } -"markup.link.url" = { fg = "peach", modifiers = ["underlined"] } -"markup.link.text" = "blue" -"markup.raw" = "flamingo" - -"diff.plus" = "green" -"diff.minus" = "red" -"diff.delta" = "yellow" - -# User Interface -# -------------- -"ui.background" = { fg = "text", bg = "base" } - -"ui.linenr" = { fg = "surface1" } -"ui.linenr.selected" = { fg = "lavender" } - -"ui.statusline" = { fg = "overlay1", bg = "surface0" } -"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" } -"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] } -"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"] } -"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"] } - -"ui.bufferline" = { fg = "subtext1", bg = "mantle" } -"ui.bufferline.active" = { fg = "text", bg = "surface0", modifiers = ["bold"] } - -"ui.popup" = { fg = "text", bg = "surface0" } -"ui.window" = { fg = "crust" } -"ui.help" = { fg = "overlay2", bg = "surface0" } - -"ui.text" = "text" -"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] } - -"ui.virtual" = "overlay0" -"ui.virtual.ruler" = { bg = "surface0" } -"ui.virtual.indent-guide" = "surface0" - -"ui.selection" = { bg = "surface1" } - -"ui.cursor" = { fg = "base", bg = "secondary_cursor" } -"ui.cursor.primary" = { fg = "base", bg = "rosewater" } -"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] } - -"ui.cursorline.primary" = { bg = "cursorline" } - -"ui.highlight" = { bg = "surface1" } - -"ui.menu" = { fg = "overlay2", bg = "surface0" } -"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] } - -diagnostic = { modifiers = ["underlined"] } - -error = "red" -warning = "yellow" -info = "sky" -hint = "teal" +inherits = "catppuccin_mocha" [palette] # catppuccin palette colors diff --git a/runtime/themes/catppuccin_latte.toml b/runtime/themes/catppuccin_latte.toml index 8e8780f9e..e1580c9d7 100644 --- a/runtime/themes/catppuccin_latte.toml +++ b/runtime/themes/catppuccin_latte.toml @@ -1,109 +1,4 @@ -# Syntax highlighting -# ------------------- -"type" = "yellow" -"type.enum.variant" = "peach" - -"constructor" = "sapphire" - -"constant" = "peach" -"constant.character" = "teal" -"constant.character.escape" = "pink" - -"string" = "green" -"string.regexp" = "peach" -"string.special" = "pink" - -"comment" = { fg = "overlay1", modifiers = ["italic"] } - -"variable" = "text" -"variable.parameter" = { fg = "maroon", modifiers = ["italic"] } -"variable.builtin" = "red" -"variable.other.member" = "teal" - -"label" = "sapphire" # used for lifetimes - -"punctuation" = "overlay2" - -"keyword" = "mauve" -"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] } - -"operator" = "sky" - -"function" = "blue" -"function.builtin" = "peach" -"function.macro" = "teal" - -"tag" = "mauve" - -"namespace" = { fg = "blue", modifiers = ["italic"] } - -"special" = "blue" # fuzzy highlight - -"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] } -"markup.heading.1" = "lavender" -"markup.heading.2" = "mauve" -"markup.heading.3" = "green" -"markup.heading.4" = "yellow" -"markup.heading.5" = "pink" -"markup.heading.6" = "teal" -"markup.list" = "mauve" -"markup.bold" = { modifiers = ["bold"] } -"markup.italic" = { modifiers = ["italic"] } -"markup.link.url" = { fg = "peach", modifiers = ["underlined"] } -"markup.link.text" = "blue" -"markup.raw" = "flamingo" - -"diff.plus" = "green" -"diff.minus" = "red" -"diff.delta" = "yellow" - -# User Interface -# -------------- -"ui.background" = { fg = "text", bg = "base" } - -"ui.linenr" = { fg = "surface1" } -"ui.linenr.selected" = { fg = "lavender" } - -"ui.statusline" = { fg = "overlay1", bg = "surface0" } -"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" } -"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] } -"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"] } -"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"] } - -"ui.bufferline" = { fg = "overlay2", bg = "surface1", modifiers = ["italic"] } -"ui.bufferline.active" = { fg = "text", bg = "surface0", modifiers = ["bold"] } -"ui.bufferline.background" = { bg = "surface1" } - -"ui.popup" = { fg = "text", bg = "surface0" } -"ui.window" = { fg = "crust" } -"ui.help" = { fg = "overlay2", bg = "surface0" } - -"ui.text" = "text" -"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] } - -"ui.virtual" = "overlay0" -"ui.virtual.ruler" = { bg = "surface0" } -"ui.virtual.indent-guide" = "surface0" - -"ui.selection" = { bg = "surface1" } - -"ui.cursor" = { fg = "base", bg = "secondary_cursor" } -"ui.cursor.primary" = { fg = "base", bg = "rosewater" } -"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] } - -"ui.cursorline.primary" = { bg = "cursorline" } - -"ui.highlight" = { bg = "surface1" } - -"ui.menu" = { fg = "overlay2", bg = "surface0" } -"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] } - -diagnostic = { modifiers = ["underlined"] } - -error = "red" -warning = "yellow" -info = "sky" -hint = "teal" +inherits = "catppuccin_mocha" [palette] # catppuccin palette colors diff --git a/runtime/themes/catppuccin_macchiato.toml b/runtime/themes/catppuccin_macchiato.toml index c2fe3184c..e09a82f9b 100644 --- a/runtime/themes/catppuccin_macchiato.toml +++ b/runtime/themes/catppuccin_macchiato.toml @@ -1,108 +1,4 @@ -# Syntax highlighting -# ------------------- -"type" = "yellow" -"type.enum.variant" = "peach" - -"constructor" = "sapphire" - -"constant" = "peach" -"constant.character" = "teal" -"constant.character.escape" = "pink" - -"string" = "green" -"string.regexp" = "peach" -"string.special" = "pink" - -"comment" = { fg = "overlay1", modifiers = ["italic"] } - -"variable" = "text" -"variable.parameter" = { fg = "maroon", modifiers = ["italic"] } -"variable.builtin" = "red" -"variable.other.member" = "teal" - -"label" = "sapphire" # used for lifetimes - -"punctuation" = "overlay2" - -"keyword" = "mauve" -"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] } - -"operator" = "sky" - -"function" = "blue" -"function.builtin" = "peach" -"function.macro" = "teal" - -"tag" = "mauve" - -"namespace" = { fg = "blue", modifiers = ["italic"] } - -"special" = "blue" # fuzzy highlight - -"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] } -"markup.heading.1" = "lavender" -"markup.heading.2" = "mauve" -"markup.heading.3" = "green" -"markup.heading.4" = "yellow" -"markup.heading.5" = "pink" -"markup.heading.6" = "teal" -"markup.list" = "mauve" -"markup.bold" = { modifiers = ["bold"] } -"markup.italic" = { modifiers = ["italic"] } -"markup.link.url" = { fg = "peach", modifiers = ["underlined"] } -"markup.link.text" = "blue" -"markup.raw" = "flamingo" - -"diff.plus" = "green" -"diff.minus" = "red" -"diff.delta" = "yellow" - -# User Interface -# -------------- -"ui.background" = { fg = "text", bg = "base" } - -"ui.linenr" = { fg = "surface1" } -"ui.linenr.selected" = { fg = "lavender" } - -"ui.statusline" = { fg = "overlay1", bg = "surface0" } -"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" } -"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] } -"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"] } -"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"] } - -"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold"] } -"ui.bufferline" = { fg = "overlay1", bg = "mantle" } - -"ui.popup" = { fg = "text", bg = "surface0" } -"ui.window" = { fg = "crust" } -"ui.help" = { fg = "overlay2", bg = "surface0" } - -"ui.text" = "text" -"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] } - -"ui.virtual" = "overlay0" -"ui.virtual.ruler" = { bg = "surface0" } -"ui.virtual.indent-guide" = "surface0" - -"ui.selection" = { bg = "surface1" } - -"ui.cursor" = { fg = "base", bg = "secondary_cursor" } -"ui.cursor.primary" = { fg = "base", bg = "rosewater" } -"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] } - -"ui.cursorline.primary" = { bg = "cursorline" } - -"ui.highlight" = { bg = "surface1" } - -"ui.menu" = { fg = "overlay2", bg = "surface0" } -"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] } - -diagnostic = { modifiers = ["underlined"] } - -error = "red" -warning = "yellow" -info = "sky" -hint = "teal" +inherits = "catppuccin_mocha" [palette] # catppuccin palette colors diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml index c4750b281..575ef3030 100644 --- a/runtime/themes/catppuccin_mocha.toml +++ b/runtime/themes/catppuccin_mocha.toml @@ -1,19 +1,19 @@ # Syntax highlighting # ------------------- "type" = "yellow" -"type.enum.variant" = "peach" "constructor" = "sapphire" "constant" = "peach" +"constant.builtin" = "peach" "constant.character" = "teal" "constant.character.escape" = "pink" "string" = "green" "string.regexp" = "peach" -"string.special" = "pink" +"string.special" = "blue" -"comment" = { fg = "overlay1", modifiers = ["italic"] } +"comment" = { fg = "surface2", modifiers = ["italic"] } "variable" = "text" "variable.parameter" = { fg = "maroon", modifiers = ["italic"] } @@ -23,6 +23,7 @@ "label" = "sapphire" # used for lifetimes "punctuation" = "overlay2" +"punctuation.special" = "sky" "keyword" = "mauve" "keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] } @@ -31,7 +32,7 @@ "function" = "blue" "function.builtin" = "peach" -"function.macro" = "teal" +"function.macro" = "mauve" "tag" = "mauve" @@ -49,13 +50,13 @@ "markup.list" = "mauve" "markup.bold" = { modifiers = ["bold"] } "markup.italic" = { modifiers = ["italic"] } -"markup.link.url" = { fg = "peach", modifiers = ["underlined"] } +"markup.link.url" = { fg = "rosewater", modifiers = ["italic", "underlined"] } "markup.link.text" = "blue" "markup.raw" = "flamingo" "diff.plus" = "green" "diff.minus" = "red" -"diff.delta" = "yellow" +"diff.delta" = "blue" # User Interface # -------------- @@ -64,20 +65,24 @@ "ui.linenr" = { fg = "surface1" } "ui.linenr.selected" = { fg = "lavender" } -"ui.statusline" = { fg = "overlay1", bg = "surface0" } -"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" } -"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] } -"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"] } -"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"] } - -"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold"] } -"ui.bufferline" = { fg = "overlay1", bg = "mantle" } +"ui.statusline" = { fg = "text", bg = "mantle" } +"ui.statusline.inactive" = { fg = "surface2", bg = "mantle" } +"ui.statusline.normal" = { fg = "base", bg = "lavender", modifiers = ["bold"] } +"ui.statusline.insert" = { fg = "base", bg = "green", modifiers = ["bold"] } +"ui.statusline.select" = { fg = "base", bg = "flamingo", modifiers = ["bold"] } "ui.popup" = { fg = "text", bg = "surface0" } "ui.window" = { fg = "crust" } "ui.help" = { fg = "overlay2", bg = "surface0" } -"ui.text" = "text" +"ui.bufferline" = { fg = "surface1", bg = "mantle" } +"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = [ + "bold", + "italic", +] } +"ui.bufferline.background" = { bg = "surface0" } + +"ui.text" = "text" "ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] } "ui.virtual" = "overlay0" @@ -92,12 +97,15 @@ "ui.cursorline.primary" = { bg = "cursorline" } -"ui.highlight" = { bg = "surface1" } +"ui.highlight" = { bg = "surface1", modifiers = ["bold"] } "ui.menu" = { fg = "overlay2", bg = "surface0" } "ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] } -diagnostic = { modifiers = ["underlined"] } +"diagnostic.error" = { fg = "red", underline = { color = "red", style = "curl" } } +"diagnostic.warning" = { fg = "yellow", underline = { color = "yellow", style = "curl" } } +"diagnostic.info" = { fg = "sky", underline = { color = "sky", style = "curl" } } +"diagnostic.hint" = { fg = "teal", underline = { color = "teal", style = "curl" } } error = "red" warning = "yellow"