change some mappings

diff --git a/stow/nvim/.config/nvim/lua/mappings.lua b/stow/nvim/.config/nvim/lua/mappings.lua
index 4405876bdf00143947ff5dc836daef7c2ea4f2ea..fdfbae78519b2c960074657d91601cf48e641ba5 100644 (file)
--- a/stow/nvim/.config/nvim/lua/mappings.lua
+++ b/stow/nvim/.config/nvim/lua/mappings.lua
@@ -15,50 +15,51 @@ function vmap(shortcut, command)
 end
 
 vim.g.mapleader = " "
-nmap("<F8>", "]s")
-nmap("<S-F8>", "[s")
-nmap("Z", "Y")
-nmap("<leader>-", "i•")
-nmap("<C-k>", "<C-W>k")
-nmap("<C-j>", "<C-W>j")
-nmap("<C-h>", "<C-W>h")
-nmap("<C-l>", "<C-W>l")
-nmap("<Leader>i", "a'\" <<  << \"' <Esc>6hi")
-nmap("<Leader>a", "a'{}' <Esc>2hi")
-nmap("<Leader>A", "a'\"+  +\"' <Esc>4hi")
-nmap("<Leader>fd", "msgg=G`s")
-imap("kj", "<Esc>")
-nmap("<leader>j", ":bprev<CR>")
-nmap("<leader>k", ":bnext<CR>")
-nmap("<C-l>", "<C-W>l")
-vmap("<leader>c", "\"*y")
-nmap("<leader>v", "\"*p")
-nmap("<S-Up>", ":m .-2<CR>==")
-vmap("<S-Up>", ":m '<-2<CR>gv=gv")
-nmap("<S-Down>", ":m .+1<CR>==")
-vmap("<S-Down>", ":m '>+1<CR>gv=gv")
-nmap("<S-Right>", ">>")
-vmap("<S-Right>", ":><CR>gv")
-vmap("<S-Left>", " :<<CR>gv")
-nmap("<S-Left>", "<<")
-nmap("<leader>w", ":w<CR>")
-nmap("<leader>wj", ":wa<CR>")
-nmap("<leader>wk", ":xall<CR>")
-vmap(".", ":normal.<CR>")
--- vmap("<leader>tt", ":Tabular /^[^-+=]*\zs\S*=/l1l1<cr>")
--- vmap("<leader>t,", ":Tabular /,\zs/l1l1<cr>")
--- vmap("<leader>t<space>", " :Tabular /\s\+\zs/l1l0<cr>")
--- vmap("<leader>t:", "       :Tabular /:\zs/l1l0<cr>")
--- vmap("<leader>t(", " :Tabular /(/l1l0<cr>")
-nmap("<Leader>s", "yiw/<C-R>/\\|<C-R>\"<cr>")
-vmap("<Leader>s", "y/<C-R>/\\|<C-R>\"<cr>")
-nmap("<Leader>ll", "iprint_log(\"\");<Esc>V=0f(la")
-nmap("<leader><tab>", ":Files<cr>")
-imap("<F4>", "<Esc>:Explore<CR>")
-nmap("<F4>", ":Explore<CR>")
+vim.keymap.set("n", "<F8>", "]s")
+vim.keymap.set("n", "<S-F8>", "[s")
+vim.keymap.set("n", "Z", "Y")
+vim.keymap.set("n", "<leader>-", "i•")
+vim.keymap.set("n", "<Leader>i", "a'\" <<  << \"' <Esc>6hi")
+vim.keymap.set("n", "<Leader>a", "a'{}' <Esc>2hi")
+vim.keymap.set("n", "J", "mzJ`z")
+vim.keymap.set("n", "<Leader>A", "a'\"+  +\"' <Esc>4hi")
+vim.keymap.set("n", "<Leader>fd", "msgg=G`s")
+vim.keymap.set("i", "kj", "<Esc>")
+vim.keymap.set("n", "n", "nzz")
+vim.keymap.set("n", "N", "Nzz")
+vim.keymap.set("n", "<C-d>", "<C-d>zz")
+vim.keymap.set("n", "<C-u>", "<C-u>zz")
+vim.keymap.set("n", "<leader>j", ":bprev<CR>")
+vim.keymap.set("n", "<leader>k", ":bnext<CR>")
+vim.keymap.set("n", "<C-l>", "<C-W>l")
+vim.keymap.set("v", "<leader>c", "\"*y")
+vim.keymap.set("n", "<leader>v", "\"*p")
+vim.keymap.set("n", "<leader>E", ":Explore<CR>")
+vim.keymap.set("x", "<leader>p", "\"_dP")
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+vim.keymap.set("n", "<S-Right>", ">>")
+vim.keymap.set("v", "<S-Right>", ":><CR>gv")
+vim.keymap.set("v", "<S-Left>", " :<<CR>gv")
+vim.keymap.set("n", "<S-Left>", "<<")
+vim.keymap.set("n", "<leader>w", ":w<CR>")
+vim.keymap.set("n", "<leader>wj", ":wa<CR>")
+vim.keymap.set("n", "<leader>wk", ":xall<CR>")
+vim.keymap.set("v", ".", ":normal.<CR>")
+vim.keymap.set("n", "<Leader>s", "yiw/<C-R>/\\|<C-R>\"<cr>")
+vim.keymap.set("v", "<Leader>s", "y/<C-R>/\\|<C-R>\"<cr>")
+vim.keymap.set("n", "<Leader>ll", "iprint_log(\"\");<Esc>V=0f(la")
+vim.keymap.set("n", "<leader><tab>", ":Files<cr>")
+vim.keymap.set("i", "<F4>", "<Esc>:Explore<CR>")
+vim.keymap.set("n", "<F4>", ":Explore<CR>")
+vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
 
-nmap("<Leader>r", ":Reload<CR>:echom 'config relaoded!'<CR>")
-nmap("<leader>e", ":tabedit $MYVIMRC<CR>:lcd %:p:h<cr>")
+vim.keymap.set("n", "<S-Right>", ">>")
+vim.keymap.set("v", "<S-Right>", ":><CR>gv")
+vim.keymap.set("v", "<S-Left>", " :<<CR>gv")
+vim.keymap.set("n", "<S-Left>", "<<")
+vim.keymap.set("n", "<Leader>r", ":Reload<CR>:echom 'config relaoded!'<CR>")
+vim.keymap.set("n", "<leader>e", ":tabedit $MYVIMRC<CR>:lcd %:p:h<cr>")
 
 vim.keymap.set('n', "<Leader>r", function ()
     for k in pairs(package.loaded) do
@@ -69,6 +70,13 @@ vim.keymap.set('n', "<Leader>r", function ()
 end
 )
 
+
+-- Quickfix nav
+vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
+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")
+
 -- telescope
 local builtin = require('telescope.builtin')
 vim.keymap.set('n', '<leader>ff', builtin.find_files, {})