switched to YCM for code completion and ultisnips for snippets

[stack/conf/vim.git] / vimrc

diff --git a/vimrc b/vimrc
index 9e5f3d6..2b16f7c 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -25,7 +25,7 @@ syntax on " syntax highlighting on
 
 set background=dark
 set t_Co=256
-colorscheme desert 
+colorscheme morning 
 "colorscheme xoria256 
 "let g:solarized_termcolors=256
 
@@ -224,30 +224,15 @@ let vam_install_path = expand('$HOME') . '/.vim/addons'
 exec 'set runtimepath+='.vam_install_path.'/vim-addon-manager'
 " Enable addons with vim-addon-manager using file type recognition
 let ft_addons = {
-    \ 'always': ['desert', 'gnupg', 'surround', 'checksyntax', 'quickfixsigns', 'LargeFile', 'snipmate', 'snipmate-snippets', 'The_NERD_tree', 'SuperTab%1643', 'fugitive'],
+    \ 'always': ['desert', 'surround', 'checksyntax', 'quickfixsigns', 'LargeFile', 'UltiSnips', 'The_NERD_tree', 'fugitive'],
     \ 'r': [ 'Screen_vim__gnu_screentmux', 'Vim-R-plugin' ],
     \ '^\%(c\|cpp\|cuda\|javascript\|python\|php\|html\|xml\|r\|sh\|css\|java\|make\|xslt\|vim\)$': [ 'Tagbar', 'checksyntax', 'TagHighlight', 'sleuth'],
-    \ '^\%(c\|cpp\|h\|cuda\)$': [ 'clang_complete' ],
-    \ 'python': [ 'python_pydoc'],
-    \ 'php': ['phpcomplete', 'PDV_-_phpDocumentor_for_Vim'],
-    \ 'gpg': ['gnupg'],
+    \ '^\%(c\|cpp\|h\|cuda\|php\|python\)$': [ 'YouCompleteMe' ],
+    \ 'php': ['PDV_-_phpDocumentor_for_Vim'],
     \ }
 call vam#ActivateAddons(ft_addons['always'], {'auto_install': 1})
 au FileType * for l in values(filter(copy(ft_addons), string(expand('<amatch>')).' =~ v:key')) | call vam#ActivateAddons(l, {'force_loading_plugins_now':1}) | endfor
 
-" SuperTab option for context aware completion
-let g:SuperTabDefaultCompletionType = "context"
-" If you prefer the Omni-Completion tip window to close when a selection is
-" " made, these lines close it on movement in insert mode or when leaving
-" " insert mode
-if has("autocmd")
-    autocmd CursorMovedI * if pumvisible() == 0|pclose|endif
-    autocmd InsertLeave * if pumvisible() == 0|pclose|endif
-endif
-
-let g:clang_complete_copen = 1
-let g:clang_complete_auto = 1
-let g:clang_user_options='|| exit 0'
 
 if has("cscope")
     set csto=0
@@ -265,3 +250,8 @@ if has("cscope")
     endif
     set csverb
 endif
+
+let g:UltiSnipsExpandTrigger = "<c-j>"
+let g:UltiSnipsJumpForwardTrigger = "<c-j>"
+let g:UltiSnipsJumpBackwardTrigger = "<c-k>"
+let g:UltiSnipsDontReverseSearchPath=1