From 2e1e14df55fa9698dd76be1b71a4b37ad8d5d584 Mon Sep 17 00:00:00 2001 From: Chirikumbrah Date: Thu, 16 May 2024 11:08:31 +0300 Subject: [PATCH 1/7] gruvbox refactoring --- runtime/themes/gruvbox.toml | 207 +++++++++++++++++++++++------------- 1 file changed, 134 insertions(+), 73 deletions(-) diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml index a6b0636d3e9e..ed918951b399 100644 --- a/runtime/themes/gruvbox.toml +++ b/runtime/themes/gruvbox.toml @@ -1,89 +1,151 @@ # Author : Jakub Bartodziej # The theme uses the gruvbox dark palette with standard contrast: github.com/morhetz/gruvbox -"attribute" = "aqua1" -"keyword" = { fg = "red1" } -"keyword.directive" = "red0" -"namespace" = "aqua1" -"punctuation" = "orange1" -"punctuation.delimiter" = "orange1" -"operator" = "purple1" -"special" = "purple0" -"variable.other.member" = "blue1" -"variable" = "fg1" -"variable.builtin" = "orange1" -"variable.parameter" = "fg2" -"type" = "yellow1" -"type.builtin" = "yellow1" -"constructor" = { fg = "purple1", modifiers = ["bold"] } -"function" = { fg = "green1", modifiers = ["bold"] } -"function.macro" = "aqua1" -"function.builtin" = "yellow1" -"tag" = "red1" -"comment" = { fg = "gray1", modifiers = ["italic"] } +"annotation" = { fg = "fg1" } + +"attribute" = { fg = "aqua1", modifiers = ["italic"] } + +"comment" = { fg = "gray", modifiers = ["italic"] } +"comment.block" = { fg = "gray", modifiers = ["italic"] } +"comment.block.documentation" = { fg = "gray", modifiers = ["italic"] } +"comment.line" = { fg = "gray", modifiers = ["italic"] } + "constant" = { fg = "purple1" } -"constant.builtin" = { fg = "purple1", modifiers = ["bold"] } -"string" = "green1" -"constant.numeric" = "purple1" -"constant.character.escape" = { fg = "fg2", modifiers = ["bold"] } -"label" = "aqua1" -"module" = "aqua1" - -"diff.plus" = "green1" -"diff.delta" = "orange1" -"diff.minus" = "red1" - -"warning" = "orange1" -"error" = "red1" -"info" = "aqua1" -"hint" = "blue1" +"constant.builtin" = { fg = "purple1" } +"constant.builtin.boolean" = { fg = "purple1" } +"constant.character" = { fg = "aqua1" } +"constant.character.escape" = { fg = "orange1" } +"constant.macro" = { fg = "aqua1" } +"constant.numeric" = { fg = "purple1" } +"constructor" = { fg = "purple1" } + +"definition" = { underline = { color = "aqua1" } } + +"diagnostic" = { underline = { color = "orange1", style = "curl" } } +"diagnostic.deprecated" = { modifiers = ["crossed_out"] } +"diagnostic.error" = { underline = { color = "red1", style = "curl" } } +"diagnostic.hint" = { underline = { color = "aqua1", style = "curl" } } +"diagnostic.info" = { underline = { color = "yellow1", style = "curl" } } +"diagnostic.unnecessary" = { modifiers = ["dim"] } +"diagnostic.warning" = { underline = { color = "orange1", style = "curl" } } + +"error" = { fg = "red1" } +"hint" = { fg = "aqua1" } +"info" = { fg = "yellow1" } +"warning" = { fg = "orange1" } + +"diff.delta" = { fg = "orange1" } +"diff.minus" = { fg = "red1" } +"diff.plus" = { fg = "green1" } + +"function" = { fg = "green1" } +"function.builtin" = { fg = "yellow1" } +"function.call" = { fg = "green1" } +"function.macro" = { fg = "blue1" } +"function.method" = { fg = "green1" } + +"keyword" = { fg = "red1" } +"keyword.control.conditional" = { fg = "red1" } +"keyword.control.exception" = { fg = "red1" } +"keyword.control.import" = { fg = "aqua1" } +"keyword.control.repeat" = { fg = "red1" } +"keyword.control.return" = { fg = "red1" } +"keyword.directive" = { fg = "red1" } +"keyword.function" = { fg = "red1" } +"keyword.operator" = { fg = "red1" } +"keyword.storage" = { fg = "red1" } +"keyword.storage.modifier" = { fg = "red1" } +"keyword.storage.type" = { fg = "red1" } + +"label" = { fg = "red1" } + +"markup.bold" = { modifiers = ["bold"] } +"markup.heading" = "aqua1" +"markup.italic" = { modifiers = ["italic"] } +"markup.link.text" = "red1" +"markup.link.url" = { fg = "green1", modifiers = ["underlined"] } +"markup.raw" = "red1" +"markup.strikethrough" = { modifiers = ["crossed_out"] } + +"module" = { fg = "aqua1" } + +"namespace" = { fg = "fg1" } + +"operator" = { fg = "orange1" } + +"punctuation" = { fg = "orange1" } +"punctuation.bracket" = { fg = "orange1" } +"punctuation.delimiter" = { fg = "orange1" } +"punctuation.special" = { fg = "orange1" } + +"special" = { fg = "purple0" } + +"string" = { fg = "green1" } +"string.regexp" = { fg = "orange1" } +"string.special" = { fg = "orange1" } +"string.symbol" = { fg = "yellow1" } + +"tag" = { fg = "aqua1" } +"tag.attribute" = { fg = "purple" } +"tag.delimiter" = { fg = "foreground" } + +"type" = { fg = "yellow1" } +"type.builtin" = { fg = "yellow1" } +"type.enum.variant" = { fg = "yellow1", modifiers = ["italic"] } "ui.background" = { bg = "bg0" } -"ui.linenr" = { fg = "bg4" } -"ui.linenr.selected" = { fg = "yellow1" } -"ui.cursorline" = { bg = "bg1" } -"ui.statusline" = { fg = "fg1", bg = "bg2" } -"ui.statusline.normal" = { fg = "fg1", bg = "bg2" } -"ui.statusline.insert" = { fg = "fg1", bg = "blue0" } -"ui.statusline.select" = { fg = "fg1", bg = "orange0" } -"ui.statusline.inactive" = { fg = "fg4", bg = "bg1" } "ui.bufferline" = { fg = "fg1", bg = "bg1" } "ui.bufferline.active" = { fg = "bg0", bg = "yellow0" } "ui.bufferline.background" = { bg = "bg2" } -"ui.popup" = { bg = "bg1" } -"ui.window" = { bg = "bg1" } + +"ui.cursor" = { fg = "bg1", bg = "bg2" } +"ui.cursor.insert" = { fg = "bg1", bg = "blue0" } +"ui.cursor.normal" = { fg = "bg1", bg = "gray" } +"ui.cursor.select" = { fg = "bg1", bg = "orange0" } +"ui.cursor.match" = { fg = "fg3", bg = "bg3" } + +"ui.cursor.primary" = { bg = "fg3", fg = "bg1" } +"ui.cursor.primary.insert" = { fg = "bg1", bg = "blue1" } +"ui.cursor.primary.normal" = { fg = "bg1", bg = "fg3" } +"ui.cursor.primary.select" = { fg = "bg1", bg = "orange1" } + +"ui.cursorline" = { bg = "bg0_s" } +"ui.cursorline.primary" = { bg = "bg1" } + "ui.help" = { bg = "bg1", fg = "fg1" } -"ui.text" = { fg = "fg1" } -"ui.text.focus" = { fg = "fg1" } -"ui.selection" = { bg = "bg2" } -"ui.selection.primary" = { bg = "bg3" } -"ui.cursor.primary" = { bg = "fg4", fg = "bg1" } -"ui.cursor.match" = { bg = "bg3" } +"ui.linenr" = { fg = "bg3" } +"ui.linenr.selected" = { fg = "yellow1" } "ui.menu" = { fg = "fg1", bg = "bg2" } "ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] } -"ui.virtual.whitespace" = "bg2" +"ui.popup" = { bg = "bg1" } +"ui.selection" = { bg = "bg2" } +"ui.selection.primary" = { bg = "bg3" } + +"ui.statusline" = { fg = "fg1", bg = "bg2" } +"ui.statusline.inactive" = { fg = "fg4", bg = "bg2" } +"ui.statusline.insert" = { fg = "bg1", bg = "blue1", modifiers = ["bold"] } +"ui.statusline.normal" = { fg = "bg1", bg = "fg3", modifiers = ["bold"] } +"ui.statusline.select" = { fg = "bg1", bg = "orange1", modifiers = ["bold"] } + +"ui.text" = { fg = "fg1" } +"ui.text.focus" = { fg = "fg1" } +"ui.virtual.inlay-hint" = { fg = "gray" } +"ui.virtual.jump-label" = { fg = "purple0", modifiers = ["bold"] } "ui.virtual.ruler" = { bg = "bg1" } -"ui.virtual.inlay-hint" = { fg = "gray1" } +"ui.virtual.whitespace" = "bg2" "ui.virtual.wrap" = { fg = "bg2" } -"ui.virtual.jump-label" = { fg = "purple0", modifiers = ["bold"] } +"ui.window" = { bg = "bg1" } -"diagnostic.warning" = { underline = { color = "orange1", style = "curl" } } -"diagnostic.error" = { underline = { color = "red1", style = "curl" } } -"diagnostic.info" = { underline = { color = "aqua1", style = "curl" } } -"diagnostic.hint" = { underline = { color = "blue1", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } +"variable" = { fg = "fg1" } +"variable.builtin" = { fg = "orange1", modifiers = ["italic"] } +"variable.other" = { fg = "fg1" } +"variable.other.member" = { fg = "blue1" } +"variable.parameter" = { fg = "blue1", modifiers = ["italic"] } -"markup.heading" = "aqua1" -"markup.bold" = { modifiers = ["bold"] } -"markup.italic" = { modifiers = ["italic"] } -"markup.strikethrough" = { modifiers = ["crossed_out"] } -"markup.link.url" = { fg = "green1", modifiers = ["underlined"] } -"markup.link.text" = "red1" -"markup.raw" = "red1" [palette] -bg0 = "#282828" # main background +bg0 = "#282828" # main background +bg0_s = "#32302f" bg1 = "#3c3836" bg2 = "#504945" bg3 = "#665c54" @@ -93,13 +155,12 @@ fg0 = "#fbf1c7" fg1 = "#ebdbb2" # main foreground fg2 = "#d5c4a1" fg3 = "#bdae93" -fg4 = "#a89984" # gray0 +fg4 = "#a89984" -gray0 = "#a89984" -gray1 = "#928374" +gray = "#928374" -red0 = "#cc241d" # neutral -red1 = "#fb4934" # bright +red0 = "#cc241d" # neutral +red1 = "#fb4934" # bright green0 = "#98971a" green1 = "#b8bb26" yellow0 = "#d79921" From ae5ceefb59674b66fedbfb9cebd6e6548e723953 Mon Sep 17 00:00:00 2001 From: Chirikumbrah Date: Sat, 18 May 2024 10:43:18 +0300 Subject: [PATCH 2/7] removed unnecessary lines --- runtime/themes/gruvbox.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml index ed918951b399..4d4fb2140001 100644 --- a/runtime/themes/gruvbox.toml +++ b/runtime/themes/gruvbox.toml @@ -74,9 +74,6 @@ "operator" = { fg = "orange1" } "punctuation" = { fg = "orange1" } -"punctuation.bracket" = { fg = "orange1" } -"punctuation.delimiter" = { fg = "orange1" } -"punctuation.special" = { fg = "orange1" } "special" = { fg = "purple0" } From b59723e1afa4c656e3d54e95b69575e2f74bc102 Mon Sep 17 00:00:00 2001 From: Chirikumbrah Date: Sat, 18 May 2024 10:52:29 +0300 Subject: [PATCH 3/7] set purple1 for operators --- runtime/themes/gruvbox.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml index 4d4fb2140001..a045973cc96d 100644 --- a/runtime/themes/gruvbox.toml +++ b/runtime/themes/gruvbox.toml @@ -71,7 +71,7 @@ "namespace" = { fg = "fg1" } -"operator" = { fg = "orange1" } +"operator" = { fg = "purple1" } "punctuation" = { fg = "orange1" } From 2ad1647cb568c5e19abdff6c745b8be07563f380 Mon Sep 17 00:00:00 2001 From: Chirikumbrah Date: Sun, 19 May 2024 00:22:09 +0300 Subject: [PATCH 4/7] changed diagnostics colors --- runtime/themes/gruvbox.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml index a045973cc96d..483152af7d53 100644 --- a/runtime/themes/gruvbox.toml +++ b/runtime/themes/gruvbox.toml @@ -24,15 +24,15 @@ "diagnostic" = { underline = { color = "orange1", style = "curl" } } "diagnostic.deprecated" = { modifiers = ["crossed_out"] } "diagnostic.error" = { underline = { color = "red1", style = "curl" } } -"diagnostic.hint" = { underline = { color = "aqua1", style = "curl" } } -"diagnostic.info" = { underline = { color = "yellow1", style = "curl" } } -"diagnostic.unnecessary" = { modifiers = ["dim"] } -"diagnostic.warning" = { underline = { color = "orange1", style = "curl" } } +"diagnostic.hint" = { underline = { color = "blue1", style = "curl" } } +"diagnostic.info" = { underline = { color = "aqua1", style = "curl" } } +"diagnostic.warning" = { underline = { color = "yellow1", style = "curl" } } +# "diagnostic.unnecessary" = { modifiers = ["dim"] } # do not remove this for future resolving "error" = { fg = "red1" } -"hint" = { fg = "aqua1" } -"info" = { fg = "yellow1" } -"warning" = { fg = "orange1" } +"hint" = { fg = "blue1" } +"info" = { fg = "aqua1" } +"warning" = { fg = "yellow1" } "diff.delta" = { fg = "orange1" } "diff.minus" = { fg = "red1" } From 392a2e3a181880fe9e9ae92c93ffadd5eb98e265 Mon Sep 17 00:00:00 2001 From: Chirikumbrah Date: Mon, 20 May 2024 08:58:25 +0300 Subject: [PATCH 5/7] removed some unnecessary lines --- runtime/themes/gruvbox.toml | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml index 483152af7d53..53d4af8e57ee 100644 --- a/runtime/themes/gruvbox.toml +++ b/runtime/themes/gruvbox.toml @@ -6,17 +6,11 @@ "attribute" = { fg = "aqua1", modifiers = ["italic"] } "comment" = { fg = "gray", modifiers = ["italic"] } -"comment.block" = { fg = "gray", modifiers = ["italic"] } -"comment.block.documentation" = { fg = "gray", modifiers = ["italic"] } -"comment.line" = { fg = "gray", modifiers = ["italic"] } "constant" = { fg = "purple1" } -"constant.builtin" = { fg = "purple1" } -"constant.builtin.boolean" = { fg = "purple1" } "constant.character" = { fg = "aqua1" } "constant.character.escape" = { fg = "orange1" } "constant.macro" = { fg = "aqua1" } -"constant.numeric" = { fg = "purple1" } "constructor" = { fg = "purple1" } "definition" = { underline = { color = "aqua1" } } @@ -40,22 +34,10 @@ "function" = { fg = "green1" } "function.builtin" = { fg = "yellow1" } -"function.call" = { fg = "green1" } "function.macro" = { fg = "blue1" } -"function.method" = { fg = "green1" } "keyword" = { fg = "red1" } -"keyword.control.conditional" = { fg = "red1" } -"keyword.control.exception" = { fg = "red1" } "keyword.control.import" = { fg = "aqua1" } -"keyword.control.repeat" = { fg = "red1" } -"keyword.control.return" = { fg = "red1" } -"keyword.directive" = { fg = "red1" } -"keyword.function" = { fg = "red1" } -"keyword.operator" = { fg = "red1" } -"keyword.storage" = { fg = "red1" } -"keyword.storage.modifier" = { fg = "red1" } -"keyword.storage.type" = { fg = "red1" } "label" = { fg = "red1" } @@ -87,8 +69,7 @@ "tag.delimiter" = { fg = "foreground" } "type" = { fg = "yellow1" } -"type.builtin" = { fg = "yellow1" } -"type.enum.variant" = { fg = "yellow1", modifiers = ["italic"] } +"type.enum.variant" = { modifiers = ["italic"] } "ui.background" = { bg = "bg0" } "ui.bufferline" = { fg = "fg1", bg = "bg1" } @@ -125,7 +106,6 @@ "ui.statusline.select" = { fg = "bg1", bg = "orange1", modifiers = ["bold"] } "ui.text" = { fg = "fg1" } -"ui.text.focus" = { fg = "fg1" } "ui.virtual.inlay-hint" = { fg = "gray" } "ui.virtual.jump-label" = { fg = "purple0", modifiers = ["bold"] } "ui.virtual.ruler" = { bg = "bg1" } @@ -135,7 +115,6 @@ "variable" = { fg = "fg1" } "variable.builtin" = { fg = "orange1", modifiers = ["italic"] } -"variable.other" = { fg = "fg1" } "variable.other.member" = { fg = "blue1" } "variable.parameter" = { fg = "blue1", modifiers = ["italic"] } From 6caf005692f85136fd066f497e83f4709590f699 Mon Sep 17 00:00:00 2001 From: Chirikumbrah Date: Mon, 20 May 2024 09:00:15 +0300 Subject: [PATCH 6/7] set diff.delta color to yellow --- runtime/themes/gruvbox.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml index 53d4af8e57ee..3c96f0202d96 100644 --- a/runtime/themes/gruvbox.toml +++ b/runtime/themes/gruvbox.toml @@ -28,7 +28,7 @@ "info" = { fg = "aqua1" } "warning" = { fg = "yellow1" } -"diff.delta" = { fg = "orange1" } +"diff.delta" = { fg = "yellow1" } "diff.minus" = { fg = "red1" } "diff.plus" = { fg = "green1" } From 9069411f49f186f03f909796258e183351fc172c Mon Sep 17 00:00:00 2001 From: Chirikumbrah Date: Fri, 21 Jun 2024 08:01:15 +0300 Subject: [PATCH 7/7] removed some tag colors --- runtime/themes/gruvbox.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml index 3c96f0202d96..220843b50de3 100644 --- a/runtime/themes/gruvbox.toml +++ b/runtime/themes/gruvbox.toml @@ -65,8 +65,6 @@ "string.symbol" = { fg = "yellow1" } "tag" = { fg = "aqua1" } -"tag.attribute" = { fg = "purple" } -"tag.delimiter" = { fg = "foreground" } "type" = { fg = "yellow1" } "type.enum.variant" = { modifiers = ["italic"] }