commit fa277b1ff9bb045d2d7f8ebfcf545abf9a01e96d (tree) parent 33ad924a8a62598227a6dc0c8c8e8d4a82f3370e Author: Motiejus Jakštys <motiejus@uber.com> Date: Tue, 4 Aug 2020 15:54:11 +0300 move things to the right blocks Diffstat:
| M | vim/.vim/vimrc | | | 21 | ++++++++------------- |
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc @@ -2,25 +2,21 @@ syntax on filetype plugin indent on set et ts=4 sw=4 nu hlsearch ruler ignorecase smartcase nomodeline bg=dark incsearch set path=**/* grepprg=rg\ --vimgrep grepformat^=%f:%l:%c:%m backspace=2 nojs -command OLD :new +setl\ buftype=nofile | 0put =v:oldfiles | nnoremap <buffer> <CR> :e <C-r>=getline('.')<CR><CR> - -" inspired by vim-sensible -set autoindent smarttab nrformats-=octal -nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L> -set laststatus=2 wildmenu scrolloff=1 sidescrolloff=5 display+=lastline encoding=utf-8 -set formatoptions+=j history=1000 tabpagemax=50 sessionoptions-=options -if has("patch-8.1-0360") - set diffopt+=algorithm:patience -endif - -" truly custom mappings nnoremap <Leader>\ gqj +command OLD :new +setl\ buftype=nofile | 0put =v:oldfiles | nnoremap <buffer> <CR> :e <C-r>=getline('.')<CR><CR> let g:gutentags_enabled = 0 let g:gutentags_generate_on_new = 0 let g:gutentags_cache_dir = '~/.vim/ctags' let b:gutentags_file_list_command = 'git ls-files' +" bits from vim-sensible +set autoindent smarttab nrformats-=octal +nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L> +set laststatus=2 wildmenu scrolloff=1 sidescrolloff=5 display+=lastline encoding=utf-8 +set formatoptions+=j history=1000 tabpagemax=50 sessionoptions-=options +set diffopt+=algorithm:patience + " html au FileType html setlocal ts=2 sw=2 sws=2 @@ -44,7 +40,6 @@ au FileType go setlocal noet au FileType go nnoremap <buffer> <C-]> :GoDef<CR> au FileType go let g:go_template_autocreate = 0 au FileType go let g:go_fmt_command = "goimports" -"au FileType go let g:go_fmt_command = "gofmt" let $USEGO111MODULE="off" " strace