|
@@ -1,18 +1,17 @@
|
|
|
-vim.api.nvim_set_keymap('n', '<Space>', '<NOP>', { noremap = true, silent = true })
|
|
|
+vim.api.nvim_set_keymap('n', '<Space>', '<NOP>', {noremap = true, silent = true})
|
|
|
vim.g.mapleader = ' '
|
|
|
|
|
|
-- no hl
|
|
|
-vim.api.nvim_set_keymap('n', '<Leader>h', ':set hlsearch!<CR>', { noremap = true, silent = true })
|
|
|
+vim.api.nvim_set_keymap('n', '<Leader>h', ':set hlsearch!<CR>', {noremap = true, silent = true})
|
|
|
|
|
|
-- explorer
|
|
|
-vim.api.nvim_set_keymap('n', '<Leader>e', ':NvimTreeToggle<CR>', { noremap = true, silent = true })
|
|
|
-
|
|
|
+vim.api.nvim_set_keymap('n', '<Leader>e', ':NvimTreeToggle<CR>', {noremap = true, silent = true})
|
|
|
|
|
|
-- better window movement
|
|
|
-vim.api.nvim_set_keymap('n', '<C-h>', '<C-w>h', { silent = true })
|
|
|
-vim.api.nvim_set_keymap('n', '<C-j>', '<C-w>j', { silent = true })
|
|
|
-vim.api.nvim_set_keymap('n', '<C-k>', '<C-w>k', { silent = true })
|
|
|
-vim.api.nvim_set_keymap('n', '<C-l>', '<C-w>l', { silent = true })
|
|
|
+vim.api.nvim_set_keymap('n', '<C-h>', '<C-w>h', {silent = true})
|
|
|
+vim.api.nvim_set_keymap('n', '<C-j>', '<C-w>j', {silent = true})
|
|
|
+vim.api.nvim_set_keymap('n', '<C-k>', '<C-w>k', {silent = true})
|
|
|
+vim.api.nvim_set_keymap('n', '<C-l>', '<C-w>l', {silent = true})
|
|
|
|
|
|
-- TODO fix this
|
|
|
-- Terminal window navigation
|
|
@@ -37,24 +36,22 @@ vim.cmd([[
|
|
|
nnoremap <silent> <C-Right> :vertical resize +2<CR>
|
|
|
]])
|
|
|
|
|
|
-
|
|
|
-- better indenting
|
|
|
-vim.api.nvim_set_keymap('v', '<', '<gv', { noremap = true, silent = true })
|
|
|
-vim.api.nvim_set_keymap('v', '>', '>gv', { noremap = true, silent = true })
|
|
|
+vim.api.nvim_set_keymap('v', '<', '<gv', {noremap = true, silent = true})
|
|
|
+vim.api.nvim_set_keymap('v', '>', '>gv', {noremap = true, silent = true})
|
|
|
|
|
|
-- I hate escape
|
|
|
-vim.api.nvim_set_keymap('i', 'jk', '<ESC>', { noremap = true, silent = true })
|
|
|
-vim.api.nvim_set_keymap('i', 'kj', '<ESC>', { noremap = true, silent = true })
|
|
|
-vim.api.nvim_set_keymap('i', 'jj', '<ESC>', { noremap = true, silent = true })
|
|
|
+vim.api.nvim_set_keymap('i', 'jk', '<ESC>', {noremap = true, silent = true})
|
|
|
+vim.api.nvim_set_keymap('i', 'kj', '<ESC>', {noremap = true, silent = true})
|
|
|
+vim.api.nvim_set_keymap('i', 'jj', '<ESC>', {noremap = true, silent = true})
|
|
|
|
|
|
-- Tab switch buffer
|
|
|
-vim.api.nvim_set_keymap('n', '<TAB>', ':bnext<CR>', { noremap = true, silent = true })
|
|
|
-vim.api.nvim_set_keymap('n', '<S-TAB>', ':bprevious<CR>', { noremap = true, silent = true })
|
|
|
+vim.api.nvim_set_keymap('n', '<TAB>', ':bnext<CR>', {noremap = true, silent = true})
|
|
|
+vim.api.nvim_set_keymap('n', '<S-TAB>', ':bprevious<CR>', {noremap = true, silent = true})
|
|
|
|
|
|
-- Move selected line / block of text in visual mode
|
|
|
-vim.api.nvim_set_keymap('x', 'K', ':move \'<-2<CR>gv-gv', { noremap = true, silent = true })
|
|
|
-vim.api.nvim_set_keymap('x', 'J', ':move \'>+1<CR>gv-gv', { noremap = true, silent = true })
|
|
|
-
|
|
|
+vim.api.nvim_set_keymap('x', 'K', ':move \'<-2<CR>gv-gv', {noremap = true, silent = true})
|
|
|
+vim.api.nvim_set_keymap('x', 'J', ':move \'>+1<CR>gv-gv', {noremap = true, silent = true})
|
|
|
|
|
|
-- Better nav for omnicomplete
|
|
|
vim.cmd('inoremap <expr> <c-j> (\"\\<C-n>\")')
|
|
@@ -63,7 +60,7 @@ vim.cmd('inoremap <expr> <c-k> (\"\\<C-p>\")')
|
|
|
-- vim.cmd('inoremap <expr> <S-TAB> (\"\\<C-p>\")')
|
|
|
|
|
|
-- TAB Complete
|
|
|
---vim.api.nvim_set_keymap('i', '<expr><TAB>', 'pumvisible() ? \"\\<C-n>\" : \"\\<TAB>\"', { noremap = true, silent = true })
|
|
|
+-- vim.api.nvim_set_keymap('i', '<expr><TAB>', 'pumvisible() ? \"\\<C-n>\" : \"\\<TAB>\"', { noremap = true, silent = true })
|
|
|
|
|
|
vim.cmd([[
|
|
|
map p <Plug>(miniyank-autoput)
|