trying to get Ultisnips to work...

timwingfield · Jul 6, 2016 · 158ab57 · 158ab57
1 parent 32f09d3
commit 158ab57
Show file tree

Hide file tree

Showing 24 changed files with 44 additions and 36 deletions.
diff --git a/.vim/bundle/ag.vim b/.vim/bundle/ag.vim
diff --git a/.vim/bundle/auto-pairs b/.vim/bundle/auto-pairs
diff --git a/.vim/bundle/javascript-libraries-syntax.vim b/.vim/bundle/javascript-libraries-syntax.vim
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
diff --git a/.vim/bundle/tabular b/.vim/bundle/tabular
diff --git a/.vim/bundle/tlib_vim b/.vim/bundle/tlib_vim
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
diff --git a/.vim/bundle/vim-coffee-script b/.vim/bundle/vim-coffee-script
diff --git a/.vim/bundle/vim-commentary b/.vim/bundle/vim-commentary
diff --git a/.vim/bundle/vim-dispatch b/.vim/bundle/vim-dispatch
diff --git a/.vim/bundle/vim-elixir b/.vim/bundle/vim-elixir
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter
diff --git a/.vim/bundle/vim-instant-markdown b/.vim/bundle/vim-instant-markdown
diff --git a/.vim/bundle/vim-javascript b/.vim/bundle/vim-javascript
diff --git a/.vim/bundle/vim-markdown b/.vim/bundle/vim-markdown
diff --git a/.vim/bundle/vim-rails b/.vim/bundle/vim-rails
diff --git a/.vim/bundle/vim-snippets b/.vim/bundle/vim-snippets
diff --git a/.vim/bundle/vim-surround b/.vim/bundle/vim-surround
diff --git a/.vim/bundle/vim-test b/.vim/bundle/vim-test
diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle
diff --git a/.vim/bundles.vim b/.vim/bundles.vim
@@ -1,14 +1,13 @@
-" ****************************************************************************** 
+" ******************************************************************************
 " VUNDLE!
-" ******************************************************************************  
+" ******************************************************************************
 
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#rc()
 Plugin 'airblade/vim-gitgutter'
 Plugin 'bling/vim-airline'
 Plugin 'elixir-lang/vim-elixir'
 Plugin 'ervandew/supertab'
-Plugin 'garbas/vim-snipmate'
 Plugin 'gmarik/vundle'
 Plugin 'godlygeek/tabular'
 Plugin 'honza/vim-snippets'
@@ -22,6 +21,7 @@ Plugin 'pangloss/vim-javascript'
 Plugin 'rking/ag.vim'
 Plugin 'scrooloose/nerdtree'
 Plugin 'scrooloose/syntastic'
+Plugin 'SirVer/ultisnips'
 Plugin 'suan/vim-instant-markdown'
 Plugin 'tomtom/tlib_vim'
 Plugin 'tpope/vim-commentary'
@@ -31,6 +31,7 @@ Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-markdown'
 Plugin 'tpope/vim-rails'
 Plugin 'tpope/vim-surround'
+Plugin 'vim-airline/vim-airline-themes'
 
 " **** color schemes ****
 Plugin 'tpope/vim-vividchalk'
@@ -39,9 +40,9 @@ Plugin 'vim-scripts/summerfruit256.vim'
 Plugin 'vim-scripts/twilight'
 
 
-" ****************************************************************************** 
+" ******************************************************************************
 " CTRLP
-" ******************************************************************************   
+" ******************************************************************************
 
 " show hidden files
 let g:ctrlp_show_hidden = 1
@@ -55,7 +56,7 @@ nnoremap <silent> <leader>b :CtrlPBuffer<cr>
 
 " ******************************************************************************
 " NERDTREEE
-" ****************************************************************************** 
+" ******************************************************************************
 
 nnoremap <silent> <F2> :NERDTreeToggle<CR>
 
@@ -88,17 +89,24 @@ let g:syntastic_mode_map= {
 
 " toggle the mode
 nnoremap <silent> <leader>s :SyntasticToggleMode<CR>
+" ******************************************************************************
+" ULTISNIP
+" ******************************************************************************
+
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<c-j>"
+let g:UltiSnipsJumpBackwardTrigger="<c-k>"
 
-" ****************************************************************************** 
+" ******************************************************************************
 " VIM-COFFEE-SCRIPT
-" ****************************************************************************** 
+" ******************************************************************************
 
 " compile CoffeeScript in a new buffer
 vnoremap <silent> <localleader>c :CoffeeCompile<CR>
 
-" ****************************************************************************** 
+" ******************************************************************************
 " VIM-GITGUTTER
-" ****************************************************************************** 
+" ******************************************************************************
 
 " start with git gutter off
 let g:gitgutter_enabled = 0
@@ -109,16 +117,17 @@ nnoremap <silent> <leader>g :GitGutterToggle<CR>
 " toggle the git gutter highlights
 nnoremap <silent> <leader>h :GitGutterLineHighlightsToggle<CR>
 
-" ****************************************************************************** 
+" ******************************************************************************
 " VIM-AIRLINE
-" ****************************************************************************** 
+" ******************************************************************************
 
 " add fancy schmancy fonts
 let g:airline_powerline_fonts=1
 
 " set the airline theme
 let g:airline_theme='simple'
 
+
 " show buffers
 let g:airline#extensions#tabline#enabled = 1
 

diff --git a/.vim/install.vim b/.vim/install.vim
@@ -5,5 +5,4 @@
 set nocompatible
 filetype off
 source ~/.vim/bundles.vim
-filetype indent plugin on
-filetype plugin on
+filetype plugin indent on