summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '.config')
m---------.config/vim/bundle/ultisnips0
m---------.config/vim/bundle/vim-snippets0
-rw-r--r--.config/vim/vimrc14
3 files changed, 13 insertions, 1 deletions
diff --git a/.config/vim/bundle/ultisnips b/.config/vim/bundle/ultisnips
new file mode 160000
+Subproject dbd43ad27cbfed14c9dc3de6d5acb5f4edb8f64
diff --git a/.config/vim/bundle/vim-snippets b/.config/vim/bundle/vim-snippets
new file mode 160000
+Subproject 1f8a204b5cd7e6911d7b650c819af4e7ac9922b
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index 7b0f2fb..4d9b30d 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -99,7 +99,7 @@ endif
map M :%s/ $//g
" use Tab to switch between current and last buffer
-nmap <Tab> :b#<CR>
+"nmap <Tab> :b#<CR>
map <C-n> :NERDTreeToggle<CR>
@@ -174,6 +174,18 @@ autocmd BufWinLeave * call clearmatches()
set wildignore+=Tests/*,*.swp " Linux/MacOSX
+let g:UltiSnipsExpandTrigger = '<tab>'
+let g:UltiSnipsListSnippets = '<c-tab>'
+let g:UltiSnipsJumpForwardTrigger = '<c-j>'
+let g:UltiSnipsJumpBackwardTrigger = '<c-k>'
+let g:UltiSnipsSnippetsDir = '~/.config/vim/UltiSnips/'
+let g:snips_author = 'Benjamin Franzke <bfr@qbus.de>'
+
+
+" If you want :UltiSnipsEdit to split your window.
+let g:UltiSnipsEditSplit="vertical"
+
+
call pathogen#infect()
colorscheme tangoX