vim: cleanup, add vim-snippets

Signed-off-by: Florian Pritz <bluewind@xinu.at>

1 files changed, 11 insertions, 88 deletions

diff --git a/.vimrc b/.vimrc
index 10a2e8a..8adbf22 100644
--- a/.vimrc
+++ b/.vimrc
@@ -66,32 +66,19 @@ set rtp+=~/.vim/bundle/vundle
 call vundle#begin()
 
 Plugin 'scrooloose/syntastic'
-"NeoBundle 'Rip-Rip/clang_complete'
-"NeoBundle 'Shougo/neocomplete.vim'
-"NeoBundle 'Shougo/neosnippet.vim'
-"NeoBundle 'Shougo/neosnippet-snippets'
-
-"NeoBundle 'Shougo/vimproc.vim', {
-	  "\ 'build' : {
-	  "\     'windows' : 'make -f make_mingw32.mak',
-	  "\     'cygwin' : 'make -f make_cygwin.mak',
-	  "\     'mac' : 'make -f make_mac.mak',
-	  "\     'unix' : 'make -f make_unix.mak',
-	  "\    },
-	  "\ }
-"NeoBundle 'osyo-manga/vim-reunions'
-"NeoBundle 'osyo-manga/vim-marching'
-"
 Plugin 'Valloric/YouCompleteMe'
 Plugin 'SirVer/ultisnips'
-"
+Plugin 'honza/vim-snippets'
+
 Plugin 'tpope/vim-unimpaired'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
+
 Plugin 'SudoEdit'
 Plugin 'rking/ag.vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'majutsushi/tagbar'
+
 Plugin 'adoy/vim-php-refactoring-toolbox'
 Plugin 'shawncplus/phpcomplete.vim'
 
@@ -165,77 +152,19 @@ inoremap <C-f> <ESC>:FufFile<CR>
 "noremap <C-b> :FuzzyFinderBuffer<CR>
 "inoremap <C-b> <ESC>:FuzzyFinderBuffer<CR>
 
-noremap <C-h> :nohl<CR>
-inoremap <C-h> <ESC>:nohl<CR>a
-
 let g:UltiSnipsJumpForwardTrigger="<tab>"
 let g:UltiSnipsExpandTrigger="<c-j>"
+let g:UltiSnipsListSnippets="<c-e>"
 let g:UltiSnipsUsePythonVersion=2
-
-" #### Neocomplete config ####
-let g:acp_enableAtStartup = 0
-let g:neocomplete#enable_at_startup = 1
-let g:neocomplete#force_overwrite_completefunc = 1
-let g:neocomplete#enable_smart_case = 1
-let g:neocomplete#sources#syntax#min_keyword_length = 2
-let g:neocomplete#disable_auto_complete = 0
-let g:neocomplete#enable_auto_close_preview = 0
-
-imap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
-"imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
-			"\ "\<Plug>(neosnippet_expand_or_jump)"
-			"\: pumvisible() ? "\<C-n>" : "\<TAB>"
-"smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
-			"\ "\<Plug>(neosnippet_expand_or_jump)"
-			"\: pumvisible() ? "\<C-n>" : "\<TAB>"
-			""\: "\<TAB>"
-"inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
-"function! s:my_cr_function()
-	""return neocomplete#close_popup() . "\<CR>"
-	"" For no inserting <CR> key.
-	"return pumvisible() ? neocomplete#close_popup() : "\<CR>"
-"endfunction
-
-" For snippet_complete marker.
-if has('conceal')
-	set conceallevel=2 concealcursor=vin
-endif
-
-" Enable heavy omni completion.
-if !exists('g:neocomplete_omni_patterns')
-  let g:neocomplete_omni_patterns = {}
-endif
-let g:neocomplete_omni_patterns.php = '[^. \t]->\h\w*\|\h\w*::'
-let g:neocomplete_omni_patterns.c = '[^.[:digit:] *\t]\%(\.\|->\)'
-let g:neocomplete_omni_patterns.cpp = '[^.[:digit:] *\t]\%(\.\|->\)\|\h\w*::'
-
-" clang_complete support
-if !exists('g:neocomplete#force_omni_input_patterns')
-	let g:neocomplete#force_omni_input_patterns = {}
-endif
-let g:neocomplete#force_overwrite_completefunc = 1
-let g:neocomplete#force_omni_input_patterns.c = '[^.[:digit:] *\t]\%(\.\|->\)\w*'
-let g:neocomplete#force_omni_input_patterns.cpp = '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*'
-let g:neocomplete#force_omni_input_patterns.objc = '[^.[:digit:] *\t]\%(\.\|->\)\w*'
-let g:neocomplete#force_omni_input_patterns.objcpp = '[^.[:digit:] *\t]\%(\.\|->\)\w*\|\h\w*::\w*'
-let g:clang_complete_auto = 0
-let g:clang_auto_select = 0
-
-let g:clang_complete_macros = 1
-let g:clang_complete_patterns = 1
-
-let g:clang_snippets=1
-let g:clang_conceal_snippets=1
-let g:clang_snippets_engine='clang_complete'
+let g:UltiSnipsEditSplit="vertical"
 
 let g:tagbar_left=1
 let g:tagbar_autofocus=1
 let g:tagbar_autoclose=1
 
-
-" For perlomni.vim setting.
-" https://github.com/c9s/perlomni.vim
-let g:neocomplete_omni_patterns.perl = '\h\w*->\h\w*\|\h\w*::'
+"let g:syntastic_always_populate_loc_list = 1
+"let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
 
 autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
 autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags
@@ -243,29 +172,23 @@ autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
 autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
 autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
 autocmd FileType php set omnifunc=phpcomplete#CompletePHP
+
 autocmd FileType php set foldmethod=syntax
 autocmd FileType php set foldlevelstart=2 foldnestmax=2
 autocmd FileType php let g:php_folding=1
 
 autocmd FileType python set foldmethod=indent
 autocmd FileType python set foldlevelstart=2 foldnestmax=2
+autocmd FileType python set ts=4 sw=4 softtabstop=4 et
 
 autocmd FileType make setlocal noexpandtab
-au FileType python set ts=4 sw=4 softtabstop=4 et
 autocmd BufRead,BufNewFile PKGBUILD let is_bash=1 | set ft=sh
 
-"colorscheme gardener
-"colorscheme desert256
-"colorscheme candycode
 let g:jellybeans_background_color_256 = 'none'
 let g:jellybeans_overrides = {
 \    'SpecialKey': { 'guifg': 'b0b0b0', 'guibg': '000000'}
 \}
 colorscheme jellybeans
-"colorscheme inkpot
-"colorscheme mustang
-"colorscheme wombat256
-"colorscheme xoria256
 
 " Toggle dark/light default colour theme for shitty terms
 "map <F2> :let &background = ( &background == "dark" ? "light" : "dark" )<CR>