From 414f854e4a0aade1fe48aa0cee98c8927aa73dd5 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 19 Mar 2021 02:54:17 -0400 Subject: updates --- README.md | 3 ++- lua/keymappings.lua | 37 +++++++++++++++++-------------------- vimscript/functions.vim | 2 ++ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 70ae1e63..a95dd652 100644 --- a/README.md +++ b/README.md @@ -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 ## 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', '', '', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', '', '', {noremap = true, silent = true}) vim.g.mapleader = ' ' -- no hl -vim.api.nvim_set_keymap('n', 'h', ':set hlsearch!', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', 'h', ':set hlsearch!', {noremap = true, silent = true}) -- explorer -vim.api.nvim_set_keymap('n', 'e', ':NvimTreeToggle', { noremap = true, silent = true }) - +vim.api.nvim_set_keymap('n', 'e', ':NvimTreeToggle', {noremap = true, silent = true}) -- better window movement -vim.api.nvim_set_keymap('n', '', 'h', { silent = true }) -vim.api.nvim_set_keymap('n', '', 'j', { silent = true }) -vim.api.nvim_set_keymap('n', '', 'k', { silent = true }) -vim.api.nvim_set_keymap('n', '', 'l', { silent = true }) +vim.api.nvim_set_keymap('n', '', 'h', {silent = true}) +vim.api.nvim_set_keymap('n', '', 'j', {silent = true}) +vim.api.nvim_set_keymap('n', '', 'k', {silent = true}) +vim.api.nvim_set_keymap('n', '', 'l', {silent = true}) -- TODO fix this -- Terminal window navigation @@ -37,24 +36,22 @@ vim.cmd([[ nnoremap :vertical resize +2 ]]) - -- better indenting -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', '', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('i', 'kj', '', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('i', 'jj', '', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('i', 'jk', '', {noremap = true, silent = true}) +vim.api.nvim_set_keymap('i', 'kj', '', {noremap = true, silent = true}) +vim.api.nvim_set_keymap('i', 'jj', '', {noremap = true, silent = true}) -- Tab switch buffer -vim.api.nvim_set_keymap('n', '', ':bnext', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '', ':bprevious', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', '', ':bnext', {noremap = true, silent = true}) +vim.api.nvim_set_keymap('n', '', ':bprevious', {noremap = true, silent = true}) -- Move selected line / block of text in visual mode -vim.api.nvim_set_keymap('x', 'K', ':move \'<-2gv-gv', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('x', 'J', ':move \'>+1gv-gv', { noremap = true, silent = true }) - +vim.api.nvim_set_keymap('x', 'K', ':move \'<-2gv-gv', {noremap = true, silent = true}) +vim.api.nvim_set_keymap('x', 'J', ':move \'>+1gv-gv', {noremap = true, silent = true}) -- Better nav for omnicomplete vim.cmd('inoremap (\"\\\")') @@ -63,7 +60,7 @@ vim.cmd('inoremap (\"\\\")') -- vim.cmd('inoremap (\"\\\")') -- TAB Complete ---vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \"\\\" : \"\\\"', { noremap = true, silent = true }) +-- vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \"\\\" : \"\\\"', { noremap = true, silent = true }) vim.cmd([[ map p (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 + -- cgit v1.2.3