refactor(nvim): update to support new kanagawa colors

This commit is contained in:
Price Hiller 2023-03-04 17:01:51 -06:00
parent f4bc4e5151
commit 03994c70ac
No known key found for this signature in database
3 changed files with 142 additions and 148 deletions

View File

@ -30,9 +30,9 @@ cmp.setup({
local selection = selections[entry.source.name]
if not selection then
local kind = require("lspkind").cmp_format({
mode = "symbol_text",
maxwidth = 50,
})(entry, vim_item)
mode = "symbol_text",
maxwidth = 50,
})(entry, vim_item)
local strings = vim.split(kind.kind, "%s", { trimempty = true })
kind.kind = " " .. strings[1] .. " "
vim_item.menu = strings[1] .. " " .. strings[2]
@ -65,9 +65,12 @@ cmp.setup({
},
},
window = {
documentation = { side_padding = 0 },
documentation = {
side_padding = 0,
winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None",
},
completion = {
winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None",
winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None",
col_offset = -3,
side_padding = 0,
},
@ -80,7 +83,7 @@ cmp.setup({
end,
},
mapping = {
["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }),
["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs( -4), { "i", "c" }),
["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }),
["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
["<C-y>"] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
@ -97,8 +100,8 @@ cmp.setup({
end
end, { "i", "s" }),
["<C-S-Tab>"] = cmp.mapping(function(fallback)
if luasnip.jumpable(-1) then
luasnip.jump(-1)
if luasnip.jumpable( -1) then
luasnip.jump( -1)
else
fallback()
end
@ -113,16 +116,16 @@ cmp.setup({
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
elseif luasnip.jumpable( -1) then
luasnip.jump( -1)
else
fallback()
end
end, { "i", "s" }),
},
sources = cmp.config.sources({
{ name = "nvim_lsp", priority = 11 },
{ name = "luasnip", priority = 10 }, -- For luasnip users.
{ name = "nvim_lsp", priority = 11 },
{ name = "luasnip", priority = 10 }, -- For luasnip users.
{ name = "fuzzy_buffer", priority = 9, keyword_length = 3, max_item_count = 10 },
{
name = "rg",
@ -130,12 +133,12 @@ cmp.setup({
keyword_length = 3,
max_item_count = 10,
},
{ name = "path", priority = 6 },
{ name = "zsh", priority = 5 },
{ name = "path", priority = 6 },
{ name = "zsh", priority = 5 },
{ name = "emoji", keyword_length = 2 },
{ name = "neorg" },
{ name = "calc" },
{ name = "npm", keyword_length = 2 },
{ name = "npm", keyword_length = 2 },
{ name = "spell", keyword_length = 2 },
}),
sorting = {
@ -156,7 +159,7 @@ cmp.setup({
-- Git Commit Completions
cmp.setup.filetype("gitcommit", {
sources = cmp.config.sources({
{ name = "conventionalcommits", priority = 20 },
{ name = "conventionalcommits", priority = 20 },
{ { name = "emoji", keyword_length = 2 } },
}),
})

View File

@ -1,4 +1,3 @@
local colors = require("kanagawa.colors").setup({})
vim.opt.fillchars:append({
horiz = "",
horizup = "",
@ -8,133 +7,124 @@ vim.opt.fillchars:append({
vertright = "",
verthoriz = "",
})
require("kanagawa").setup({
transparent = true,
dim_inactive = true,
globalStatus = true,
overrides = {
NeogitHunkHeader = { bg = colors.diff.text },
NeogitHunkHeaderHighlight = { fg = colors.git.changed, bg = colors.diff.text },
NeogitDiffContextHighlight = { bg = colors.diff.change },
NeogitDiffDeleteHighlight = { fg = colors.git.removed, bg = colors.diff.delete },
NeogitDiffAddHighlight = { fg = colors.git.added, bg = colors.diff.add },
NeogitCommitViewHeader = { fg = colors.git.changed, bg = colors.diff.text },
menuSel = { bg = colors.sumiInk0, fg = "NONE" },
Pmenu = { fg = colors.fujiWhite, bg = colors.sumiInk2 },
CmpItemAbbrDeprecated = { fg = colors.fujiGray, bg = "NONE" },
CmpItemAbbrMatch = { fg = colors.crystalBlue, bg = "NONE" },
CmpItemAbbrMatchFuzzy = { fg = colors.crystalBlue, bg = "NONE" },
CmpItemMenu = { fg = colors.roninYellow, bg = "NONE" },
CmpItemKindField = { fg = colors.fujiWhite, bg = colors.sakuraPink },
CmpItemKindProperty = { fg = colors.fujiWhite, bg = colors.sakuraPink },
CmpItemKindEvent = { fg = colors.fujiWhite, bg = colors.sakuraPink },
CmpItemKindText = { fg = colors.fujiWhite, bg = colors.dragonBlue },
CmpItemKindEnum = { fg = colors.fujiWhite, bg = colors.crystalBlue },
CmpItemKindKeyword = { fg = colors.fujiWhite, bg = colors.springBlue },
CmpItemKindConstant = { fg = colors.fujiWhite, bg = colors.crystalBlue },
CmpItemKindConstructor = { fg = colors.fujiWhite, bg = colors.crystalBlue },
CmpItemKindReference = { fg = colors.fujiWhite, bg = colors.crystalBlue },
CmpItemKindFunction = { fg = colors.fujiWhite, bg = colors.oniViolet },
CmpItemKindStruct = { fg = colors.fujiWhite, bg = colors.oniViolet },
CmpItemKindClass = { fg = colors.fujiWhite, bg = colors.oniViolet },
CmpItemKindModule = { fg = colors.fujiWhite, bg = colors.oniViolet },
CmpItemKindOperator = { fg = colors.fujiWhite, bg = colors.oniViolet },
CmpItemKindVariable = { fg = colors.fujiWhite, bg = colors.roninYellow },
CmpItemKindFile = { fg = colors.fujiWhite, bg = colors.autumnYellow },
CmpItemKindUnit = { fg = colors.fujiWhite, bg = colors.autumnYellow },
CmpItemKindSnippet = { fg = colors.fujiWhite, bg = colors.autumnYellow },
CmpItemKindFolder = { fg = colors.fujiWhite, bg = colors.autumnYellow },
CmpItemKindMethod = { fg = colors.fujiWhite, bg = colors.autumnGreen },
CmpItemKindValue = { fg = colors.fujiWhite, bg = colors.autumnGreen },
CmpItemKindEnumMember = { fg = colors.fujiWhite, bg = colors.autumnGreen },
CmpItemKindInterface = { fg = colors.fujiWhite, bg = colors.waveRed },
CmpItemKindColor = { fg = colors.fujiWhite, bg = colors.waveAqua2 },
CmpItemKindTypeParameter = { fg = colors.fujiWhite, bg = colors.waveAqua2 },
CmpCustomSelectionBuffer = { fg = colors.fujiWhite, bg = colors.dragonBlue },
CmpCustomSelectionPath = { fg = colors.fujiWhite, bg = colors.autumnYellow },
CmpCustomSelectionCalculator = { fg = colors.fujiWhite, bg = colors.waveBlue2 },
CmpCustomSelectionNeorg = { fg = colors.fujiWhite, bg = colors.waveAqua1 },
CmpCustomSelectionEmoji = { fg = colors.fujiWhite, bg = colors.dragonBlue },
CmpCustomSelectionZsh = { fg = colors.fujiWhite, bg = colors.springGreen },
CmpCustomSelectionCrates = { fg = colors.fujiWhite, bg = colors.roninYellow },
CmpCustomSelectionCmdHistory = { fg = colors.fujiWhite, bg = colors.waveBlue2 },
CmpCustomSelectionRipgrep = { fg = colors.fujiWhite, bg = colors.dragonBlue },
CmpCustomSelectionNpm = { fg = colors.fujiWhite, bg = colors.peachRed },
CmpCustomSelectionCommit = { fg = colors.fujiWhite, bg = colors.peachRed },
CmpCustomSelectionSpell = { fg = colors.fujiWhite, bg = colors.waveRed },
TelescopeNormal = { bg = colors.sumiInk1 },
TelescopeBorder = { bg = colors.sumiInk1, fg = colors.sumiInk1 },
TelescopePromptBorder = { bg = colors.sumiInk0, fg = colors.sumiInk0 },
TelescopePromptTitle = { fg = colors.sumiInk0, bg = colors.oniViolet },
TelescopePreviewTitle = { fg = colors.sumiInk0, bg = colors.sakuraPink },
TelescopePreviewBorder = { bg = colors.sumiInk2, fg = colors.sumiInk2 },
TelescopePreviewNormal = { bg = colors.sumiInk2 },
TelescopeResultsTitle = { fg = "NONE", bg = "NONE" },
WinSeparator = { fg = colors.sumiInk4, bg = "NONE" },
MiniCursorword = { bg = colors.sumiInk3 },
MiniCursorwordCurrent = { bg = colors.sumiInk3 },
rainbowcol1 = { fg = colors.oniViolet },
rainbowcol2 = { fg = colors.crystalBlue },
rainbowcol3 = { fg = colors.lightBlue },
rainbowcol4 = { fg = colors.sakuraPink },
rainbowcol5 = { fg = colors.springGreen },
rainbowcol6 = { fg = colors.springViolet2 },
rainbowcol7 = { fg = colors.carpYellow },
packerSuccess = { fg = colors.autumnGreen, bg = "NONE" },
WinBar = { fg = colors.fujiWhite, bg = colors.sumiInk1b },
WinBarNC = { fg = colors.fujiWhite, bg = colors.sumiInk1b },
NeoTreeNormal = { bg = colors.sumiInk1b },
NeoTreeNormalNC = { bg = colors.sumiInk1b },
NoiceCmdlineIconCmdline = { fg = colors.oniViolet },
NoiceCmdlinePopupBorderCmdline = { fg = colors.oniViolet },
NoiceCmdlineIconFilter = { fg = colors.springGreen },
NoiceCmdlinePopupBorderFilter = { fg = colors.springGreen },
NoiceCmdLineIconLua = { fg = colors.crystalBlue },
NoiceCmdlinePopupBorderLua = { fg = colors.crystalBlue },
NoiceCmdlineIconHelp = { fg = colors.surimiOrange },
NoiceCmdlinePopupBorderHelp = { fg = colors.surimiOrange },
NoiceCmdLineIconSearch = { fg = colors.roninYellow },
NoiceCmdlinePopupBorderSearch = { fg = colors.roninYellow },
NoiceCmdlineIconIncRename = { fg = colors.peachRed },
NoiceCmdlinePopupdBorderIncRename = { fg = colors.peachRed },
Folded = { bg = colors.waveBlue1 },
UfoFoldedBg = { bg = "NONE" },
TSRainbowRed = { fg = colors.peachRed },
TSRainbowYellow = { fg = colors.carpYellow },
TSRainbowBlue = { fg = colors.crystalBlue },
TSRainbowGreen = { fg = colors.springGreen },
TSRainbowViolet = { fg = colors.oniViolet },
TSRainbowCyan = { fg = colors.lightBlue }
theme = "dragon",
colors = {
theme = {
all = {
ui = {
bg_gutter = 'NONE'
}
}
}
},
})
overrides = function(palette)
local colors = palette.palette
local overrides = {
NeogitHunkHeader = { bg = colors.winterBlue },
NeogitHunkHeaderHighlight = { fg = colors.winterYellow, bg = colors.oldWhite },
NeogitDiffContextHighlight = { bg = colors.winterBlue },
NeogitDiffDeleteHighlight = { fg = colors.winterRed, bg = colors.autumnRed },
NeogitDiffAddHighlight = { fg = colors.winterGreen, bg = colors.autumnGreen },
NeogitCommitViewHeader = { fg = colors.winterYellow, bg = colors.autumnYellow },
menuSel = { bg = colors.sumiInk0, fg = "NONE" },
Pmenu = { fg = colors.fujiWhite, bg = colors.sumiInk2 },
CmpItemAbbrDeprecated = { fg = colors.fujiGray, bg = "NONE" },
CmpItemAbbrMatch = { fg = colors.crystalBlue, bg = "NONE" },
CmpItemAbbrMatchFuzzy = { fg = colors.crystalBlue, bg = "NONE" },
CmpItemMenu = { fg = colors.roninYellow, bg = "NONE" },
CmpItemKindField = { fg = colors.fujiWhite, bg = colors.sakuraPink },
CmpItemKindProperty = { fg = colors.fujiWhite, bg = colors.sakuraPink },
CmpItemKindEvent = { fg = colors.fujiWhite, bg = colors.sakuraPink },
CmpItemKindText = { fg = colors.fujiWhite, bg = colors.dragonBlue },
CmpItemKindEnum = { fg = colors.fujiWhite, bg = colors.crystalBlue },
CmpItemKindKeyword = { fg = colors.fujiWhite, bg = colors.springBlue },
CmpItemKindConstant = { fg = colors.fujiWhite, bg = colors.crystalBlue },
CmpItemKindConstructor = { fg = colors.fujiWhite, bg = colors.crystalBlue },
CmpItemKindReference = { fg = colors.fujiWhite, bg = colors.crystalBlue },
CmpItemKindFunction = { fg = colors.fujiWhite, bg = colors.oniViolet },
CmpItemKindStruct = { fg = colors.fujiWhite, bg = colors.oniViolet },
CmpItemKindClass = { fg = colors.fujiWhite, bg = colors.oniViolet },
CmpItemKindModule = { fg = colors.fujiWhite, bg = colors.oniViolet },
CmpItemKindOperator = { fg = colors.fujiWhite, bg = colors.oniViolet },
CmpItemKindVariable = { fg = colors.fujiWhite, bg = colors.roninYellow },
CmpItemKindFile = { fg = colors.fujiWhite, bg = colors.autumnYellow },
CmpItemKindUnit = { fg = colors.fujiWhite, bg = colors.autumnYellow },
CmpItemKindSnippet = { fg = colors.fujiWhite, bg = colors.autumnYellow },
CmpItemKindFolder = { fg = colors.fujiWhite, bg = colors.autumnYellow },
CmpItemKindMethod = { fg = colors.fujiWhite, bg = colors.autumnGreen },
CmpItemKindValue = { fg = colors.fujiWhite, bg = colors.autumnGreen },
CmpItemKindEnumMember = { fg = colors.fujiWhite, bg = colors.autumnGreen },
CmpItemKindInterface = { fg = colors.fujiWhite, bg = colors.waveRed },
CmpItemKindColor = { fg = colors.fujiWhite, bg = colors.waveAqua2 },
CmpItemKindTypeParameter = { fg = colors.fujiWhite, bg = colors.waveAqua2 },
CmpCustomSelectionBuffer = { fg = colors.fujiWhite, bg = colors.dragonBlue },
CmpCustomSelectionPath = { fg = colors.fujiWhite, bg = colors.autumnYellow },
CmpCustomSelectionCalculator = { fg = colors.fujiWhite, bg = colors.waveBlue2 },
CmpCustomSelectionNeorg = { fg = colors.fujiWhite, bg = colors.waveAqua1 },
CmpCustomSelectionEmoji = { fg = colors.fujiWhite, bg = colors.dragonBlue },
CmpCustomSelectionZsh = { fg = colors.fujiWhite, bg = colors.springGreen },
CmpCustomSelectionCrates = { fg = colors.fujiWhite, bg = colors.roninYellow },
CmpCustomSelectionCmdHistory = { fg = colors.fujiWhite, bg = colors.waveBlue2 },
CmpCustomSelectionRipgrep = { fg = colors.fujiWhite, bg = colors.dragonBlue },
CmpCustomSelectionNpm = { fg = colors.fujiWhite, bg = colors.peachRed },
CmpCustomSelectionCommit = { fg = colors.fujiWhite, bg = colors.peachRed },
CmpCustomSelectionSpell = { fg = colors.fujiWhite, bg = colors.waveRed },
TelescopeNormal = { bg = colors.sumiInk1 },
TelescopeBorder = { bg = colors.sumiInk1, fg = colors.sumiInk1 },
TelescopePromptBorder = { bg = colors.sumiInk0, fg = colors.sumiInk0 },
TelescopePromptTitle = { fg = colors.sumiInk0, bg = colors.oniViolet },
TelescopePreviewTitle = { fg = colors.sumiInk0, bg = colors.sakuraPink },
TelescopePreviewBorder = { bg = colors.sumiInk2, fg = colors.sumiInk2 },
TelescopePreviewNormal = { bg = colors.sumiInk2 },
TelescopeResultsTitle = { fg = "NONE", bg = "NONE" },
WinSeparator = { fg = colors.sumiInk4, bg = "NONE" },
MiniCursorword = { bg = colors.waveBlue2 },
MiniCursorwordCurrent = { bg = colors.waveBlue2 },
rainbowcol1 = { fg = colors.oniViolet },
rainbowcol2 = { fg = colors.crystalBlue },
rainbowcol3 = { fg = colors.lightBlue },
rainbowcol4 = { fg = colors.sakuraPink },
rainbowcol5 = { fg = colors.springGreen },
rainbowcol6 = { fg = colors.springViolet2 },
rainbowcol7 = { fg = colors.carpYellow },
packerSuccess = { fg = colors.autumnGreen, bg = "NONE" },
WinBar = { fg = colors.fujiWhite, bg = colors.sumiInk1 },
WinBarNC = { fg = colors.fujiWhite, bg = colors.sumiInk1 },
NeoTreeNormal = { bg = colors.sumiInk1 },
NeoTreeNormalNC = { bg = colors.sumiInk1 },
NoiceCmdlineIconCmdline = { fg = colors.oniViolet },
NoiceCmdlinePopupBorderCmdline = { fg = colors.oniViolet },
NoiceCmdlineIconFilter = { fg = colors.springGreen },
NoiceCmdlinePopupBorderFilter = { fg = colors.springGreen },
NoiceCmdLineIconLua = { fg = colors.crystalBlue },
NoiceCmdlinePopupBorderLua = { fg = colors.crystalBlue },
NoiceCmdlineIconHelp = { fg = colors.surimiOrange },
NoiceCmdlinePopupBorderHelp = { fg = colors.surimiOrange },
NoiceCmdLineIconSearch = { fg = colors.roninYellow },
NoiceCmdlinePopupBorderSearch = { fg = colors.roninYellow },
NoiceCmdlineIconIncRename = { fg = colors.peachRed },
NoiceCmdlinePopupdBorderIncRename = { fg = colors.peachRed },
Folded = { bg = colors.waveBlue1 },
UfoFoldedBg = { bg = colors.waveBlue1 },
TSRainbowRed = { fg = colors.peachRed },
TSRainbowYellow = { fg = colors.carpYellow },
TSRainbowBlue = { fg = colors.crystalBlue },
TSRainbowGreen = { fg = colors.springGreen },
TSRainbowViolet = { fg = colors.oniViolet },
TSRainbowCyan = { fg = colors.lightBlue },
SmoothCursorCursor = { fg = colors.roninYellow },
SmoothCursorTrailBig1 = { fg = colors.autumnYellow },
SmoothCursorTrailBig2 = { fg = colors.crystalBlue },
SmoothCursorTrailMedium = { fg = colors.oniViolet },
SmoothCursorTrailSmall = { fg = colors.springBlue },
SmoothCursorTrailXSmall = { fg = colors.waveAqua2 }
}
-- NOTE: Colors for SmoothCursor
vim.api.nvim_set_hl(0, "SmoothCursorCursor", { fg = colors.roninYellow })
vim.api.nvim_set_hl(0, "SmoothCursorTrailBig1", { fg = colors.autumnYellow })
vim.api.nvim_set_hl(0, "SmoothCursorTrailBig2", { fg = colors.crystalBlue })
vim.api.nvim_set_hl(0, "SmoothCursorTrailMedium", { fg = colors.oniViolet })
vim.api.nvim_set_hl(0, "SmoothCursorTrailSmall", { fg = colors.springBlue })
vim.api.nvim_set_hl(0, "SmoothCursorTrailXSmall", { fg = colors.waveAqua2 })
return overrides
end,
})

View File

@ -60,6 +60,7 @@ lazy.setup({
config = function()
require("plugins.configs.kanagawa")
vim.cmd.colorscheme("kanagawa")
vim.schedule(vim.cmd.KanagawaCompile)
end,
},
@ -195,7 +196,7 @@ lazy.setup({
"nvim-telescope/telescope-ui-select.nvim",
"debugloop/telescope-undo.nvim",
{ "nvim-telescope/telescope-smart-history.nvim", dependencies = "tami5/sqlite.lua" },
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
{ "nvim-telescope/telescope-fzf-native.nvim", build = "make" },
},
config = function()
require("plugins.configs.telescope-nvim")
@ -324,7 +325,7 @@ lazy.setup({
event = "VeryLazy",
dependencies = { "hrsh7th/nvim-cmp", "tzachar/fuzzy.nvim" },
},
{ "tzachar/cmp-fuzzy-path", dependencies = { "hrsh7th/nvim-cmp", "tzachar/fuzzy.nvim" } },
{ "tzachar/cmp-fuzzy-path", dependencies = { "hrsh7th/nvim-cmp", "tzachar/fuzzy.nvim" } },
{
"saecki/crates.nvim",
event = "VeryLazy",
@ -395,8 +396,8 @@ lazy.setup({
setopt = true,
relculright = false,
segments = {
{ text = { "%s" }, click = "v:lua.ScSa" },
{ text = { builtin.lnumfunc }, click = "v:lua.ScLa" },
{ text = { "%s" }, click = "v:lua.ScSa" },
{ text = { builtin.lnumfunc }, click = "v:lua.ScLa" },
{ text = { " ", builtin.foldfunc, " " }, click = "v:lua.ScFa" },
},
})
@ -476,7 +477,7 @@ lazy.setup({
"AckslD/nvim-neoclip.lua",
event = "VeryLazy",
dependencies = {
{ "tami5/sqlite.lua", module = "sqlite" },
{ "tami5/sqlite.lua", module = "sqlite" },
{ "nvim-telescope/telescope.nvim" },
},
config = function()
@ -791,8 +792,8 @@ lazy.setup({
{ cursor = "", texthl = "SmoothCursorTrailMedium" },
{ cursor = "", texthl = "SmoothCursorTrailMedium" },
{ cursor = "", texthl = "SmoothCursorTrailSmall" },
{ cursor = ".", texthl = "SmoothCursorTrailXSmall" },
{ cursor = ".", texthl = "SmoothCursorTrailXSmall" },
{ cursor = ".", texthl = "SmoothCursorTrailXSmall" },
{ cursor = ".", texthl = "SmoothCursorTrailXSmall" },
},
},
disabled_filetypes = { "NeogitNotification" },