Skip to content

Commit 3a43c4a

Browse files
Nanito111Nanito111
committed
feat(theme): fix wrong colors in flexoki and add flexochad
1 parent db58475 commit 3a43c4a

File tree

2 files changed

+190
-25
lines changed

2 files changed

+190
-25
lines changed

‎lua/base46/themes/flexochad.lua‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
-- Credits to original theme https://github.com/kepano/flexoki/
2+
-- This is a modified version of it
3+
4+
-- return colors
5+
local M = {}
6+
7+
M.base_30 = {
8+
white = "#CECDC3",
9+
darker_black = "#171616",
10+
black = "#100F0F", -- nvim bg
11+
black2 = "#1c1b1b",
12+
one_bg = "#292626", -- real bg of onedark
13+
one_bg2 = "#353232",
14+
one_bg3 = "#373434",
15+
grey = "#393636",
16+
grey_fg = "#555050",
17+
grey_fg2 = "#5f5959",
18+
light_grey = "#6a6363",
19+
red = "#D14D41",
20+
baby_pink = "#d36da1",
21+
pink = "#CE5D97",
22+
line = "#292626", -- for lines like vertsplit
23+
green = "#879A39",
24+
vibrant_green = "#7e9f0e",
25+
nord_blue = "#4385BE",
26+
blue = "#4385BE",
27+
yellow = "#D0A215",
28+
sun = "#eabb2b",
29+
purple = "#8B7EC8",
30+
dark_purple = "#7f70c2",
31+
teal = "#519ABA",
32+
orange = "#DA702C",
33+
cyan = "#3AA99F",
34+
statusline_bg = "#171616",
35+
lightbg = "#292626",
36+
pmenu_bg = "#3AA99F",
37+
folder_bg = "#4385BE",
38+
}
39+
40+
M.base_16 = {
41+
base00 = M.base_30.black,
42+
base01 = M.base_30.black2,
43+
base02 = M.base_30.one_bg,
44+
base03 = M.base_30.grey,
45+
base04 = M.base_30.grey_fg,
46+
base05 = M.base_30.white,
47+
base06 = "#b6bdca",
48+
base07 = "#c8ccd4",
49+
base08 = M.base_30.red,
50+
base09 = M.base_30.orange,
51+
base0A = M.base_30.purple,
52+
base0B = M.base_30.green,
53+
base0C = M.base_30.cyan,
54+
base0D = M.base_30.blue,
55+
base0E = M.base_30.yellow,
56+
base0F = M.base_30.teal,
57+
}
58+
59+
M.polish_hl = {
60+
syntax = {
61+
Keyword = { fg = M.base_30.cyan },
62+
Include = { fg = M.base_30.yellow },
63+
Tag = { fg = M.base_30.blue },
64+
},
65+
treesitter = {
66+
["@keyword"] = { fg = M.base_30.cyan },
67+
["@variable.parameter"] = { fg = M.base_30.baby_pink },
68+
["@tag.attribute"] = { fg = M.base_30.orange },
69+
["@tag"] = { fg = M.base_30.blue },
70+
["@string"] = { fg = M.base_30.green },
71+
["@string.special.url"] = { fg = M.base_30.green },
72+
["@markup.link.url"] = { fg = M.base_30.green },
73+
["@punctuation.bracket"] = { fg = M.base_30.yellow },
74+
},
75+
}
76+
77+
M.type = "dark"
78+
79+
M = require("base46").override_theme(M, "flexochad")
80+
81+
return M

‎lua/base46/themes/flexoki.lua‎

Lines changed: 109 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
-- Credits to original theme https://github.com/kepano/flexoki/
22
-- This is a modified version of it
33

4-
-- return colors
54
local M = {}
65

76
M.base_30 = {
8-
white = "#CECDC3",
97
darker_black = "#171616",
10-
black = "#100F0F", -- nvim bg
11-
black2 = "#1c1b1b",
12-
one_bg = "#292626", -- real bg of onedark
13-
one_bg2 = "#353232",
14-
one_bg3 = "#373434",
15-
grey = "#393636",
16-
grey_fg = "#555050",
17-
grey_fg2 = "#5f5959",
18-
light_grey = "#6a6363",
8+
black = "#100F0F", -- bg (nvim bg)
9+
black2 = "#1C1B1A", -- bg2 (secondary bg)
10+
one_bg = "#282726", -- ui (borders)
11+
one_bg2 = "#343331", -- ui2 (hovered borders)
12+
one_bg3 = "#403E3C", -- ui3 (active borders)
13+
grey = "#575653", -- tx3 (faint text)
14+
grey_fg = "#6F6E69",
15+
grey_fg2 = "#878580", -- tx2 (muted text)
16+
light_grey = "#B7B5AC",
17+
white = "#CECDC3", -- tx1
1918
red = "#D14D41",
2019
baby_pink = "#d36da1",
2120
pink = "#CE5D97",
22-
line = "#292626", -- for lines like vertsplit
2321
green = "#879A39",
2422
vibrant_green = "#7e9f0e",
2523
nord_blue = "#4385BE",
@@ -33,9 +31,10 @@ M.base_30 = {
3331
cyan = "#3AA99F",
3432
statusline_bg = "#171616",
3533
lightbg = "#292626",
36-
pmenu_bg = "#3AA99F",
37-
folder_bg = "#4385BE",
3834
}
35+
M.base_30.pmenu_bg = M.base_30.cyan
36+
M.base_30.folder_bg = M.base_30.blue
37+
M.base_30.line = M.base_30.one_bg -- for lines like vertsplit
3938

4039
M.base_16 = {
4140
base00 = M.base_30.black,
@@ -56,21 +55,106 @@ M.base_16 = {
5655
base0F = M.base_30.teal,
5756
}
5857

58+
local colors = {
59+
keyword = M.base_30.green,
60+
keyword_variable = M.base_30.blue,
61+
include = M.base_30.red,
62+
63+
constructor = M.base_30.red,
64+
punctuation = M.base_30.grey_fg2,
65+
operator = M.base_30.grey_fg2,
66+
67+
tag = M.base_30.white,
68+
type = M.base_30.orange,
69+
boolean = M.base_30.yellow,
70+
module = M.base_30.green,
71+
call = M.base_30.orange,
72+
variable = M.base_30.white,
73+
variable_builtin = M.base_30.blue,
74+
member = M.base_30.white,
75+
property = M.base_30.blue,
76+
attribute = M.base_30.orange,
77+
78+
special = M.base_30.pink,
79+
specialChar = M.base_30.pink,
80+
81+
comment = M.base_30.grey,
82+
number = M.base_30.purple,
83+
functions = M.base_30.orange,
84+
string = M.base_30.cyan,
85+
parameter = M.base_30.blue,
86+
constant = M.base_30.yellow,
87+
}
88+
5989
M.polish_hl = {
90+
tbline = {
91+
TbFill = { bg = "NONE" },
92+
TbBufOn = { fg = M.base_30.white, bg = M.base_30.black },
93+
TbBufOnClose = { fg = M.base_30.red, bg = M.base_30.black },
94+
TbBufOff = { fg = M.base_30.grey, bg = "NONE" },
95+
TbBufOffClose = { bg = "NONE" },
96+
TbBufOnModified = { fg = M.base_30.green, bg = M.base_30.black },
97+
TbBufOffModified = { fg = M.base_30.red, bg = "NONE" },
98+
},
99+
telescope = {
100+
TelescopeResultsNormal = { fg = M.base_30.grey_fg2 },
101+
TelescopeSelection = { fg = M.base_30.white },
102+
TelescopeMatching = { fg = M.base_30.green, bg = "NONE", bold = true },
103+
},
60104
syntax = {
61-
Keyword = { fg = M.base_30.cyan },
62-
Include = { fg = M.base_30.yellow },
63-
Tag = { fg = M.base_30.blue },
105+
Keyword = { fg = colors.keyword },
106+
Include = { fg = colors.include },
107+
Tag = { fg = colors.tag },
108+
Type = { fg = colors.type },
109+
Special = { fg = colors.special },
110+
SpecialChar = { fg = colors.specialChar },
111+
Boolean = { fg = colors.boolean },
112+
Comment = { fg = colors.comment },
113+
Number = { fg = colors.number },
64114
},
65115
treesitter = {
66-
["@keyword"] = { fg = M.base_30.cyan },
67-
["@variable.parameter"] = { fg = M.base_30.baby_pink },
68-
["@tag.attribute"] = { fg = M.base_30.orange },
69-
["@tag"] = { fg = M.base_30.blue },
70-
["@string"] = { fg = M.base_30.green },
71-
["@string.special.url"] = { fg = M.base_30.green },
72-
["@markup.link.url"] = { fg = M.base_30.green },
73-
["@punctuation.bracket"] = { fg = M.base_30.yellow },
116+
["@keyword"] = { fg = colors.keyword_variable },
117+
["@keyword.return"] = { fg = colors.keyword },
118+
["@keyword.conditional"] = { fg = colors.keyword },
119+
["@keyword.operator"] = { fg = colors.keyword },
120+
["@keyword.function"] = { fg = colors.keyword },
121+
["@keyword.repeat"] = { fg = colors.keyword },
122+
["@keyword.exception"] = { fg = colors.keyword },
123+
124+
["@constant"] = { fg = colors.constant },
125+
["@constant.builtin"] = { fg = colors.constant },
126+
["@variable"] = { fg = colors.variable },
127+
["@variable.builtin"] = { fg = colors.variable_builtin },
128+
["@variable.member"] = { fg = colors.member },
129+
["@variable.parameter"] = { fg = colors.parameter },
130+
["@attribute"] = { fg = colors.attribute },
131+
["@property"] = { fg = colors.property },
132+
133+
["@tag.attribute"] = { bg = colors.tag },
134+
["@tag"] = { bg = colors.tag },
135+
136+
["@string"] = { fg = colors.string },
137+
["@string.special.url"] = { bg = colors.string },
138+
["@markup.link.url"] = { bg = colors.string },
139+
140+
["@punctuation.bracket"] = { fg = colors.punctuation },
141+
["@punctuation.delimiter"] = { fg = colors.punctuation },
142+
143+
["@operator"] = { fg = colors.operator },
144+
["@constructor"] = { fg = colors.constructor },
145+
146+
["@function.call"] = { fg = colors.call },
147+
["@function.method.call"] = { fg = colors.call },
148+
["@function.builtin"] = { fg = colors.keyword },
149+
150+
["@type.builtin"] = { fg = colors.type },
151+
152+
["@number"] = { fg = colors.number },
153+
["@number.float"] = { fg = colors.number },
154+
155+
["@comment"] = { fg = colors.comment },
156+
["@function"] = { fg = colors.functions },
157+
["@module"] = { fg = colors.module },
74158
},
75159
}
76160

0 commit comments

Comments
 (0)