mirror of https://github.com/sgoudham/nvim.git
Merge branch 'dev' into dev
Pocco81
2 years ago
committed by
GitHub
commit
b9592b1840
Binary file not shown.
|
After Width: | Height: | Size: 962 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 150 KiB |
@ -1,27 +1,29 @@
|
|||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
function M.get(cp)
|
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 {
|
return {
|
||||||
BufferLineFill = { bg = cp.crust },
|
BufferLineFill = { bg = bg_highlight },
|
||||||
BufferLineBackcrust = { fg = cp.text, bg = inactive_bg }, -- others
|
BufferLineBackcrust = { fg = cp.text, bg = inactive_bg }, -- others
|
||||||
BufferLineBufferVisible = { fg = cp.surface1, bg = inactive_bg },
|
BufferLineBufferVisible = { fg = cp.surface1, bg = inactive_bg },
|
||||||
BufferLineBufferSelected = { fg = cp.text, bg = cp.base, style = "bold,italic" }, -- current
|
BufferLineBufferSelected = { fg = cp.text, bg = cp.base, style = "bold,italic" }, -- current
|
||||||
BufferLineTab = { fg = cp.surface1, bg = cp.base },
|
BufferLineTab = { fg = cp.surface1, bg = cp.base },
|
||||||
BufferLineTabSelected = { fg = cp.red, bg = cp.blue },
|
BufferLineTabSelected = { fg = cp.red, bg = cp.blue },
|
||||||
BufferLineTabClose = { fg = cp.red, bg = inactive_bg },
|
BufferLineTabClose = { fg = cp.red, bg = inactive_bg },
|
||||||
BufferLineIndicatorSelected = { fg = cp.peach, bg = cp.base },
|
BufferLineIndicatorSelected = { fg = cp.peach, bg = cp.base },
|
||||||
-- separators
|
-- separators
|
||||||
BufferLineSeparator = { fg = inactive_bg, bg = inactive_bg },
|
BufferLineSeparator = { fg = inactive_bg, bg = inactive_bg },
|
||||||
BufferLineSeparatorVisible = { fg = inactive_bg, bg = inactive_bg },
|
BufferLineSeparatorVisible = { fg = inactive_bg, bg = inactive_bg },
|
||||||
BufferLineSeparatorSelected = { fg = inactive_bg, bg = inactive_bg },
|
BufferLineSeparatorSelected = { fg = inactive_bg, bg = inactive_bg },
|
||||||
-- close buttons
|
-- close buttons
|
||||||
BufferLineCloseButton = { fg = cp.surface1, bg = inactive_bg },
|
BufferLineCloseButton = { fg = cp.surface1, bg = inactive_bg },
|
||||||
BufferLineCloseButtonVisible = { fg = cp.surface1, bg = inactive_bg },
|
BufferLineCloseButtonVisible = { fg = cp.surface1, bg = inactive_bg },
|
||||||
BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.base },
|
BufferLineCloseButtonSelected = { fg = cp.red, bg = cp.base },
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
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
|
||||||
@ -0,0 +1,38 @@
|
|||||||
|
local M = {}
|
||||||
|
|
||||||
|
local is_prepared
|
||||||
|
|
||||||
|
local function set_prepared(val)
|
||||||
|
is_prepared = val
|
||||||
|
end
|
||||||
|
|
||||||
|
local function get_prepared()
|
||||||
|
return is_prepared
|
||||||
|
end
|
||||||
|
|
||||||
|
function M.get(cp)
|
||||||
|
|
||||||
|
if not get_prepared() then
|
||||||
|
local catppuccin = require("catppuccin")
|
||||||
|
if catppuccin.after_loading ~= nil then
|
||||||
|
catppuccin.after_loading = function ()
|
||||||
|
catppuccin.after_loading()
|
||||||
|
require'leap'.init_highlight(true)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
catppuccin.after_loading = function ()
|
||||||
|
require'leap'.init_highlight(true)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
set_prepared(true)
|
||||||
|
end
|
||||||
|
|
||||||
|
return {
|
||||||
|
LeapLabelPrimary = {bg = cp.surface1, fg = cp.text},
|
||||||
|
LeapLabelSecondary = {bg = cp.surface1, fg = cp.text},
|
||||||
|
LeapBackdrop = {bg = cp.base, fg = cp.overlay0},
|
||||||
|
LeapMatch = {bg = cp.base, fg = cp.red, style = "underline"},
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
return M
|
||||||
@ -0,0 +1,62 @@
|
|||||||
|
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 = transparent_background and "NONE" or cp.mantle
|
||||||
|
|
||||||
|
return {
|
||||||
|
MiniCompletionActiveParameter = { style = "underline" },
|
||||||
|
|
||||||
|
MiniCursorword = { style = "underline" },
|
||||||
|
MiniCursorwordCurrent = { style = "underline" },
|
||||||
|
|
||||||
|
MiniIndentscopeSymbol = { fg = cp.text },
|
||||||
|
MiniIndentscopePrefix = { style = "nocombine" }, -- Make it invisible
|
||||||
|
|
||||||
|
MiniJump = { fg = cp.overlay2, bg = cp.pink },
|
||||||
|
|
||||||
|
MiniJump2dSpot = { bg = cp.base, fg = cp.peach, style = "bold,underline" },
|
||||||
|
|
||||||
|
MiniStarterCurrent = {},
|
||||||
|
MiniStarterFooter = { fg = cp.yellow, style = "italic" },
|
||||||
|
MiniStarterHeader = { fg = cp.blue },
|
||||||
|
MiniStarterInactive = { fg = cp.surface2, style = cnf.styles.comments },
|
||||||
|
MiniStarterItem = { fg = cp.text },
|
||||||
|
MiniStarterItemBullet = { fg = cp.blue },
|
||||||
|
MiniStarterItemPrefix = { fg = cp.pink },
|
||||||
|
MiniStarterSection = { fg = cp.flamingo },
|
||||||
|
MiniStarterQuery = { fg = cp.green },
|
||||||
|
|
||||||
|
MiniStatuslineDevinfo = { fg = cp.subtext1, bg = cp.surface1 },
|
||||||
|
MiniStatuslineFileinfo = { fg = cp.subtext1, bg = cp.surface1 },
|
||||||
|
MiniStatuslineFilename = { fg = cp.text, bg = cp.mantle },
|
||||||
|
MiniStatuslineInactive = { fg = cp.blue, bg = cp.mantle },
|
||||||
|
MiniStatuslineModeCommand = { fg = cp.base, bg = cp.peach, style = "bold" },
|
||||||
|
MiniStatuslineModeInsert = { fg = cp.base, bg = cp.green, style = "bold" },
|
||||||
|
MiniStatuslineModeNormal = { fg = cp.mantle, bg = cp.blue, style = "bold" },
|
||||||
|
MiniStatuslineModeOther = { fg = cp.base, bg = cp.teal, style = "bold" },
|
||||||
|
MiniStatuslineModeReplace = { fg = cp.base, bg = cp.red, style = "bold" },
|
||||||
|
MiniStatuslineModeVisual = { fg = cp.base, bg = cp.mauve, style = "bold" },
|
||||||
|
|
||||||
|
MiniSurround = { bg = cp.pink, fg = cp.surface1 },
|
||||||
|
|
||||||
|
MiniTablineCurrent = { fg = cp.text, bg = cp.base, style = "bold,italic" },
|
||||||
|
MiniTablineFill = { bg = bg_highlight },
|
||||||
|
MiniTablineHidden = { fg = cp.text, bg = inactive_bg },
|
||||||
|
MiniTablineModifiedCurrent = { fg = cp.base, bg = cp.text, style = "bold,italic" },
|
||||||
|
MiniTablineModifiedHidden = { fg = inactive_bg, bg = cp.text },
|
||||||
|
MiniTablineModifiedVisible = { fg = cp.surface1, bg = cp.subtext1 },
|
||||||
|
MiniTablineTabpagesection = { fg = cp.surface1, bg = cp.base },
|
||||||
|
MiniTablineVisible = { fg = cp.subtext1, bg = cp.surface1 },
|
||||||
|
|
||||||
|
MiniTestEmphasis = { style = "bold" },
|
||||||
|
MiniTestFail = { fg = cp.red, style = "bold" },
|
||||||
|
MiniTestPass = { fg = cp.green, style = "bold" },
|
||||||
|
|
||||||
|
MiniTrailspace = { bg = cp.red },
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
return M
|
||||||
@ -1,35 +0,0 @@
|
|||||||
-- NOTE: references for Catppuccin Moccha
|
|
||||||
-- monochromatic: https://coolors.co/c6d0f5-aeb7d9-969dbc-7e84a0-666a83-4e5167-36374a-1e1e2e-12121c-07070a
|
|
||||||
-- analogous 1: https://coolors.co/f5e0dc-f2cdcd-f5c2e7-cba6f7-eba0ac-f38ba8-fab387
|
|
||||||
-- analogous 2: https://coolors.co/bfb7e4-8caaee-99d1db-e5c890-85c1dc-a6d189-81c8be
|
|
||||||
|
|
||||||
local color_palette = {
|
|
||||||
rosewater = "#F5E0DC",
|
|
||||||
flamingo = "#F2CDCD",
|
|
||||||
pink = "#F5C2E7",
|
|
||||||
mauve = "#CBA6F7",
|
|
||||||
red = "#F38BA8",
|
|
||||||
maroon = "#EBA0AC",
|
|
||||||
peach = "#FAB387",
|
|
||||||
yellow = "#F9E2AF",
|
|
||||||
green = "#A6E3A1",
|
|
||||||
teal = "#94E2D5",
|
|
||||||
sky = "#89DCEB",
|
|
||||||
blue = "#90C1FB",
|
|
||||||
sapphire = "#74C7EC",
|
|
||||||
lavender = "#B4BEFE",
|
|
||||||
|
|
||||||
text = "#C6D0F5",
|
|
||||||
overlay2 = "#AEB7D9",
|
|
||||||
overlay1 = "#969DBC",
|
|
||||||
overlay0 = "#7E84A0",
|
|
||||||
surface2 = "#666A83",
|
|
||||||
surface1 = "#4E5167",
|
|
||||||
surface0 = "#36374A",
|
|
||||||
|
|
||||||
crust = "#11111B",
|
|
||||||
mantle = "#181825",
|
|
||||||
base = "#1E1E2E",
|
|
||||||
}
|
|
||||||
|
|
||||||
return color_palette
|
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
local M = {}
|
||||||
|
|
||||||
|
function M.flavour_completion()
|
||||||
|
return vim.tbl_keys(require("catppuccin.utils.data").set_of({
|
||||||
|
"latte",
|
||||||
|
"frappe",
|
||||||
|
"macchiato",
|
||||||
|
"mocha",
|
||||||
|
}))
|
||||||
|
end
|
||||||
|
|
||||||
|
return M
|
||||||
Loading…
Reference in New Issue