From cb657b017c5a96a51c96baf0f4ae0a33e1aa5dec Mon Sep 17 00:00:00 2001 From: beeb Date: Wed, 4 Jan 2023 21:21:11 +0100 Subject: [PATCH 1/3] feat(theme): update catppuccin themes --- runtime/themes/catppuccin_frappe.toml | 39 +++++++++++++---------- runtime/themes/catppuccin_latte.toml | 40 +++++++++++++----------- runtime/themes/catppuccin_macchiato.toml | 39 +++++++++++++---------- runtime/themes/catppuccin_mocha.toml | 39 +++++++++++++---------- 4 files changed, 88 insertions(+), 69 deletions(-) diff --git a/runtime/themes/catppuccin_frappe.toml b/runtime/themes/catppuccin_frappe.toml index 89ae77c8210c..dc9be7983378 100644 --- a/runtime/themes/catppuccin_frappe.toml +++ b/runtime/themes/catppuccin_frappe.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,19 +65,20 @@ "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.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.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"] } @@ -92,12 +94,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" @@ -137,4 +142,4 @@ crust = "#232634" # derived colors by blending existing palette colors cursorline = "#3b3f52" -secondary_cursor = "#b8a5a6" +secondary_cursor = "#b8a5a6" \ No newline at end of file diff --git a/runtime/themes/catppuccin_latte.toml b/runtime/themes/catppuccin_latte.toml index 8e8780f9e810..ff3f1e01be38 100644 --- a/runtime/themes/catppuccin_latte.toml +++ b/runtime/themes/catppuccin_latte.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,20 @@ "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.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.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"] } @@ -93,12 +94,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" @@ -138,4 +142,4 @@ crust = "#dce0e8" # derived colors by blending existing palette colors cursorline = "#e9ebf1" -secondary_cursor = "#e2a99e" +secondary_cursor = "#e2a99e" \ No newline at end of file diff --git a/runtime/themes/catppuccin_macchiato.toml b/runtime/themes/catppuccin_macchiato.toml index c2fe3184c7c0..64648544bd29 100644 --- a/runtime/themes/catppuccin_macchiato.toml +++ b/runtime/themes/catppuccin_macchiato.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,19 +65,20 @@ "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.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"] } @@ -92,12 +94,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" @@ -137,4 +142,4 @@ crust = "#181926" # derived colors by blending existing palette colors cursorline = "#303347" -secondary_cursor = "#b6a5a7" +secondary_cursor = "#b6a5a7" \ No newline at end of file diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml index c4750b28166a..e448a31a3011 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,19 +65,20 @@ "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.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"] } @@ -92,12 +94,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" @@ -137,4 +142,4 @@ crust = "#11111b" # derived colors by blending existing palette colors cursorline = "#2a2b3c" -secondary_cursor = "#b5a6a8" +secondary_cursor = "#b5a6a8" \ No newline at end of file From 402f236fc8181a5a30494ea4276aa44c96654ebf Mon Sep 17 00:00:00 2001 From: beeb Date: Sat, 7 Jan 2023 10:04:07 +0100 Subject: [PATCH 2/3] style: formatting and adding newlines EOF --- runtime/themes/catppuccin_frappe.toml | 13 ++++++++----- runtime/themes/catppuccin_latte.toml | 13 ++++++++----- runtime/themes/catppuccin_macchiato.toml | 13 ++++++++----- runtime/themes/catppuccin_mocha.toml | 13 ++++++++----- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/runtime/themes/catppuccin_frappe.toml b/runtime/themes/catppuccin_frappe.toml index dc9be7983378..55fb330f2819 100644 --- a/runtime/themes/catppuccin_frappe.toml +++ b/runtime/themes/catppuccin_frappe.toml @@ -68,18 +68,21 @@ "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.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.bufferline" = { fg = "surface1", bg = "mantle" } -"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold", "italic"] } +"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = [ + "bold", + "italic", +] } "ui.bufferline.background" = { bg = "surface0" } -"ui.text" = "text" +"ui.text" = "text" "ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] } "ui.virtual" = "overlay0" @@ -142,4 +145,4 @@ crust = "#232634" # derived colors by blending existing palette colors cursorline = "#3b3f52" -secondary_cursor = "#b8a5a6" \ No newline at end of file +secondary_cursor = "#b8a5a6" diff --git a/runtime/themes/catppuccin_latte.toml b/runtime/themes/catppuccin_latte.toml index ff3f1e01be38..b6f3459bdc94 100644 --- a/runtime/themes/catppuccin_latte.toml +++ b/runtime/themes/catppuccin_latte.toml @@ -68,18 +68,21 @@ "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.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.bufferline" = { fg = "surface1", bg = "mantle" } -"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold", "italic"] } +"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = [ + "bold", + "italic", +] } "ui.bufferline.background" = { bg = "surface0" } -"ui.text" = "text" +"ui.text" = "text" "ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] } "ui.virtual" = "overlay0" @@ -142,4 +145,4 @@ crust = "#dce0e8" # derived colors by blending existing palette colors cursorline = "#e9ebf1" -secondary_cursor = "#e2a99e" \ No newline at end of file +secondary_cursor = "#e2a99e" diff --git a/runtime/themes/catppuccin_macchiato.toml b/runtime/themes/catppuccin_macchiato.toml index 64648544bd29..2a8587324ce1 100644 --- a/runtime/themes/catppuccin_macchiato.toml +++ b/runtime/themes/catppuccin_macchiato.toml @@ -68,18 +68,21 @@ "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.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.bufferline" = { fg = "surface1", bg = "mantle" } -"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold", "italic"] } +"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = [ + "bold", + "italic", +] } "ui.bufferline.background" = { bg = "surface0" } -"ui.text" = "text" +"ui.text" = "text" "ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] } "ui.virtual" = "overlay0" @@ -142,4 +145,4 @@ crust = "#181926" # derived colors by blending existing palette colors cursorline = "#303347" -secondary_cursor = "#b6a5a7" \ No newline at end of file +secondary_cursor = "#b6a5a7" diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml index e448a31a3011..575ef3030689 100644 --- a/runtime/themes/catppuccin_mocha.toml +++ b/runtime/themes/catppuccin_mocha.toml @@ -68,18 +68,21 @@ "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.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.bufferline" = { fg = "surface1", bg = "mantle" } -"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = ["bold", "italic"] } +"ui.bufferline.active" = { fg = "text", bg = "base", modifiers = [ + "bold", + "italic", +] } "ui.bufferline.background" = { bg = "surface0" } -"ui.text" = "text" +"ui.text" = "text" "ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] } "ui.virtual" = "overlay0" @@ -142,4 +145,4 @@ crust = "#11111b" # derived colors by blending existing palette colors cursorline = "#2a2b3c" -secondary_cursor = "#b5a6a8" \ No newline at end of file +secondary_cursor = "#b5a6a8" From fd78415e30d3f8a639b0286de96207233b178c45 Mon Sep 17 00:00:00 2001 From: beeb Date: Sat, 7 Jan 2023 11:33:15 +0100 Subject: [PATCH 3/3] refactor: inherit from one theme --- runtime/themes/catppuccin_frappe.toml | 114 +---------------------- runtime/themes/catppuccin_latte.toml | 114 +---------------------- runtime/themes/catppuccin_macchiato.toml | 114 +---------------------- 3 files changed, 3 insertions(+), 339 deletions(-) diff --git a/runtime/themes/catppuccin_frappe.toml b/runtime/themes/catppuccin_frappe.toml index 55fb330f2819..eb1d471944a9 100644 --- a/runtime/themes/catppuccin_frappe.toml +++ b/runtime/themes/catppuccin_frappe.toml @@ -1,116 +1,4 @@ -# Syntax highlighting -# ------------------- -"type" = "yellow" - -"constructor" = "sapphire" - -"constant" = "peach" -"constant.builtin" = "peach" -"constant.character" = "teal" -"constant.character.escape" = "pink" - -"string" = "green" -"string.regexp" = "peach" -"string.special" = "blue" - -"comment" = { fg = "surface2", modifiers = ["italic"] } - -"variable" = "text" -"variable.parameter" = { fg = "maroon", modifiers = ["italic"] } -"variable.builtin" = "red" -"variable.other.member" = "teal" - -"label" = "sapphire" # used for lifetimes - -"punctuation" = "overlay2" -"punctuation.special" = "sky" - -"keyword" = "mauve" -"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] } - -"operator" = "sky" - -"function" = "blue" -"function.builtin" = "peach" -"function.macro" = "mauve" - -"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 = "rosewater", modifiers = ["italic", "underlined"] } -"markup.link.text" = "blue" -"markup.raw" = "flamingo" - -"diff.plus" = "green" -"diff.minus" = "red" -"diff.delta" = "blue" - -# User Interface -# -------------- -"ui.background" = { fg = "text", bg = "base" } - -"ui.linenr" = { fg = "surface1" } -"ui.linenr.selected" = { fg = "lavender" } - -"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.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" -"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", modifiers = ["bold"] } - -"ui.menu" = { fg = "overlay2", bg = "surface0" } -"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] } - -"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" -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 b6f3459bdc94..e1580c9d78b2 100644 --- a/runtime/themes/catppuccin_latte.toml +++ b/runtime/themes/catppuccin_latte.toml @@ -1,116 +1,4 @@ -# Syntax highlighting -# ------------------- -"type" = "yellow" - -"constructor" = "sapphire" - -"constant" = "peach" -"constant.builtin" = "peach" -"constant.character" = "teal" -"constant.character.escape" = "pink" - -"string" = "green" -"string.regexp" = "peach" -"string.special" = "blue" - -"comment" = { fg = "surface2", modifiers = ["italic"] } - -"variable" = "text" -"variable.parameter" = { fg = "maroon", modifiers = ["italic"] } -"variable.builtin" = "red" -"variable.other.member" = "teal" - -"label" = "sapphire" # used for lifetimes - -"punctuation" = "overlay2" -"punctuation.special" = "sky" - -"keyword" = "mauve" -"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] } - -"operator" = "sky" - -"function" = "blue" -"function.builtin" = "peach" -"function.macro" = "mauve" - -"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 = "rosewater", modifiers = ["italic", "underlined"] } -"markup.link.text" = "blue" -"markup.raw" = "flamingo" - -"diff.plus" = "green" -"diff.minus" = "red" -"diff.delta" = "blue" - -# User Interface -# -------------- -"ui.background" = { fg = "text", bg = "base" } - -"ui.linenr" = { fg = "surface1" } -"ui.linenr.selected" = { fg = "lavender" } - -"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.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" -"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", modifiers = ["bold"] } - -"ui.menu" = { fg = "overlay2", bg = "surface0" } -"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] } - -"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" -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 2a8587324ce1..e09a82f9b511 100644 --- a/runtime/themes/catppuccin_macchiato.toml +++ b/runtime/themes/catppuccin_macchiato.toml @@ -1,116 +1,4 @@ -# Syntax highlighting -# ------------------- -"type" = "yellow" - -"constructor" = "sapphire" - -"constant" = "peach" -"constant.builtin" = "peach" -"constant.character" = "teal" -"constant.character.escape" = "pink" - -"string" = "green" -"string.regexp" = "peach" -"string.special" = "blue" - -"comment" = { fg = "surface2", modifiers = ["italic"] } - -"variable" = "text" -"variable.parameter" = { fg = "maroon", modifiers = ["italic"] } -"variable.builtin" = "red" -"variable.other.member" = "teal" - -"label" = "sapphire" # used for lifetimes - -"punctuation" = "overlay2" -"punctuation.special" = "sky" - -"keyword" = "mauve" -"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] } - -"operator" = "sky" - -"function" = "blue" -"function.builtin" = "peach" -"function.macro" = "mauve" - -"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 = "rosewater", modifiers = ["italic", "underlined"] } -"markup.link.text" = "blue" -"markup.raw" = "flamingo" - -"diff.plus" = "green" -"diff.minus" = "red" -"diff.delta" = "blue" - -# User Interface -# -------------- -"ui.background" = { fg = "text", bg = "base" } - -"ui.linenr" = { fg = "surface1" } -"ui.linenr.selected" = { fg = "lavender" } - -"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.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" -"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", modifiers = ["bold"] } - -"ui.menu" = { fg = "overlay2", bg = "surface0" } -"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] } - -"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" -info = "sky" -hint = "teal" +inherits = "catppuccin_mocha" [palette] # catppuccin palette colors