From 8020639f31c17070040c4e18566b2ec33620a727 Mon Sep 17 00:00:00 2001
From: Oliver Hartmann <oliver.hartmann@continental-corporation.com>
Date: Fri, 1 Jul 2022 16:44:37 +0200
Subject: [PATCH] use x for visual mode instead of v

---
 lua/my_keymappings.lua          | 54 ++++++++++++---------------------
 lua/setup/my_command_center.lua |  4 +--
 2 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/lua/my_keymappings.lua b/lua/my_keymappings.lua
index 4a4d2d6..5e750c0 100644
--- a/lua/my_keymappings.lua
+++ b/lua/my_keymappings.lua
@@ -1,49 +1,35 @@
 vim.g.mapleader = ','
-vim.keymap.set('n', '<space>', 'nil', { noremap = true, silent = true })
+local opts = { noremap = true, silent = true }
+vim.keymap.set('n', '<space>', 'nil', opts)
 
 -- Tabs
-vim.keymap.set('n', '<S-Right>', ':tabnext<CR>', { noremap = true, silent = true })
-vim.keymap.set('n', '<S-Left>', ':tabprevious<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<S-Right>', ':tabnext<CR>', opts)
+vim.keymap.set('n', '<S-Left>', ':tabprevious<CR>', opts)
 -- Split movement
-vim.keymap.set('n', '<A-Up>', ':wincmd k<CR>', { noremap = true, silent = true })
-vim.keymap.set('n', '<A-Down>', ':wincmd j<CR>', { noremap = true, silent = true })
-vim.keymap.set('n', '<A-Left>', ':wincmd h<CR>', { noremap = true, silent = true })
-vim.keymap.set('n', '<A-Right>', ':wincmd l<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<A-Up>', ':wincmd k<CR>', opts)
+vim.keymap.set('n', '<A-Down>', ':wincmd j<CR>', opts)
+vim.keymap.set('n', '<A-Left>', ':wincmd h<CR>', opts)
+vim.keymap.set('n', '<A-Right>', ':wincmd l<CR>', opts)
 
 vim.keymap.set('n', '<C-S>', ':wa | wshada<CR>')
 
 -- Linewrap and jumping
-vim.keymap.set('n', 'k', 'gk')
-vim.keymap.set('n', 'j', 'gj')
-vim.keymap.set('n', '0', 'g0')
-vim.keymap.set('n', '$', 'g$')
-vim.keymap.set('n', '<Up>', 'gk')
-vim.keymap.set('n', '<Down>', 'gj')
-vim.keymap.set('n', '<Home>', 'g<Home>')
-vim.keymap.set('n', '<End>', 'g<End>')
-vim.keymap.set('v', 'k', 'gk')
-vim.keymap.set('v', 'j', 'gj')
-vim.keymap.set('v', '0', 'g0')
-vim.keymap.set('v', '$', 'g$')
-vim.keymap.set('v', '<Up>', 'gk')
-vim.keymap.set('v', '<Down>', 'gj')
-vim.keymap.set('v', '<Home>', 'g<Home>')
-vim.keymap.set('v', '<End>', 'g<End>')
+vim.keymap.set({ 'n', 'x' }, 'k', 'gk', opts)
+vim.keymap.set({ 'n', 'x' }, 'j', 'gj', opts)
+vim.keymap.set({ 'n', 'x' }, '0', 'g0', opts)
+vim.keymap.set({ 'n', 'x' }, '$', 'g$', opts)
+vim.keymap.set({ 'n', 'x' }, '<Up>', 'gk', opts)
+vim.keymap.set({ 'n', 'x' }, '<Down>', 'gj', opts)
+vim.keymap.set({ 'n', 'x' }, '<Home>', 'g<Home>', opts)
+vim.keymap.set({ 'n', 'x' }, '<End>', 'g<End>', opts)
 
-vim.keymap.set('v', '<', '<gv')
-vim.keymap.set('v', '>', '>gv')
+vim.keymap.set('x', '<', '<gv')
+vim.keymap.set('x', '>', '>gv')
 
 -- Highlight word under cursor
-vim.keymap.set('n', 'ü', ':let @/=\'\\<<C-R>=expand("<cword>")<CR>\\>\'<CR>:set hls<CR>', { noremap = true, silent = true })
-vim.keymap.set('v', 'ü', "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>")
-vim.keymap.set('v', 'ü', "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>", { noremap = true, silent = true })
 vim.keymap.set('n', "'", ':let @/=\'\\<<C-R>=expand("<cword>")<CR>\\>\'<CR>:set hls<CR>', { noremap = true, silent = true })
-vim.keymap.set('v', "'", "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>")
-vim.keymap.set('v', "'", "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>", { noremap = true, silent = true })
+-- vim.keymap.set('v', "'", "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>")
+vim.keymap.set('x', "'", "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>", { noremap = true, silent = true })
 
 -- Close Buffer
 vim.keymap.set('n', '<C-w>', ':bd<CR>')
-
--- <Tab> to navigate the completion menu
-vim.keymap.set('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<Tab>"', { expr = true })
-vim.keymap.set('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"', { expr = true })
diff --git a/lua/setup/my_command_center.lua b/lua/setup/my_command_center.lua
index 15ab99c..1ba7d7b 100644
--- a/lua/setup/my_command_center.lua
+++ b/lua/setup/my_command_center.lua
@@ -16,7 +16,7 @@ command_center.add({
     cmd = '<CMD>Telescope command_center<CR>',
     keybindings = {
       { 'n', '<Leader>p', noremap },
-      { 'v', '<Leader>p', noremap },
+      { 'x', '<Leader>p', noremap },
     },
   },
   {
@@ -221,7 +221,7 @@ command_center.add({
     description = 'Comment line',
     cmd = '<Plug>(comment_toggle_linewise_visual)gv',
     keybindings = {
-      { 'v', '<c-_>', silent_noremap },
+      { 'x', '<c-_>', silent_noremap },
     },
   },
   {