summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/vim/vimrc10
1 files changed, 7 insertions, 3 deletions
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index c8bc436..f91db51 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -850,10 +850,10 @@ Bundle 'lbdbq'
"Bundle 'LaTeX-Suite-aka-Vim-LaTeX'
"Bundle 'tpope/vim-fugitive'
Bundle 'Lokaltog/vim-easymotion'
-Bundle 'rstacruz/sparkup', {'rtp': 'vim/'}
+Bundle 'rstacruz/sparkup', {'rtp': 'vim'}
Bundle 'klen/python-mode'
"Bundle 'msanders/snipmate.vim'
-Bundle 'SirVer/ultisnips'
+"Bundle 'SirVer/ultisnips'
"Bundle 'honza/vim-snippets'
"Bundle 'Lokaltog/powerline', {'rtp': 'powerline/powerline/bindings/vim'}
"Bundle 'Lokaltog/powerline'
@@ -875,7 +875,8 @@ Bundle 'tpope/vim-surround'
Bundle 'Raimondi/delimitMate'
Bundle 'Shougo/vimproc.vim'
Bundle 'eagletmt/ghcmod-vim'
-Bundle 'dag/vim2hs'
+" TODO vim2hs
+"Bundle 'dag/vim2hs'
"Bundle 'godlygeek/tabular'
Bundle 'pbrisbin/html-template-syntax'
Bundle 'kana/vim-textobj-user'
@@ -971,6 +972,9 @@ let g:necoghc_enable_detailed_browse = 1
let g:ycm_semantic_triggers = {'haskell' : ['.']}
+" ultisnips
+set rtp+=/usr/share/vim-ultisnips
+
" make YCM compatible with UltiSnips (using supertab)
let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']