Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
778 changes: 0 additions & 778 deletions lua/one_monokai/highlights/groups.lua

This file was deleted.

35 changes: 35 additions & 0 deletions lua/one_monokai/highlights/groups/blink_cmp.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
local colors = require "one_monokai.colors"

---@type one_monokai.highlights.groups
local groups = {
BlinkCmpDocCursorLine = { link = "PmenuSel" },
BlinkCmpDocBorder = { link = "FloatBorder" },
BlinkCmpFloatBorder = { link = "FloatBorder" },
BlinkCmpLabelDeprecated = { fg = colors.light_gray, strikethrough = true },
BlinkCmpLabelMatch = { fg = colors.aqua },
BlinkCmpDocSeparator = { fg = colors.pink },

BlinkCmpKindClass = { fg = colors.pink },
BlinkCmpKindConstant = { fg = colors.cyan },
BlinkCmpKindConstructor = { link = "@constructor" },
BlinkCmpKindEnum = { fg = colors.cyan },
BlinkCmpKindEnumMember = { fg = colors.yellow },
BlinkCmpKindEvent = { fg = colors.yellow },
BlinkCmpKindField = { fg = colors.yellow },
BlinkCmpKindFile = { fg = colors.white },
BlinkCmpKindFolder = { fg = colors.yellow },
BlinkCmpKindFunction = { link = "Function" },
BlinkCmpKindInterface = { fg = colors.pink },
BlinkCmpKindKeyword = { fg = colors.white },
BlinkCmpKindMethod = { link = "Function" },
BlinkCmpKindModule = { fg = colors.pink },
BlinkCmpKindOperator = { link = "Operator" },
BlinkCmpKindProperty = { fg = colors.yellow },
BlinkCmpKindStruct = { fg = colors.pink },
BlinkCmpKindText = { fg = colors.white },
BlinkCmpKindUnit = { fg = colors.orange },
BlinkCmpKindValue = { fg = colors.white },
BlinkCmpKindVariable = { fg = colors.cyan },
}

return groups
45 changes: 45 additions & 0 deletions lua/one_monokai/highlights/groups/bufferline.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
local colors = require "one_monokai.colors"
local config = require "one_monokai.config"

---@type one_monokai.highlights.groups
local groups = {
BufferLineDiagnostic = { fg = colors.dark_gray },
BufferLineDiagnosticSelected = { fg = colors.light_gray, bold = true, italic = config.italics },
BufferLineDiagnosticVisible = { fg = colors.dark_gray },
BufferLineErrorDiagnostic = { fg = colors.dark_gray, sp = colors.red },
BufferLineErrorDiagnosticSelected = { fg = colors.red, sp = colors.red, bold = true, italic = config.italics },
BufferLineErrorDiagnosticVisible = { fg = colors.red },
BufferLineHintDiagnostic = { fg = colors.dark_gray, sp = colors.light_gray },
BufferLineHintDiagnosticSelected = {
fg = colors.light_gray,
sp = colors.light_gray,
bold = true,
italic = config.italics,
},
BufferLineHintDiagnosticVisible = { fg = colors.light_gray },
BufferLineIndicatorSelected = { fg = colors.aqua },
BufferLineInfoDiagnostic = { fg = colors.dark_gray, sp = colors.green },
BufferLineInfoDiagnosticSelected = {
fg = colors.green,
sp = colors.green,
bold = true,
italic = config.italics,
},
BufferLineInfoDiagnosticVisible = { fg = colors.green },
BufferLineModified = { fg = colors.pink },
BufferLineModifiedSelected = { fg = colors.pink },
BufferLineModifiedVisible = { fg = colors.pink },
BufferLineNumbers = { fg = colors.purple },
BufferLineNumbersSelected = { fg = colors.purple },
BufferLineNumbersVisible = { fg = colors.purple },
BufferLineWarningDiagnostic = { fg = colors.dark_gray, sp = colors.yellow },
BufferLineWarningDiagnosticSelected = {
fg = colors.yellow,
sp = colors.yellow,
bold = true,
italic = config.italics,
},
BufferLineWarningDiagnosticVisible = { fg = colors.yellow },
}

return groups
13 changes: 13 additions & 0 deletions lua/one_monokai/highlights/groups/checkhealth.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
local colors = require "one_monokai.colors"

---@type one_monokai.highlights.groups
local groups = {
healthSuccess = { fg = colors.green },
healthWarning = { fg = colors.yellow },
helpCommand = { fg = colors.orange },
helpHyperTextJump = { fg = colors.aqua },
helpHeader = { fg = colors.white },
helpSectionDelim = { fg = colors.green },
}

return groups
12 changes: 12 additions & 0 deletions lua/one_monokai/highlights/groups/conflict_markers.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
local colors = require "one_monokai.colors"

---@type one_monokai.highlights.groups
local groups = {
ConflictOurs = { bg = colors.cyan:darken(0.3) },
ConflictTheirs = { bg = colors.aqua:darken(0.3) },
ConflictOursMarker = { fg = colors.fg, bg = colors.cyan:darken(0.6) },
ConflictTheirsMarker = { fg = colors.fg, bg = colors.aqua:darken(0.6) },
ConflictMid = { fg = colors.white, bg = colors.vulcan },
}

return groups
100 changes: 100 additions & 0 deletions lua/one_monokai/highlights/groups/core.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
local colors = require "one_monokai.colors"
local config = require "one_monokai.config"

---@type one_monokai.highlights.groups
local groups = {
Normal = { fg = colors.fg, bg = config.transparent and colors.none or colors.bg },
Visual = { bg = colors.dark_gray },

NormalFloat = { link = "Normal" },
FloatTitle = { fg = colors.pink },

Cursor = { fg = colors.bg, bg = colors.fg },
CursorColumn = { bg = colors.vulcan },
CursorLine = { bg = colors.vulcan },
CursorLineNr = { fg = colors.fg },
LineNr = { fg = colors.dark_gray },

StatusLine = { fg = colors.light_gray, bg = colors.black },
StatusLineNC = { fg = colors.light_gray, bg = colors.dark_blue },

WinBar = { link = "Normal" },
WinBarNC = { link = "NormalNC" },

ColorColumn = { bg = colors.dark_blue },
MatchParen = { bg = colors.dark_gray, bold = true },
ModeMsg = { fg = colors.yellow },
MoreMsg = { fg = colors.yellow },
Nontext = { fg = colors.dark_gray:lighten(0.8) },
Whitespace = { fg = colors.dark_gray:darken(0.91) },
Question = { fg = colors.yellow },
Search = { fg = colors.bg, bg = colors.yellow },
SignColumn = {},
TabLine = { fg = colors.fg, bg = config.transparent and colors.none or colors.dark_blue },
VertSplit = { fg = colors.fg },
Directory = { fg = colors.aqua },
SpecialKey = { fg = colors.pink },
Title = { fg = colors.yellow },
Ignore = { fg = colors.yellow },
Underlined = { fg = colors.green, underline = true },

QuickFixLine = { bg = colors.vulcan },

FoldColumn = { bg = colors.dark_blue },
Folded = { fg = colors.gray, bg = colors.dark_blue },

Pmenu = { link = "NormalFloat" },
PmenuSel = { link = "Visual" },
PmenuThumb = { fg = colors.dark_green, bg = colors.dark_gray },

ErrorMsg = { fg = colors.red },
WarningMsg = { fg = colors.yellow },

DiagnosticError = { fg = colors.red },
DiagnosticHint = { fg = colors.light_gray },
DiagnosticInfo = { fg = colors.white },
DiagnosticUnderlineError = { sp = colors.red, undercurl = true },
DiagnosticUnderlineHint = { sp = colors.light_gray, undercurl = true },
DiagnosticUnderlineInfo = { sp = colors.green, undercurl = true },
DiagnosticUnderlineWarn = { sp = colors.yellow, undercurl = true },
DiagnosticWarn = { fg = colors.yellow },

-- Do not exceed this line. All further additions should be placed above.
Boolean = { fg = colors.cyan },
Character = { fg = colors.yellow },
Constant = { fg = colors.aqua },
Float = { fg = colors.purple },
Number = { fg = colors.purple },
String = { fg = colors.yellow },

StorageClass = { fg = colors.cyan },
Structure = { fg = colors.cyan },
Type = { fg = colors.aqua },
Typedef = { fg = colors.aqua },

Function = { fg = colors.green },
Identifier = { fg = colors.green },

Keyword = { fg = colors.cyan },
Label = { fg = colors.pink },
Operator = { fg = colors.pink },
Statement = { fg = colors.pink },

Define = { fg = colors.pink },
Include = { fg = colors.pink },
Macro = { fg = colors.green },
PreCondit = { fg = colors.pink },
PreProc = { fg = colors.green },
Conceal = { fg = colors.light_gray },

Delimiter = { fg = colors.pink },
Special = { fg = colors.purple },
SpecialChar = { fg = colors.pink },
SpecialComment = { fg = colors.cyan },
Tag = { fg = colors.pink },

Comment = { fg = colors.gray, italic = config.italics },
Todo = { fg = colors.orange, bold = true, italic = config.italics },
}

return groups
22 changes: 22 additions & 0 deletions lua/one_monokai/highlights/groups/crates.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
local colors = require "one_monokai.colors"

---@type one_monokai.highlights.groups
local groups = {
CratesNvimError = { fg = colors.red },
CratesNvimLoading = { fg = colors.purple },
CratesNvimNoMatch = { fg = colors.pink },
CratesNvimPopupEnabled = { fg = colors.green },
CratesNvimPopupFeature = { fg = colors.aqua },
CratesNvimPopupPreRelease = { fg = colors.cyan },
CratesNvimPopupTitle = { fg = colors.purple },
CratesNvimPopupTransitive = { fg = colors.pink },
CratesNvimPopupUrl = { fg = colors.aqua },
CratesNvimPopupVersion = { fg = colors.green },
CratesNvimPopupYanked = { fg = colors.pink },
CratesNvimPreRelease = { fg = colors.cyan },
CratesNvimUpgrade = { fg = colors.yellow },
CratesNvimVersion = { fg = colors.green },
CratesNvimYanked = { fg = colors.red },
}

return groups
10 changes: 10 additions & 0 deletions lua/one_monokai/highlights/groups/dashboard.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
local colors = require "one_monokai.colors"

---@type one_monokai.highlights.groups
local groups = {
DashboardCenter = { fg = colors.pink },
DashboardFooter = { fg = colors.aqua },
DashboardHeader = { fg = colors.peanut },
}

return groups
19 changes: 19 additions & 0 deletions lua/one_monokai/highlights/groups/diff.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
local colors = require "one_monokai.colors"

---@type one_monokai.highlights.groups
local groups = {
DiffAdd = { bg = colors.green:darken(0.3) },
DiffChange = { bg = colors.white:darken(0.3) },
DiffDelete = { bg = colors.red:darken(0.3) },
DiffText = { bg = colors.cyan:darken(0.3) },

diffAdded = { fg = colors.green },
diffChanged = { fg = colors.white },
diffFile = { fg = colors.white },
diffIndexLine = { fg = colors.cyan },
diffLine = { fg = colors.purple },
diffRemoved = { fg = colors.pink },
diffSubname = { fg = colors.cyan },
}

return groups
11 changes: 11 additions & 0 deletions lua/one_monokai/highlights/groups/flash.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
local colors = require "one_monokai.colors"

---@type one_monokai.highlights.groups
local groups = {
FlashMatch = { link = "Search" },
FlashCurrent = { link = "IncSearch" },
FlashBackdrop = { link = "Comment" },
FlashLabel = { fg = colors.dark_pink },
}

return groups
15 changes: 15 additions & 0 deletions lua/one_monokai/highlights/groups/fzf.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
local colors = require "one_monokai.colors"

---@type one_monokai.highlights.groups
local groups = {
FzfLuaNormal = { link = "NormalFloat" },
FzfLuaBorder = { link = "FloatBorder" },
FzfLuaTitle = { fg = colors.aqua },
FzfLuaFzfPointer = { fg = colors.fg, bg = colors.dark_gray },
FzfLuaFzfCursorLine = { link = "Visual" },
FzfLuaFzfGutter = { link = "Visual" },
FzfLuaFzfInfo = { fg = colors.green },
FzfLuaFzfPrompt = { fg = colors.pink },
}

return groups
11 changes: 11 additions & 0 deletions lua/one_monokai/highlights/groups/git_conflict.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
local colors = require "one_monokai.colors"

---@type one_monokai.highlights.groups
local groups = {
GitConflictCurrent = { bg = colors.cyan:darken(0.3) },
GitConflictIncoming = { bg = colors.aqua:darken(0.3) },
GitConflictCurrentLabel = { fg = colors.fg, bg = colors.cyan:darken(0.6) },
GitConflictIncomingLabel = { fg = colors.fg, bg = colors.aqua:darken(0.6) },
}

return groups
13 changes: 13 additions & 0 deletions lua/one_monokai/highlights/groups/indent_blankline.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
local colors = require "one_monokai.colors"

---@type one_monokai.highlights.groups
local groups = {
IndentBlanklineIndent1 = { fg = colors.pink, nocombine = true },
IndentBlanklineIndent2 = { fg = colors.yellow, nocombine = true },
IndentBlanklineIndent3 = { fg = colors.green, nocombine = true },
IndentBlanklineIndent4 = { fg = colors.cyan, nocombine = true },
IndentBlanklineIndent5 = { fg = colors.aqua, nocombine = true },
IndentBlanklineIndent6 = { fg = colors.purple, nocombine = true },
}

return groups
58 changes: 58 additions & 0 deletions lua/one_monokai/highlights/groups/init.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
---@class one_monokai.highlights.groups
---@field [string] vim.api.keyset.highlight
local groups = {}

---@type string[]
local plugins = {
"blink_cmp",
"bufferline",
"checkhealth",
"conflict_markers",
"crates",
"dashboard",
"diff",
"flash",
"fzf",
"git_conflict",
"indent_blankline",
"lazy",
"leap",
"lsp",
"mason",
"mini",
"nvim_cmp",
"nvim_navic",
"nvim_notify",
"nvimtree",
"oil",
"rainbow_delimiters",
"sj",
"snacks",
"telescope",
"treesitter",
"vim_illuminate",
"whichkey",
}

for _, plugin in ipairs(plugins) do
---@type table<string, vim.api.keyset.highlight>
local default_groups = require(("one_monokai.highlights.groups.%s"):format(plugin))

for name, attrs in pairs(default_groups) do
groups[name] = attrs
end
end

local config = require "one_monokai.config"

if config.highlights then
local colors = require "one_monokai.colors"
---@type table<string, vim.api.keyset.highlight>
local user_groups = config.highlights(colors)

for name, attrs in pairs(user_groups) do
groups[name] = attrs
end
end

return groups
Loading
Loading