1 files changed, 6 insertions, 3 deletions
diff --git a/vim/vimrc b/vim/vimrc
index 6f79be6..a3faa66 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -60,9 +60,12 @@ if neobundle#tap('vimfiler.vim')
 	let neobundle#hooks.on_source = s:plugrc . '/vimfiler.rc.vim'
 	call neobundle#untap()
 endif
-if neobundle#tap('ultisnips')
-	let g:UltiSnipsForwardTrigger  = "<c-,>"
-	let g:UltiSnipsBackwardTrigger = "<c-.>"
+if neobundle#tap('neosnippet.vim')
+	let g:neosnippet#snippets_directory =
+		\ $XDG_CONFIG_HOME . '/vim/snippets'
+	imap <C-k> <Plug>(neosnippet_expand_or_jump)
+	smap <C-k> <Plug>(neosnippet_expand_or_jump)
+	xmap <C-k> <Plug>(neosnippet_expand_or_jump)
 	call neobundle#untap()
 endif
 if neobundle#tap('clang_complete')