adds more highlights for lualine and general hl groups

modules/nvim/config/colors/winterly.lua

@@ -17,21 +17,21 @@ end
 -- General
 hi("Normal", { fg = palette.fg })
 
-hi("Conceal", { fg = "LightGrey", bg = "DarkGrey", ctermfg = "LightGrey", ctermbg = "DarkGrey" })
+hi("Conceal", { fg = palette.silver, bg = palette.grey, ctermfg = "LightGrey", ctermbg = "DarkGrey" })
 hi("Cursor", { bg = palette.magenta_bright })
-hi("DiffText", { bg = "Red", bold = true, ctermbg = "Red", cterm = { bold = true } })
+hi("DiffText", { bg = palette.yellow_subtle_bg, bold = true, ctermbg = "DarkYellow", cterm = { bold = true } })
 hi("ErrorMsg", { fg = palette.red_bright, bg = palette.red_subtle_bg, ctermfg = "White", ctermbg = "DarkRed" })
-hi("IncSearch", { reverse = true, cterm = { reverse = true } })
+hi("IncSearch", { bg = palette.magenta_subtle_bg, fg = palette.magenta })
 hi("ModeMsg", { bold = true, cterm = { bold = true } })
 hi("NonText", { fg = palette.grey, ctermfg = "DarkGrey" })
-hi("PmenuSbar", { bg = "Grey", ctermbg = "Grey" })
+hi("PmenuSbar", { bg = palette.grey, ctermbg = "Grey" })
 hi("StatusLine", { reverse = true, bold = true, cterm = { reverse = true, bold = true } })
 hi("StatusLineNC", { reverse = true, cterm = { reverse = true } })
 hi("TabLineFill", { reverse = true, cterm = { reverse = true } })
 hi("TabLineSel", { bold = true, cterm = { bold = true } })
 hi("TermCursor", { reverse = true, cterm = { reverse = true } })
 hi("WinBar", { bold = true, cterm = { bold = true } })
-hi("WildMenu", { fg = "Black", bg = "Yellow", ctermfg = "Black", ctermbg = "Yellow" })
+hi("WildMenu", { fg = palette.bg, bg = palette.yellow_subtle_bg, ctermfg = "Black", ctermbg = "Yellow" })
 
 hi("VertSplit", { link = "Normal" })
 hi("WinSeparator", { link = "VertSplit" })
@@ -57,18 +57,18 @@ hi("ComplHintMore", { link = "MoreMsg" })
 hi("Whitespace", { link = "NonText" })
 hi("MsgSeparator", { link = "StatusLine" })
 hi("NormalFloat", { link = "Pmenu" })
-hi("FloatBorder", { link = "WinSeparator" })
+hi("FloatBorder", { bg = palette.bg_secondary, fg = palette.fg_dim })
-hi("FloatTitle", { link = "Title" })
+hi("FloatTitle", { bg = palette.bg_secondary, fg = palette.fg, bold = true })
 hi("FloatFooter", { link = "Title" })
 
-hi("FloatShadow", { bg = "Black", blend = 80 })
+hi("FloatShadow", { bg = palette.bg, blend = 80 })
-hi("FloatShadowThrough", { bg = "Black", blend = 100 })
+hi("FloatShadowThrough", { bg = palette.bg, blend = 100 })
 hi("RedrawDebugNormal", { reverse = true, cterm = { reverse = true } })
 hi("RedrawDebugClear", { bg = "Yellow", ctermbg = "Yellow" })
 hi("RedrawDebugComposed", { bg = "Green", ctermbg = "Green" })
 hi("RedrawDebugRecompose", { bg = "Red", ctermbg = "Red" })
 hi("Error", { fg = "White", bg = "Red", ctermfg = "White", ctermbg = "Red" })
-hi("Todo", { fg = "Blue", bg = "Yellow", ctermfg = "Black", ctermbg = "Yellow" })
+hi("Todo", { fg = palette.bg, bg = palette.cyan_bright, ctermbg = "Cyan", ctermfg = "Black" })
 
 hi("String", { link = "Constant" })
 hi("Character", { link = "Constant" })
@@ -79,7 +79,7 @@ hi("Function", { link = "Identifier" })
 hi("Conditional", { link = "Statement" })
 hi("Repeat", { link = "Statement" })
 hi("Label", { link = "Statement" })
-hi("Operator", { link = "Statement" })
+hi("Operator", { fg = palette.fg_alt, italic = false, ctermfg = "White" })
 hi("Keyword", { link = "Statement" })
 hi("Exception", { link = "Statement" })
 hi("Include", { link = "PreProc" })
@@ -98,7 +98,7 @@ hi("Debug", { link = "Special" })
 hi("DiagnosticError", { fg = palette.red_bright, ctermfg = 1 })
 hi("DiagnosticWarn", { fg = "Orange", ctermfg = 3 })
 hi("DiagnosticInfo", { fg = "LightBlue", ctermfg = 4 })
-hi("DiagnosticHint", { fg = "LightGrey", ctermfg = 7 })
+hi("DiagnosticHint", { fg = palette.silver, ctermfg = 7 })
 hi("DiagnosticOk", { fg = "LightGreen", ctermfg = 10 })
 hi("DiagnosticUnderlineError", { fg = palette.red_bright, undercurl = true, cterm = { underline = true } })
 hi("DiagnosticUnderlineWarn", { sp = "Orange", undercurl = true, cterm = { underline = true } })
@@ -222,20 +222,29 @@ else
   hi("DiffChange", { fg = palette.yellow_brighter, bg = palette.yellow_subtle_bg, ctermbg = "DarkYellow" })
   hi("DiffDelete", { fg = palette.red_bright, bg = palette.red_subtle_bg, ctermbg = "DarkRed" })
   hi("Directory", { fg = "Cyan", ctermfg = "LightCyan" })
-  hi("FoldColumn", { fg = "Cyan", bg = "Grey", ctermfg = "Cyan", ctermbg = "DarkGrey" })
+  hi("FoldColumn", { fg = "Cyan", bg = palette.grey, ctermfg = "Cyan", ctermbg = "DarkGrey" })
-  hi("Folded", { fg = "Cyan", bg = "DarkGrey", ctermfg = "Cyan", ctermbg = "DarkGrey" })
+  hi("Folded", { fg = "Cyan", bg = palette.grey, ctermfg = "Cyan", ctermbg = "DarkGrey" })
   hi("LineNr", { fg = palette.grey_bright, ctermfg = "Grey" })
-  hi("MatchParen", { bg = "DarkCyan", ctermbg = "DarkCyan" })
+  hi("MatchParen", { fg = palette.fg_alt, bg = palette.magenta_subtle_bg, ctermbg = "DarkMagenta", ctermfg = "Black" })
   hi("MoreMsg", { fg = "SeaGreen", bold = true, ctermfg = "LightGreen" })
-  hi("Pmenu", { bg = palette.bg, ctermfg = "White", ctermbg = "Black" })
+  hi("Pmenu", { bg = palette.bg_secondary, ctermfg = "White", ctermbg = "Black" })
-  hi("PmenuSel", { bg = "DarkGrey", ctermfg = "DarkGrey", ctermbg = "Black" })
+  hi("PmenuSel", {
+    bg = palette.magenta_subtle_bg,
+    fg = palette.fg,
+    bold = true,
+    ctermfg = "LightMagenta",
+    ctermbg = "DarkMagenta",
+  })
   hi("PmenuThumb", { bg = "White", ctermbg = "White" })
   hi("Question", { fg = "Green", bold = true, ctermfg = "LightGreen" })
-  hi("Search", { fg = palette.cyan_bright, bg = palette.cyan_subtle_bg, ctermfg = "LightCyan", ctermbg = "DarkCyan" })
+  hi("Search", { link = "IncSearch" })
-  hi(
+  hi("Substitute", {
-    "Substitute",
+    fg = palette.green_bright,
-    { fg = palette.blue_subtle_bg, bg = palette.blue_bright, bold = true, ctermfg = "DarkBlue", ctermbg = "LightBlue" }
+    bg = palette.green_subtle_bg,
-  )
+    bold = true,
+    ctermfg = "DarkBlue",
+    ctermbg = "LightBlue",
+  })
   hi("SignColumn", { fg = palette.grey_bright, bg = palette.bg, ctermfg = "Cyan", ctermbg = "DarkGrey" })
   hi("SpecialKey", { fg = "Cyan", ctermfg = "LightBlue" })
   hi("SpellBad", { sp = "Red", undercurl = true, ctermbg = "Red" })
@@ -249,9 +258,9 @@ else
   hi("StatusLineTermNC", { fg = "Black", bg = "LightGreen", ctermfg = "Black", ctermbg = "LightGreen" })
   hi(
     "TabLine",
-    { bg = "DarkGrey", underline = true, ctermfg = "White", ctermbg = "DarkGrey", cterm = { underline = true } }
+    { bg = palette.grey, underline = true, ctermfg = "White", ctermbg = "DarkGrey", cterm = { underline = true } }
   )
-  hi("Title", { fg = "Magenta", bold = true, ctermfg = "LightMagenta" })
+  hi("Title", { fg = palette.magenta_bright, bold = true, ctermfg = "Magenta" })
   hi(
     "Visual",
     { fg = palette.magenta_brighter, bg = palette.magenta_subtle_bg, ctermfg = "LightMagenta", ctermbg = "DarkMagenta" }
@@ -274,13 +283,21 @@ else
   -- Snacks
   hi("SnacksIndentScope", { fg = palette.magenta, ctermfg = "LightGrey" })
   hi("SnacksIndent", { fg = palette.magenta_subtle_bg, ctermfg = "DarkGrey" })
+  hi(
+    "SnacksPickerCursorLine",
+    { bg = palette.magenta_subtle_bg, fg = palette.fg, bold = true, cterm = { underline = true } }
+  )
+  hi("SnacksPickerListCursorLine", { link = "SnacksPickerCursorLine" })
+  hi("SnacksPickerTitle", { link = "FloatTitle" })
+  hi("SnacksBackdrop", { link = "Pmenu" })
 
   -- Flash
-  hi("FlashMatch", { fg = palette.bg, bg = palette.grey_bright, ctermfg = "LightGrey", ctermbg = "DarkGrey" })
+  hi("FlashMatch", { reverse = true })
+  hi("FlashLabel", { bg = palette.fg, fg = palette.bg })
 
   -- todo-comments
-  hi("TodoBgTODO", { fg = palette.bg, bg = palette.cyan, ctermbg = "Cyan", ctermfg = "Black" })
+  hi("TodoBgTODO", { link = "Todo" })
-  hi("TodoFgTODO", { fg = palette.cyan, ctermfg = "Cyan" })
+  hi("TodoFgTODO", { fg = palette.cyan_bright, ctermfg = "Cyan" })
 
   -- Neogit
   hi("NeogitDiffAdd", { link = "DiffAdd" })

modules/nvim/config/lua/plugins/lualine.lua

@@ -1,46 +1,35 @@
-local colors = {
+local palette = require("dnsc.palette")
-  black = "#0d0e1c",
-  white = "#ffffff",
-  red = "#ef8386",
-  green = "#88ca9f",
-  blue = "#82b0ec",
-  magenta = "#caa6df",
-  cyan = "#9ac8e0",
-  gray = "#4a4f69",
-  darkgray = "#1d2235",
-  lightgray = "#989898",
-}
 
 local modus_vivendi_tinted = {
   normal = {
-    a = { bg = colors.blue, fg = colors.black, gui = "bold" },
+    a = { bg = palette.magenta, fg = palette.bg, gui = "bold" },
-    b = { bg = colors.darkgray, fg = colors.blue },
+    b = { bg = palette.bg_secondary, fg = palette.magenta },
-    c = { bg = colors.darkgray, fg = colors.white },
+    c = { bg = palette.bg_secondary, fg = palette.magenta },
   },
   insert = {
-    a = { bg = colors.cyan, fg = colors.black, gui = "bold" },
+    a = { bg = palette.cyan_bright, fg = palette.bg, gui = "bold" },
-    b = { bg = colors.darkgray, fg = colors.cyan },
+    b = { bg = palette.bg_secondary, fg = palette.cyan_bright },
-    c = { bg = colors.darkgray, fg = colors.white },
+    c = { bg = palette.bg_secondary, fg = palette.cyan_bright },
   },
   visual = {
-    a = { bg = colors.magenta, fg = colors.black, gui = "bold" },
+    a = { bg = palette.blue_bright, fg = palette.bg, gui = "bold" },
-    b = { bg = colors.darkgray, fg = colors.magenta },
+    b = { bg = palette.bg_secondary, fg = palette.blue_bright },
-    c = { bg = colors.darkgray, fg = colors.white },
+    c = { bg = palette.bg_secondary, fg = palette.blue_bright },
   },
   replace = {
-    a = { bg = colors.red, fg = colors.black, gui = "bold" },
+    a = { bg = palette.red_bright, fg = palette.bg, gui = "bold" },
-    b = { bg = colors.darkgray, fg = colors.red },
+    b = { bg = palette.bg_secondary, fg = palette.red_bright },
-    c = { bg = colors.darkgray, fg = colors.white },
+    c = { bg = palette.bg_secondary, fg = palette.red_bright },
   },
   command = {
-    a = { bg = colors.green, fg = colors.black, gui = "bold" },
+    a = { bg = palette.green_bright, fg = palette.bg, gui = "bold" },
-    b = { bg = colors.darkgray, fg = colors.green },
+    b = { bg = palette.bg_secondary, fg = palette.green_bright },
-    c = { bg = colors.darkgray, fg = colors.white },
+    c = { bg = palette.bg_secondary, fg = palette.green_bright },
   },
   inactive = {
-    a = { bg = colors.black, fg = colors.lightgray },
+    a = { bg = palette.bg_secondary, fg = palette.fg_dim },
-    b = { bg = colors.black, fg = colors.lightgray },
+    b = { bg = palette.bg_secondary, fg = palette.fg_dim },
-    c = { bg = colors.black, fg = colors.lightgray },
+    c = { bg = palette.bg_secondary, fg = palette.fg_dim },
   },
 }