Better search highlighting

lua/gruvbox.lua

@@ -72,6 +72,7 @@ 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
@@ -87,13 +88,13 @@ M.highlights = function()
   return {
     standard = {
       Normal         = { fg = fg, bg = bg },   -- normal text
-      NormalNC       = { link = 'Normal' },    -- normal text in non-current windows
+      NormalNC       = { fg = fg, bg = C.bg0_s },    -- normal text in non-current windows
 
       NormalFloat    = { link = 'Normal' },    -- floating windows
-      FloatBorder    = { fg = C.gray },
+      FloatBorder    = { fg = C.gray, bg = bg },
       FloatTitle     = { fg = C.blue },
 
-      Comment        = { fg = C.bg3, italic = true },  -- any comment
+      Comment        = { fg = C.bg3, italic = false },  -- any comment
 
       Constant       = { fg   = C.orange },  -- any constant
       String         = { fg   = C.aqua   },  -- a string constant: "this is a string"
@@ -113,10 +114,10 @@ M.highlights = function()
       Keyword        = { link = 'Statement' },  -- any other keyword
       Exception      = { link = 'Statement' },  -- try, catch, throw
 
-      PreProc        = { fg   = C.orange },     -- generic Preprocessor
+      PreProc        = { fg   = C.dim_orange }, -- generic Preprocessor
       Include        = { link = 'PreProc' },    -- preprocessor #include
       Define         = { link = 'PreProc' },    -- preprocessor #define
-      Macro          = { link = 'PreProc' },    -- same as Define
+      Macro          = { link = 'Constant' },   -- same as Define
       PreCondit      = { link = 'PreProc' },    -- preprocessor #if, #else, #endif, etc.
 
       Type           = { fg   = C.yellow },     -- int, long, char, etc.
@@ -124,7 +125,7 @@ M.highlights = function()
       Structure      = { link = 'Statement' },  -- struct, union, enum, etc.
       Typedef        = { link = 'Statement' },  -- A typedef
 
-      Special        = { fg   = C.red },        -- any special symbol
+      Special        = { fg   = C.dim_orange }, -- 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
@@ -134,10 +135,10 @@ M.highlights = function()
       Underlined     = { underline = true },
       Ignore         = { },
       Todo           = { fg = C.purple, bold = true },
-      Error          = { fg = C.red },
-      Warning        = { fg = C.yellow},
-      Information    = { fg = C.br_blue },
-      Hint           = { fg = C.fg0 },
+      Error          = { fg = C.dim_red },
+      Warning        = { fg = C.dim_yellow},
+      Information    = { fg = C.blue },
+      Hint           = { fg = C.fg4 },
     },
 
     additional = {
@@ -157,8 +158,9 @@ M.highlights = function()
       CursorLine     = { bg = C.bg0_s },
       CursorLineNr   = { bg = C.bg0_s, fg = C.fg2 },
 
-      IncSearch      = { fg = C.br_yellow, reverse = true },
-      Search         = { fg = C.yellow , reverse = true },
+      IncSearch      = { link = 'CurSearch' },
+      CurSearch      = { fg = C.purple_bg, bg = C.br_purple, bold = true },
+      Search         = { fg = C.br_purple, bg = C.purple_bg },
 
       DiffAdd        = { fg = C.green, bg = C.green_bg },
       DiffDelete     = { fg = C.red, bg = C.red_bg },
@@ -432,7 +434,7 @@ M.highlights = function()
       ['@keyword.exception']        = { link = 'Exception' },
       ['@keyword.function']         = { link = 'Keyword' },
       ['@keyword.import']           = { link = 'Include' },
-      ['@keyword.operator']         = { link = 'Opeator' },
+      ['@keyword.operator']         = { link = 'Operator' },
       ['@keyword.repeat']           = { link = 'Repeat' },
       ['@keyword.return']           = { link = 'Keyword' },
       ['@keyword.storage']          = { link = 'StorageClass' },
@@ -658,11 +660,11 @@ M.highlights = function()
     -- 'nvim-telescope/telescope.nvim'
     telescope = {
       TelescopeBorder         = { link = 'FloatBorder' },
-      TelescopePromptBorder   = { fg = C.fg0 },
+      TelescopePromptBorder   = { fg = C.br_blue, bg = bg },
       TelescopeTitle          = { link = 'FloatTitle' },
       TelescopePromptPrefix   = { link = 'FloatTitle' },
       TelescopePromptCounter  = { fg = C.bg3 },
-      TelescopeNormal         = { fg = C.fg },
+      TelescopeNormal         = { link = 'Normal' },
       TelescopeMatching       = { fg = C.br_yellow, bg = C.yellow_bg },
       TelescopeSelection      = { bg = C.blue_bg },
       TelescopeMultiSelection = { fg = C.orange, italic = true },
@@ -684,19 +686,19 @@ M.highlights = function()
       CmpItemAbbrMatch        = { fg   = C.fg0 },
       CmpItemAbbrMatchFuzzy   = { link = 'CmpItemAbbrMatch' },
 
-      CmpItemAbbrDeprecated   = { fg   = C.orange, strikethrough = true },
+      CmpItemAbbrDeprecated   = { fg   = C.dim_orange, strikethrough = true },
 
-      CmpItemKind             = { fg   = C.purple },
+      CmpItemKind             = { fg   = C.dim_purple },
       CmpItemMenu             = { fg   = C.bg2, italic = true },
 
-      CmpItemKindVariable     = { fg   = C.aqua },
+      CmpItemKindVariable     = { fg   = C.dim_aqua },
       CmpItemKindInterface    = { link = 'CmpItemKindVariable' },
       CmpItemKindText         = { link = 'CmpItemKindVariable' },
 
-      CmpItemKindFunction     = { fg   = C.blue },
+      CmpItemKindFunction     = { fg   = C.dim_blue },
       CmpItemKindMethod       = { link = 'CmpItemKindFunction' },
 
-      CmpItemKindKeyword      = { fg   = C.green },
+      CmpItemKindKeyword      = { fg   = C.dim_green },
       CmpItemKindProperty     = { link = 'CmpItemKindKeyword' },
       CmpItemKindUnit         = { link = 'CmpItemKindKeyword' },
 
@@ -728,9 +730,16 @@ 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' },