Skip to content

Commit 35094c0

Browse files
authored
refactor: split groups into modules (#119)
1 parent 0eb4214 commit 35094c0

34 files changed

+998
-797
lines changed

lua/one_monokai/highlights/groups.lua

Lines changed: 0 additions & 778 deletions
This file was deleted.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
local colors = require "one_monokai.colors"
2+
3+
---@type one_monokai.highlights.groups
4+
local groups = {
5+
BlinkCmpDocCursorLine = { link = "PmenuSel" },
6+
BlinkCmpDocBorder = { link = "FloatBorder" },
7+
BlinkCmpFloatBorder = { link = "FloatBorder" },
8+
BlinkCmpLabelDeprecated = { fg = colors.light_gray, strikethrough = true },
9+
BlinkCmpLabelMatch = { fg = colors.aqua },
10+
BlinkCmpDocSeparator = { fg = colors.pink },
11+
12+
BlinkCmpKindClass = { fg = colors.pink },
13+
BlinkCmpKindConstant = { fg = colors.cyan },
14+
BlinkCmpKindConstructor = { link = "@constructor" },
15+
BlinkCmpKindEnum = { fg = colors.cyan },
16+
BlinkCmpKindEnumMember = { fg = colors.yellow },
17+
BlinkCmpKindEvent = { fg = colors.yellow },
18+
BlinkCmpKindField = { fg = colors.yellow },
19+
BlinkCmpKindFile = { fg = colors.white },
20+
BlinkCmpKindFolder = { fg = colors.yellow },
21+
BlinkCmpKindFunction = { link = "Function" },
22+
BlinkCmpKindInterface = { fg = colors.pink },
23+
BlinkCmpKindKeyword = { fg = colors.white },
24+
BlinkCmpKindMethod = { link = "Function" },
25+
BlinkCmpKindModule = { fg = colors.pink },
26+
BlinkCmpKindOperator = { link = "Operator" },
27+
BlinkCmpKindProperty = { fg = colors.yellow },
28+
BlinkCmpKindStruct = { fg = colors.pink },
29+
BlinkCmpKindText = { fg = colors.white },
30+
BlinkCmpKindUnit = { fg = colors.orange },
31+
BlinkCmpKindValue = { fg = colors.white },
32+
BlinkCmpKindVariable = { fg = colors.cyan },
33+
}
34+
35+
return groups
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
local colors = require "one_monokai.colors"
2+
local config = require "one_monokai.config"
3+
4+
---@type one_monokai.highlights.groups
5+
local groups = {
6+
BufferLineDiagnostic = { fg = colors.dark_gray },
7+
BufferLineDiagnosticSelected = { fg = colors.light_gray, bold = true, italic = config.italics },
8+
BufferLineDiagnosticVisible = { fg = colors.dark_gray },
9+
BufferLineErrorDiagnostic = { fg = colors.dark_gray, sp = colors.red },
10+
BufferLineErrorDiagnosticSelected = { fg = colors.red, sp = colors.red, bold = true, italic = config.italics },
11+
BufferLineErrorDiagnosticVisible = { fg = colors.red },
12+
BufferLineHintDiagnostic = { fg = colors.dark_gray, sp = colors.light_gray },
13+
BufferLineHintDiagnosticSelected = {
14+
fg = colors.light_gray,
15+
sp = colors.light_gray,
16+
bold = true,
17+
italic = config.italics,
18+
},
19+
BufferLineHintDiagnosticVisible = { fg = colors.light_gray },
20+
BufferLineIndicatorSelected = { fg = colors.aqua },
21+
BufferLineInfoDiagnostic = { fg = colors.dark_gray, sp = colors.green },
22+
BufferLineInfoDiagnosticSelected = {
23+
fg = colors.green,
24+
sp = colors.green,
25+
bold = true,
26+
italic = config.italics,
27+
},
28+
BufferLineInfoDiagnosticVisible = { fg = colors.green },
29+
BufferLineModified = { fg = colors.pink },
30+
BufferLineModifiedSelected = { fg = colors.pink },
31+
BufferLineModifiedVisible = { fg = colors.pink },
32+
BufferLineNumbers = { fg = colors.purple },
33+
BufferLineNumbersSelected = { fg = colors.purple },
34+
BufferLineNumbersVisible = { fg = colors.purple },
35+
BufferLineWarningDiagnostic = { fg = colors.dark_gray, sp = colors.yellow },
36+
BufferLineWarningDiagnosticSelected = {
37+
fg = colors.yellow,
38+
sp = colors.yellow,
39+
bold = true,
40+
italic = config.italics,
41+
},
42+
BufferLineWarningDiagnosticVisible = { fg = colors.yellow },
43+
}
44+
45+
return groups
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
local colors = require "one_monokai.colors"
2+
3+
---@type one_monokai.highlights.groups
4+
local groups = {
5+
healthSuccess = { fg = colors.green },
6+
healthWarning = { fg = colors.yellow },
7+
helpCommand = { fg = colors.orange },
8+
helpHyperTextJump = { fg = colors.aqua },
9+
helpHeader = { fg = colors.white },
10+
helpSectionDelim = { fg = colors.green },
11+
}
12+
13+
return groups
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
local colors = require "one_monokai.colors"
2+
3+
---@type one_monokai.highlights.groups
4+
local groups = {
5+
ConflictOurs = { bg = colors.cyan:darken(0.3) },
6+
ConflictTheirs = { bg = colors.aqua:darken(0.3) },
7+
ConflictOursMarker = { fg = colors.fg, bg = colors.cyan:darken(0.6) },
8+
ConflictTheirsMarker = { fg = colors.fg, bg = colors.aqua:darken(0.6) },
9+
ConflictMid = { fg = colors.white, bg = colors.vulcan },
10+
}
11+
12+
return groups
Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
local colors = require "one_monokai.colors"
2+
local config = require "one_monokai.config"
3+
4+
---@type one_monokai.highlights.groups
5+
local groups = {
6+
Normal = { fg = colors.fg, bg = config.transparent and colors.none or colors.bg },
7+
Visual = { bg = colors.dark_gray },
8+
9+
NormalFloat = { link = "Normal" },
10+
FloatTitle = { fg = colors.pink },
11+
12+
Cursor = { fg = colors.bg, bg = colors.fg },
13+
CursorColumn = { bg = colors.vulcan },
14+
CursorLine = { bg = colors.vulcan },
15+
CursorLineNr = { fg = colors.fg },
16+
LineNr = { fg = colors.dark_gray },
17+
18+
StatusLine = { fg = colors.light_gray, bg = colors.black },
19+
StatusLineNC = { fg = colors.light_gray, bg = colors.dark_blue },
20+
21+
WinBar = { link = "Normal" },
22+
WinBarNC = { link = "NormalNC" },
23+
24+
ColorColumn = { bg = colors.dark_blue },
25+
MatchParen = { bg = colors.dark_gray, bold = true },
26+
ModeMsg = { fg = colors.yellow },
27+
MoreMsg = { fg = colors.yellow },
28+
Nontext = { fg = colors.dark_gray:lighten(0.8) },
29+
Whitespace = { fg = colors.dark_gray:darken(0.91) },
30+
Question = { fg = colors.yellow },
31+
Search = { fg = colors.bg, bg = colors.yellow },
32+
SignColumn = {},
33+
TabLine = { fg = colors.fg, bg = config.transparent and colors.none or colors.dark_blue },
34+
VertSplit = { fg = colors.fg },
35+
Directory = { fg = colors.aqua },
36+
SpecialKey = { fg = colors.pink },
37+
Title = { fg = colors.yellow },
38+
Ignore = { fg = colors.yellow },
39+
Underlined = { fg = colors.green, underline = true },
40+
41+
QuickFixLine = { bg = colors.vulcan },
42+
43+
FoldColumn = { bg = colors.dark_blue },
44+
Folded = { fg = colors.gray, bg = colors.dark_blue },
45+
46+
Pmenu = { link = "NormalFloat" },
47+
PmenuSel = { link = "Visual" },
48+
PmenuThumb = { fg = colors.dark_green, bg = colors.dark_gray },
49+
50+
ErrorMsg = { fg = colors.red },
51+
WarningMsg = { fg = colors.yellow },
52+
53+
DiagnosticError = { fg = colors.red },
54+
DiagnosticHint = { fg = colors.light_gray },
55+
DiagnosticInfo = { fg = colors.white },
56+
DiagnosticUnderlineError = { sp = colors.red, undercurl = true },
57+
DiagnosticUnderlineHint = { sp = colors.light_gray, undercurl = true },
58+
DiagnosticUnderlineInfo = { sp = colors.green, undercurl = true },
59+
DiagnosticUnderlineWarn = { sp = colors.yellow, undercurl = true },
60+
DiagnosticWarn = { fg = colors.yellow },
61+
62+
-- Do not exceed this line. All further additions should be placed above.
63+
Boolean = { fg = colors.cyan },
64+
Character = { fg = colors.yellow },
65+
Constant = { fg = colors.aqua },
66+
Float = { fg = colors.purple },
67+
Number = { fg = colors.purple },
68+
String = { fg = colors.yellow },
69+
70+
StorageClass = { fg = colors.cyan },
71+
Structure = { fg = colors.cyan },
72+
Type = { fg = colors.aqua },
73+
Typedef = { fg = colors.aqua },
74+
75+
Function = { fg = colors.green },
76+
Identifier = { fg = colors.green },
77+
78+
Keyword = { fg = colors.cyan },
79+
Label = { fg = colors.pink },
80+
Operator = { fg = colors.pink },
81+
Statement = { fg = colors.pink },
82+
83+
Define = { fg = colors.pink },
84+
Include = { fg = colors.pink },
85+
Macro = { fg = colors.green },
86+
PreCondit = { fg = colors.pink },
87+
PreProc = { fg = colors.green },
88+
Conceal = { fg = colors.light_gray },
89+
90+
Delimiter = { fg = colors.pink },
91+
Special = { fg = colors.purple },
92+
SpecialChar = { fg = colors.pink },
93+
SpecialComment = { fg = colors.cyan },
94+
Tag = { fg = colors.pink },
95+
96+
Comment = { fg = colors.gray, italic = config.italics },
97+
Todo = { fg = colors.orange, bold = true, italic = config.italics },
98+
}
99+
100+
return groups
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
local colors = require "one_monokai.colors"
2+
3+
---@type one_monokai.highlights.groups
4+
local groups = {
5+
CratesNvimError = { fg = colors.red },
6+
CratesNvimLoading = { fg = colors.purple },
7+
CratesNvimNoMatch = { fg = colors.pink },
8+
CratesNvimPopupEnabled = { fg = colors.green },
9+
CratesNvimPopupFeature = { fg = colors.aqua },
10+
CratesNvimPopupPreRelease = { fg = colors.cyan },
11+
CratesNvimPopupTitle = { fg = colors.purple },
12+
CratesNvimPopupTransitive = { fg = colors.pink },
13+
CratesNvimPopupUrl = { fg = colors.aqua },
14+
CratesNvimPopupVersion = { fg = colors.green },
15+
CratesNvimPopupYanked = { fg = colors.pink },
16+
CratesNvimPreRelease = { fg = colors.cyan },
17+
CratesNvimUpgrade = { fg = colors.yellow },
18+
CratesNvimVersion = { fg = colors.green },
19+
CratesNvimYanked = { fg = colors.red },
20+
}
21+
22+
return groups
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
local colors = require "one_monokai.colors"
2+
3+
---@type one_monokai.highlights.groups
4+
local groups = {
5+
DashboardCenter = { fg = colors.pink },
6+
DashboardFooter = { fg = colors.aqua },
7+
DashboardHeader = { fg = colors.peanut },
8+
}
9+
10+
return groups
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
local colors = require "one_monokai.colors"
2+
3+
---@type one_monokai.highlights.groups
4+
local groups = {
5+
DiffAdd = { bg = colors.green:darken(0.3) },
6+
DiffChange = { bg = colors.white:darken(0.3) },
7+
DiffDelete = { bg = colors.red:darken(0.3) },
8+
DiffText = { bg = colors.cyan:darken(0.3) },
9+
10+
diffAdded = { fg = colors.green },
11+
diffChanged = { fg = colors.white },
12+
diffFile = { fg = colors.white },
13+
diffIndexLine = { fg = colors.cyan },
14+
diffLine = { fg = colors.purple },
15+
diffRemoved = { fg = colors.pink },
16+
diffSubname = { fg = colors.cyan },
17+
}
18+
19+
return groups
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
local colors = require "one_monokai.colors"
2+
3+
---@type one_monokai.highlights.groups
4+
local groups = {
5+
FlashMatch = { link = "Search" },
6+
FlashCurrent = { link = "IncSearch" },
7+
FlashBackdrop = { link = "Comment" },
8+
FlashLabel = { fg = colors.dark_pink },
9+
}
10+
11+
return groups

0 commit comments

Comments
 (0)