summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Luevano Alvarado <david@luevano.xyz>2023-06-04 02:44:33 -0600
committerDavid Luevano Alvarado <david@luevano.xyz>2023-06-04 02:44:33 -0600
commit523a7cc1b23b853007e200b73df8bc63b4339308 (patch)
tree298ad4a3738b0fa1992f6b4c19ab61ca19f8db3a
parent0b65026302b599ee83b8ba9ccc62c48ccb0a999e (diff)
merge(fix): changes from original repo (nvim-lua/kickstart.nvim@cdaa750c86cfc0c8f2fc1c8638b7296c327bf5a9)
-rw-r--r--lua/kickstart/plugins/autoformat.lua12
-rw-r--r--lua/plugins/dracula.lua2
-rw-r--r--lua/plugins/gitsigns.lua4
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', '<leader>gp', gitsigns.prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
- vim.keymap.set('n', '<leader>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', '<leader>ph', gitsigns.preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
end,
},