From 523a7cc1b23b853007e200b73df8bc63b4339308 Mon Sep 17 00:00:00 2001 From: David Luevano Alvarado Date: Sun, 4 Jun 2023 02:44:33 -0600 Subject: merge(fix): changes from original repo (nvim-lua/kickstart.nvim@cdaa750c86cfc0c8f2fc1c8638b7296c327bf5a9) --- lua/kickstart/plugins/autoformat.lua | 12 +----------- lua/plugins/dracula.lua | 2 ++ lua/plugins/gitsigns.lua | 4 ++-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lua/kickstart/plugins/autoformat.lua b/lua/kickstart/plugins/autoformat.lua index bc56b15..88bbd57 100644 --- a/lua/kickstart/plugins/autoformat.lua +++ b/lua/kickstart/plugins/autoformat.lua @@ -28,9 +28,6 @@ return { return _augroups[client.id] end - -- Whenever an LSP attaches to a buffer, we will run this function. - -- - -- See `:help LspAttach` for more information about this autocmd event. vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('kickstart-lsp-attach-format', { clear = true }), -- This is where we attach the autoformatting for reasonable clients @@ -50,8 +47,6 @@ return { return end - -- Create an autocmd that will run *before* we save the buffer. - -- Run the formatting command for the LSP that has just attached. vim.api.nvim_create_autocmd('BufWritePre', { group = get_augroup(client), buffer = bufnr, @@ -60,12 +55,7 @@ return { return end - vim.lsp.buf.format { - async = false, - filter = function(c) - return c.id == client.id - end, - } + vim.lsp.buf.format({ async = false }) end, }) end, diff --git a/lua/plugins/dracula.lua b/lua/plugins/dracula.lua index 65f032e..b58ba34 100644 --- a/lua/plugins/dracula.lua +++ b/lua/plugins/dracula.lua @@ -1,6 +1,8 @@ return { 'Mofiqul/dracula.nvim', + lazy = false, priority = 1000, + opts = {}, config = function() vim.cmd.colorscheme 'dracula' end, diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua index 7745cf3..086fb91 100644 --- a/lua/plugins/gitsigns.lua +++ b/lua/plugins/gitsigns.lua @@ -10,8 +10,8 @@ return { }, on_attach = function(bufnr) local gitsigns = require('gitsigns') - vim.keymap.set('n', 'gp', gitsigns.prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' }) - vim.keymap.set('n', 'gn', gitsigns.next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' }) + vim.keymap.set('n', '[c', gitsigns.prev_hunk, { buffer = bufnr, desc = 'Go to Previous Hunk' }) + vim.keymap.set('n', ']c', gitsigns.next_hunk, { buffer = bufnr, desc = 'Go to Next Hunk' }) vim.keymap.set('n', 'ph', gitsigns.preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' }) end, }, -- cgit v1.2.3-54-g00ecf