mirror of https://github.com/sgoudham/nvim.git
fix: merge conflict
commit
789b4ac3ce
@ -1,27 +1,29 @@
|
||||
local M = {}
|
||||
|
||||
function M.get(cp)
|
||||
local transparent_background = require("catppuccin.config").options.transparent_background
|
||||
local bg_highlight = transparent_background and "NONE" or cp.base
|
||||
|
||||
local inactive_bg = cp.mantle
|
||||
local inactive_bg = transparent_background and "NONE" or cp.mantle
|
||||
|
||||
return {
|
||||
BufferLineFill = { bg = cp.crust },
|
||||
BufferLineBackcrust = { fg = cp.text, bg = inactive_bg }, -- others
|
||||
BufferLineBufferVisible = { fg = cp.surface1, bg = inactive_bg },
|
||||
BufferLineBufferSelected = { fg = cp.text, bg = cp.base, style = "bold,italic" }, -- current
|
||||
BufferLineTab = { fg = cp.surface1, bg = cp.base },
|
||||
BufferLineTabSelected = { fg = cp.red, bg = cp.blue },
|
||||
BufferLineTabClose = { fg = cp.red, bg = inactive_bg },
|
||||
BufferLineIndicatorSelected = { fg = cp.peach, bg = cp.base },
|
||||
-- separators
|
||||
BufferLineSeparator = { fg = inactive_bg, bg = inactive_bg },
|
||||
BufferLineSeparatorVisible = { fg = inactive_bg, bg = inactive_bg },
|
||||
BufferLineSeparatorSelected = { fg = inactive_bg, bg = inactive_bg },
|
||||
-- close buttons
|
||||
BufferLineCloseButton = { fg = cp.surface1, bg = inactive_bg },
|
||||
BufferLineCloseButtonVisible = { fg = cp.surface1, bg = inactive_bg },
|
||||
BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.base },
|
||||
}
|
||||
return {
|
||||
BufferLineFill = { bg = bg_highlight },
|
||||
BufferLineBackcrust = { fg = cp.text, bg = inactive_bg }, -- others
|
||||
BufferLineBufferVisible = { fg = cp.surface1, bg = inactive_bg },
|
||||
BufferLineBufferSelected = { fg = cp.text, bg = cp.base, style = "bold,italic" }, -- current
|
||||
BufferLineTab = { fg = cp.surface1, bg = cp.base },
|
||||
BufferLineTabSelected = { fg = cp.red, bg = cp.blue },
|
||||
BufferLineTabClose = { fg = cp.red, bg = inactive_bg },
|
||||
BufferLineIndicatorSelected = { fg = cp.peach, bg = cp.base },
|
||||
-- separators
|
||||
BufferLineSeparator = { fg = inactive_bg, bg = inactive_bg },
|
||||
BufferLineSeparatorVisible = { fg = inactive_bg, bg = inactive_bg },
|
||||
BufferLineSeparatorSelected = { fg = inactive_bg, bg = inactive_bg },
|
||||
-- close buttons
|
||||
BufferLineCloseButton = { fg = cp.surface1, bg = inactive_bg },
|
||||
BufferLineCloseButtonVisible = { fg = cp.surface1, bg = inactive_bg },
|
||||
BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.base },
|
||||
}
|
||||
end
|
||||
|
||||
return M
|
||||
|
@ -0,0 +1,27 @@
|
||||
local M = {}
|
||||
|
||||
local util = require("catppuccin.utils.util")
|
||||
|
||||
function M.get(cp)
|
||||
local error = cp.red
|
||||
local warning = cp.yellow
|
||||
local info = cp.sky
|
||||
local hint = cp.teal
|
||||
|
||||
return {
|
||||
-- These groups are for the coc.nvim, the documentation is here (https://github.com/neoclide/coc.nvim/blob/master/doc/coc.txt#L2365).
|
||||
CocErrorHighlight = { fg = error },
|
||||
CocErrorSign = { fg = error },
|
||||
CocErrorVirtualText = { fg = error },
|
||||
CocHintHighlight = { fg = hint },
|
||||
CocHintSign = { fg = hint },
|
||||
CocHintVirtualText = { fg = hint },
|
||||
CocInfoHighlight = { fg = info },
|
||||
CocInfoSign = { fg = info },
|
||||
CocInfoVirtualText = { fg = info },
|
||||
CocWarningHighlight = { fg = warning },
|
||||
CocWarningSign = { fg = warning },
|
||||
}
|
||||
end
|
||||
|
||||
return M
|
Loading…
Reference in New Issue