aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
m---------vim/bundle/syntastic0
m---------vim/bundle/ultisnips0
m---------vim/bundle/vim-gitgutter0
m---------vim/bundle/vim-snipmate0
m---------vim/bundle/vim-snippets0
m---------vim/bundle/vim-table-mode0
-rw-r--r--vimrc5
8 files changed, 8 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index 3a6f663..2489650 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
[submodule "vim/bundle/tlib_vim"]
path = vim/bundle/tlib_vim
url = https://github.com/tomtom/tlib_vim.git
-[submodule "vim/bundle/vim-snipmate"]
- path = vim/bundle/vim-snipmate
- url = https://github.com/garbas/vim-snipmate.git
[submodule "vim/bundle/tagbar"]
path = vim/bundle/tagbar
url = https://github.com/majutsushi/tagbar.git
@@ -37,3 +34,6 @@
[submodule "vim/bundle/vim-autotag"]
path = vim/bundle/vim-autotag
url = https://github.com/craigemery/vim-autotag.git
+[submodule "vim/bundle/ultisnips"]
+ path = vim/bundle/ultisnips
+ url = https://github.com/SirVer/ultisnips.git
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
-Subproject 5d9a0bc3877aea992292eeb6f318f4321fdef63
+Subproject 0bfac45565efa4e94364818b3b0cb2ee46826a0
diff --git a/vim/bundle/ultisnips b/vim/bundle/ultisnips
new file mode 160000
+Subproject 5352d98f212e273b3e8b1d84efdbe2d6a6d557e
diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter
-Subproject 9ecce5a269bdbb0c5081d00b412ec41c562b615
+Subproject f16cf539a23fc980af1293bebdae61a595baa90
diff --git a/vim/bundle/vim-snipmate b/vim/bundle/vim-snipmate
deleted file mode 160000
-Subproject f1432b6022c9815cd89b9197b06e3efdc3596b7
diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets
-Subproject 527f21a1903501811a515ae959dcd940d1da43f
+Subproject 7b02b74edf5de3d4864b7601fbd83ccc2671d0b
diff --git a/vim/bundle/vim-table-mode b/vim/bundle/vim-table-mode
-Subproject 35b41e082212776006fb7c18b406545ed8395ad
+Subproject 4e41af8e5f0bf53326d1b83c2feb1eff89fe90d
diff --git a/vimrc b/vimrc
index 8776cac..75a75ce 100644
--- a/vimrc
+++ b/vimrc
@@ -104,5 +104,10 @@ map <F11> :call LangToggle()<cr>
" TODO bind F2 to execute gnu ident on whole file and ensure that if it fails, no change is done.
" TODO check if .tags exists and alternativelly warn that it missing
+" UltiSnips triggers
+let g:UltiSnipsExpandTrigger="<c-h>"
+let g:UltiSnipsJumpForwardTrigger="<c-j>"
+let g:UltiSnipsJumpBackwardTrigger="<c-k>"
+
let g:ycm_path_to_python_interpreter="/usr/bin/python3"
let g:ycm_global_ycm_extra_conf = ".ycm_conf.py"