From: Jannik ZANDER <jannikz@gmail.com>
Date: Thu, 2 Aug 2018 09:13:28 +0000 (+0200)
Subject: Replace ultisnip with snipmate
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=7acd21eff9e3b41be245351c1a694aa1b0691565;p=dotfiles.git

Replace ultisnip with snipmate
---

diff --git a/.gitmodules b/.gitmodules
index cd54ecf..72fc9ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule ".vim/pack/plugins/opt/vim-unimpaired"]
 	path = .vim/pack/github/opt/vim-unimpaired
 	url = https://github.com/tpope/vim-unimpaired.git
-[submodule ".vim/pack/plugins/opt/ultisnips"]
-	path = .vim/pack/github/opt/ultisnips
-	url = https://github.com/SirVer/ultisnips.git
 [submodule ".vim/pack/plugins/opt/tagbar"]
 	path = .vim/pack/github/opt/tagbar
 	url = https://github.com/majutsushi/tagbar.git
@@ -61,3 +58,15 @@
 [submodule ".vim/pack/github/opt/vim-javascript"]
 	path = .vim/pack/github/opt/vim-javascript
 	url = https://github.com/pangloss/vim-javascript
+[submodule ".vim/pack/github/opt/vim-surround"]
+	path = .vim/pack/github/opt/vim-surround
+	url = https://github.com/tpope/vim-surround.git
+[submodule ".vim/pack/github/opt/vim-repeat"]
+	path = .vim/pack/github/opt/vim-repeat
+	url = https://github.com/tpope/vim-repeat.git
+[submodule ".vim/pack/github/opt/vim-snipmate"]
+	path = .vim/pack/github/opt/vim-snipmate
+	url = https://github.com/garbas/vim-snipmate.git
+[submodule ".vim/pack/github/opt/vim-addon-mw-utils"]
+	path = .vim/pack/github/opt/vim-addon-mw-utils
+	url = https://github.com/MarcWeber/vim-addon-mw-utils.git
diff --git a/.vim/pack/github/opt/tlib_vim b/.vim/pack/github/opt/tlib_vim
new file mode 160000
index 0000000..ced8f3e
--- /dev/null
+++ b/.vim/pack/github/opt/tlib_vim
@@ -0,0 +1 @@
+Subproject commit ced8f3ebe85b50da2ec0e6d593e6b2e8e6bd243b
diff --git a/.vim/pack/github/opt/ultisnips b/.vim/pack/github/opt/ultisnips
deleted file mode 160000
index 6fdc364..0000000
--- a/.vim/pack/github/opt/ultisnips
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba
diff --git a/.vim/pack/github/opt/vim-addon-mw-utils b/.vim/pack/github/opt/vim-addon-mw-utils
new file mode 160000
index 0000000..295862b
--- /dev/null
+++ b/.vim/pack/github/opt/vim-addon-mw-utils
@@ -0,0 +1 @@
+Subproject commit 295862ba6be47ec3b11b6c85c10d982ffd9bc0b2
diff --git a/.vim/pack/github/opt/vim-repeat b/.vim/pack/github/opt/vim-repeat
new file mode 160000
index 0000000..43d2678
--- /dev/null
+++ b/.vim/pack/github/opt/vim-repeat
@@ -0,0 +1 @@
+Subproject commit 43d2678fa59d068c815d8298331c195e850ff5a7
diff --git a/.vim/pack/github/opt/vim-snipmate b/.vim/pack/github/opt/vim-snipmate
new file mode 160000
index 0000000..a9802f2
--- /dev/null
+++ b/.vim/pack/github/opt/vim-snipmate
@@ -0,0 +1 @@
+Subproject commit a9802f2351910f64b70fb10b63651e6ff6b8125e
diff --git a/.vim/pack/github/opt/vim-surround b/.vim/pack/github/opt/vim-surround
new file mode 160000
index 0000000..5970688
--- /dev/null
+++ b/.vim/pack/github/opt/vim-surround
@@ -0,0 +1 @@
+Subproject commit 597068870b8f093a8b2d11536c62ff31222ee8d0
diff --git a/.vim/vimrc b/.vim/vimrc
index a77c5a9..1888b60 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -134,15 +134,8 @@ noremap <c-h>                 <c-w><c-h>
 noremap <c-j>                 <c-w><c-j>
 noremap <c-k>                 <c-w><c-k>
 noremap <c-l>                 <c-w><c-l>
-noremap <silent> <c-n>        :bn<cr>
-noremap <silent> <c-p>        :bp<cr>
 noremap! <C-a>                <Home>
 noremap! <C-e>                <End>
-"noremap <leader>z :bp<CR>
-"noremap <leader>q :bp<CR>
-"noremap <leader>x :bn<CR>
-"noremap <leader>w :bn<CR>
-"noremap <leader>c :bd<CR>
 
 " Normal Mode Mappings
 "nnoremap hh                       <nop>
@@ -188,8 +181,6 @@ tnoremap <C-h>              <C-\><C-n><C-w>h
 tnoremap <C-j>              <C-\><C-n><C-w>j
 tnoremap <C-k>              <C-\><C-n><C-w>k
 tnoremap <C-l>              <C-\><C-n><C-w>l
-tnoremap <silent> <c-n>     <C-\><C-n>:bnext<cr>
-tnoremap <silent> <c-p>     <C-\><C-n>:bprev<cr>
 
 " Functions
 
@@ -267,10 +258,9 @@ if has('autocmd')
   augroup end
 endif
 
-" Packages 
-
 " Airline
 packadd! vim-airline
+
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
 
@@ -282,9 +272,6 @@ let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
 " Tagbar
 packadd! tagbar
 
-" Fugitive
-packadd! vim-fugitive
-
 " Gtags-Cscope
 packadd! gtags-cscope
 set csprg=gtags-cscope
@@ -296,8 +283,11 @@ let GtagsCscope_Keep_Alive = 1
 let GtagsCscope_Auto_Load = 1
 let GtagsCscope_Quiet = 1
 
-" Unimpaired
+" Tpope 
+packadd! vim-fugitive
 packadd! vim-unimpaired
+packadd! vim-surround
+packadd! vim-repeat
 
 " Matchit (%)
 packadd! matchit
@@ -323,13 +313,11 @@ packadd errormarker.vim
 " Meson build system
 packadd mesonic
 
-" UltiSnips
-packadd vim-snippets
-packadd ultisnips
-let g:UltiSnipsExpandTrigger="<tab>"
-let g:UltiSnipsJumpForwardTrigger="<tab>"
-let g:UltiSnipsJumpBackwardTrigger="<c-b>"
-let g:UltiSnipsEditSplit="vertical"
+" snipmate 
+packadd tlib_vim 
+packadd vim-addon-mw-utils
+packadd vim-snipmate
+packadd vim-snippets 
 
 " better syntax hi 
 packadd vim-syntax-extra