Compare commits

..

No commits in common. "d4852742cc2d5fc4132f4c1000acba70cea6e4ef" and "5b8e76f99524df3ffe1836faf9a7e5288378d72e" have entirely different histories.

View file

@ -68,8 +68,8 @@ end
-- @field set_colors function to easily apply color scheme -- @field set_colors function to easily apply color scheme
local PALETTE = { local PALETTE = {
--|| DARK NORMAL BRIGHT ( x11 codes ) -- TODO map dark variants --|| DARK NORMAL BRIGHT ( x11 codes ) -- TODO map dark variants
black = COLOR("#16161c", "#201f29", "#302E3A", nil, 235, 238), black = COLOR("#19161A", "#252A2B", "#333333", nil, 235, 238),
gray = COLOR("#494756", "#848291", "#A8A7AF", nil, 244, nil), gray = COLOR("#444444", "#808080", "#A8A499", nil, 244, nil),
white = COLOR("#ADA9A1", "#D4D2CF", "#E8E1D3", nil, 252, 15 ), white = COLOR("#ADA9A1", "#D4D2CF", "#E8E1D3", nil, 252, 15 ),
azure = COLOR("#5D748C", "#81A1C1", "#A6B4C2", nil, nil, nil), azure = COLOR("#5D748C", "#81A1C1", "#A6B4C2", nil, nil, nil),
blue = COLOR("#48589C", "#5B6EA3", "#798DB8", nil, 67, 4 ), blue = COLOR("#48589C", "#5B6EA3", "#798DB8", nil, 67, 4 ),
@ -181,20 +181,17 @@ function PALETTE:set_semantic_colors()
vim.api.nvim_set_hl(0, "@lsp.type.struct", { link = "@type" }) vim.api.nvim_set_hl(0, "@lsp.type.struct", { link = "@type" })
vim.api.nvim_set_hl(0, "@lsp.type.type", { link = "@define" }) vim.api.nvim_set_hl(0, "@lsp.type.type", { link = "@define" })
vim.api.nvim_set_hl(0, "@lsp.type.typeParameter", { link = "@type.definition" }) vim.api.nvim_set_hl(0, "@lsp.type.typeParameter", { link = "@type.definition" })
vim.api.nvim_set_hl(0, "@lsp.type.variable", { link = "@variable" }) vim.api.nvim_set_hl(0, "@lsp.type.variable", {})
end end
function PALETTE:set_ui_colors() function PALETTE:set_ui_colors()
-- FG BG ATTR -- FG BG ATTR
vim.api.nvim_set_hl(0, "NonText", HIGHLIGHT(self.black.normal, nil, nil)) vim.api.nvim_set_hl(0, "NonText", HIGHLIGHT(self.black.normal, nil, nil))
vim.api.nvim_set_hl(0, "Visual", HIGHLIGHT(nil, self.black.bright, nil)) vim.api.nvim_set_hl(0, "Visual", HIGHLIGHT(nil, self.black.bright, nil))
vim.api.nvim_set_hl(0, "Search", HIGHLIGHT(self.yellow.bright, self.gray.dark, nil)) vim.api.nvim_set_hl(0, "Search", HIGHLIGHT(self.yellow.bright, self.gray.dark, {bold=true}))
vim.api.nvim_set_hl(0, "CurSearch", HIGHLIGHT(self.yellow.bright, self.gray.dark, {bold=true}))
vim.api.nvim_set_hl(0, "IncSearch", { link = "CurSearch" })
vim.api.nvim_set_hl(0, "Folded", HIGHLIGHT(self.cyan.normal, self.black.normal, nil)) vim.api.nvim_set_hl(0, "Folded", HIGHLIGHT(self.cyan.normal, self.black.normal, nil))
vim.api.nvim_set_hl(0, "FoldColumn", HIGHLIGHT(self.cyan.normal, nil, nil)) vim.api.nvim_set_hl(0, "FoldColumn", HIGHLIGHT(self.cyan.normal, nil, nil))
vim.api.nvim_set_hl(0, "VertSplit", HIGHLIGHT(self.black.normal, self.black.normal, nil)) -- Split divider color vim.api.nvim_set_hl(0, "VertSplit", HIGHLIGHT(self.black.normal, self.black.normal, nil)) -- Split divider color
vim.api.nvim_set_hl(0, "WinSeparator", HIGHLIGHT(self.black.bright, nil, nil)) -- Split divider color
vim.api.nvim_set_hl(0, "SignColumn", HIGHLIGHT(nil, nil, nil)) -- Gutter color vim.api.nvim_set_hl(0, "SignColumn", HIGHLIGHT(nil, nil, nil)) -- Gutter color
vim.api.nvim_set_hl(0, "CursorLine", HIGHLIGHT(nil, nil, nil)) -- Line number color vim.api.nvim_set_hl(0, "CursorLine", HIGHLIGHT(nil, nil, nil)) -- Line number color
vim.api.nvim_set_hl(0, "CursorLineSign", HIGHLIGHT(nil, self.black.normal, nil)) -- CursorLine color (in sign column) vim.api.nvim_set_hl(0, "CursorLineSign", HIGHLIGHT(nil, self.black.normal, nil)) -- CursorLine color (in sign column)
@ -207,13 +204,11 @@ function PALETTE:set_ui_colors()
vim.api.nvim_set_hl(0, "PmenuSel", HIGHLIGHT(nil, self.gray.dark, nil)) -- Balloon color vim.api.nvim_set_hl(0, "PmenuSel", HIGHLIGHT(nil, self.gray.dark, nil)) -- Balloon color
-- vim.api.nvim_set_hl(0, "PmenuSbar", HIGHLIGHT(nil, self.black.normal, nil)) -- Balloon color -- vim.api.nvim_set_hl(0, "PmenuSbar", HIGHLIGHT(nil, self.black.normal, nil)) -- Balloon color
-- vim.api.nvim_set_hl(0, "PmenuThumb", HIGHLIGHT(nil, self.black.normal, nil)) -- Balloon color -- vim.api.nvim_set_hl(0, "PmenuThumb", HIGHLIGHT(nil, self.black.normal, nil)) -- Balloon color
vim.api.nvim_set_hl(0, "NormalFloat", HIGHLIGHT(self.white.dark, self.black.normal, nil)) -- Used mostly for replace popup
vim.api.nvim_set_hl(0, "FloatBorder", HIGHLIGHT(self.black.bright, nil, nil)) -- Used mostly for replace popup vim.api.nvim_set_hl(0, "FloatBorder", HIGHLIGHT(self.black.bright, nil, nil)) -- Used mostly for replace popup
vim.api.nvim_set_hl(0, "FloatTitle", HIGHLIGHT(self.white.dark, self.gray.bright, nil)) -- custom definition of dessing.nvim vim.api.nvim_set_hl(0, "FloatTitle", HIGHLIGHT(self.white.dark, self.gray.dark, nil)) -- custom definition of dessing.nvim
-- must configure rust-tools to use this as group -- must configure rust-tools to use this as group
vim.api.nvim_set_hl(0, "InlayHint", HIGHLIGHT(self.gray.dark, nil, nil)) vim.api.nvim_set_hl(0, "InlayHint", HIGHLIGHT(self.black.bright, nil, nil))
vim.api.nvim_set_hl(0, "LspInlayHint", HIGHLIGHT(self.gray.dark, nil, nil))
vim.api.nvim_set_hl(0, "Question", HIGHLIGHT(self.cyan.normal, nil, {bold=true})) vim.api.nvim_set_hl(0, "Question", HIGHLIGHT(self.cyan.normal, nil, {bold=true}))
vim.api.nvim_set_hl(0, "MoreMsg", HIGHLIGHT(self.black.bright, nil, {bold=true})) vim.api.nvim_set_hl(0, "MoreMsg", HIGHLIGHT(self.black.bright, nil, {bold=true}))
@ -237,11 +232,10 @@ end
function PALETTE:set_diff_colors() function PALETTE:set_diff_colors()
-- FG BG ATTR -- FG BG ATTR
vim.api.nvim_set_hl(0, "diffAdded", HIGHLIGHT(self.green.normal, self.black.dark, nil)) vim.api.nvim_set_hl(0, "DiffAdd", HIGHLIGHT(nil, self.black.normal, nil))
vim.api.nvim_set_hl(0, "diffChanged", HIGHLIGHT(self.purple.normal, self.black.dark, nil)) vim.api.nvim_set_hl(0, "DiffChange", HIGHLIGHT(nil, self.black.dark, nil))
vim.api.nvim_set_hl(0, "diffRemoved", HIGHLIGHT(self.red.normal, self.black.dark, nil)) vim.api.nvim_set_hl(0, "DiffDelete", HIGHLIGHT(self.black.normal, self.black.dark, nil))
vim.api.nvim_set_hl(0, "diffLine", HIGHLIGHT(self.pink.normal, self.black.bright, {bold=true})) vim.api.nvim_set_hl(0, "DiffText", HIGHLIGHT(nil, self.black.normal, nil))
vim.api.nvim_set_hl(0, "diffSubname", HIGHLIGHT(self.yellow.dark, self.black.bright, nil))
end end
function PALETTE:set_spell_colors() function PALETTE:set_spell_colors()
@ -270,8 +264,6 @@ function PALETTE:set_statusline_colors()
end end
function PALETTE:set_neotree_colors() function PALETTE:set_neotree_colors()
vim.api.nvim_set_hl(0, 'NeoTreeTitleBar', HIGHLIGHT(self.white.bright, nil, {bold=true}))
vim.api.nvim_set_hl(0, 'NeoTreeFloatTitle', HIGHLIGHT(self.white.bright, self.black.bright, {bold=true}))
vim.api.nvim_set_hl(0, "NeoTreeGitAdded", HIGHLIGHT(self.green.normal, nil, nil)) vim.api.nvim_set_hl(0, "NeoTreeGitAdded", HIGHLIGHT(self.green.normal, nil, nil))
vim.api.nvim_set_hl(0, "NeoTreeGitDeleted", HIGHLIGHT(self.red.dark, nil, nil)) vim.api.nvim_set_hl(0, "NeoTreeGitDeleted", HIGHLIGHT(self.red.dark, nil, nil))
vim.api.nvim_set_hl(0, "NeoTreeGitModified", HIGHLIGHT(self.red.bright, nil, nil)) vim.api.nvim_set_hl(0, "NeoTreeGitModified", HIGHLIGHT(self.red.bright, nil, nil))