Hide cusorline, theme maturing, fix inconsistent colors

README.md

@@ -166,6 +166,8 @@ require 'nordic' .setup {
         bold = false,
         -- Avialable styles: 'dark', 'light'.
         theme = 'light',
+        -- Hide the cursorline when the window is not focused.
+        hide_unfocused = true,
     },
     noice = {
         -- Available styles: `classic`, `flat`.

lua/nordic/colors/init.lua

@@ -17,6 +17,8 @@ palette.grey5 = palette.gray5
 palette.bg = palette.gray0
 palette.bg_dark = palette.black
 palette.bg_highlight = palette.black
+
+palette.bg_highlight = u.blend(palette.black, palette.bg, 0.5)
 palette.bg_visual = palette.bg_highlight
 palette.bg_sidebar = palette.bg
 palette.bg_float = palette.bg
@@ -41,11 +43,11 @@ palette.border_float = palette.white1
 palette.border_nb = palette.orange.base
 
 -- Diffs.
-local diff_blend = 0.35
+local diff_blend = 0.2
 palette.diff = {}
-palette.diff.add = u.blend(palette.green.base, palette.bg, diff_blend)
-palette.diff.change0 = u.blend(palette.blue2, palette.bg, diff_blend * 0.15)
+palette.diff.change0 = u.blend(palette.blue1, palette.bg, 0.05)
 palette.diff.change1 = u.blend(palette.blue2, palette.bg, diff_blend)
+palette.diff.add = u.blend(palette.green.base, palette.bg, diff_blend)
 palette.diff.delete = u.blend(palette.red.base, palette.bg, diff_blend)
 
 -- Git.
@@ -65,8 +67,8 @@ palette.info = palette.blue2
 palette.comment = palette.gray4
 
 if o.cursorline.theme == 'light' then
-    palette.bg_highlight = palette.gray1
-    palette.bg_visual = palette.gray1
+    palette.bg_highlight = u.blend(palette.gray1, palette.bg, 0.5)
+    palette.bg_visual = palette.bg_highlight
 end
 
 return palette

lua/nordic/commands.lua

@@ -0,0 +1,21 @@
+local o = require 'nordic.config'.options
+local api = vim.api
+
+function _Win_leave_hl()
+    vim.cmd([[setlocal cursorlineopt=number]])
+end
+
+function _Win_enter_hl()
+    vim.cmd([[setlocal cursorlineopt=both]])
+end
+
+if o.cursorline.hide_unfocused then
+
+    api.nvim_create_autocmd({'WinEnter'}, {
+        callback = _Win_enter_hl
+    })
+    api.nvim_create_autocmd({'WinLeave'}, {
+        callback = _Win_leave_hl
+    })
+
+end

lua/nordic/config.lua

@@ -30,6 +30,8 @@ M.defaults = {
         bold = false,
         -- Avialable styles: 'dark', 'light'.
         theme = 'light',
+        -- Hide the cursorline when the window is not focused.
+        hide_unfocused = true,
     },
     noice = {
         -- Available styles: `classic`, `flat`.

lua/nordic/groups/integrations/telescope.lua

@@ -76,6 +76,18 @@ local groups = {
         bg = c.bg,
         fg = c.orange.bright,
     },
+
+    -- Multi.
+    TelescopeMultiIcon = {
+        fg = c.yellow.bright,
+        bg = c.bg_dark,
+        bold = true
+    },
+    TelescopeMultiSelection = {
+        fg = c.fg,
+        bg = c.bg_dark
+    }
+
 }
 
 -- Apply the flat style.

lua/nordic/groups/integrations/treesitter.lua

@@ -115,8 +115,8 @@ return {
     ['@type.builtin'] = { link = 'Type' },
     ['@type.definition'] = { link = 'Type' },
     ['@punctuation.special'] = { link = 'Type' },
-    ['@type.qualifier'] = { link = 'Builtin' },
-    ['@storageclass'] = { link = 'Builtin' },
+    ['@type.qualifier'] = { link = 'Keyword' },
+    ['@storageclass'] = { link = 'Keyword' },
     ['@none'] = { link = 'None' },
     -----------------------
 }

lua/nordic/groups/integrations/vimtex.lua

@@ -1,6 +1,7 @@
 local c = require 'nordic.colors'
 
 return {
+    texGroup = { fg = c.fg },
     texEnvArgName = { fg = c.cyan.base },
     texMathEnvArgName = { link = 'texEnvArgName' },
     texArg = { fg = c.cyan.base },

lua/nordic/groups/native/editor.lua

@@ -38,7 +38,7 @@ local groups = {
     }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
 
     CursorLine = {
-        bg = u.blend(c.bg_highlight, c.bg, 0.5),
+        bg = c.bg_highlight,
         bold = o.cursorline.bold,
     }, -- Screen-line at the cursor, when 'cursorline' is set.  Low-priority if foreground (ctermfg OR guifg) is not set.
 
@@ -96,10 +96,15 @@ local groups = {
     }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
 
     CursorLineNr = {
+        bg = c.bg,
         fg = c.gray5,
         bold = true,
     }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
 
+    CursorLineSign = {
+        bg = c.bg
+    },
+
     MatchParen = {
         fg = c.yellow.bright,
         bold = true,

lua/nordic/init.lua

@@ -16,6 +16,7 @@ function M.load(opts)
     local groups = merge(g.get_groups(), config.options.override)
     require('nordic.utils').highlight(groups)
     g.set_term_colors()
+    require 'nordic.commands'
 end
 
 -- Expose the colorsceheme to vim.

lua/nordic/tests/options.lua

@@ -13,6 +13,7 @@ config.nordic.reduced_blue = false
 config.onedark.brighter_whites = false
 config.cursorline.theme = 'light'
 config.cursorline.bold = true
+config.cursorline.hide_unfocused = false
 config.noice.style = 'flat'
 config.telescope.style = 'classic'
 config.leap.dim_backdrop = true