move highlights to colorscheme, and change cmp style

lua/core/handler.lua

@@ -1,6 +1,5 @@
 require('core.plugins') -- load plugins first to allow colorscheme to be set in opts
 require('core.opts')
-require('core.highlight')
 require('core.binds')
 require('core.auto')
 require('core.cmds')

lua/core/highlight.lua

@@ -1,80 +0,0 @@
-local highlight = function(group, opts, space)
-  if not pcall(require, "mellow") then return end
-  space = space or 0
-
-  if type(group) == 'table' then
-    for i in pairs(group) do
-      a.nvim_set_hl(space, group[i], opts)
-    end
-  elseif type(group) == 'string' then
-    a.nvim_set_hl(space, group, opts)
-  end
-end
-
-if pcall(require, "mellow") then c = require('mellow.colors').dark end
-
--- vim highlights -------------------------------------------------------------
-highlight('CursorLineNr', { bg = c.bg_dark, fg = c.fg,  bold = true })
-
--- remove tildas
-highlight('EndOfBuffer', { fg = c.bg })
-
--- plugin highlights ----------------------------------------------------------
--- telescope
-highlight('TelescopeMatching', { bg = c.gray01 })
-highlight('TelescopeNormal', { bg = c.bg_dark })
-
-highlight('TelescopePreviewBorder', { bg = c.bg_dark })
-highlight('TelescopePreviewNormal', { bg = c.bg_dark })
-highlight('TelescopePreviewTitle', { bg = c.bg_dark, fg = c.bg_dark })
-
-highlight('TelescopePromptBorder', { bg = c.gray01 })
-highlight('TelescopePromptNormal', { bg = c.gray01 })
-highlight('TelescopePromptPrefix', { bg = c.gray01 })
-highlight('TelescopePromptTitle', { bg = c.gray01 })
-
-highlight('TelescopeResultsBorder', { bg = c.bg_dark })
-highlight('TelescopeResultsNormal', { bg = c.bg_dark })
-highlight('TelescopeResultsTitle', { bg = c.bg_dark, fg = c.bg_dark })
-
-highlight('TelescopeSelection', { bg = c.bg })
-highlight('TelescopeSelectionCaret', { bg = c.bg, fg = c.red})
-
--- indent blankline
-highlight('IndentBlanklineIndent1', { bg = c.bg })
-highlight('IndentBlanklineIndent2', { bg = c.bg_dark })
-
--- alpha
-highlight('AlphaHeader', { fg = c.blue })
-
--- fidget
-highlight('FidgetTask', { fg = c.fg })
-
--- quick fix sign
-highlight('LightBulbSignTxthl', {fg = c.bright_magenta})
-
--- completion highlights
-highlight('CmpItemAbbrDeprecated',    { fg = c.gray06, strikethrough = true })
-highlight('CmpItemAbbrMatch',         { fg = c.yellow, bold = true })
-highlight('CmpItemAbbrMatchFuzzy',    { fg = c.yellow, bold = true })
-highlight('CmpItemMenu',              { fg = c.magenta, italic = true })
-
-highlight({ 'CmpItemKindField', 'CmpItemKindProperty', 'CmpItemKindEvent' },
-  { fg = '#EED8DA', bg = '#B5585F' })
-highlight({ 'CmpItemKindText', 'CmpItemKindEnum', 'CmpItemKindKeyword' },
-  { fg = '#C3E88D', bg = '#9FBD73' })
-highlight({ 'CmpItemKindConstant', 'CmpItemKindConstructor',
-  'CmpItemKindReference' },
-  { fg = '#FFE082', bg = '#D4BB6C' })
-highlight({ 'CmpItemKindFunction', 'CmpItemKindStruct', 'CmpItemKindClass',
-  'CmpItemKindModule', 'CmpItemKindOperator', },
-  { fg = '#EADFF0', bg = '#A377BF', })
-highlight({ 'CmpItemKindVariable', 'CmpItemKindFile' },
-  { fg = '#C5CDD9', bg = '#7E8294' })
-highlight({ 'CmpItemKindUnit', 'CmpItemKindSnippet', 'CmpItemKindFolder' },
-  { fg = '#F5EBD9', bg = '#D4A959' })
-highlight({ 'CmpItemKindMethod', 'CmpItemKindValue', 'CmpItemKindEnumMember' },
-  { fg = '#DDE5F5', bg = '#6C8ED4' })
-highlight({ 'CmpItemKindInterface', 'CmpItemKindColor',
-  'CmpItemKindTypeParameter' },
-  { fg = '#D8EEEB', bg = '#58B5A8' })

lua/core/opts.lua

@@ -34,7 +34,8 @@ o.softtabstop = tabwidth
 
 -- colorscheme
 o.termguicolors = true
-if pcall(require, "mellow") then vim.cmd('colorscheme mellow') end
+vim.cmd('colorscheme mellow') -- mellow
+vim.cmd('colorscheme mellow+') -- some changes
 
 -- better editing -------------------------------------------------------------
 o.clipboard = 'unnamedplus' -- system clipboard (on unix like)