summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vim/neobundle.toml18
-rw-r--r--vim/vimrc9
2 files changed, 16 insertions, 11 deletions
diff --git a/vim/neobundle.toml b/vim/neobundle.toml
index 623b872..8047946 100644
--- a/vim/neobundle.toml
+++ b/vim/neobundle.toml
@@ -31,14 +31,6 @@ repository = 'Shougo/vimfiler.vim'
lazy = 0
[[plugins]]
-repository = 'SirVer/ultisnips'
-
-[[plugins]]
-repository = 'honza/vim-snippets'
-lazy = 1
-on_i = 1
-
-[[plugins]]
repository = 'chriskempson/base16-vim'
[[plugins]]
@@ -126,6 +118,16 @@ repository = 'Shougo/vinarise.vim'
on_cmd = 'Vinarise'
[[plugins]]
+repository = 'Shougo/neosnippet.vim'
+lazy = 1
+on_map = ['i', '<Plug>']
+
+[[plugins]]
+repository = 'Shougo/neosnippet-snippets'
+lazy = 1
+on_source = 'neosnippet.vim'
+
+[[plugins]]
repository = 'junegunn/vim-easy-align'
lazy = 1
on_cmd = ['EasyAlign', 'LiveEasyAlign']
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')