Merge branch 'master' of tardis:/dotfiles

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 9d182552d614d6476fe9db1dc047b81859bb9c54..23e9b8af20b489dab52a56fb59e7d43f5526ab91 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -442,7 +442,11 @@ let g:tagbar_iconchars = ['+', '-']
 
 " UltiSnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
 
 " UltiSnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'

-let g:UltiSnipsSnippetsDir = "$XDG_CONFIG_HOME/vim/ultisnips"
+let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
+let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+let g:UltiSnipsExpandTrigger = "<C-L>"
+let g:UltiSnipsJumpForwardTrigger = "<C-L>"
+let g:UltiSnipsJumpBackwardTrigger = "<C-H>"

 
 " youcompleteme {{{2
 let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
 
 " youcompleteme {{{2
 let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']