From 9b2328aad38d0a63f660ab7fbf035d7f7519e9ed Mon Sep 17 00:00:00 2001
From: bretello <bretello@distruzione.org>
Date: Thu, 30 Sep 2021 12:42:37 +0200
Subject: [PATCH] vim: replace snipmate with ultisnips

---
 vim/plugins_config.vim | 12 +++++-------
 vim/plugs.vim          |  6 ++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/vim/plugins_config.vim b/vim/plugins_config.vim
index 4625a08..2599be0 100644
--- a/vim/plugins_config.vim
+++ b/vim/plugins_config.vim
@@ -158,13 +158,11 @@ let g:gutentags_ctags_extra_args = ['--tag-relative=always', ]
 "" nerdtree
 let NERDTreeIgnore=['__pycache__']
 
-" snipmate
-" Silence deprecation warning
-let g:snipMate = { 'snippet_version' : 1 }
-" show description in snipmate's tab completion
-let g:snipMate.description_in_completion = 1
-
-let g:ackprg = 'rg --vimgrep --no-heading'
+" ultisnips
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<c-b>"
+let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+let g:UltiSnipsEditSplit="vertical"
 
 
 "" Fzf
diff --git a/vim/plugs.vim b/vim/plugs.vim
index 852e72a..4c2e632 100644
--- a/vim/plugs.vim
+++ b/vim/plugs.vim
@@ -43,10 +43,8 @@ Plug 'junegunn/fzf.vim'
 " Open tags with fzf's :Tags
 Plug 'https://github.com/ludovicchabant/vim-gutentags.git'
 
-" snipmate
-Plug 'https://github.com/MarcWeber/vim-addon-mw-utils'
-Plug 'https://github.com/tomtom/tlib_vim'
-Plug 'https://github.com/garbas/vim-snipmate'
+" snippets
+Plug 'https://github.com/SirVer/ultisnips'
 Plug 'https://github.com/honza/vim-snippets'
 
 " Git gutter line