|
|
|
@ -123,7 +123,8 @@ require('lazy').setup({
|
|
|
|
|
changedelete = { text = '~' },
|
|
|
|
|
},
|
|
|
|
|
on_attach = function(bufnr)
|
|
|
|
|
vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
|
|
|
|
|
vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk,
|
|
|
|
|
{ buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
|
|
|
|
|
vim.keymap.set('n', '<leader>gn', require('gitsigns').next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
|
|
|
|
|
vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
|
|
|
|
|
end,
|
|
|
|
@ -218,7 +219,7 @@ require('lazy').setup({
|
|
|
|
|
--
|
|
|
|
|
-- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
|
|
|
|
|
{ import = 'custom.plugins' },
|
|
|
|
|
}, {})-- [[ Setting options ]]
|
|
|
|
|
}, {}) -- [[ Setting options ]]
|
|
|
|
|
-- See `:help vim.o`
|
|
|
|
|
-- NOTE: You can change these options as you wish!
|
|
|
|
|
|
|
|
|
@ -287,14 +288,13 @@ vim.o.colorcolumn = "80"
|
|
|
|
|
-- Keymaps for better default experience
|
|
|
|
|
-- See `:help vim.keymap.set()`
|
|
|
|
|
vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
|
|
|
|
|
vim.keymap.set('n', '<leader>pv', vim.cmd.Ex, { desc = "[P]roject [V]iew"})
|
|
|
|
|
vim.keymap.set('n', '<leader>pv', vim.cmd.Ex, { desc = "[P]roject [V]iew" })
|
|
|
|
|
|
|
|
|
|
-- Remap for dealing with word wrap
|
|
|
|
|
vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
|
|
|
|
vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
|
|
|
|
|
|
|
|
|
-- Move lines
|
|
|
|
|
--
|
|
|
|
|
vim.keymap.set('v', 'J', ":m '>+1<CR>gv=gv")
|
|
|
|
|
vim.keymap.set('v', 'K', ":m '<-2<CR>gv=gv")
|
|
|
|
|
|
|
|
|
@ -582,5 +582,8 @@ cmp.setup {
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require("venv-selector").setup({
|
|
|
|
|
poetry_path = "%~",
|
|
|
|
|
})
|
|
|
|
|
-- The line beneath this is called `modeline`. See `:help modeline`
|
|
|
|
|
-- vim: ts=2 sts=2 sw=2 et
|
|
|
|
|