From 3480f26268abd53cf123a3eadec1612e5fd76f85 Mon Sep 17 00:00:00 2001
From: fiplox <fiplox@filnar.com>
Date: Mon, 3 Jul 2023 22:20:19 +0200
Subject: [PATCH] fix!: adapt mappings, next/prev search now on k/K

---
 lua/config/mappings.lua | 20 ++++++++++----------
 lua/config/settings.lua | 11 +++++++++--
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/lua/config/mappings.lua b/lua/config/mappings.lua
index f8b4b5c..77a65d8 100644
--- a/lua/config/mappings.lua
+++ b/lua/config/mappings.lua
@@ -15,12 +15,12 @@ keymap('n', '<c-right>', '<cmd>vertical resize -2<cr>', opt)
 keymap('v', '<', '<gv', opt)
 keymap('v', '>', '>gv', opt)
 vim.cmd([[
-nnoremap <c-j> :m .+1<CR>==
-nnoremap <c-k> :m .-2<CR>==
-inoremap <c-j> <Esc>:m .+1<CR>==gi
-inoremap <c-k> <Esc>:m .-2<CR>==gi
-vnoremap <c-j> :m '>+1<CR>gv=gv
-vnoremap <c-k> :m '<-2<CR>gv=gv
+nnoremap M :m .+1<CR>==
+nnoremap L :m .-2<CR>==
+inoremap <c-M> <Esc>:m .+1<CR>==gi
+inoremap <c-L> <Esc>:m .-2<CR>==gi
+vnoremap M :m '>+1<CR>gv=gv
+vnoremap L :m '<-2<CR>gv=gv
 ]])
 
 keymap('n', 'Y', '"+y', opt)
@@ -95,8 +95,8 @@ function MapDHM()
 	keymap('x', 'e', 'k', { noremap = true })
 	keymap('n', 'l', 'i', { noremap = true })
 	keymap('n', 'N', 'J', { noremap = true })
-	keymap('n', 'j', 'n', { noremap = true })
-	keymap('n', 'J', 'N', { noremap = true })
+	keymap('n', 'k', 'n', { noremap = true })
+	keymap('n', 'K', 'N', { noremap = true })
 	keymap('n', '<nop>', 'I', { noremap = true })
 end
 
@@ -174,7 +174,7 @@ local opts = {
 	nowait = false, -- use `nowait` when creating keymaps
 }
 
-vim.keymap.set('n', 'L', function()
+--[[ vim.keymap.set('n', 'L', function()
 	local win = vim.api.nvim_get_current_win()
 	local qf_winid = vim.fn.getloclist(win, { winid = 0 }).winid
 	local action = qf_winid > 0 and 'lclose' or 'lopen'
@@ -185,7 +185,7 @@ vim.keymap.set('n', 'X', function()
 	local qf_winid = vim.fn.getqflist({ winid = 0 }).winid
 	local action = qf_winid > 0 and 'cclose' or 'copen'
 	vim.cmd('botright ' .. action)
-end, { noremap = true, silent = true })
+end, { noremap = true, silent = true }) ]]
 -- }}}
 -- leader mappings {{{
 -- TODO create entire treesitter section
diff --git a/lua/config/settings.lua b/lua/config/settings.lua
index 0415b4c..bfb5d08 100644
--- a/lua/config/settings.lua
+++ b/lua/config/settings.lua
@@ -5,12 +5,19 @@ g.mapleader = ' '
 g.tex_flavor = 'latex'
 g.c_syntax_for_h = true
 vim.cmd([[
+let g:VM_default_mappings 	    = 0
+let g:VM_mouse_mappings             = 1
 let g:VM_leader                     = {'default': ',', 'visual': ',', 'buffer': ','}
 let g:VM_maps                       = {}
-let g:VM_custom_motions             = {'n': 'j', 'l': 'i', 'e': 'k', 'i': 'l'}
 let g:VM_maps['i']                  = 'l'
 let g:VM_maps['I']                  = 'L'
-let g:VM_mouse_mappings             = 1
+let g:VM_maps['Find Under']         = '<c-k>'
+let g:VM_maps['Find Subword Under'] = '<c-k>'
+let g:VM_maps["Add Cursor Down"]    = '<C-n>'
+let g:VM_maps["Add Cursor Up"]      = '<C-e>'
+let g:VM_maps['Find Next']          = 'k'
+let g:VM_maps['Find Prev']          = 'K'
+let g:VM_custom_motions             = {'n': 'j', 'j': 'n', 'l': 'i', 'e': 'k', 'i': 'l'}
 ]])
 
 opt.termguicolors = true