From d848835c576a30bccaea0dd5515e4a22af670992 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Fri, 5 Dec 2014 00:46:10 +0100 Subject: [PATCH] move to neobundle --- .gitmodules | 3 - vim/bundle/Vundle.vim | 1 - vim/snippets/javascript-jasmin.snippets | 60 -------------- vim/snippets/javascript.snippets | 11 --- vimrc | 101 +++++++++++++----------- 5 files changed, 55 insertions(+), 121 deletions(-) delete mode 160000 vim/bundle/Vundle.vim delete mode 100644 vim/snippets/javascript-jasmin.snippets delete mode 100644 vim/snippets/javascript.snippets diff --git a/.gitmodules b/.gitmodules index 2d0def5..3da96cf 100644 --- a/.gitmodules +++ b/.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 diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim deleted file mode 160000 index 8db3bcb..0000000 --- a/vim/bundle/Vundle.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8db3bcb5921103f0eb6de361c8b25cc03cb350b5 diff --git a/vim/snippets/javascript-jasmin.snippets b/vim/snippets/javascript-jasmin.snippets deleted file mode 100644 index 88143bd..0000000 --- a/vim/snippets/javascript-jasmin.snippets +++ /dev/null @@ -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} - diff --git a/vim/snippets/javascript.snippets b/vim/snippets/javascript.snippets deleted file mode 100644 index e24d0d6..0000000 --- a/vim/snippets/javascript.snippets +++ /dev/null @@ -1,11 +0,0 @@ -# requirejs -snippet def - define([ - ${1} - ], function( - ${2} - ){ - 'use strict'; - - ${3} - }); diff --git a/vimrc b/vimrc index 5277b7f..031a360 100644 --- a/vimrc +++ b/vimrc @@ -1,58 +1,66 @@ -" FULL VIM -set nocompatible +" NeoBundle +if !1 | finish | endif -" Vundle +if has('vim_starting') + set nocompatible " Be iMproved -filetype off " required! -" set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() + set runtimepath+=~/.vim/bundle/neobundle.vim/ +endif -" let Vundle manage Vundle, required -Plugin 'gmarik/Vundle.vim' +call neobundle#begin(expand('~/.vim/bundle/')) -Plugin 'L9' -Plugin 'unimpaired.vim' +NeoBundleFetch 'Shougo/neobundle.vim' -Plugin 'scrooloose/nerdtree' -Plugin 'kien/ctrlp.vim' +" my bundles +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' -Plugin 'honza/vim-snippets' +NeoBundle 'surround.vim' -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' -Plugin 'airblade/vim-gitgutter' +NeoBundle 'nathanaelkane/vim-indent-guides' -Plugin 'mileszs/ack.vim' +NeoBundle 'tpope/vim-fugitive' +NeoBundle 'airblade/vim-gitgutter' -Plugin 'vim-airline', {'name': 'airline'} -Plugin 'chriskempson/base16-vim' +NeoBundle 'rking/ag.vim' -Plugin 'scrooloose/syntastic.git' -Plugin 'Raimondi/delimitMate' +NeoBundle 'vim-airline' +NeoBundle 'chriskempson/base16-vim' -Plugin 'pangloss/vim-javascript' -Plugin 'mustache/vim-mustache-handlebars' -Plugin 'gorodinskiy/vim-coloresque' +NeoBundle 'scrooloose/syntastic.git' +NeoBundle 'Raimondi/delimitMate' -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 -call vundle#end() " required -filetype plugin indent on " required +NeoBundle 'mustache/vim-mustache-handlebars' +NeoBundle 'gorodinskiy/vim-coloresque' +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 = "\" "" fast saving nmap w :update @@ -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 n :NERDTreeToggle -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 = '' -let g:NERDTreeWinSize = 20 -set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.pyc,*.db,*.sqlite "" Unimpaired "" bubble single lines @@ -272,6 +273,14 @@ nmap g :IndentGuidesToggle "" Gundo nmap u :GundoToggle +"" Ultisnips +"let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +"let g:UltiSnipsJumpBackwardTrigger="" + +" Tex +let g:tex_flavor = "latex" + " " Autocmd Rules "