diff options
author | Toby Vincent <tobyv13@gmail.com> | 2022-07-13 10:54:56 -0500 |
---|---|---|
committer | Toby Vincent <tobyv13@gmail.com> | 2022-07-13 10:54:56 -0500 |
commit | 31e41262e825b130f2f103befbd7986f458a87fa (patch) | |
tree | 2fc81a1dc5e94aa49ffa3af385b90f0d2628c865 /nvim/.config | |
parent | 7eb7706b8fdf56dc84d1f59d17fe76869013c060 (diff) |
feat(git): improve git diff and merge with proper nvim support
Diffstat (limited to 'nvim/.config')
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/git-conflict.lua | 8 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/git-conflict.lua b/nvim/.config/nvim/lua/tobyvin/plugins/git-conflict.lua index e853e4c..30e42e4 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/git-conflict.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/git-conflict.lua @@ -7,7 +7,13 @@ M.setup = function() return end - git_conflict.setup() + git_conflict.setup({ + disable_diagnostics = true, + highlights = { + incoming = "diffText", + current = "diffAdd", + }, + }) end return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua b/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua index b188abf..d8dbc0b 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua @@ -16,11 +16,13 @@ M.setup = function() sources = { -- Code Actions + code_actions.gitrebase, code_actions.gitsigns, code_actions.shellcheck, -- Diagnostics diagnostics.markdownlint, + diagnostics.gitlint, -- diagnostics.luacheck, diagnostics.shellcheck, diagnostics.checkmake, @@ -33,7 +35,7 @@ M.setup = function() formatting.stylua, formatting.shfmt, }, - on_attach = lsp.on_attach + on_attach = lsp.on_attach, -- on_attach = function(client, bufnr) -- client.server_capabilities.documentFormattingProvider = client.supports_method("textDocument/formatting") -- lsp.on_attach(client, bufnr) |