warg/nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up keymaps

Browse Source
This commit is contained in:
Oscar Wallberg
2023-09-24 02:43:23 +02:00
parent 7f0d1706b3
commit 337a65e87f
17 changed files with 102 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/plugins/config/aerial.lua
+6 -2
View File
@@ -24,8 +24,12 @@ require("aerial").setup({
unlisted_buffers = true,
},
on_attach = function (bufnr)
vim.api.nvim_buf_set_keymap(bufnr, "n", "<leader>at", "<cmd>AerialToggle!<CR>", {})
vim.keymap.set(
"n",
"<leader>at",
function () vim.cmd.AerialToggle({ bang = true, }) end,
{ buffer = bufnr, }
)
end,
show_guides = true,
})
lua/plugins/config/bufdelete.lua
+1 -1
View File
@@ -19,6 +19,6 @@
vim.keymap.set(
"n",
"<C-w>q",
":Bwipeout<CR>",
vim.cmd.Bwipeout,
{ remap = false, silent = true, }
)
lua/plugins/config/dap.lua
+12 -14
View File
@@ -16,17 +16,18 @@
-- https://github.com/mfussenegger/nvim-dap
vim.fn.execute("nnoremap <silent> <F5> :lua require'dap'.continue()<CR>")
vim.fn.execute("nnoremap <silent> <F10> :lua require'dap'.step_over()<CR>")
vim.fn.execute("nnoremap <silent> <F11> :lua require'dap'.step_into()<CR>")
vim.fn.execute("nnoremap <silent> <F12> :lua require'dap'.step_out()<CR>")
local dap = require("dap")
vim.keymap.set("n", "<F5>", dap.continue)
vim.keymap.set("n", "<F10>", dap.step_over)
vim.keymap.set("n", "<F11>", dap.step_into)
vim.keymap.set("n", "<F12>", dap.step_out)
local utils = require("utils")
local M = {}
local env_ok = false
local dap = nil
local function check_env()
utils.assert_installed("python3")
@@ -38,15 +39,12 @@ local function start(config)
if not env_ok then
check_env()
end
if not dap then
dap = require("dap")
dap.adapters.python = {
type = "executable",
command = "python",
args = { "-m", "debugpy.adapter", },
cwd = vim.fn.getcwd(),
}
end
dap.adapters.python = {
type = "executable",
command = "python",
args = { "-m", "debugpy.adapter", },
cwd = vim.fn.getcwd(),
}
dap.run(config)
-- List of events described at https://microsoft.github.io/debug-adapter-protocol/specification#Events
-- Also see :h dap-extensions
lua/plugins/config/diffview.lua
+18 -17
View File
@@ -41,6 +41,15 @@ require("diffview").setup({
keymaps = {
file_panel = {
["<cr>"] = false,
{
"n",
"<CR>",
function ()
actions.select_entry()
vim.cmd.wincmd("l")
end,
{ desc = "Open the current file in diffview", },
},
{
"n",
"s",
@@ -56,31 +65,23 @@ require("diffview").setup({
{
"n",
"cc",
":G commit | wincmd J<CR>",
function ()
vim.cmd.G("commit")
vim.cmd.wincmd("J")
end,
{ desc = "Commit staged changes", },
},
{
"n",
"ca",
":G commit --amend | wincmd J<CR>",
function ()
vim.cmd.G("commit --amend")
vim.cmd.wincmd("J")
end,
{ desc = "Amend the last commit", },
},
},
},
})
local opts = { silent = true, remap = false, }
vim.keymap.set("n", "<leader>gg", ":DiffviewOpen<CR>", opts)
vim.api.nvim_create_autocmd("FileType", {
pattern = "DiffviewFiles",
callback = function ()
vim.keymap.set(
"n",
"<CR>",
function ()
actions.select_entry()
vim.fn.execute("wincmd l")
end,
{ silent = true, noremap = true, buffer = true, })
end,
})
vim.keymap.set("n", "<leader>gg", vim.cmd.DiffviewOpen)
lua/plugins/config/flog.lua
+1 -1
View File
@@ -16,4 +16,4 @@
-- https://github.com/rbong/vim-flog
vim.keymap.set("n", "<leader>gl", ":Flog<CR>", { remap = false, silent = true, })
vim.keymap.set("n", "<leader>gl", vim.cmd.Flog)
lua/plugins/config/fugitive.lua
+6 -6
View File
@@ -17,15 +17,15 @@
-- https://github.com/tpope/vim-fugitive
local function git_status_tab()
vim.fn.execute("tabnew")
vim.fn.execute("leftabove vertical G")
vim.fn.execute("vertical resize 60 | set wfw")
vim.cmd.tabnew()
vim.cmd("leftabove vertical G")
vim.cmd("vertical resize 60")
vim.cmd.set("wfw")
end
local opts = { silent = true, remap = false, }
vim.keymap.set("n", "<leader>gd", ":Gdiffsplit<CR>", opts)
vim.keymap.set("n", "<leader>gd", vim.cmd.Gdiffsplit)
-- Only used if diffview is not available
if not pcall(require, "diffview") then
vim.keymap.set("n", "<leader>gg", git_status_tab, opts)
vim.keymap.set("n", "<leader>gg", git_status_tab)
end
lua/plugins/config/gitsigns.lua
+16 -12
View File
@@ -16,21 +16,25 @@
-- https://github.com/lewis6991/gitsigns.nvim
local function map(bufnr, mode, l, r, opts)
opts = opts or {}
opts.buffer = bufnr
vim.keymap.set(mode, l, r, opts)
end
require("gitsigns").setup({
on_attach = function (bufnr)
local gs = package.loaded.gitsigns
map(bufnr, "n", "<leader>gv", gs.select_hunk)
map(bufnr, { "n", "x", }, "<leader>gr", ":Gitsigns reset_hunk<CR>") -- gs.reset_hunk() doesn't work with selected lines
map(bufnr, "n", "<leader>g?", gs.preview_hunk)
map(bufnr, "n", "<leader>gb", function ()
gs.blame_line { full = true, }
end)
vim.keymap.set("n", "<leader>gv", gs.select_hunk, { buffer = bufnr, })
vim.keymap.set("n", "<leader>gr", gs.reset_hunk, { buffer = bufnr, })
vim.keymap.set(
"x",
"<leader>gr",
":Gitsigns reset_hunk<CR>",
{ buffer = bufnr, }
)
vim.keymap.set("n", "<leader>g?", gs.preview_hunk, { buffer = bufnr, })
vim.keymap.set(
"n",
"<leader>gb",
function ()
gs.blame_line { full = true, ignore_whitespace = true, }
end,
{ buffer = bufnr, })
end,
signs = {
untracked = { text = "│", },
lua/plugins/config/move.lua
+4 -4
View File
@@ -17,10 +17,10 @@
-- https://github.com/fedepujol/move.nvim
local opts = { noremap = true, silent = true, }
vim.keymap.set("n", "<A-j>", ":MoveLine(1)<CR>", opts)
vim.keymap.set("n", "<A-k>", ":MoveLine(-1)<CR>", opts)
vim.keymap.set("n", "<A-h>", ":MoveHChar(-1)<CR>", opts)
vim.keymap.set("n", "<A-l>", ":MoveHChar(1)<CR>", opts)
vim.keymap.set("n", "<A-j>", function () vim.cmd.MoveLine(1) end, opts)
vim.keymap.set("n", "<A-k>", function () vim.cmd.MoveLine(-1) end, opts)
vim.keymap.set("n", "<A-h>", function () vim.cmd.MoveHChar(-1) end, opts)
vim.keymap.set("n", "<A-l>", function () vim.cmd.MoveHChar(1) end, opts)
vim.keymap.set("x", "<A-j>", ":MoveBlock(1)<CR>", opts)
vim.keymap.set("x", "<A-k>", ":MoveBlock(-1)<CR>", opts)
vim.keymap.set("x", "<A-h>", ":MoveHBlock(-1)<CR>", opts)
lua/plugins/config/notify.lua
+1 -3
View File
@@ -28,7 +28,5 @@ vim.notify = notify
if has_telescope then
telescope.load_extension("notify")
vim.keymap.set(
"n", "<leader>fn", function () telescope.extensions.notify.notify() end
)
vim.keymap.set("n", "<leader>fn", telescope.extensions.notify.notify)
end
lua/plugins/config/telescope.lua
+7 -5
View File
@@ -19,10 +19,14 @@
local builtin = require("telescope.builtin")
vim.keymap.set(
"n", "<leader>ff", function () builtin.find_files({ hidden = true, }) end
"n",
"<leader>ff",
function () builtin.find_files({ hidden = true, }) end
)
vim.keymap.set(
"n", "<leader>fr", function () builtin.oldfiles({ hidden = true, }) end
"n",
"<leader>fr",
function () builtin.oldfiles({ hidden = true, }) end
)
vim.keymap.set(
"n", "<leader>fg", function ()
@@ -40,6 +44,4 @@ vim.keymap.set(
)
end
)
vim.keymap.set(
"n", "<leader>fb", function () builtin.buffers() end
)
vim.keymap.set("n", "<leader>fb", builtin.buffers)
lua/plugins/config/tree.lua
+1 -6
View File
@@ -64,9 +64,4 @@ require("nvim-tree").setup({
},
})
local opts = { remap = false, silent = true, }
vim.keymap.set(
"n", "<leader>tt",
function () require("nvim-tree.api").tree.toggle() end,
opts
)
vim.keymap.set("n", "<leader>tt", require("nvim-tree.api").tree.toggle)
lua/plugins/config/winresizer.lua
+1 -2
View File
@@ -20,5 +20,4 @@ vim.g.winresizer_vert_resize = "5"
vim.g.winresizer_horiz_resize = "5"
vim.g.winresizer_start_key = ""
local opts = { remap = false, silent = true, }
vim.keymap.set("n", "<C-W>r", ":WinResizerStartResize<CR>", opts)
vim.keymap.set("n", "<C-W>r", vim.cmd.WinResizerStartResize)
lua/plugins/config/winshift.lua
+5 -1
View File
@@ -16,4 +16,8 @@
-- https://github.com/sindrets/winshift.nvim
vim.keymap.set("n", "<C-W>m", ":WinShift<CR>", { remap = false, })
vim.keymap.set(
"n",
"<C-W>m",
vim.cmd.WinShift
)