nvim: mapping fixes

2 files changed, 17 insertions, 7 deletions

diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index df7e3d3..ad40879 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -39,16 +39,17 @@ map('n', '*', ':keepjumps normal! mi*`i<CR>')
 map('n', '#', ':keepjumps normal! mi#`i<CR> ')
 
 -- save file as sudo on files that require root permission
-map('c', 'w!!', 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!<CR>')
+map('c', 'w!!', 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!<CR>', { silent = false })
 
 -- replace ex mode with gq (format lines)
 map('n', 'Q', 'gq')
 
 -- set formatprg to sentences, for prose
-map('n', '<Leader>fp', ":set formatprg=~/.local/bin/sentences<CR>")
+map('n', '<Leader>fp', ":set formatprg=~/.local/bin/sentences<CR>", { silent = false })
 
 -- replace all is aliased to S.
-map('n', 'S', ':%s//g<Left><Left>')
+map('n', 'S', ':%s//g<Left><Left>', { silent = false })
+map('v', 'S', ':s//g<Left><Left>', { silent = false })
 
 -- if you like "Y" to work from the cursor to the end of line (which is more
 -- logical, but not Vi-compatible)
@@ -58,8 +59,8 @@ map('n', 'Y', 'y$', { noremap = false })
 map('n', '<Leader>b', ':ls<cr>:b<space>')
 
 -- up and down are more logical with g..
-map('n', 'k', 'gk')
-map('n', 'j', 'gj')
+map('n', 'k', '(v:count == 0 ? "gk" : "k")', { expr = true })
+map('n', 'j', '(v:count == 0 ? "gj" : "j")', { expr = true })
 map('i', '<Up>', '<Esc>gka')
 map('i', '<Down>', '<Esc>gja')
 
@@ -92,7 +93,16 @@ map('n', '<leader>nr', ':call CreateReference(expand("<cword>"))<CR>')
 -- create a new note
 map('n', '<leader>nn', ':call CreateNote()<CR>')
 
-vim.cmd("cnoremap <expr> %% getcmdtype() == ':' ? expand('%:h').'/' : '%%'")
+-- :%% to get current file path
+map('c', '%%', "getcmdtype() == ':' ? expand('%:h').'/' : '%%'", { expr = true, silent = false })
+
+-- reselect visual selection after indent
+map('v', '>', '>gv')
+map('v', '<', '<gv')
+
+-- keep cursor position after visual yank
+map('v', 'y', 'myy`y')
+map('v', 'Y', 'myY`y')
 
 -- plug mappings {{{ --
 
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index 34e68b2..895d6d9 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -35,7 +35,7 @@ bo.spelllang = "en_gb"
 wo.spell = false
 
 -- tab completion, zsh style
-o.wildmode = "full"
+o.wildmode = "longest:full,full"
 opt.wildignore = {
     '*.o', '*.obj', '*.class', '*.aux', '*.lof', '*.log', '*.lot', '*.fls',
     '*.toc', '*.fmt', '*.fot', '*.cb', '*.cb2', '.*.lb', '.dvi', '*.xdv',