Skip to content

Commit 9a0bff0

Browse files
committed
feat(colouriser): add tab/nav/cmp highlighting
1 parent 083f728 commit 9a0bff0

4 files changed

Lines changed: 230 additions & 7 deletions

File tree

lua/arshamiser/colouriser.lua

Lines changed: 221 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ local internals = function(palette) -- Internals {{{
8383
CursorLine = {
8484
-- Screen-line at the cursor, when 'cursorline' is set. Low-priority
8585
-- if foreground (ctermfg OR fg) is not set.
86-
fg = palette.none,
8786
bg = palette.base3,
8887
},
8988
ToolbarLine = {
@@ -276,6 +275,107 @@ local internals = function(palette) -- Internals {{{
276275
fg = palette.white,
277276
bold = true,
278277
},
278+
TabLineSepSel = {
279+
bg = palette.blue_pale,
280+
fg = palette.white,
281+
},
282+
TabLineSep = {
283+
bg = palette.blue_dark,
284+
fg = palette.white,
285+
},
286+
TabLineModifiedSel = {
287+
bg = palette.blue_pale,
288+
fg = palette.white,
289+
},
290+
TabLineModified = {
291+
bg = palette.blue_pale,
292+
fg = palette.white,
293+
}, --}}}
294+
-- GPS {{{
295+
NavicIcons = {
296+
fg = palette.blue_pale,
297+
bg = palette.base3,
298+
},
299+
NavicText = {
300+
fg = palette.white,
301+
},
302+
NavicIconsFile = {
303+
link = "CmpItemKindFile",
304+
},
305+
NavicIconsModule = {
306+
link = "CmpItemKindModule",
307+
},
308+
NavicIconsNamespace = {
309+
link = "CmpItemKindNamespace",
310+
},
311+
NavicIconsPackage = {
312+
link = "CmpItemKindPackage",
313+
},
314+
NavicIconsClass = {
315+
link = "CmpItemKindClass",
316+
},
317+
NavicIconsMethod = {
318+
link = "CmpItemKindMethod",
319+
},
320+
NavicIconsProperty = {
321+
link = "CmpItemKindProperty",
322+
},
323+
NavicIconsField = {
324+
link = "CmpItemKindField",
325+
},
326+
NavicIconsConstructor = {
327+
link = "CmpItemKindConstructor",
328+
},
329+
NavicIconsEnum = {
330+
link = "CmpItemKindEnum",
331+
},
332+
NavicIconsInterface = {
333+
link = "CmpItemKindInterface",
334+
},
335+
NavicIconsFunction = {
336+
link = "CmpItemKindFunction",
337+
},
338+
NavicIconsVariable = {
339+
link = "CmpItemKindVariable",
340+
},
341+
NavicIconsConstant = {
342+
link = "CmpItemKindConstant",
343+
},
344+
NavicIconsString = {
345+
link = "CmpItemKindString",
346+
},
347+
NavicIconsNumber = {
348+
link = "CmpItemKindNumber",
349+
},
350+
NavicIconsBoolean = {
351+
link = "CmpItemKindBoolean",
352+
},
353+
NavicIconsArray = {
354+
link = "CmpItemKindArray",
355+
},
356+
NavicIconsObject = {
357+
link = "CmpItemKindObject",
358+
},
359+
NavicIconsKey = {
360+
link = "CmpItemKindKey",
361+
},
362+
NavicIconsNull = {
363+
link = "CmpItemKindNull",
364+
},
365+
NavicIconsEnumMember = {
366+
link = "CmpItemKindEnumMember",
367+
},
368+
NavicIconsStruct = {
369+
link = "CmpItemKindStruct",
370+
},
371+
NavicIconsEvent = {
372+
link = "CmpItemKindEvent",
373+
},
374+
NavicIconsOperator = {
375+
link = "CmpItemKindOperator",
376+
},
377+
NavicIconsTypeParameter = {
378+
link = "CmpItemKindTypeParameter",
279379
}, --}}}
280380
SpellBad = { --{{{
281381
-- Word that is not recognized by the spellchecker. |spell| Combined
@@ -455,6 +555,7 @@ local internals = function(palette) -- Internals {{{
455555
SpecialComment = {
456556
-- special things inside a comment
457557
fg = palette.grey,
558+
bold = true,
458559
},
459560
Tag = {
460561
-- you can use CTRL-] on this
@@ -495,14 +596,14 @@ local internals = function(palette) -- Internals {{{
495596
bg = palette.base2,
496597
},
497598
EndOfBuffer = {
599+
-- filler lines (~) after the end of the buffer.
498600
fg = palette.base2,
499601
bg = palette.none,
500602
},
501603
Conceal = {
502604
-- placeholder characters substituted for concealed text (see
503605
-- 'conceallevel')
504606
fg = palette.grey,
505-
bg = palette.none,
506607
}, --}}}
507608
WildMenu = { --{{{
508609
-- current match in 'wildmenu' completion
@@ -613,7 +714,6 @@ local internals = function(palette) -- Internals {{{
613714
Directory = {
614715
-- directory names (and other special names in listings)
615716
fg = palette.aqua,
616-
bg = palette.none,
617717
},
618718
Repeat = {
619719
fg = palette.pink,
@@ -640,6 +740,103 @@ end
640740

641741
local plugin_syntax = function(palette) -- Plugins {{{
642742
return {
743+
-- CMP {{{
744+
CmpDocumentation = {
745+
fg = palette.green,
746+
bg = palette.blue,
747+
},
748+
CmpDocumentationBorder = {
749+
fg = palette.border_highlight,
750+
bg = palette.blue,
751+
},
752+
CmpItemAbbr = {
753+
fg = palette.white,
754+
},
755+
CmpItemAbbrDeprecated = {
756+
fg = palette.grey,
757+
strikethrough = true,
758+
},
759+
CmpItemAbbrMatch = {
760+
fg = palette.blue,
761+
},
762+
CmpItemAbbrMatchFuzzy = {
763+
fg = palette.blue,
764+
},
765+
CmpItemKind = {
766+
fg = palette.orange,
767+
},
768+
CmpItemKindClass = {
769+
fg = palette.orange,
770+
},
771+
CmpItemKindConstant = {
772+
fg = palette.magenta,
773+
},
774+
CmpItemKindConstructor = {
775+
fg = palette.blue,
776+
},
777+
CmpItemKindDefault = {
778+
fg = palette.green_dark,
779+
},
780+
CmpItemKindEnum = {
781+
fg = palette.orange,
782+
},
783+
CmpItemKindEnumMember = {
784+
fg = palette.green,
785+
},
786+
CmpItemKindEvent = {
787+
fg = palette.orange,
788+
},
789+
CmpItemKindField = {
790+
fg = palette.green,
791+
},
792+
CmpItemKindFunction = {
793+
fg = palette.blue,
794+
},
795+
CmpItemKindInterface = {
796+
fg = palette.aqua,
797+
},
798+
CmpItemKindKeyword = {
799+
fg = palette.cyan,
800+
},
801+
CmpItemKindMethod = {
802+
fg = palette.blue,
803+
},
804+
CmpItemKindModule = {
805+
fg = palette.yellow,
806+
},
807+
CmpItemKindOperator = {
808+
fg = palette.green,
809+
},
810+
CmpItemKindProperty = {
811+
fg = palette.green,
812+
},
813+
CmpItemKindReference = {
814+
fg = palette.magenta,
815+
},
816+
CmpItemKindSnippet = {
817+
fg = palette.blue,
818+
},
819+
CmpItemKindStruct = {
820+
fg = palette.orange,
821+
},
822+
CmpItemKindText = {
823+
fg = palette.aqua,
824+
},
825+
CmpItemKindTypeParameter = {
826+
fg = palette.green,
827+
},
828+
CmpItemKindUnit = {
829+
fg = palette.orange,
830+
},
831+
CmpItemKindValue = {
832+
fg = palette.magenta,
833+
},
834+
CmpItemKindVariable = {
835+
fg = palette.aqua,
836+
},
837+
CmpItemMenu = {
838+
fg = palette.base7,
839+
}, --}}}
643840
-- Treesitter {{{
644841
TSString = {
645842
fg = palette.yellow,
@@ -692,6 +889,7 @@ local plugin_syntax = function(palette) -- Plugins {{{
692889
TSError = {
693890
-- For syntax/parser errors.
694891
fg = palette.error,
892+
italic = true,
695893
},
696894
TSConditional = {
697895
fg = palette.pink,
@@ -865,6 +1063,26 @@ local plugin_syntax = function(palette) -- Plugins {{{
8651063
bg = palette.base5,
8661064
},
8671065
-- }}}
1066+
-- LSP {{{
1067+
LspCodeLens = {
1068+
fg = palette.orange,
1069+
},
1070+
LspReferenceText = {
1071+
-- used for highlighting "text" references
1072+
fg = palette.accent,
1073+
bg = palette.highlight,
1074+
},
1075+
LspReferenceRead = {
1076+
-- used for highlighting "read" references
1077+
fg = palette.accent,
1078+
bg = palette.highlight,
1079+
},
1080+
LspReferenceWrite = {
1081+
-- used for highlighting "write" references
1082+
fg = palette.accent,
1083+
bg = palette.highlight,
1084+
},
1085+
-- }}}
8681086
-- Diagnostics {{{
8691087
DiagnosticError = {
8701088
fg = palette.error,

lua/arshamiser/feliniser/init.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ table.insert(components.active[3], {
286286
return util.diagnostics_exist(vim.diagnostic.ERROR)
287287
end,
288288
hl = {
289-
fg = "red",
289+
fg = "error",
290290
bg = "statusline_bg",
291291
},
292292
})
@@ -308,7 +308,7 @@ table.insert(components.active[3], {
308308
return util.diagnostics_exist(vim.diagnostic.HINT)
309309
end,
310310
hl = {
311-
fg = "green",
311+
fg = "info",
312312
bg = "statusline_bg",
313313
},
314314
})

lua/arshamiser/feliniser/util.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ M.colors = {--{{{
6060
git_add = get_hl_properties("GitSignsAdd").fg,
6161
git_del = get_hl_properties("GitSignsDelete").fg,
6262
git_change = get_hl_properties("GitSignsChange").fg,
63+
warn = get_hl_properties("DiagnosticWarn").fg,
64+
error = get_hl_properties("DiagnosticError").fg,
65+
info = get_hl_properties("DiagnosticInfo").fg,
6366
}
6467
--}}}
6568

lua/arshamiser/palette.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,28 @@ local light = {
1818
border = "#A1B5B1",
1919
brown = "#6D3717",
2020
color_column = "#2B2828",
21+
cyan = "#119999",
2122
darkred = "darkred",
2223
diff_add_bg = "#2A3B52",
2324
diff_change_bg = "#2D403A",
2425
diff_remove_bg = "#3F2D32",
2526
diff_text_bg = "#283E40",
2627
sign_add_bg = "#537196",
27-
sign_change_bg = "#3D5213",
28+
sign_change_bg = "#4E6E0E",
2829
sign_remove_bg = "#803C52",
2930
error = "#C46476",
3031
green = "#BFDCA1",
3132
green_dark = "#4F6752",
3233
grey = "#72696A",
3334
grey_light = "#DDDDDD",
35+
magenta = "#CF4CC9",
3436
orange = "#FCB08B",
3537
pink = "#FFA1B8",
3638
pmenu = "#1D2021",
3739
purple = "#BBB3E8",
3840
red = "#DE7185",
3941
sidebar_bg = "#202324",
40-
warning = "#F7A379",
42+
warning = "#C78F73",
4143
white = "#FFF1F3",
4244
yellow = "#D6C596",
4345

0 commit comments

Comments
 (0)