nvim: disable LazyVim's keymaps and import some of them

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 5f6f87a50aeeda06e345bd6d90d0640067e86ac5..f40b08fb64ea4c974c136bb963b1171a611723ee 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,14 +1,14 @@
+" force python3
+if has('python3') | endif
+
+" space is leader
+let g:mapleader = " "
+

 " runtimepath {{{1
 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
 
 " runtimepath {{{1
 set runtimepath ^=$XDG_CONFIG_HOME/vim
 set runtimepath +=$XDG_CONFIG_HOME/vim/after
 

-" force python3
-if has('python3') | endif
-

 " plugins {{{1
 " plugins {{{1

-" remove all autocommands
-autocmd!
-

 call plug#begin('$XDG_DATA_HOME/vim')
 " This does not update vim-plug, use PlugUpgrade instead
 Plug 'junegunn/vim-plug'
 call plug#begin('$XDG_DATA_HOME/vim')
 " This does not update vim-plug, use PlugUpgrade instead
 Plug 'junegunn/vim-plug'


@@ -247,6 +247,7 @@ set shortmess+=T    " truncate other messages in the middle
 set shortmess+=W    " don't give 'written' or '[w]' when writing a file
 set shortmess+=A    " ignore swapfile warning
 set shortmess+=I    " no splash screen
 set shortmess+=W    " don't give 'written' or '[w]' when writing a file
 set shortmess+=A    " ignore swapfile warning
 set shortmess+=I    " no splash screen

+set shortmess+=c    " don't give |ins-completion-menu| messages

 
 " editing text {{{2
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode
 
 " editing text {{{2
 set backspace=indent,eol,start  " allow backspacing over everything in insert mode


@@ -264,6 +265,7 @@ set formatoptions+=t    " Auto-wrap text using textwidth
 set formatoptions-=o    " Do not insert comment leader after hitting o or O in normal mode
 
 set nrformats-=octal    " don't inc/dec octal numbers with ^[AX]
 set formatoptions-=o    " Do not insert comment leader after hitting o or O in normal mode
 
 set nrformats-=octal    " don't inc/dec octal numbers with ^[AX]

+set nrformats+=unsigned " treat all numbers as unsigned

 
 set complete=.       " scan the current buffer ( 'wrapscan' is ignored)
 set complete+=w      " scan buffers from other windows
 
 set complete=.       " scan the current buffer ( 'wrapscan' is ignored)
 set complete+=w      " scan buffers from other windows


@@ -315,6 +317,7 @@ set backupskip+=.netrc          " skip netrc
 set backupskip+=/dev/shm/pass*  " skip passwordstore files
 
 set undofile                    " persistent undo history
 set backupskip+=/dev/shm/pass*  " skip passwordstore files
 
 set undofile                    " persistent undo history

+set undolevels=10000            " moar undos

 if !has('nvim')
   set undodir=$XDG_CACHE_HOME/vim/undo//
 endif
 if !has('nvim')
   set undodir=$XDG_CACHE_HOME/vim/undo//
 endif


@@ -352,6 +355,7 @@ set wildignore+=*.orig                           " Merge resolution files
 " running make and jumping to errors {{{2
 set makeprg=make\ -w     " print changing directories
 
 " running make and jumping to errors {{{2
 set makeprg=make\ -w     " print changing directories
 

+set grepformat=%f:%l:%c:%m

 set grepprg=ag\ --vimgrep\ $*
 
 " language specific {{{2
 set grepprg=ag\ --vimgrep\ $*
 
 " language specific {{{2


@@ -376,9 +380,9 @@ set sessionoptions+=unix,slash  " damn windows and it's silly ways
 
 " autocmds {{{1
 " Resize splits when the window is resized {{{2
 
 " autocmds {{{1
 " Resize splits when the window is resized {{{2

-augroup resize
+augroup resize_splits

     au!
     au!

-    autocmd VimResized * :wincmd =
+    autocmd VimResized * :tabdo wincmd =

 augroup END
 
 " Only show cursorline in the current window and in normal mode {{{2
 augroup END
 
 " Only show cursorline in the current window and in normal mode {{{2


@@ -395,7 +399,7 @@ augroup ft_stdin
 augroup END
 
 " Jump to last known cursor position {{{2
 augroup END
 
 " Jump to last known cursor position {{{2

-augroup cursor_pos
+augroup last_loc

     au!
     " blacklist certain filetype
     let blacklist = ['gitcommit']
     au!
     " blacklist certain filetype
     let blacklist = ['gitcommit']


@@ -425,9 +429,6 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) |
 
 " bindings {{{1
 
 
 " bindings {{{1
 

-" allow both <space> and \ to be <leader>
-map <space> <leader>
-

 " make
 function! MakeWithOpt()
   " TODO only do this if makeprg matches make
 " make
 function! MakeWithOpt()
   " TODO only do this if makeprg matches make


@@ -615,6 +616,14 @@ nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"na
 let g:checkattach_filebrowser = 'ranger'
 let g:checkattach_once = 'y'
 
 let g:checkattach_filebrowser = 'ranger'
 let g:checkattach_once = 'y'
 

+" close-another-window {{{2
+nnoremap <silent> <C-W>c  <NOP>
+nnoremap <silent> <C-W>cc <C-W>c
+nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
+nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
+nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
+nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
+

 " delimitmate {{{2
 let delimitMate_expand_cr = 2
 let g:delimitMate_expand_space = 1
 " delimitmate {{{2
 let delimitMate_expand_cr = 2
 let g:delimitMate_expand_space = 1


@@ -679,14 +688,6 @@ nmap <silent> cog <Plug>IndentGuidesToggle
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 
 nmap <silent> [og <Plug>IndentGuidesEnable
 nmap <silent> ]og <Plug>IndentGuidesDisable
 

-" close-another-window {{{2
-nnoremap <silent> <C-W>c  <NOP>
-nnoremap <silent> <C-W>cc <C-W>c
-nnoremap <silent> <C-W>ch :CloseLeftWindow<CR>
-nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
-nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
-nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
-

 " python-mode {{{2
 
 let g:pymode_rope_completion = 0
 " python-mode {{{2
 
 let g:pymode_rope_completion = 0