feat(nvim): improve Neogit's appearance

This commit is contained in:
Price Hiller 2023-07-13 18:55:35 -05:00
parent c14ab8c21b
commit 3e479f5e09
Signed by: Price
SSH Key Fingerprint: SHA256:Y4S9ZzYphRn1W1kbJerJFO6GGsfu9O70VaBSxJO7dF8
4 changed files with 33 additions and 6 deletions

View File

@ -0,0 +1 @@
vim.opt_local.list = false

View File

@ -19,6 +19,7 @@ g.indent_blankline_filetype_exclude = {
"lazy", "lazy",
"NeogitStatus", "NeogitStatus",
"NeogitHelpPopup", "NeogitHelpPopup",
"NeogitPopup",
"NeogitLogView", "NeogitLogView",
} }

View File

@ -25,12 +25,36 @@ require("kanagawa").setup({
overrides = function(palette) overrides = function(palette)
local colors = palette.palette local colors = palette.palette
local overrides = { local overrides = {
NeogitHunkHeader = { fg = colors.oniViolet, bg = colors.sumiInk1 }, DiffAdd = { bg = colors.winterGreen, fg = colors.autumnGreen },
NeogitHunkHeaderHighlight = { fg = colors.winterYellow, bg = colors.oldWhite }, DiffDelete = { bg = colors.winterREd, fg = colors.autumnRed },
NeogitDiffContextHighlight = { link = "CursorLine" }, NeogitPopupSectionTitle = { fg = colors.crystalBlue },
NeogitDiffDelete = { bg = colors.winterRed, fg = colors.autumnRed }, NeogitPopupConfigEnabled = { fg = colors.springBlue, italic = true },
NeogitDiffAdd = { bg = colors.winterGreen, fg = colors.autumnGreen }, NeogitPopupActionkey = { fg = colors.surimiOrange },
NeogitCommitViewHeader = { fg = colors.autumnGreen, bg = colors.sumiInk0 }, NeogitPopupConfigKey = { fg = colors.peachRed },
NeogitHunkHeader = { fg = colors.crystalBlue, bg = colors.sumiInk2 },
NeogitHunkHeaderHighlight = { fg = colors.roninYellow, bg = colors.sumiInk1 },
NeogitBranch = { fg = colors.autumnYellow, bold = true },
NeogitRemote = { fg = colors.carpYellow, bold = true },
NeogitDiffContext = { bg = colors.sumiInk3 },
NeogitDiffContextHighlight = { bg = colors.sumiInk4 },
NeogitCursorLine = { link = "CursorLine" },
NeogitDiffDelete = { link = "DiffDelete" },
NeogitDiffDeleteHighlight = { link = "DiffDelete" },
NeogitDiffHeader = { fg = colors.oniViolet, bg = colors.sumiInk0, bold = true },
NeogitDiffHeaderHighlight = { fg = colors.sakuraPink, bg = colors.sumiInk0, bold = true },
NeogitDiffAdd = { link = "DiffAdd" },
NeogitDiffAddHighlight = { link = "DiffAdd" },
NeogitStagedChanges = { fg = colors.surimiOrange, bold = true },
NeogitUnpulledChanges = { fg = colors.peachRed, bold = true },
NeogitUnmergedChanges = { fg = colors.springGreen, bold = true },
NeogitUnstagedChanges = { fg = colors.peachRed, bold = true },
NeogitUntrackedFiles = { fg = colors.peachRed, bold = true },
NeogitRecentCommits = { fg = colors.crystalBlue, bold = true },
NeogitCommitViewHeader = { fg = colors.crystalBlue, bold = true, italic = true },
NeogitFilePath = { fg = colors.autumnYellow, italic = true },
NeogitNotificationInfo = { fg = colors.springGreen, bold = true },
NeogitNotificationWarning = { fg = colors.roninYellow, bold = true },
NeogitNotificationError = { fg = colors.samuraiRed, bold = true },
menuSel = { bg = colors.sumiInk0, fg = "NONE" }, menuSel = { bg = colors.sumiInk0, fg = "NONE" },
Pmenu = { fg = colors.fujiWhite, bg = colors.sumiInk2 }, Pmenu = { fg = colors.fujiWhite, bg = colors.sumiInk2 },
CmpItemAbbrDeprecated = { fg = colors.fujiGray, bg = "NONE" }, CmpItemAbbrDeprecated = { fg = colors.fujiGray, bg = "NONE" },

View File

@ -461,6 +461,7 @@ lazy.setup({
-- Better Git integration -- Better Git integration
{ {
"NeogitOrg/neogit", "NeogitOrg/neogit",
dev = true,
lazy = true, lazy = true,
opts = { opts = {
disable_insert_on_commit = "auto", disable_insert_on_commit = "auto",