git.iko.soy/helix
on master help sign in
Adjust everforest to resemble original more closely
9248de8basbebe
runtime/themes/everforest_dark.toml+67−54
compare with master
unifiedsplit
@@ -1,81 +1,93 @@
1−# Everforest (Dark Hard)
1+# Everforest (Dark Medium)
2−# Author: CptPotato
2+# Authors: CptPotato, basbebe
3
3
4# Original Author:
4# Original Author:
5# URL: https://github.com/sainnhe/everforest
5# URL: https://github.com/sainnhe/everforest
6−# Filename: autoload/everforest.vim
6+# Filename: colors/everforest.vim
7# Author: sainnhe
7# Author: sainnhe
8# Email: sainnhe@gmail.com
8# Email: sainnhe@gmail.com
9# License: MIT License
9# License: MIT License
10
10
11−"type" = "yellow"
11+"type" = { fg = "yellow", modifiers = ["italic"] }
12+"constant" = "fg"
13+"constant.builtin" = { fg = "purple", modifiers = ["italic"] }
12−"constant" = "purple"
14+"constant.builtin.boolean" = "purple"
13"constant.numeric" = "purple"
15"constant.numeric" = "purple"
14−"constant.character.escape" = "orange"
16+"constant.character.escape" = "green"
15−"string" = "green"
17+"string" = "aqua"
16−"string.regexp" = "blue"
18+"string.regexp" = "green"
17−"comment" = "grey0"
19+"string.special" = "yellow"
20+"comment" = { fg = "grey1", modifiers = ["italic"] }
18"variable" = "fg"
21"variable" = "fg"
19−"variable.builtin" = "blue"
22+"variable.builtin" = { fg = "purple", modifiers = ["italic"] }
20"variable.parameter" = "fg"
23"variable.parameter" = "fg"
21−"variable.other.member" = "fg"
24+"variable.other.member" = "blue"
22−"label" = "aqua"
25+"label" = "orange"
23"punctuation" = "grey2"
26"punctuation" = "grey2"
24−"punctuation.delimiter" = "grey2"
27+"punctuation.delimiter" = "grey1"
25"punctuation.bracket" = "fg"
28"punctuation.bracket" = "fg"
29+"punctuation.special" = "blue"
26"keyword" = "red"
30"keyword" = "red"
31+"keyword.operator" = "orange"
27−"keyword.directive" = "aqua"
32+"keyword.directive" = "purple"
33+"keyword.storage" = "orange"
28"operator" = "orange"
34"operator" = "orange"
29"function" = "green"
35"function" = "green"
30−"function.builtin" = "blue"
36+"function.macro" = "green"
31−"function.macro" = "aqua"
37+"tag" = "orange"
32−"tag" = "yellow"
33−"namespace" = "aqua"
38+"namespace" = { fg = "yellow", modifiers = ["italic"] }
34−"attribute" = "aqua"
39+"attribute" = { fg = "purple", modifiers = ["italic"] }
35−"constructor" = "yellow"
40+"constructor" = "green"
36−"module" = "blue"
41+"module" = "yellow"
37−"special" = "orange"
42+"special" = "blue"
38
43
39−"markup.heading.marker" = "grey2"
44+"markup.heading.marker" = "grey1"
40"markup.heading.1" = { fg = "red", modifiers = ["bold"] }
45"markup.heading.1" = { fg = "red", modifiers = ["bold"] }
41"markup.heading.2" = { fg = "orange", modifiers = ["bold"] }
46"markup.heading.2" = { fg = "orange", modifiers = ["bold"] }
42"markup.heading.3" = { fg = "yellow", modifiers = ["bold"] }
47"markup.heading.3" = { fg = "yellow", modifiers = ["bold"] }
43"markup.heading.4" = { fg = "green", modifiers = ["bold"] }
48"markup.heading.4" = { fg = "green", modifiers = ["bold"] }
44"markup.heading.5" = { fg = "blue", modifiers = ["bold"] }
49"markup.heading.5" = { fg = "blue", modifiers = ["bold"] }
45−"markup.heading.6" = { fg = "fg", modifiers = ["bold"] }
50+"markup.heading.6" = { fg = "purple", modifiers = ["bold"] }
46"markup.list" = "red"
51"markup.list" = "red"
47"markup.bold" = { modifiers = ["bold"] }
52"markup.bold" = { modifiers = ["bold"] }
48"markup.italic" = { modifiers = ["italic"] }
53"markup.italic" = { modifiers = ["italic"] }
49"markup.strikethrough" = { modifiers = ["crossed_out"] }
54"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"
51"markup.link.text" = "purple"
57"markup.link.text" = "purple"
52−"markup.quote" = "grey2"
58+"markup.quote" = "grey1"
53−"markup.raw" = "green"
59+"markup.raw.inline" = "green"
60+"markup.raw.block" = "aqua"
54
61
55"diff.plus" = "green"
62"diff.plus" = "green"
56−"diff.delta" = "orange"
63+"diff.delta" = "blue"
57"diff.minus" = "red"
64"diff.minus" = "red"
58
65
59"ui.background" = { bg = "bg0" }
66"ui.background" = { bg = "bg0" }
60−"ui.background.separator" = "grey0"
67+"ui.background.separator" = "bg_visual"
61−"ui.cursor" = { fg = "bg0", bg = "fg" }
62−"ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
68+"ui.cursor" = { fg = "bg1", bg = "grey2" }
63"ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
69"ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
64"ui.cursor.select" = { fg = "bg0", bg = "blue" }
70"ui.cursor.select" = { fg = "bg0", bg = "blue" }
71+"ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
72+"ui.cursor.primary" = { fg = "bg0", bg = "fg" }
65"ui.cursorline.primary" = { bg = "bg1" }
73"ui.cursorline.primary" = { bg = "bg1" }
66−"ui.cursorline.secondary" = { bg = "bg1" }
74+"ui.cursorline.secondary" = { bg = "bg2" }
67"ui.selection" = { bg = "bg3" }
75"ui.selection" = { bg = "bg3" }
68"ui.linenr" = "grey0"
76"ui.linenr" = "grey0"
69−"ui.linenr.selected" = "fg"
77+"ui.linenr.selected" = "grey2"
70"ui.statusline" = { fg = "grey2", bg = "bg3" }
78"ui.statusline" = { fg = "grey2", bg = "bg3" }
71"ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
79"ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
72−"ui.statusline.normal" = { fg = "bg0", bg = "grey2", modifiers = ["bold"] }
80+"ui.statusline.normal" = { fg = "bg0", bg = "statusline1", modifiers = [
81+ "bold",
82+] }
73−"ui.statusline.insert" = { fg = "bg0", bg = "yellow", modifiers = ["bold"] }
83+"ui.statusline.insert" = { fg = "bg0", bg = "statusline2", modifiers = [
84+ "bold",
85+] }
74"ui.statusline.select" = { fg = "bg0", bg = "blue", modifiers = ["bold"] }
86"ui.statusline.select" = { fg = "bg0", bg = "blue", modifiers = ["bold"] }
75−"ui.bufferline" = { fg = "grey0", bg = "bg1" }
87+"ui.bufferline" = { fg = "grey2", bg = "bg3" }
76−"ui.bufferline.active" = { fg = "fg", bg = "bg3", modifiers = ["bold"] }
88+"ui.bufferline.active" = { fg = "bg0", bg = "statusline1", modifiers = ["bold"] }
77"ui.popup" = { fg = "grey2", bg = "bg2" }
89"ui.popup" = { fg = "grey2", bg = "bg2" }
78−"ui.window" = { fg = "grey0", bg = "bg0" }
90+"ui.window" = { fg = "bg4", bg = "bg_dim" }
79"ui.help" = { fg = "fg", bg = "bg2" }
91"ui.help" = { fg = "fg", bg = "bg2" }
80"ui.text" = "fg"
92"ui.text" = "fg"
81"ui.text.focus" = "fg"
93"ui.text.focus" = "fg"
@@ -85,30 +97,30 @@
85"ui.virtual.indent-guide" = { fg = "bg4" }
97"ui.virtual.indent-guide" = { fg = "bg4" }
86"ui.virtual.ruler" = { bg = "bg3" }
98"ui.virtual.ruler" = { bg = "bg3" }
87
99
88−"hint" = "blue"
100+"hint" = "green"
89−"info" = "aqua"
101+"info" = "blue"
90"warning" = "yellow"
102"warning" = "yellow"
91"error" = "red"
103"error" = "red"
92
104
93−"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
105+"diagnostic.hint" = { underline = { color = "green", style = "curl" } }
94−"diagnostic.info" = { underline = { color = "aqua", style = "curl" } }
106+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
95"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
107"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
96"diagnostic.error" = { underline = { color = "red", style = "curl" } }
108"diagnostic.error" = { underline = { color = "red", style = "curl" } }
97
109
98−
99[palette]
110[palette]
100
111
101−bg0 = "#2b3339"
112+bg_dim = "#232a2e"
102−bg1 = "#323c41"
113+bg0 = "#2d353b"
103−bg2 = "#3a454a"
114+bg1 = "#343f44"
104−bg3 = "#445055"
115+bg2 = "#3d484d"
105−bg4 = "#4c555b"
116+bg3 = "#475258"
106−bg5 = "#53605c"
117+bg4 = "#4f585e"
118+bg5 = "#56635f"
107−bg_visual = "#503946"
119+bg_visual = "#543a48"
108−bg_red = "#4e3e43"
120+bg_red = "#514045"
109−bg_green = "#404d44"
121+bg_green = "#425047"
110−bg_blue = "#394f5a"
122+bg_blue = "#3a515d"
111−bg_yellow = "#4a4940"
123+bg_yellow = "#4d4c43"
112
124
113fg = "#d3c6aa"
125fg = "#d3c6aa"
114red = "#e67e80"
126red = "#e67e80"
@@ -118,6 +130,7 @@ green = "#a7c080"
118aqua = "#83c092"
130aqua = "#83c092"
119blue = "#7fbbb3"
131blue = "#7fbbb3"
120purple = "#d699b6"
132purple = "#d699b6"
133+
121grey0 = "#7a8478"
134grey0 = "#7a8478"
122grey1 = "#859289"
135grey1 = "#859289"
123grey2 = "#9da9a0"
136grey2 = "#9da9a0"
runtime/themes/everforest_light.toml+73−54
@@ -1,81 +1,95 @@
1−# Everforest (Dark Hard)
1+# Everforest (Light Medium)
2−# Author: CptPotato
2+# Authors: CptPotato, WindSoilder, basbebe
3
3
4# Original Author:
4# Original Author:
5# URL: https://github.com/sainnhe/everforest
5# URL: https://github.com/sainnhe/everforest
6−# Filename: autoload/everforest.vim
6+# Filename: colors/everforest.vim
7# Author: sainnhe
7# Author: sainnhe
8# Email: sainnhe@gmail.com
8# Email: sainnhe@gmail.com
9# License: MIT License
9# License: MIT License
10
10
11−"type" = "yellow"
11+"type" = { fg = "yellow", modifiers = ["italic"] }
12+"constant" = "fg"
13+"constant.builtin" = { fg = "purple", modifiers = ["italic"] }
12−"constant" = "purple"
14+"constant.builtin.boolean" = "purple"
13"constant.numeric" = "purple"
15"constant.numeric" = "purple"
14−"constant.character.escape" = "orange"
16+"constant.character.escape" = "green"
15−"string" = "green"
17+"string" = "aqua"
16−"string.regexp" = "blue"
18+"string.regexp" = "green"
17−"comment" = "grey0"
19+"string.special" = "yellow"
20+"comment" = { fg = "grey1", modifiers = ["italic"] }
18"variable" = "fg"
21"variable" = "fg"
19−"variable.builtin" = "blue"
22+"variable.builtin" = { fg = "purple", modifiers = ["italic"] }
20"variable.parameter" = "fg"
23"variable.parameter" = "fg"
21−"variable.other.member" = "fg"
24+"variable.other.member" = "blue"
22−"label" = "aqua"
25+"label" = "orange"
23"punctuation" = "grey2"
26"punctuation" = "grey2"
24−"punctuation.delimiter" = "grey2"
27+"punctuation.delimiter" = "grey1"
25"punctuation.bracket" = "fg"
28"punctuation.bracket" = "fg"
29+"punctuation.special" = "blue"
26"keyword" = "red"
30"keyword" = "red"
31+"keyword.operator" = "orange"
27−"keyword.directive" = "aqua"
32+"keyword.directive" = "purple"
33+"keyword.storage" = "orange"
28"operator" = "orange"
34"operator" = "orange"
29"function" = "green"
35"function" = "green"
30−"function.builtin" = "blue"
36+"function.macro" = "green"
31−"function.macro" = "aqua"
37+"tag" = "orange"
32−"tag" = "yellow"
33−"namespace" = "aqua"
38+"namespace" = { fg = "yellow", modifiers = ["italic"] }
34−"attribute" = "aqua"
39+"attribute" = { fg = "purple", modifiers = ["italic"] }
35−"constructor" = "yellow"
40+"constructor" = "green"
36−"module" = "blue"
41+"module" = "yellow"
37−"special" = "orange"
42+"special" = "blue"
38
43
39−"markup.heading.marker" = "grey2"
44+"markup.heading.marker" = "grey1"
40"markup.heading.1" = { fg = "red", modifiers = ["bold"] }
45"markup.heading.1" = { fg = "red", modifiers = ["bold"] }
41"markup.heading.2" = { fg = "orange", modifiers = ["bold"] }
46"markup.heading.2" = { fg = "orange", modifiers = ["bold"] }
42"markup.heading.3" = { fg = "yellow", modifiers = ["bold"] }
47"markup.heading.3" = { fg = "yellow", modifiers = ["bold"] }
43"markup.heading.4" = { fg = "green", modifiers = ["bold"] }
48"markup.heading.4" = { fg = "green", modifiers = ["bold"] }
44"markup.heading.5" = { fg = "blue", modifiers = ["bold"] }
49"markup.heading.5" = { fg = "blue", modifiers = ["bold"] }
45−"markup.heading.6" = { fg = "fg", modifiers = ["bold"] }
50+"markup.heading.6" = { fg = "purple", modifiers = ["bold"] }
46"markup.list" = "red"
51"markup.list" = "red"
47"markup.bold" = { modifiers = ["bold"] }
52"markup.bold" = { modifiers = ["bold"] }
48"markup.italic" = { modifiers = ["italic"] }
53"markup.italic" = { modifiers = ["italic"] }
49"markup.strikethrough" = { modifiers = ["crossed_out"] }
54"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"
51"markup.link.text" = "purple"
57"markup.link.text" = "purple"
52−"markup.quote" = "grey2"
58+"markup.quote" = "grey1"
53−"markup.raw" = "green"
59+"markup.raw.inline" = "green"
60+"markup.raw.block" = "aqua"
54
61
55"diff.plus" = "green"
62"diff.plus" = "green"
56−"diff.delta" = "orange"
63+"diff.delta" = "blue"
57"diff.minus" = "red"
64"diff.minus" = "red"
58
65
59"ui.background" = { bg = "bg0" }
66"ui.background" = { bg = "bg0" }
60−"ui.background.separator" = "grey0"
67+"ui.background.separator" = "bg_visual"
61−"ui.cursor" = { fg = "bg0", bg = "fg" }
62−"ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
68+"ui.cursor" = { fg = "bg1", bg = "grey2" }
63"ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
69"ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
64"ui.cursor.select" = { fg = "bg0", bg = "blue" }
70"ui.cursor.select" = { fg = "bg0", bg = "blue" }
71+"ui.cursor.match" = { bg = "bg4", modifiers = ["bold"] }
72+"ui.cursor.primary" = { fg = "bg0", bg = "fg" }
65"ui.cursorline.primary" = { bg = "bg1" }
73"ui.cursorline.primary" = { bg = "bg1" }
66−"ui.cursorline.secondary" = { bg = "bg1" }
74+"ui.cursorline.secondary" = { bg = "bg2" }
67"ui.selection" = { bg = "bg3" }
75"ui.selection" = { bg = "bg3" }
68"ui.linenr" = "grey0"
76"ui.linenr" = "grey0"
69−"ui.linenr.selected" = "fg"
77+"ui.linenr.selected" = "grey2"
70"ui.statusline" = { fg = "grey2", bg = "bg3" }
78"ui.statusline" = { fg = "grey2", bg = "bg3" }
71"ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
79"ui.statusline.inactive" = { fg = "grey0", bg = "bg1" }
72−"ui.statusline.normal" = { fg = "bg0", bg = "grey2", modifiers = ["bold"] }
80+"ui.statusline.normal" = { fg = "bg0", bg = "statusline1", modifiers = [
81+ "bold",
82+] }
73−"ui.statusline.insert" = { fg = "bg0", bg = "yellow", modifiers = ["bold"] }
83+"ui.statusline.insert" = { fg = "bg0", bg = "statusline2", modifiers = [
84+ "bold",
85+] }
74"ui.statusline.select" = { fg = "bg0", bg = "blue", modifiers = ["bold"] }
86"ui.statusline.select" = { fg = "bg0", bg = "blue", modifiers = ["bold"] }
75−"ui.bufferline" = { fg = "grey0", bg = "bg1" }
87+"ui.bufferline" = { fg = "grey2", bg = "bg3" }
76−"ui.bufferline.active" = { fg = "fg", bg = "bg3", modifiers = ["bold"] }
88+"ui.bufferline.active" = { fg = "bg0", bg = "statusline1", modifiers = [
89+ "bold",
90+] }
77"ui.popup" = { fg = "grey2", bg = "bg2" }
91"ui.popup" = { fg = "grey2", bg = "bg2" }
78−"ui.window" = { fg = "grey0", bg = "bg0" }
92+"ui.window" = { fg = "bg4", bg = "bg_dim" }
79"ui.help" = { fg = "fg", bg = "bg2" }
93"ui.help" = { fg = "fg", bg = "bg2" }
80"ui.text" = "fg"
94"ui.text" = "fg"
81"ui.text.focus" = "fg"
95"ui.text.focus" = "fg"
@@ -85,38 +99,43 @@
85"ui.virtual.indent-guide" = { fg = "bg4" }
99"ui.virtual.indent-guide" = { fg = "bg4" }
86"ui.virtual.ruler" = { bg = "bg3" }
100"ui.virtual.ruler" = { bg = "bg3" }
87
101
88−"hint" = "blue"
102+"hint" = "green"
89−"info" = "aqua"
103+"info" = "blue"
90"warning" = "yellow"
104"warning" = "yellow"
91"error" = "red"
105"error" = "red"
92
106
93−"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
107+"diagnostic.hint" = { underline = { color = "green", style = "curl" } }
94−"diagnostic.info" = { underline = { color = "aqua", style = "curl" } }
108+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
95"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
109"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
96"diagnostic.error" = { underline = { color = "red", style = "curl" } }
110"diagnostic.error" = { underline = { color = "red", style = "curl" } }
97
111
98[palette]
112[palette]
99
113
100−bg0 = "#fff9e8"
114+bg_dim = "#efebd4"
101−bg1 = "#f7f4e0"
115+bg0 = "#fdf6e3"
102−bg2 = "#f0eed9"
116+bg1 = "#f4f0d9"
103−bg3 = "#e9e8d2"
117+bg2 = "#efebd4"
104−bg4 = "#e1ddcb"
118+bg3 = "#e6e2cc"
105−bg5 = "#bec5b2"
119+bg4 = "#e0dcc7"
120+bg5 = "#bdc3af"
121+bg_red = "#fbe3da"
106−bg_visual = "#edf0cd"
122+bg_visual = "#eaedc8"
107−bg_red = "#fce5dc"
123+bg_yellow = "#faedcd"
108−bg_green = "#f1f3d4"
124+bg_green = "#f0f1d2"
109−bg_blue = "#eaf2eb"
125+bg_blue = "#e9f0e9"
110−bg_yellow = "#fbefd0"
111
126
112fg = "#5c6a72"
127fg = "#5c6a72"
113red = "#f85552"
128red = "#f85552"
114orange = "#f57d26"
129orange = "#f57d26"
115yellow = "#dfa000"
130yellow = "#dfa000"
116green = "#8da101"
131green = "#8da101"
117−aqua = "#35a77c"
118blue = "#3a94c5"
132blue = "#3a94c5"
133+aqua = "#35a77c"
119purple = "#df69ba"
134purple = "#df69ba"
135+
120grey0 = "#a6b0a0"
136grey0 = "#a6b0a0"
121grey1 = "#939f91"
137grey1 = "#939f91"
122grey2 = "#829181"
138grey2 = "#829181"
139+statusline1 = "#93b259"
140+statusline2 = "#708089"
141+statusline3 = "#e66868"