diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2017-10-07 23:51:43 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2017-10-08 00:25:40 +0200 |
| commit | 56c1c35108a365f81d9db0a3d36595c656818964 (patch) | |
| tree | f2bd3ffdf8c471dd7f5f487e708b87c41d89299e | |
| parent | ee7bc1575b90adeef80e0012fe1f9175f4fdb35b (diff) | |
| download | dotfiles-56c1c35108a365f81d9db0a3d36595c656818964.tar.gz dotfiles-56c1c35108a365f81d9db0a3d36595c656818964.tar.bz2 dotfiles-56c1c35108a365f81d9db0a3d36595c656818964.zip | |
Some vim changes.
| -rw-r--r-- | .vim/after/syntax/python.vim | 7 | ||||
| m--------- | .vim/bundle/vundle | 0 | ||||
| -rw-r--r-- | .vim/bundles.vim | 19 | ||||
| -rw-r--r-- | .vimrc | 19 |
4 files changed, 17 insertions, 28 deletions
diff --git a/.vim/after/syntax/python.vim b/.vim/after/syntax/python.vim index 6991ebf..831547c 100644 --- a/.vim/after/syntax/python.vim +++ b/.vim/after/syntax/python.vim @@ -1,5 +1,2 @@ -syn keyword selfType self -syn keyword clsType cls - -hi def link selfType Type -hi def link clsType Type +hi link pythonBoolean Constant +hi link pythonClassVar Type diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle -Subproject 4984767509e3d05ca051e253c8a8b37de784be4 +Subproject 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c8 diff --git a/.vim/bundles.vim b/.vim/bundles.vim index 8e7d461..ce025cc 100644 --- a/.vim/bundles.vim +++ b/.vim/bundles.vim @@ -25,9 +25,6 @@ Plugin 'scrooloose/nerdtree' " Tagbar Plugin 'majutsushi/tagbar' -" vim-latex -Plugin 'git://vim-latex.git.sourceforge.net/gitroot/vim-latex/vim-latex' - " surround.vim Plugin 'tpope/vim-surround' @@ -46,27 +43,17 @@ Plugin 'scrooloose/syntastic' " Ctrl-P Plugin 'ctrlpvim/ctrlp.vim' -" projects -Plugin 'project.tar.gz' - " GPG Plugin 'jamessan/vim-gnupg' -" Snippet Management -Plugin 'SirVer/ultisnips' -Plugin 'honza/vim-snippets' - -" Some nice shortcuts -Plugin 'tpope/vim-unimpaired' - " i3 Syntax highlighting Plugin 'PotatoesMaster/i3-vim-syntax' -" LiveScript support -Plugin 'necoro/vim-ls' - " YCM Plugin 'Valloric/YouCompleteMe' +" Enhanced Python Syntax +Plugin 'vim-python/python-syntax' + call vundle#end() filetype plugin indent on " required! @@ -45,8 +45,11 @@ fun StatusLine() if strlen(head) let head = ",".head endif + let tag = tagbar#currenttag('#%s', '') - return '%-3.3n %f %r%w[' + return '%-3.3n %f' + \ .tag. + \ ' %r%w[' \ .ft.','.fenc \ .',%{&fileformat}' \ .head @@ -70,7 +73,6 @@ cnoremap <Right> <Space><BS><Right> " ======================================================= " CUSTOM MAPPINGS " ======================================================= - " Some maps opening/closing nice windows nmap <silent> <Leader>T :TagbarToggle<CR> nmap <silent> <Leader>U :GundoToggle<CR> @@ -97,6 +99,9 @@ let g:toggle_words_dict = { \ ['enabled', 'disabled'] \ ]} +" we use python3 +let g:gundo_prefer_python3 = 1 + " Stuff for the TagList-Plugin let Tlist_Sort_Type = "name" let Tlist_File_Fold_Auto_Close = 1 @@ -112,13 +117,15 @@ let g:autotagCtagsCmd="ctags --c++-kinds=+p --fields=+iaS --extra=+q" let g:bugsummary_browser="firefox '%s'" " python syntax -let python_highlight_numbers = 1 -let python_highlight_space_errors = 1 +let g:python_highlight_string_templates = 0 +let g:python_highlight_builtin_funcs_kwarg=0 +let g:python_highlight_all = 1 +let g:python_highlight_space_errors = 1 " default to latex for .tex files let g:tex_flavor = "latex" let g:Tex_DefaultTargetFormat="pdf" -let g:Tex_ViewRule_pdf = "evince" +let g:Tex_ViewRule_pdf = "zathura" " do not do concealment in .tex files -- just too slow (and ugly) let g:tex_conceal = "" @@ -140,8 +147,6 @@ let g:UltiSnipsEditSplit = "vertical" let g:ycm_semantic_triggers = {'haskell' : ['re!\w\.']} let g:ycm_autoclose_preview_window_after_completion = 1 let g:ycm_autoclose_preview_window_after_insertion = 1 -let g:ycm_key_list_select_completion = ['<Down>'] -let g:ycm_key_list_previous_completion = ['<Up>'] " ======================================================= " FINAL |