diff options
| -rw-r--r-- | git/.gitconfig | 8 | ||||
| -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 |
3 files changed, 14 insertions, 6 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index 36eb23c..cf81f16 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -31,11 +31,11 @@ prune = true [advice] detachedHead = false -[diff] -tool = vscode +[merge] +tool = nvimdiff -[difftool "vscode"] -cmd = code --wait --diff $LOCAL $REMOTE +[mergetool "nvimdiff"] +layout = "MERGED" [trailer] separators = ":#" 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) |