diff --git a/lua/plugins/diffview.lua b/lua/plugins/diffview.lua index 23c554f..ab634bc 100644 --- a/lua/plugins/diffview.lua +++ b/lua/plugins/diffview.lua @@ -1,6 +1,7 @@ local actions = require("diffview.actions") require("diffview").setup({ + enhanced_diff_hl = true, keymaps = { view = { ["gq"] = "DiffviewClose", diff --git a/lua/plugins/gruvbox.lua b/lua/plugins/gruvbox.lua index e25d55e..37040e4 100644 --- a/lua/plugins/gruvbox.lua +++ b/lua/plugins/gruvbox.lua @@ -1,3 +1,5 @@ +local colors = require("gruvbox.palette").colors; + require("gruvbox").setup({ undercurl = true, underline = true, @@ -22,8 +24,23 @@ require("gruvbox").setup({ dark1 = '#242424', }, overrides = { - Pmenu = { bg = '#222222'} + Pmenu = { bg = '#222222'}, + GruvboxAquaSign = { bg = "NONE" }, + GruvboxBlueSign = { bg = "NONE" }, + GruvboxGreenSign = { bg = "NONE" }, + GruvboxOrangeSign = { bg = "NONE" }, + GruvboxPurpleSign = { bg = "NONE" }, + GruvboxRedSign = { bg = "NONE" }, + GruvboxYellowSign = { bg = "NONE" }, + SignColumn = { bg = "NONE" }, } }) vim.o.background = "dark" -vim.api.nvim_command([[colorscheme gruvbox]]) + +-- TODO: how to apply this when colorscheme changes? +vim.api.nvim_set_hl(0, 'DiffDelete', { bg = "none", fg = colors.dark2 }) +vim.api.nvim_set_hl(0, 'DiffviewDiffDelete', { bg = "none", fg = colors.dark2 }) +vim.api.nvim_set_hl(0, 'DiffviewDiffAddAsDelete', { bg = "#370000" }) +vim.api.nvim_set_hl(0, 'DiffAdd', { bg = "#393400" }) -- #122f2f +vim.api.nvim_set_hl(0, 'DiffChange', { bg = "#222a36" }) +vim.api.nvim_set_hl(0, 'DiffText', { bg = "#2f3f5c" }) -- #2f3f5c diff --git a/lua/user/settings.lua b/lua/user/settings.lua index 534d7bd..680d4e6 100644 --- a/lua/user/settings.lua +++ b/lua/user/settings.lua @@ -91,3 +91,5 @@ vim.api.nvim_create_autocmd('TextYankPost', { }) vim.opt.fillchars:append { diff = "╱" } + +vim.api.nvim_command([[colorscheme gruvbox]])