diff options
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | lua/keymappings.lua | 37 | ||||
| -rw-r--r-- | vimscript/functions.vim | 2 |
3 files changed, 21 insertions, 21 deletions
@@ -6,6 +6,8 @@ If you are looking for my old configs checkout the two snapshot branches on this **WARNING** Still very experimental will not work without some configuation +You will need to run `nv` then `:PackerInstall` ignore the errors that are presented + ```bash bash <(curl -s https://raw.githubusercontent.com/ChristianChiarulli/nvcode/master/utils/installer/install-nv-code.sh) ``` @@ -95,7 +97,6 @@ git config --global github.user <username> ## TODO **HIGH PRIORITY** -- formatting using efm server for prettier/eslint - list all binaries needed for functionality - learn what opt is - better install script, support both nvim and nvcode paths diff --git a/lua/keymappings.lua b/lua/keymappings.lua index 8080d4b1..5a36a9da 100644 --- a/lua/keymappings.lua +++ b/lua/keymappings.lua @@ -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) diff --git a/vimscript/functions.vim b/vimscript/functions.vim index 6f869935..9a468f45 100644 --- a/vimscript/functions.vim +++ b/vimscript/functions.vim @@ -23,3 +23,5 @@ command! ResetHunk lua require 'nv-utils'.reset_hunk() command! ResetBuffer lua require 'nv-utils'.reset_buffer() command! PreviewHunk lua require 'nv-utils'.preview_hunk() command! BlameLine lua require 'nv-utils'.blame_line() +command! W noa w + |