git.iko.soy/helix
on master help sign in
Adjust everforest to resemble original more closely

Adjust palettes and assignments: Color palettes of upstream everforest where tweaked since creation of this port: - https://github.com/sainnhe/everforest/pull/108 - https://github.com/sainnhe/everforest/pull/109 These adjustments move the helix everforest theme closer to the dcocumented upstream vim theme

commit9248de87802131475eaf52acbc1e0c95e6a1097e authorbasbebe <git@bastianbeuttel.com> dateTue 7 Feb 2023, 12:35 (4 years ago) parent92c5f5f
2 files changed+140−108
compare with master
unifiedsplit
runtime/themes/everforest_dark.toml+67−54 runtime/themes/everforest_light.toml+73−54
runtime/themes/everforest_dark.toml+67−54
@@ -1,81 +1,93 @@
1−# Everforest (Dark Hard)
2−# Author: CptPotato
1+# Everforest (Dark Medium)
2+# Authors: CptPotato, basbebe
33
44# Original Author:
55# URL: https://github.com/sainnhe/everforest
6−# Filename: autoload/everforest.vim
6+# Filename: colors/everforest.vim
77# Author: sainnhe
88# Email: sainnhe@gmail.com
99# License: MIT License
1010
11−"type" = "yellow"
12−"constant" = "purple"
11+"type" = { fg = "yellow", modifiers = ["italic"] }
12+"constant" = "fg"
13+"constant.builtin" = { fg = "purple", modifiers = ["italic"] }
14+"constant.builtin.boolean" = "purple"
1315"constant.numeric" = "purple"
14−"constant.character.escape" = "orange"
15−"string" = "green"
16−"string.regexp" = "blue"
17−"comment" = "grey0"
16+"constant.character.escape" = "green"
17+"string" = "aqua"
18+"string.regexp" = "green"
19+"string.special" = "yellow"
20+"comment" = { fg = "grey1", modifiers = ["italic"] }
1821"variable" = "fg"
19−"variable.builtin" = "blue"
22+"variable.builtin" = { fg = "purple", modifiers = ["italic"] }
2023"variable.parameter" = "fg"
21−"variable.other.member" = "fg"
22−"label" = "aqua"
24+"variable.other.member" = "blue"
25+"label" = "orange"
2326"punctuation" = "grey2"
24−"punctuation.delimiter" = "grey2"
27+"punctuation.delimiter" = "grey1"
2528"punctuation.bracket" = "fg"
29+"punctuation.special" = "blue"
2630"keyword" = "red"
27−"keyword.directive" = "aqua"
31+"keyword.operator" = "orange"
32+"keyword.directive" = "purple"
33+"keyword.storage" = "orange"
2834"operator" = "orange"
2935"function" = "green"
30−"function.builtin" = "blue"
31−"function.macro" = "aqua"
32−"tag" = "yellow"
33−"namespace" = "aqua"
34−"attribute" = "aqua"
35−"constructor" = "yellow"
36−"module" = "blue"
37−"special" = "orange"
36+"function.macro" = "green"
37+"tag" = "orange"
38+"namespace" = { fg = "yellow", modifiers = ["italic"] }
39+"attribute" = { fg = "purple", modifiers = ["italic"] }
40+"constructor" = "green"
41+"module" = "yellow"
42+"special" = "blue"
3843
39−"markup.heading.marker" = "grey2"
44+"markup.heading.marker" = "grey1"
4045"markup.heading.1" = { fg = "red", modifiers = ["bold"] }
4146"markup.heading.2" = { fg = "orange", modifiers = ["bold"] }
4247"markup.heading.3" = { fg = "yellow", modifiers = ["bold"] }
4348"markup.heading.4" = { fg = "green", modifiers = ["bold"] }
4449"markup.heading.5" = { fg = "blue", modifiers = ["bold"] }
45−"markup.heading.6" = { fg = "fg", modifiers = ["bold"] }
50+"markup.heading.6" = { fg = "purple", modifiers = ["bold"] }
4651"markup.list" = "red"
4752"markup.bold" = { modifiers = ["bold"] }
4853"markup.italic" = { modifiers = ["italic"] }
4954"markup.strikethrough" = { modifiers = ["crossed_out"] }
50−"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
55+"markup.link.url" = { fg = "blue", underline = { style = "line" } }
56+"markup.link.label" = "orange"
5157"markup.link.text" = "purple"
52−"markup.quote" = "grey2"
53−"markup.raw" = "green"
58+"markup.quote" = "grey1"
59+"markup.raw.inline" = "green"
60+"markup.raw.block" = "aqua"
5461
5562"diff.plus" = "green"
56−"diff.delta" = "orange"
63+"diff.delta" = "blue"
5764"diff.minus" = "red"
5865
5966"ui.background" = { bg = "bg0" }
60−"ui.background.separator" = "grey0"
61−"ui.cursor" = { fg = "bg0", bg = "fg" }
62−"ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
67+"ui.background.separator" = "bg_visual"
68+"ui.cursor" = { fg = "bg1", bg = "grey2" }
6369"ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
6470"ui.cursor.select" = { fg = "bg0", bg = "blue" }
71+"ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
72+"ui.cursor.primary" = { fg = "bg0", bg = "fg" }
6573"ui.cursorline.primary" = { bg = "bg1" }
66−"ui.cursorline.secondary" = { bg = "bg1" }
74+"ui.cursorline.secondary" = { bg = "bg2" }
6775"ui.selection" = { bg = "bg3" }
6876"ui.linenr" = "grey0"
69−"ui.linenr.selected" = "fg"
77+"ui.linenr.selected" = "grey2"
7078"ui.statusline" = { fg = "grey2", bg = "bg3" }
7179"ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
72−"ui.statusline.normal" = { fg = "bg0", bg = "grey2", modifiers = ["bold"] }
73−"ui.statusline.insert" = { fg = "bg0", bg = "yellow", modifiers = ["bold"] }
80+"ui.statusline.normal" = { fg = "bg0", bg = "statusline1", modifiers = [
81+ "bold",
82+] }
83+"ui.statusline.insert" = { fg = "bg0", bg = "statusline2", modifiers = [
84+ "bold",
85+] }
7486"ui.statusline.select" = { fg = "bg0", bg = "blue", modifiers = ["bold"] }
75−"ui.bufferline" = { fg = "grey0", bg = "bg1" }
76−"ui.bufferline.active" = { fg = "fg", bg = "bg3", modifiers = ["bold"] }
87+"ui.bufferline" = { fg = "grey2", bg = "bg3" }
88+"ui.bufferline.active" = { fg = "bg0", bg = "statusline1", modifiers = ["bold"] }
7789"ui.popup" = { fg = "grey2", bg = "bg2" }
78−"ui.window" = { fg = "grey0", bg = "bg0" }
90+"ui.window" = { fg = "bg4", bg = "bg_dim" }
7991"ui.help" = { fg = "fg", bg = "bg2" }
8092"ui.text" = "fg"
8193"ui.text.focus" = "fg"
@@ -85,30 +97,30 @@
8597"ui.virtual.indent-guide" = { fg = "bg4" }
8698"ui.virtual.ruler" = { bg = "bg3" }
8799
88−"hint" = "blue"
89−"info" = "aqua"
100+"hint" = "green"
101+"info" = "blue"
90102"warning" = "yellow"
91103"error" = "red"
92104
93−"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
94−"diagnostic.info" = { underline = { color = "aqua", style = "curl" } }
105+"diagnostic.hint" = { underline = { color = "green", style = "curl" } }
106+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
95107"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
96108"diagnostic.error" = { underline = { color = "red", style = "curl" } }
97109
98−
99110[palette]
100111
101−bg0 = "#2b3339"
102−bg1 = "#323c41"
103−bg2 = "#3a454a"
104−bg3 = "#445055"
105−bg4 = "#4c555b"
106−bg5 = "#53605c"
107−bg_visual = "#503946"
108−bg_red = "#4e3e43"
109−bg_green = "#404d44"
110−bg_blue = "#394f5a"
111−bg_yellow = "#4a4940"
112+bg_dim = "#232a2e"
113+bg0 = "#2d353b"
114+bg1 = "#343f44"
115+bg2 = "#3d484d"
116+bg3 = "#475258"
117+bg4 = "#4f585e"
118+bg5 = "#56635f"
119+bg_visual = "#543a48"
120+bg_red = "#514045"
121+bg_green = "#425047"
122+bg_blue = "#3a515d"
123+bg_yellow = "#4d4c43"
112124
113125fg = "#d3c6aa"
114126red = "#e67e80"
@@ -118,6 +130,7 @@ green = "#a7c080"
118130aqua = "#83c092"
119131blue = "#7fbbb3"
120132purple = "#d699b6"
133+
121134grey0 = "#7a8478"
122135grey1 = "#859289"
123136grey2 = "#9da9a0"
runtime/themes/everforest_light.toml+73−54
@@ -1,81 +1,95 @@
1−# Everforest (Dark Hard)
2−# Author: CptPotato
1+# Everforest (Light Medium)
2+# Authors: CptPotato, WindSoilder, basbebe
33
44# Original Author:
55# URL: https://github.com/sainnhe/everforest
6−# Filename: autoload/everforest.vim
6+# Filename: colors/everforest.vim
77# Author: sainnhe
88# Email: sainnhe@gmail.com
99# License: MIT License
1010
11−"type" = "yellow"
12−"constant" = "purple"
11+"type" = { fg = "yellow", modifiers = ["italic"] }
12+"constant" = "fg"
13+"constant.builtin" = { fg = "purple", modifiers = ["italic"] }
14+"constant.builtin.boolean" = "purple"
1315"constant.numeric" = "purple"
14−"constant.character.escape" = "orange"
15−"string" = "green"
16−"string.regexp" = "blue"
17−"comment" = "grey0"
16+"constant.character.escape" = "green"
17+"string" = "aqua"
18+"string.regexp" = "green"
19+"string.special" = "yellow"
20+"comment" = { fg = "grey1", modifiers = ["italic"] }
1821"variable" = "fg"
19−"variable.builtin" = "blue"
22+"variable.builtin" = { fg = "purple", modifiers = ["italic"] }
2023"variable.parameter" = "fg"
21−"variable.other.member" = "fg"
22−"label" = "aqua"
24+"variable.other.member" = "blue"
25+"label" = "orange"
2326"punctuation" = "grey2"
24−"punctuation.delimiter" = "grey2"
27+"punctuation.delimiter" = "grey1"
2528"punctuation.bracket" = "fg"
29+"punctuation.special" = "blue"
2630"keyword" = "red"
27−"keyword.directive" = "aqua"
31+"keyword.operator" = "orange"
32+"keyword.directive" = "purple"
33+"keyword.storage" = "orange"
2834"operator" = "orange"
2935"function" = "green"
30−"function.builtin" = "blue"
31−"function.macro" = "aqua"
32−"tag" = "yellow"
33−"namespace" = "aqua"
34−"attribute" = "aqua"
35−"constructor" = "yellow"
36−"module" = "blue"
37−"special" = "orange"
36+"function.macro" = "green"
37+"tag" = "orange"
38+"namespace" = { fg = "yellow", modifiers = ["italic"] }
39+"attribute" = { fg = "purple", modifiers = ["italic"] }
40+"constructor" = "green"
41+"module" = "yellow"
42+"special" = "blue"
3843
39−"markup.heading.marker" = "grey2"
44+"markup.heading.marker" = "grey1"
4045"markup.heading.1" = { fg = "red", modifiers = ["bold"] }
4146"markup.heading.2" = { fg = "orange", modifiers = ["bold"] }
4247"markup.heading.3" = { fg = "yellow", modifiers = ["bold"] }
4348"markup.heading.4" = { fg = "green", modifiers = ["bold"] }
4449"markup.heading.5" = { fg = "blue", modifiers = ["bold"] }
45−"markup.heading.6" = { fg = "fg", modifiers = ["bold"] }
50+"markup.heading.6" = { fg = "purple", modifiers = ["bold"] }
4651"markup.list" = "red"
4752"markup.bold" = { modifiers = ["bold"] }
4853"markup.italic" = { modifiers = ["italic"] }
4954"markup.strikethrough" = { modifiers = ["crossed_out"] }
50−"markup.link.url" = { fg = "blue", modifiers = ["underlined"] }
55+"markup.link.url" = { fg = "blue", underline = { style = "line" } }
56+"markup.link.label" = "orange"
5157"markup.link.text" = "purple"
52−"markup.quote" = "grey2"
53−"markup.raw" = "green"
58+"markup.quote" = "grey1"
59+"markup.raw.inline" = "green"
60+"markup.raw.block" = "aqua"
5461
5562"diff.plus" = "green"
56−"diff.delta" = "orange"
63+"diff.delta" = "blue"
5764"diff.minus" = "red"
5865
5966"ui.background" = { bg = "bg0" }
60−"ui.background.separator" = "grey0"
61−"ui.cursor" = { fg = "bg0", bg = "fg" }
62−"ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
67+"ui.background.separator" = "bg_visual"
68+"ui.cursor" = { fg = "bg1", bg = "grey2" }
6369"ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
6470"ui.cursor.select" = { fg = "bg0", bg = "blue" }
71+"ui.cursor.match" = { bg = "bg4", modifiers = ["bold"] }
72+"ui.cursor.primary" = { fg = "bg0", bg = "fg" }
6573"ui.cursorline.primary" = { bg = "bg1" }
66−"ui.cursorline.secondary" = { bg = "bg1" }
74+"ui.cursorline.secondary" = { bg = "bg2" }
6775"ui.selection" = { bg = "bg3" }
6876"ui.linenr" = "grey0"
69−"ui.linenr.selected" = "fg"
77+"ui.linenr.selected" = "grey2"
7078"ui.statusline" = { fg = "grey2", bg = "bg3" }
7179"ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
72−"ui.statusline.normal" = { fg = "bg0", bg = "grey2", modifiers = ["bold"] }
73−"ui.statusline.insert" = { fg = "bg0", bg = "yellow", modifiers = ["bold"] }
80+"ui.statusline.normal" = { fg = "bg0", bg = "statusline1", modifiers = [
81+ "bold",
82+] }
83+"ui.statusline.insert" = { fg = "bg0", bg = "statusline2", modifiers = [
84+ "bold",
85+] }
7486"ui.statusline.select" = { fg = "bg0", bg = "blue", modifiers = ["bold"] }
75−"ui.bufferline" = { fg = "grey0", bg = "bg1" }
76−"ui.bufferline.active" = { fg = "fg", bg = "bg3", modifiers = ["bold"] }
87+"ui.bufferline" = { fg = "grey2", bg = "bg3" }
88+"ui.bufferline.active" = { fg = "bg0", bg = "statusline1", modifiers = [
89+ "bold",
90+] }
7791"ui.popup" = { fg = "grey2", bg = "bg2" }
78−"ui.window" = { fg = "grey0", bg = "bg0" }
92+"ui.window" = { fg = "bg4", bg = "bg_dim" }
7993"ui.help" = { fg = "fg", bg = "bg2" }
8094"ui.text" = "fg"
8195"ui.text.focus" = "fg"
@@ -85,38 +99,43 @@
8599"ui.virtual.indent-guide" = { fg = "bg4" }
86100"ui.virtual.ruler" = { bg = "bg3" }
87101
88−"hint" = "blue"
89−"info" = "aqua"
102+"hint" = "green"
103+"info" = "blue"
90104"warning" = "yellow"
91105"error" = "red"
92106
93−"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
94−"diagnostic.info" = { underline = { color = "aqua", style = "curl" } }
107+"diagnostic.hint" = { underline = { color = "green", style = "curl" } }
108+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
95109"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
96110"diagnostic.error" = { underline = { color = "red", style = "curl" } }
97111
98112[palette]
99113
100−bg0 = "#fff9e8"
101−bg1 = "#f7f4e0"
102−bg2 = "#f0eed9"
103−bg3 = "#e9e8d2"
104−bg4 = "#e1ddcb"
105−bg5 = "#bec5b2"
106−bg_visual = "#edf0cd"
107−bg_red = "#fce5dc"
108−bg_green = "#f1f3d4"
109−bg_blue = "#eaf2eb"
110−bg_yellow = "#fbefd0"
114+bg_dim = "#efebd4"
115+bg0 = "#fdf6e3"
116+bg1 = "#f4f0d9"
117+bg2 = "#efebd4"
118+bg3 = "#e6e2cc"
119+bg4 = "#e0dcc7"
120+bg5 = "#bdc3af"
121+bg_red = "#fbe3da"
122+bg_visual = "#eaedc8"
123+bg_yellow = "#faedcd"
124+bg_green = "#f0f1d2"
125+bg_blue = "#e9f0e9"
111126
112127fg = "#5c6a72"
113128red = "#f85552"
114129orange = "#f57d26"
115130yellow = "#dfa000"
116131green = "#8da101"
117−aqua = "#35a77c"
118132blue = "#3a94c5"
133+aqua = "#35a77c"
119134purple = "#df69ba"
135+
120136grey0 = "#a6b0a0"
121137grey1 = "#939f91"
122138grey2 = "#829181"
139+statusline1 = "#93b259"
140+statusline2 = "#708089"
141+statusline3 = "#e66868"