1 files changed, 53 insertions, 16 deletions

diff --git a/.vim/lua/colors.lua b/.vim/lua/colors.lua
index 0b76ffb..11abbea 100644
--- a/.vim/lua/colors.lua
+++ b/.vim/lua/colors.lua
@@ -56,7 +56,7 @@ return lush(function()
     -- MsgArea      { }, -- Area for messages and cmdline
     -- MsgSeparator { }, -- Separator for scrolled messages, `msgsep` flag of 'display'
     NonText      { EndOfBuffer }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.
-    Normal       { fg = hsl(p.bright.white) }, -- normal text
+    Normal       { fg = hsl(p.bright.white), gui = 'nocombine' }, -- normal text
     NormalFloat  { Normal, bg = hsl(p.dim.white).darken(30) }, -- Normal text in floating windows.
     NormalNC     { Normal }, -- normal text in non-current windows
     Question     { fg = hsl(p.bright.green) }, -- |hit-enter| prompt and yes/no questions
@@ -238,10 +238,27 @@ return lush(function()
     GitSignsChangeLn { DiffChange },
     GitSignsAddLn    { DiffAdd },
     GitSignsDeleteLn { DiffDelete },
+
+    GitSignsChangeLnInline { GitSignsChangeLn },
+    GitSignsAddLnInline    { GitSignsAddLn },
+    GitSignsDeleteLnInline { GitSignsDeleteLn },
+
+    GitSignsChangeVirtLn { GitSignsChangeLn },
+    GitSignsAddVirtLn    { GitSignsAddLn },
+    GitSignsDeleteVirtLn { GitSignsDeleteLn },
+
+    GitSignsChangeVirtLnInline { GitSignsChangeLn },
+    GitSignsAddVirtLnInline    { GitSignsAddLn },
+    GitSignsDeleteVirtLnInline { GitSignsDeleteLn },
+
     GitSignsChange   { fg = GitSignsChangeLn.bg },
     GitSignsAdd      { fg = GitSignsAddLn.bg },
     GitSignsDelete   { fg = GitSignsDeleteLn.bg },
 
+    GitSignsChangeInline { GitSignsChange, bg = NormalFloat.bg },
+    GitSignsAddInline    { GitSignsAdd, bg = NormalFloat.bg },
+    GitSignsDeleteInline { GitSignsDelete, bg = NormalFloat.bg },
+
     gitcommitSummary { Bold },
     gitcommitDiff    { Comment },
     diffFile         { Special },
@@ -254,8 +271,8 @@ return lush(function()
     -- gitcommitBranch {},
     -- gitcommitDiscardedType {},
 
-    diffAdded        { DiffAdd },
-    diffRemoved      { DiffDelete },
+    DiffAdded        { DiffAdd },
+    DiffRemoved      { DiffDelete },
     -- diffLine {},
     -- diffBDiffer {},
     -- diffNewFile {},
@@ -267,8 +284,10 @@ return lush(function()
     gitmessengerEmail       { Normal },
     -- }}}
 
-    LightBulbFloatWin    { NormalFloat },
-    LightBulbVirtualText { DiagnosticVirtualTextHint },
+    LightBulb            { Special, gui = 'bold' },
+    LightBulbSign        { LightBulb },
+    LightBulbVirtualText { LightBulb },
+    LightBulbFloatWin    { LightBulb },
 
     CompeDocumentation { NormalFloat },
     AlphaFortune { Comment },
@@ -278,16 +297,33 @@ return lush(function()
     DapBreakpointLn { DapBreakpoint },
     DapStoppedLn    { DapStopped },
 
-    CmpItemAbbrMatch { gui = 'bold' },
-    CmpItemAbbrMatchFuzzy { CmpItemAbbrMatch },
-    CmpItemKindVariable { TSVariable },
-    CmpItemKindInterface { Type },
-    CmpItemKindText { Normal },
-    CmpItemKindFunction { Function },
-    CmpItemKindMethod { TSMethod },
-    CmpItemKindKeyword { Keyword },
-    CmpItemKindProperty { TSField },
-    CmpItemKindUnit { Special },
+    CmpItemAbbrMatch          { fg = hsl(p.normal.magenta) },
+    CmpItemAbbrMatchFuzzy     { CmpItemAbbrMatch },
+    CmpItemKindText           { Comment },
+    CmpItemKindMethod         { TSMethod },
+    CmpItemKindFunction       { Function },
+    CmpItemKindConstructor    { Function },
+    CmpItemKindField          { TSField },
+    CmpItemKindVariable       { TSVariable },
+    CmpItemKindClass          { Structure },
+    CmpItemKindInterface      { Structure },
+    CmpItemKindModule         { Structure },
+    CmpItemKindProperty       { TSField },
+    CmpItemKindUnit           { Boolean },
+    CmpItemKindValue          { Character },
+    CmpItemKindEnum           { Structure },
+    CmpItemKindKeyword        { Operator },
+    CmpItemKindSnippet        { Special },
+    CmpItemKindColor          { Constant },
+    CmpItemKindFile           { String },
+    CmpItemKindReference      { Character },
+    CmpItemKindFolder         { String },
+    CmpItemKindEnumMember     { Type },
+    CmpItemKindConstant       { Constant },
+    CmpItemKindStruct         { Structure },
+    CmpItemKindEvent          { Conditional },
+    CmpItemKindOperator       { Operator },
+    CmpItemKindTypeParameter  { Special },
 
     WhichKey { CursorLineNr },
     WhichKeyGroup { Keyword },
@@ -296,6 +332,7 @@ return lush(function()
     WhichKeyFloat { NormalFloat },
     WhichKeyValue { Comment },
 
+    DirbufHash { deEmph },
     -- Plugin configs END }}}
 
     -- Config specific
@@ -306,7 +343,7 @@ return lush(function()
     StatusLineReplace     { fg = hsl(p.bright.white), bg = hsl(p.bright.red) },
     StatusLineJobs        { DiagnosticHint },
     StatusLineDiagnostics { StatusLine },
-    StatusLineLightbulb   { WarningMsg },
+    StatusLineLightbulb   { LightBulb },
     StatusLineLsp         { fg = hsl(p.normal.black), bg = hsl(p.normal.white) },
     StatusLineNotify      { StatusLine, gui = 'none' },
   }