Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Replaced SnipMate with UltiSnips

  • Loading branch information...
commit bd3c8466861f1280cef4a93c4d4664f6692b6dc2 1 parent df37f4d
@dbrgn authored
Showing with 18 additions and 14 deletions.
  1. +7 −0 .vim/UltiSnips/python.snippets
  2. +11 −14 .vimrc
View
7 .vim/UltiSnips/python.snippets
@@ -0,0 +1,7 @@
+snippet compat "Compatibility future imports" b
+from __future__ import print_function, division, absolute_import, unicode_literals
+endsnippet
+
+snippet ipdb "Set ipdb breakpoint" b
+import ipdb; ipdb.set_trace()
+endsnippet
View
25 .vimrc
@@ -22,11 +22,11 @@ Bundle 'gmarik/vundle'
" Command-T
Bundle 'Command-T'
-" Snipmate
-Bundle 'MarcWeber/vim-addon-mw-utils'
-Bundle 'tomtom/tlib_vim'
-Bundle 'honza/snipmate-snippets'
-Bundle 'davidhalter/vim-snipmate'
+" Ultisnips
+Bundle 'SirVer/ultisnips'
+
+" Autocompletion
+Bundle 'Valloric/YouCompleteMe'
" Python plugins
Bundle 'vim-flake8'
@@ -35,9 +35,6 @@ Bundle 'fs111/pydoc.vim'
" Support for less syntax highlighting
Bundle 'groenewege/vim-less'
-" Autocompletion
-Bundle 'Valloric/YouCompleteMe'
-
" Zen coding
Bundle 'mattn/zencoding-vim'
@@ -152,16 +149,16 @@ map <leader>l :w<CR> :!rubber -m pdftex % && killall -HUP mupdf<CR><CR>
map <leader>m :w<CR> :!make<CR><CR>
" Configure Command-T behavior
-let g:CommandTAcceptSelectionTabMap = '<CR>'
-let g:CommandTAcceptSelectionSplitMap = '<C-CR>'
-
-" Configure snipmate
-let g:snips_author = 'Danilo Bargen'
-let g:snipMateAllowMatchingDot = 0
+let g:CommandTAcceptSelectionTabMap = "<CR>"
+let g:CommandTAcceptSelectionSplitMap = "<C-CR>"
" Configure YCM
let g:ycm_autoclose_preview_window_after_completion=1
+" Configure UltiSnips
+let g:UltiSnipsExpandTrigger = "<C-x>"
+let g:UltiSnipsListSnippets = "<C-l>"
+
" Configure GTK syntax highlighting
let glib_deprecated_errors = 1
Please sign in to comment.
Something went wrong with that request. Please try again.