From: Jannik ZANDER Date: Wed, 18 Jul 2018 21:36:54 +0000 (+0200) Subject: Add supertab to vim X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=b1f15f755c1e6967b64c14eee1b03dbc42b3ad65;p=dotfiles.git Add supertab to vim --- diff --git a/.gitmodules b/.gitmodules index 5fe132a..bda4f3b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,9 +16,6 @@ [submodule ".vim/pack/plugins/opt/ultisnips"] path = .vim/pack/github/opt/ultisnips url = https://github.com/SirVer/ultisnips.git -[submodule ".vim/pack/plugins/opt/editorconfig-vim"] - path = .vim/pack/github/opt/editorconfig-vim - url = https://github.com/editorconfig/editorconfig-vim.git [submodule ".vim/pack/plugins/opt/tagbar"] path = .vim/pack/github/opt/tagbar url = https://github.com/majutsushi/tagbar.git @@ -52,6 +49,9 @@ [submodule ".vim/pack/github/opt/vim-snippets"] path = .vim/pack/github/opt/vim-snippets url = https://github.com/honza/vim-snippets.git -[submodule ".vim/pack/github/opt/c-support"] - path = .vim/pack/github/opt/c-support - url = https://github.com/WolfgangMehner/c-support.git +[submodule ".vim/pack/github/opt/vim-syntax-extra"] + path = .vim/pack/github/opt/vim-syntax-extra + url = https://github.com/justinmk/vim-syntax-extra.git +[submodule ".vim/pack/github/opt/supertab"] + path = .vim/pack/github/opt/supertab + url = https://github.com/ervandew/supertab.git diff --git a/.vim/pack/github/opt/c-support b/.vim/pack/github/opt/c-support deleted file mode 160000 index 1ef8728..0000000 --- a/.vim/pack/github/opt/c-support +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1ef872854c877997eade712a6b7b254c74e79ccf diff --git a/.vim/pack/github/opt/editorconfig-vim b/.vim/pack/github/opt/editorconfig-vim deleted file mode 160000 index 0abb063..0000000 --- a/.vim/pack/github/opt/editorconfig-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0abb0634a8bf3c760a283e9e7475594b83869a46 diff --git a/.vim/pack/github/opt/supertab b/.vim/pack/github/opt/supertab new file mode 160000 index 0000000..40fe711 --- /dev/null +++ b/.vim/pack/github/opt/supertab @@ -0,0 +1 @@ +Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172 diff --git a/.vim/pack/github/opt/vim-syntax-extra b/.vim/pack/github/opt/vim-syntax-extra new file mode 160000 index 0000000..2290b72 --- /dev/null +++ b/.vim/pack/github/opt/vim-syntax-extra @@ -0,0 +1 @@ +Subproject commit 2290b72ba48c808d741db300110944a484b8ee9c diff --git a/.vim/vimrc b/.vim/vimrc index 04c1a58..eae10dc 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -4,7 +4,10 @@ syntax on " Use :help 'option' to see the documentation for the given option. -" indenting +" indentation +set expandtab +set shiftwidth=2 +set softtabstop=2 set autoindent set copyindent set smarttab @@ -13,10 +16,6 @@ set breakindent set breakindent showbreak=\ + set shiftround set formatoptions+=j -set tabstop=4 -set softtabstop=0 -set shiftwidth=4 -set expandtab " searching set incsearch @@ -94,11 +93,7 @@ let g:session_command_aliases = 1 " system set path=.,,** -if exists('$SHELL') - set shell=$SHELL -else - set shell=/bin/sh -endif +set shell=bash if has("win32") set shell=cmd set shellcmdflag=/c @@ -106,7 +101,7 @@ endif set fileformats=unix,dos,mac set fileignorecase -"" Encoding +" Encoding set encoding=utf-8 set fileencoding=utf-8 set fileencodings=utf-8 @@ -181,13 +176,6 @@ packadd! ranger.vim packadd! bclose.vim let g:ranger_replace_netrw = 1 -" Editorconfig -"packadd! editorconfig-vim -"let g:editorconfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] -"let g:editorconfig_verbose = 1 -"let g:editorconfig_core_mode = "python_builtin" - - " CtrlP "packadd! ctrlp.vim "let g:ctrlp_map = 'p' @@ -230,8 +218,11 @@ let g:UltiSnipsJumpForwardTrigger="" let g:UltiSnipsJumpBackwardTrigger="" let g:UltiSnipsEditSplit="vertical" -" C/C++ IDE -packadd c-support +" better syntax hi +packadd vim-syntax-extra + +" supertab +packadd supertab " Jedi (python) "packadd jedi-vim @@ -266,8 +257,6 @@ nnoremap sh :terminal "nnoremap php :-1read ~/.vim/template/php2ja - - "" Visual Mode Mappings vmap < >gv