move to neobundle

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "vim/bundle/Vundle.vim"]
-	path = vim/bundle/Vundle.vim
-	url = https://github.com/gmarik/Vundle.vim.git
 [submodule "oh-my-zsh"]
 	path = oh-my-zsh
 	url = git@github.com:robbyrussell/oh-my-zsh.git

vim/snippets/javascript-jasmin.snippets

@@ -1,60 +0,0 @@
-# Describe
-snippet des
-	describe('${1:description}', function(${2}) {
-		${3}
-	});
-
-# After Each
-snippet aft
-	afterEach(function(${1}) {
-		${2}
-	});${0}
-
-#	Before Each
-snippet bef
-	beforeEach(function(${1}) {
-		${2}
-	});
-
-# It
-snippet it
-	it('${1:description}', function(${2}) {
-		${3}
-	});
-
-# Stub
-snippet stub
-	sandbox.stub(${1:target},'${2:function}');${3}
-
-# Spy
-snippet spy
-	sandbox.spy(${1:target},'${2:function}');${3}
-
-# Expect not to be defined
-snippet end
-	expect(${1:target}).not.toBeDefined();${2}
-
-# Expect not to contain
-snippet enc
-	expect(${1:target}).not.toContain(${2:value});${3}
-
-# Expect not to equal
-snippet ene
-	expect(${1:target}).not.toEqual(${2:value});${3}
-
-# Expect not
-snippet enx
-	expect(${1:target}).not.${2};${3}
-
-# Expect to be defined
-snippet etd
-	expect(${1:target}).toBeDefined();${2}
-
-# Expect to contain
-snippet etc
-	expect(${1:target}).toContain(${2:value});${3}
-
-# Expect to equal
-snippet ete
-	expect(${1:target}).toEqual(${2:value});${3}
-

vim/snippets/javascript.snippets

@@ -1,11 +0,0 @@
-# requirejs
-snippet def
-	define([
-		${1}
-	], function(
-		${2}
-	){
-		'use strict';
-
-		${3}
-	});

vimrc

@@ -1,58 +1,66 @@
-" FULL VIM
+" NeoBundle
-set nocompatible
+if !1 | finish | endif
 
-" Vundle
+if has('vim_starting')
+  set nocompatible               " Be iMproved
 
-filetype off  " required!
+  set runtimepath+=~/.vim/bundle/neobundle.vim/
-" set the runtime path to include Vundle and initialize
+endif
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
 
-" let Vundle manage Vundle, required
+call neobundle#begin(expand('~/.vim/bundle/'))
-Plugin 'gmarik/Vundle.vim'
 
-Plugin 'L9'
+NeoBundleFetch 'Shougo/neobundle.vim'
-Plugin 'unimpaired.vim'
 
-Plugin 'scrooloose/nerdtree'
+" my bundles
-Plugin 'kien/ctrlp.vim'
+NeoBundle 'L9'
+NeoBundle 'unimpaired.vim'
 
-Plugin 'Gundo'
+NeoBundle 'Shougo/unite.vim'
 
-Plugin 'scrooloose/nerdcommenter'
+NeoBundle 'scrooloose/nerdtree'
+NeoBundle 'kien/ctrlp.vim'
 
-Plugin 'surround.vim'
+NeoBundle 'scrooloose/nerdcommenter'
 
-Plugin 'SirVer/ultisnips'
+NeoBundle 'surround.vim'
-Plugin 'honza/vim-snippets'
 
-Plugin 'editorconfig/editorconfig-vim'
+NeoBundle 'SirVer/ultisnips'
+NeoBundle 'honza/vim-snippets'
 
-Plugin 'sheerun/vim-polyglot'
+NeoBundle 'editorconfig/editorconfig-vim'
 
-Plugin 'nathanaelkane/vim-indent-guides'
+NeoBundle 'sheerun/vim-polyglot'
 
-Plugin 'tpope/vim-fugitive'
+NeoBundle 'nathanaelkane/vim-indent-guides'
-Plugin 'airblade/vim-gitgutter'
 
-Plugin 'mileszs/ack.vim'
+NeoBundle 'tpope/vim-fugitive'
+NeoBundle 'airblade/vim-gitgutter'
 
-Plugin 'vim-airline', {'name': 'airline'}
+NeoBundle 'rking/ag.vim'
-Plugin 'chriskempson/base16-vim'
 
-Plugin 'scrooloose/syntastic.git'
+NeoBundle 'vim-airline'
-Plugin 'Raimondi/delimitMate'
+NeoBundle 'chriskempson/base16-vim'
 
-Plugin 'pangloss/vim-javascript'
+NeoBundle 'scrooloose/syntastic.git'
-Plugin 'mustache/vim-mustache-handlebars'
+NeoBundle 'Raimondi/delimitMate'
-Plugin 'gorodinskiy/vim-coloresque'
 
-Plugin 'inside/vim-search-pulse'
+NeoBundle 'jelera/vim-javascript-syntax'
+NeoBundle 'JavaScript-Indent'
+NeoBundle 'othree/javascript-libraries-syntax.vim'
+NeoBundle 'marijnh/tern_for_vim'
 
-" All of your Plugins must be added before the following line
+NeoBundle 'mustache/vim-mustache-handlebars'
-call vundle#end()            " required
+NeoBundle 'gorodinskiy/vim-coloresque'
-filetype plugin indent on    " required
 
+NeoBundle 'inside/vim-search-pulse'
+
+call neobundle#end()
+
+filetype plugin indent on
+
+NeoBundleCheck
+
+" other stuff
 
 "" Encoding
 set encoding=utf-8
@@ -143,15 +151,16 @@ set t_vb=
 set spelllang=en,de
 
 "" long lines
-let &showbreak='↪ '
+set showbreak=~
 
 "
 " KEY MAPPINGS
 "
 
 "" MAP LEADER
-noremap , \
+	noremap , \
 let mapleader = ","
+"let mapleader = "\<Space>"
 
 "" fast saving
 nmap <leader>w :update<cr>
@@ -231,7 +240,7 @@ endif
 "
 
 "" syntastic
-let g:syntastic_javascript_checkers = ['jscs','jshint']
+let g:syntastic_javascript_checkers = ['jshint','jscs']
 let g:syntastic_check_on_open = 1
 
 "" ariline
@@ -241,14 +250,6 @@ let g:airline#extensions#tabline#enabled = 1
 
 "" NERDTree configuration
 nmap <leader>n :NERDTreeToggle<CR>
-let NERDTreeChDirMode=2
-let NERDTreeIgnore=['\.rbc$', '\~$', '\.pyc$', '\.db$', '\.sqlite$', '__pycache__']
-let NERDTreeSortOrder=['^__\.py$', '\/$', '*', '\.swp$', '\.bak$', '\~$']
-let NERDTreeShowBookmarks=1
-let g:nerdtree_tabs_focus_on_files=1
-let g:NERDTreeMapOpenInTabSilent = '<RightMouse>'
-let g:NERDTreeWinSize = 20
-set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.pyc,*.db,*.sqlite
 
 "" Unimpaired
 "" bubble single lines
@@ -272,6 +273,14 @@ nmap <leader>g :IndentGuidesToggle<CR>
 "" Gundo
 nmap <leader>u :GundoToggle<CR>
 
+"" Ultisnips
+"let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<tab>"
+"let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+
+" Tex
+let g:tex_flavor = "latex"
+
 "
 " Autocmd Rules
 "