add more plugins, change and remove several keymaps

This commit is contained in:
vladstojna 2023-06-06 05:15:43 +01:00 committed by vladstojna
parent 8d7a79a990
commit f215462b74
6 changed files with 14 additions and 36 deletions

View File

@ -2,19 +2,6 @@
local opts = { silent = true, noremap = true } local opts = { silent = true, noremap = true }
vim.keymap.set('n', '<C-PageDown>', ':BufferLineCycleNext<CR>', opts)
vim.keymap.set('n', '<C-PageUp>', ':BufferLineCyclePrev<CR>', opts)
vim.keymap.set('n', ']b', ':BufferLineCycleNext<CR>', opts)
vim.keymap.set('n', '[b', ':BufferLineCyclePrev<CR>', opts)
vim.keymap.set('n', '<C-S-PageDown>', ':BufferLineMoveNext<CR>', opts)
vim.keymap.set('n', '<C-S-PageUp>', ':BufferLineMovePrev<CR>', opts)
vim.keymap.set('n', '<leader>bp', ':BufferLineTogglePin<CR>', opts) vim.keymap.set('n', '<leader>bp', ':BufferLineTogglePin<CR>', opts)
vim.keymap.set('n', '<leader>bP', '<Cmd>BufferLineGroupClose ungrouped<CR>', vim.keymap.set('n', '<leader>bP', '<Cmd>BufferLineGroupClose ungrouped<CR>',
{ silent = true, noremap = true, desc = 'Delete non-pinned buffers' }) { silent = true, noremap = true, desc = 'Delete non-pinned buffers' })
for i = 1, 9, 1 do
vim.keymap.set('n', '<leader>' .. i, '<cmd>BufferLineGoToBuffer ' .. i .. '<CR>', opts)
end
vim.keymap.set('n', '<leader>$', '<cmd>BufferLineGoToBuffer -1<CR>', opts)

View File

@ -16,14 +16,14 @@ require('gitsigns').setup {
end end
-- Navigation -- Navigation
map('n', ']c', function() map('n', ']h', function()
if vim.wo.diff then return ']c' end if vim.wo.diff then return ']h' end
vim.schedule(function() gs.next_hunk() end) vim.schedule(function() gs.next_hunk() end)
return '<Ignore>' return '<Ignore>'
end, { expr = true, desc = "gitsigns: next hunk" }) end, { expr = true, desc = "gitsigns: next hunk" })
map('n', '[c', function() map('n', '[h', function()
if vim.wo.diff then return '[c' end if vim.wo.diff then return '[h' end
vim.schedule(function() gs.prev_hunk() end) vim.schedule(function() gs.prev_hunk() end)
return '<Ignore>' return '<Ignore>'
end, { expr = true, desc = "gitsigns: prev hunk" }) end, { expr = true, desc = "gitsigns: prev hunk" })

View File

@ -3,9 +3,8 @@ vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
vim.keymap.set("n", "J", "mzJ`z") vim.keymap.set("n", "J", "mzJ`z")
vim.keymap.set("n", "<C-d>", "<C-d>zz") vim.keymap.set("n", "<C-d>", "<C-d>zz")
vim.keymap.set("n", "<C-u>", "<C-u>zz")
vim.keymap.set("n", "<C-s>", "<C-u>zz") vim.keymap.set("n", "<C-s>", "<C-u>zz")
vim.keymap.set("n", "<PageDown>", "<C-d>zz")
vim.keymap.set("n", "<PageUp>", "<C-u>zz")
vim.keymap.set("n", "{", "{zz") vim.keymap.set("n", "{", "{zz")
vim.keymap.set("n", "}", "}zz") vim.keymap.set("n", "}", "}zz")
vim.keymap.set("n", "n", "nzzzv") vim.keymap.set("n", "n", "nzzzv")
@ -27,21 +26,9 @@ vim.keymap.set("i", "<C-d>", "<C-o>de")
vim.keymap.set("i", "<C-h>", "<Backspace>") vim.keymap.set("i", "<C-h>", "<Backspace>")
vim.keymap.set("i", "<C-l>", "<Del>") vim.keymap.set("i", "<C-l>", "<Del>")
-- vim.keymap.set("n", "Q", "<nop>")
vim.keymap.set("n", "<leader>f", vim.lsp.buf.format, vim.keymap.set("n", "<leader>f", vim.lsp.buf.format,
{ desc = "LSP: format buffer" }) { desc = "LSP: format buffer" })
vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz") vim.keymap.set("n", "<leader>ru",
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
vim.keymap.set("n", "<leader>su",
[[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]], [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
{ desc = "[S]earch and replace word [U]nder cursor" }) { desc = "[R]eplace word [U]nder cursor" })
vim.keymap.set("n", "<leader>px", "<cmd>!chmod +x %<CR>", { silent = true })
vim.keymap.set("n", "<S-h>", vim.cmd.bprevious,
{ silent = true, desc = "Go to previous buffer" })
vim.keymap.set("n", "<S-l>", vim.cmd.bnext,
{ silent = true, desc = "Go to previous buffer" })

View File

@ -23,3 +23,6 @@ vim.keymap.set('n', '<leader>sA',
vim.keymap.set('n', '<leader>sk', telescope_builtin.keymaps, vim.keymap.set('n', '<leader>sk', telescope_builtin.keymaps,
{ desc = '[S]earch [K]eymaps' } { desc = '[S]earch [K]eymaps' }
) )
vim.keymap.set('n', '<leader>o', require('telescope.builtin').buffers,
{ desc = '[o] Find existing buffers' }
)

View File

@ -304,7 +304,6 @@ pcall(require('telescope').load_extension, 'fzf')
-- See `:help telescope.builtin` -- See `:help telescope.builtin`
vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' }) vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
vim.keymap.set('n', '<leader>/', function() vim.keymap.set('n', '<leader>/', function()
-- You can pass additional configuration to telescope to change theme, layout, etc. -- You can pass additional configuration to telescope to change theme, layout, etc.
require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {

View File

@ -11,10 +11,12 @@ return {
"ahmedkhalf/project.nvim", "ahmedkhalf/project.nvim",
"famiu/bufdelete.nvim", "famiu/bufdelete.nvim",
"tpope/vim-repeat", "tpope/vim-repeat",
"tpope/vim-unimpaired",
"JoosepAlviste/nvim-ts-context-commentstring", "JoosepAlviste/nvim-ts-context-commentstring",
"sindrets/diffview.nvim", "sindrets/diffview.nvim",
"rhysd/git-messenger.vim", "rhysd/git-messenger.vim",
"lambdalisue/suda.vim", "lambdalisue/suda.vim",
"stevearc/dressing.nvim",
{ {
"windwp/nvim-ts-autotag", "windwp/nvim-ts-autotag",
dependencies = { dependencies = {
@ -95,8 +97,8 @@ return {
cmd = { "TodoTrouble", "TodoTelescope" }, cmd = { "TodoTrouble", "TodoTelescope" },
config = true, config = true,
keys = { keys = {
{ "]t", function() require("todo-comments").jump_next() end, desc = "Next todo comment" }, { "]/", function() require("todo-comments").jump_next() end, desc = "Next todo comment" },
{ "[t", function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" }, { "[/", function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" },
{ "<leader>xt", "<cmd>TodoTrouble<cr>", desc = "Todo (Trouble)" }, { "<leader>xt", "<cmd>TodoTrouble<cr>", desc = "Todo (Trouble)" },
{ "<leader>xT", "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme (Trouble)" }, { "<leader>xT", "<cmd>TodoTrouble keywords=TODO,FIX,FIXME<cr>", desc = "Todo/Fix/Fixme (Trouble)" },
{ "<leader>st", "<cmd>TodoTelescope<cr>", desc = "Todo" }, { "<leader>st", "<cmd>TodoTelescope<cr>", desc = "Todo" },