Compare commits

..

No commits in common. "831354ac6435b2f8bf998a50be99364ca9e2ceb9" and "87864c12dbc54bcc976c79161a8d74e40090436c" have entirely different histories.

View file

@ -72,7 +72,6 @@ M.colors = function()
for _, accent in ipairs({'red', 'green', 'yellow', 'blue', 'purple', 'aqua', 'orange'}) do
palette[accent] = c[accent]
palette['dim_' .. accent] = c[accent .. '_' .. (is_dark and 'darker' or 'lighter')]
palette['br_' .. accent] = c[accent .. '_' .. (is_dark and 'lighter' or 'darker')]
palette[accent .. '_bg'] = c[accent .. '_' .. (is_dark and 'darkest' or 'lightest')]
end
@ -88,13 +87,13 @@ M.highlights = function()
return {
standard = {
Normal = { fg = fg, bg = bg }, -- normal text
NormalNC = { fg = fg, bg = C.bg0_s }, -- normal text in non-current windows
NormalNC = { link = 'Normal' }, -- normal text in non-current windows
NormalFloat = { link = 'Normal' }, -- floating windows
FloatBorder = { fg = C.gray, bg = bg },
FloatBorder = { fg = C.gray },
FloatTitle = { fg = C.blue },
Comment = { fg = C.bg3, italic = false }, -- any comment
Comment = { fg = C.bg3, italic = true }, -- any comment
Constant = { fg = C.orange }, -- any constant
String = { fg = C.aqua }, -- a string constant: "this is a string"
@ -114,10 +113,10 @@ M.highlights = function()
Keyword = { link = 'Statement' }, -- any other keyword
Exception = { link = 'Statement' }, -- try, catch, throw
PreProc = { fg = C.dim_orange }, -- generic Preprocessor
PreProc = { fg = C.orange }, -- generic Preprocessor
Include = { link = 'PreProc' }, -- preprocessor #include
Define = { link = 'PreProc' }, -- preprocessor #define
Macro = { link = 'Constant' }, -- same as Define
Macro = { link = 'PreProc' }, -- same as Define
PreCondit = { link = 'PreProc' }, -- preprocessor #if, #else, #endif, etc.
Type = { fg = C.yellow }, -- int, long, char, etc.
@ -125,7 +124,7 @@ M.highlights = function()
Structure = { link = 'Statement' }, -- struct, union, enum, etc.
Typedef = { link = 'Statement' }, -- A typedef
Special = { fg = C.dim_orange }, -- any special symbol
Special = { fg = C.red }, -- any special symbol
SpecialChar = { link = 'Special' }, -- special character in a constant
Tag = { link = 'Special' }, -- you can use CTRL-] on this
Delimiter = { link = 'Special' }, -- character that needs attention
@ -135,10 +134,10 @@ M.highlights = function()
Underlined = { underline = true },
Ignore = { },
Todo = { fg = C.purple, bold = true },
Error = { fg = C.dim_red },
Warning = { fg = C.dim_yellow},
Information = { fg = C.blue },
Hint = { fg = C.fg4 },
Error = { fg = C.red },
Warning = { fg = C.yellow},
Information = { fg = C.br_blue },
Hint = { fg = C.fg0 },
},
additional = {
@ -158,9 +157,8 @@ M.highlights = function()
CursorLine = { bg = C.bg0_s },
CursorLineNr = { bg = C.bg0_s, fg = C.fg2 },
IncSearch = { link = 'CurSearch' },
CurSearch = { fg = C.purple_bg, bg = C.br_purple, bold = true },
Search = { fg = C.br_purple, bg = C.purple_bg },
IncSearch = { fg = C.br_yellow, reverse = true },
Search = { fg = C.yellow , reverse = true },
DiffAdd = { fg = C.green, bg = C.green_bg },
DiffDelete = { fg = C.red, bg = C.red_bg },
@ -434,7 +432,7 @@ M.highlights = function()
['@keyword.exception'] = { link = 'Exception' },
['@keyword.function'] = { link = 'Keyword' },
['@keyword.import'] = { link = 'Include' },
['@keyword.operator'] = { link = 'Operator' },
['@keyword.operator'] = { link = 'Opeator' },
['@keyword.repeat'] = { link = 'Repeat' },
['@keyword.return'] = { link = 'Keyword' },
['@keyword.storage'] = { link = 'StorageClass' },
@ -660,11 +658,11 @@ M.highlights = function()
-- 'nvim-telescope/telescope.nvim'
telescope = {
TelescopeBorder = { link = 'FloatBorder' },
TelescopePromptBorder = { fg = C.br_blue, bg = bg },
TelescopePromptBorder = { fg = C.fg0 },
TelescopeTitle = { link = 'FloatTitle' },
TelescopePromptPrefix = { link = 'FloatTitle' },
TelescopePromptCounter = { fg = C.bg3 },
TelescopeNormal = { link = 'Normal' },
TelescopeNormal = { fg = C.fg },
TelescopeMatching = { fg = C.br_yellow, bg = C.yellow_bg },
TelescopeSelection = { bg = C.blue_bg },
TelescopeMultiSelection = { fg = C.orange, italic = true },
@ -686,19 +684,19 @@ M.highlights = function()
CmpItemAbbrMatch = { fg = C.fg0 },
CmpItemAbbrMatchFuzzy = { link = 'CmpItemAbbrMatch' },
CmpItemAbbrDeprecated = { fg = C.dim_orange, strikethrough = true },
CmpItemAbbrDeprecated = { fg = C.orange, strikethrough = true },
CmpItemKind = { fg = C.dim_purple },
CmpItemKind = { fg = C.purple },
CmpItemMenu = { fg = C.bg2, italic = true },
CmpItemKindVariable = { fg = C.dim_aqua },
CmpItemKindVariable = { fg = C.aqua },
CmpItemKindInterface = { link = 'CmpItemKindVariable' },
CmpItemKindText = { link = 'CmpItemKindVariable' },
CmpItemKindFunction = { fg = C.dim_blue },
CmpItemKindFunction = { fg = C.blue },
CmpItemKindMethod = { link = 'CmpItemKindFunction' },
CmpItemKindKeyword = { fg = C.dim_green },
CmpItemKindKeyword = { fg = C.green },
CmpItemKindProperty = { link = 'CmpItemKindKeyword' },
CmpItemKindUnit = { link = 'CmpItemKindKeyword' },
@ -730,16 +728,9 @@ M.highlights = function()
-- 'rcarriga/nvim-notify'
nvim_notify = {
NotifyBackground = { fg = fg, bg = bg },
NotifyLogTitle = { fg = C.purple },
NotifyLogTime = { link = 'Comment' },
NotifyTRACEIcon = { link = 'DiagnosticInfo' },
NotifyDEBUGIcon = { link = 'DiagnosticHint' },
NotifyINFOIcon = { link = 'DiagnosticOk' },
NotifyWARNIcon = { link = 'DiagnosticWarn' },
NotifyERRORIcon = { link = 'DiagnosticError' },
NotifyTRACETitle = { link = 'DiagnosticInfo' },
NotifyDEBUGTitle = { link = 'DiagnosticHint' },
NotifyINFOTitle = { link = 'DiagnosticOk' },