6 files changed, 7 insertions, 264 deletions
diff --git a/.vim/UltiSnips/c.snippets b/.vim/UltiSnips/c.snippets
deleted file mode 100644
index 3fcf3a3..0000000
--- a/.vim/UltiSnips/c.snippets
+++ /dev/null
@@ -1,37 +0,0 @@
-priority -50
-
-snippet ndf "#ifndef ... #define ... #endif"
-#ifndef ${1/([A-Za-z0-9_]+).*/$1/}
-#define ${1:SYMBOL} val
-#endif
-endsnippet
-
-snippet main "main() (main)"
-int main(int argc, char **argv)
-{
-	${VISUAL}$0
-	return 0;
-}
-endsnippet
-
-snippet ig "include guard"
-`!p
-if not snip.c:
-	name = re.sub(r'[^A-Za-z0-9]+','_', fn).upper()
-	fpath = os.path.abspath(path)
-	val = ''
-	if (os.path.basename(os.path.dirname(fpath)) == 'src'):
-		dname = os.path.dirname(os.path.dirname(fpath))
-		dname = os.path.basename(dname)
-		dname = re.sub(r'[^A-Za-z0-9]+','_', dname).upper()
-		val = ('%s_%s' % (dname,name))
-	else:
-		val = name
-	snip.rv = '#ifndef ' + val + '\n#define ' + val
-else:
-	snip.rv = snip.c`
-
-${VISUAL}$0
-
-#endif
-endsnippet
diff --git a/.vim/UltiSnips/crystal.snippets b/.vim/UltiSnips/crystal.snippets
deleted file mode 100644
index 7e172d6..0000000
--- a/.vim/UltiSnips/crystal.snippets
+++ /dev/null
@@ -1,16 +0,0 @@
-priority -50
-
-snippet mod "module ... end"
-module ${VISUAL}$0
-end
-endsnippet
-
-snippet class "module ... end"
-class ${VISUAL}$0
-end
-endsnippet
-
-snippet def "def ... end"
-def ${VISUAL}$0
-end
-endsnippet
diff --git a/.vim/UltiSnips/elixir.snippets b/.vim/UltiSnips/elixir.snippets
deleted file mode 100644
index 6c90508..0000000
--- a/.vim/UltiSnips/elixir.snippets
+++ /dev/null
@@ -1,7 +0,0 @@
-priority -50
-
-snippet do "do ... end"
-do
-  ${VISUAL}$0
-end
-endsnippet
diff --git a/.vim/UltiSnips/go.snippets b/.vim/UltiSnips/go.snippets
deleted file mode 100644
index be1d61f..0000000
--- a/.vim/UltiSnips/go.snippets
+++ /dev/null
@@ -1,9 +0,0 @@
-priority -50
-
-snippet main "main() (main)"
-package main
-
-func main() {
-	${VISUAL}$0
-}
-endsnippet
diff --git a/.vim/UltiSnips/html.snippets b/.vim/UltiSnips/html.snippets
deleted file mode 100644
index 73983a7..0000000
--- a/.vim/UltiSnips/html.snippets
+++ /dev/null
@@ -1,189 +0,0 @@
-priority -50
-
-global !p
-def x(snip):
-	if snip.ft.startswith("x"):
-		snip.rv = '/'
-	else:
-		snip.rv = ""
-endglobal
-
-snippet doctype "HTML - 5.0 (doctype)" b
-<!DOCTYPE html>
-
-endsnippet
-
-snippet a "Link" w
-<a href="${1:http://www.${2:url.com}}"${3: target="_blank"}>${4:Anchor Text}</a>
-endsnippet
-
-snippet abbr "<abbr>" w
-<abbr title="$2">$1</abbr>
-endsnippet
-
-snippet address "<address>" w
-<address>$1</address>
-endsnippet
-
-snippet article "<article>"
-<article>
-	${1:article content}
-</article>
-endsnippet
-
-snippet aside "<aside>"
-<aside>
-	${1:aside content}
-</aside>
-endsnippet
-
-snippet base "HTML <base>" w
-<base href="$1"${2: target="$3"}`!p x(snip)`>
-endsnippet
-
-snippet blockquote "<blockquote>"
-<blockquote>$1</blockquote>
-endsnippet
-
-snippet body "<body>"
-<body>
-	${0:${VISUAL}}
-</body>
-endsnippet
-
-snippet button "<button>"
-<button>$1</button>
-endsnippet
-
-snippet caption "<caption>"
-<caption>$1</caption>
-endsnippet
-
-snippet cite "<cite>" w
-<cite>$1</cite>
-endsnippet
-
-snippet dfn "<dfn>" w
-<dfn>$1</dfn>
-endsnippet
-
-snippet div "<div>" w
-<div>
-	${0:${VISUAL}}
-</div>
-endsnippet
-
-snippet fig "<figure>"
-<figure>
-$1
-<figcaption>$2</figcaption>
-</figure>
-endsnippet
-
-snippet figcaption "<figcaption>"
-<figcaption>$1</figcaption>
-endsnippet
-
-snippet footer "<footer>"
-<footer>
-	${1:footer content}
-</footer>
-endsnippet
-
-snippet h1 "HTML <h1>" w
-<h1>${0:${VISUAL}}</h1>
-endsnippet
-
-snippet h2 "HTML <h2>" w
-<h2>${0:${VISUAL}}</h2>
-endsnippet
-
-snippet h3 "HTML <h3>" w
-<h3>${0:${VISUAL}}</h3>
-endsnippet
-
-snippet h4 "HTML <h4>" w
-<h4>${0:${VISUAL}}</h4>
-endsnippet
-
-snippet h5 "HTML <h5>" w
-<h5>${0:${VISUAL}}</h5>
-endsnippet
-
-snippet h6 "HTML <h6>" w
-<h6>${0:${VISUAL}}</h6>
-endsnippet
-
-snippet head "HTML <head>"
-<head>
-	<meta charset="utf-8">
-	<title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
-	${0:${VISUAL}}
-</head>
-endsnippet
-
-snippet header "<header>"
-<header>
-	${1:header content}
-</header>
-endsnippet
-
-snippet html "HTML basic structure" b
-<!DOCTYPE html>
-<html lang="en-GB">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width" />
-		<title>${1:`!p snip.rv = snip.basename.replace('-', ' ').capitalize()`}</title>
-	</head>
-	<body>
-		${0:body}
-	</body>
-</html>
-endsnippet
-
-snippet li "list item" w
-<li>${0:${VISUAL}}</li>
-endsnippet
-
-snippet main "<main>"
-<main>
-	${1:main content}
-</main>
-endsnippet
-
-snippet nav "<nav>"
-<nav>
-	${1:navigation links}
-</nav>
-endsnippet
-
-snippet p "paragraph" w
-<p>${0:${VISUAL}}</p>
-endsnippet
-
-snippet script "HTML <script>" w
-<script charset="utf-8">
-	${0:${VISUAL}}
-</script>
-endsnippet
-
-snippet span "<span>" w
-<span>${0:${VISUAL}}</span>
-endsnippet
-
-snippet style "HTML <style>" w
-<style type="text/css" media="screen">
-	${0:${VISUAL}}
-</style>
-endsnippet
-
-snippet title "HTML <title>" w
-<title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
-endsnippet
-
-snippet ul "unordered list" w
-<ul>
-	${0:${VISUAL}}
-</ul>
-endsnippet
diff --git a/.vimrc b/.vimrc
index 48a3b48..172d740 100644
--- a/.vimrc
+++ b/.vimrc
@@ -43,12 +43,15 @@ Plug 'sjl/gundo.vim'
 
 Plug 'itchyny/lightline.vim'
 
+Plug 'MarcWeber/vim-addon-mw-utils'
+Plug 'tomtom/tlib_vim'
+Plug 'garbas/vim-snipmate'
+Plug 'honza/vim-snippets'
+
 Plug 'dhruvasagar/vim-table-mode'
 
 Plug 'tomtom/tcomment_vim'
 
-Plug 'SirVer/ultisnips'
-
 call plug#end()
 
 
@@ -69,10 +72,8 @@ set ttimeoutlen=100
 "toggle gundo pane
 nnoremap <Leader>g :GundoToggle<CR>
 
-"snippet bindings
-let g:UltiSnipsExpandTrigger='<tab>'
-let g:UltiSnipsJumpForwardTrigger='<c-m>'
-let g:UltiSnipsJumpBackwardTrigger='<c-,>'
+"snippets
+let g:snipMate = { 'snippet_version' : 1 }
 
 "lightline colours. modded from 16color
 fun! s:Lightline_palette_init()