diff options
Diffstat (limited to 'vim')
| -rwxr-xr-x | vim/.vim/vimrc | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index e544c5a..5f5751b 100755 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -9,28 +9,31 @@ set nostartofline if has("patch-7.4.710") set list listchars+=space:ยท,tab:\ \ endif -set tabstop=8 expandtab shiftwidth=2 softtabstop=-1 smarttab +set tabstop=8 expandtab shiftwidth=4 softtabstop=-1 smarttab set ignorecase infercase dictionary=/usr/share/dict/words set keymap=vietnamese-telex imdisable iminsert=0 imsearch=-1 set omnifunc=syntaxcomplete#Complete set diffopt+=algorithm:patience + +autocmd! autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal autocmd BufNewFile,BufRead *.m setlocal filetype=octave -autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) -autocmd FileType python,cython let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1) -autocmd FileType c,h,go,glsl setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 +autocmd FileType asm,c,h,go,glsl +\ setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 +autocmd FileType vim,sh,lua,tex,cpp,html,octave,pascal setlocal shiftwidth=2 autocmd FileType rst setlocal shiftwidth=3 -autocmd FileType css,javascript,python,perl6 setlocal shiftwidth=4 -autocmd FileType python syntax keyword pythonBoolean False True None autocmd FileType java setlocal omnifunc=javacomplete#Complete +autocmd FileType python,cython +\ let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1) +autocmd BufWinEnter * if !exists('w:m1') | +\ let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) | endif + +let g:srcery_italic=1 let g:jedi#popup_on_dot = 0 let g:jedi#popup_select_first = 0 let g:jedi#show_call_signatures = 2 let g:jedi#smart_auto_mappings = 0 let g:polyglot_disabled = ['latex'] -map Q gq -command Q q -command W w call plug#begin('~/.vim/plugged') Plug 'https://github.com/vim/killersheep.git' @@ -47,3 +50,6 @@ source /usr/share/doc/fzf/examples/fzf.vim set t_Co=256 colorscheme srcery +map Q gq +command Q q +command W w |