Merge pull request #3 from barrett-ruth/feat/blink
fix plugin integrations
This commit is contained in:
commit
7dbac2132a
3 changed files with 24 additions and 7 deletions
|
|
@ -21,3 +21,4 @@ neovim theme for code, not colors.
|
||||||
- [fzf-lua](https://github.com/ibhagwan/fzf-lua)
|
- [fzf-lua](https://github.com/ibhagwan/fzf-lua)
|
||||||
- [nvim-cmp](https://github.com/hrsh7th/nvim-cmp)
|
- [nvim-cmp](https://github.com/hrsh7th/nvim-cmp)
|
||||||
- [gitsigns.nvim](https://github.com/lewis6991/gitsigns.nvim)
|
- [gitsigns.nvim](https://github.com/lewis6991/gitsigns.nvim)
|
||||||
|
- [blink.cmp](https://github.com/saghen/blink.cmp)
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,15 @@ M.daylight = {
|
||||||
cyan = '#00BFFF',
|
cyan = '#00BFFF',
|
||||||
white = '#ffffff',
|
white = '#ffffff',
|
||||||
|
|
||||||
|
bright_black = '#555555',
|
||||||
|
bright_red = '#ff0000',
|
||||||
|
bright_green = '#00ff00',
|
||||||
|
bright_yellow = '#ffa500',
|
||||||
|
bright_blue = '#0000ff',
|
||||||
|
bright_magenta = '#ff00ff',
|
||||||
|
bright_cyan = '#00ffff',
|
||||||
|
bright_white = '#ffffff',
|
||||||
|
|
||||||
light_black = '#555555',
|
light_black = '#555555',
|
||||||
light_grey = '#ECECEC',
|
light_grey = '#ECECEC',
|
||||||
light_red = '#ff0000',
|
light_red = '#ff0000',
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ local M = {}
|
||||||
---@param from string
|
---@param from string
|
||||||
---@param tos string|string[]
|
---@param tos string|string[]
|
||||||
local function link(from, tos)
|
local function link(from, tos)
|
||||||
tos = type(tos) == 'string' and { tos } or tos
|
local tos_list = type(tos) == 'string' and { tos } or tos --[[@as string[] ]]
|
||||||
for _, to in ipairs(tos) do
|
for _, to in ipairs(tos_list) do
|
||||||
vim.api.nvim_set_hl(0, to, { link = from })
|
vim.api.nvim_set_hl(0, to, { link = from })
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -72,13 +72,13 @@ function M.apply()
|
||||||
hi('CursorLine', { bg = cs.dark_grey }, { 'ColorColumn', 'Folded', 'Visual' })
|
hi('CursorLine', { bg = cs.dark_grey }, { 'ColorColumn', 'Folded', 'Visual' })
|
||||||
hi('CursorLineNr', { fg = cs.medium_emphasis })
|
hi('CursorLineNr', { fg = cs.medium_emphasis })
|
||||||
|
|
||||||
hi('Conceal', { fg = cs.light_black, bg = cs.bg })
|
hi('Conceal', { fg = cs.light_black, bg = cs.black })
|
||||||
hi('Directory', { fg = cs.white })
|
hi('Directory', { fg = cs.white })
|
||||||
hi('Error', { fg = cs.red })
|
hi('Error', { fg = cs.red })
|
||||||
hi('ErrorMsg', { bold = true, underline = true, fg = cs.red })
|
hi('ErrorMsg', { bold = true, underline = true, fg = cs.red })
|
||||||
hi('MoreMsg', { fg = cs.yellow }, { 'WarningMsg' })
|
hi('MoreMsg', { fg = cs.yellow }, { 'WarningMsg' })
|
||||||
hi('MatchParen', { bg = cs.med_grey })
|
hi('MatchParen', { bg = cs.med_grey })
|
||||||
hi('NormalFloat', { bg = cs.bg }, {
|
hi('NormalFloat', { bg = cs.black }, {
|
||||||
'LspInfoBorder',
|
'LspInfoBorder',
|
||||||
'FloatBorder',
|
'FloatBorder',
|
||||||
'FloatShadow',
|
'FloatShadow',
|
||||||
|
|
@ -125,9 +125,9 @@ function M.apply()
|
||||||
|
|
||||||
hi('@variable', { none = true })
|
hi('@variable', { none = true })
|
||||||
|
|
||||||
hi('Pmenu', { bg = cs.med_grey }, { 'PmenuSbar' })
|
hi('Pmenu', { bg = cs.dark_grey }, { 'PmenuSbar' })
|
||||||
hi('PmenuSel', { fg = cs.med_grey, bg = cs.medium_emphasis })
|
hi('PmenuSel', { bg = cs.med_grey })
|
||||||
hi('PmenuThumb', { bg = cs.medium_emphasis })
|
hi('PmenuThumb', { bg = cs.grey })
|
||||||
|
|
||||||
hi('LspInlayHint', { fg = cs.light_black })
|
hi('LspInlayHint', { fg = cs.light_black })
|
||||||
hi('LspSignatureActiveParameter', { underline = true, italic = true })
|
hi('LspSignatureActiveParameter', { underline = true, italic = true })
|
||||||
|
|
@ -164,7 +164,13 @@ function M.apply()
|
||||||
|
|
||||||
link('Search', 'HighlightUndo')
|
link('Search', 'HighlightUndo')
|
||||||
|
|
||||||
|
link('Pmenu', 'CmpPmenu')
|
||||||
|
link('PmenuSel', 'CmpPmenuSel')
|
||||||
|
hi('CmpItemAbbr', { fg = cs.white })
|
||||||
hi('CmpItemAbbrMatch', { fg = cs.white, bold = true })
|
hi('CmpItemAbbrMatch', { fg = cs.white, bold = true })
|
||||||
|
hi('CmpItemAbbrMatchFuzzy', { fg = cs.white, bold = true })
|
||||||
|
hi('CmpItemAbbrDeprecated', { fg = cs.light_black, strikethrough = true })
|
||||||
|
hi('CmpItemMenu', { fg = cs.light_black })
|
||||||
|
|
||||||
for hlgroup, color in pairs({
|
for hlgroup, color in pairs({
|
||||||
Key = 'white',
|
Key = 'white',
|
||||||
|
|
@ -202,6 +208,7 @@ function M.apply()
|
||||||
link('NormalFloat', 'FzfLuaBorder')
|
link('NormalFloat', 'FzfLuaBorder')
|
||||||
hi('FzfLuaHeaderText', { fg = cs.white }, { 'FzfLuaBufFlagCur' })
|
hi('FzfLuaHeaderText', { fg = cs.white }, { 'FzfLuaBufFlagCur' })
|
||||||
hi('FzfLuaBufFlagAlt', { fg = cs.white })
|
hi('FzfLuaBufFlagAlt', { fg = cs.white })
|
||||||
|
link('Normal', 'FzfLuaLivePrompt')
|
||||||
|
|
||||||
vim.g.terminal_color_0 = cs.black
|
vim.g.terminal_color_0 = cs.black
|
||||||
vim.g.terminal_color_1 = cs.red
|
vim.g.terminal_color_1 = cs.red
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue