diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle deleted file mode 160000 index f31aa52..0000000 --- a/.vim/bundle/vundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f31aa52552ceb40240e56e475e6df89cc756507e diff --git a/.vim/vimrc b/.vim/vimrc index 062b65b..b40e9b4 100644 --- a/.vim/vimrc +++ b/.vim/vimrc @@ -3,9 +3,10 @@ set nocompatible filetype off -set rtp+=~/.vim/bundle/vundle/ -call vundle#rc() -Bundle 'gmarik/vundle' +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() + +Plugin 'gmarik/Vundle.vim' if $MONO != "yes" set t_Co=256 " Set to 256 color mode. @@ -82,89 +83,91 @@ nmap u :GundoToggle filetype off " Plugins -Bundle 'Shougo/vimproc' -Bundle 'sjl/gundo.vim.git' -Bundle 'scrooloose/nerdcommenter.git' -Bundle 'scrooloose/nerdtree.git' -Bundle 'msanders/snipmate.vim.git' -Bundle 'godlygeek/tabular.git' -Bundle 'tpope/vim-surround.git' -Bundle 'mattn/gist-vim.git' -Bundle 'tpope/vim-fugitive.git' -Bundle 'python.vim' -Bundle 'kien/ctrlp.vim.git' -Bundle 'scratch.vim' -Bundle 'bling/vim-airline' -Bundle 'tpope/vim-characterize' +Plugin 'Shougo/vimproc' +Plugin 'sjl/gundo.vim.git' +Plugin 'scrooloose/nerdcommenter.git' +Plugin 'scrooloose/nerdtree.git' +Plugin 'msanders/snipmate.vim.git' +Plugin 'godlygeek/tabular.git' +Plugin 'tpope/vim-surround.git' +Plugin 'mattn/gist-vim.git' +Plugin 'tpope/vim-fugitive.git' +Plugin 'python.vim' +Plugin 'kien/ctrlp.vim.git' +Plugin 'scratch.vim' +Plugin 'bling/vim-airline' +Plugin 'tpope/vim-characterize' +Plugin 'tpope/vim-vinegar' " Syntax -Bundle 'groenewege/vim-less.git' -Bundle 'tpope/vim-haml.git' -Bundle 'jnwhiteh/vim-golang' -Bundle 'slim-template/vim-slim.git' -Bundle 'juvenn/mustache.vim.git' -Bundle 'puppetlabs/puppet-syntax-vim.git' +Plugin 'groenewege/vim-less.git' +Plugin 'tpope/vim-haml.git' +Plugin 'jnwhiteh/vim-golang' +Plugin 'slim-template/vim-slim.git' +Plugin 'juvenn/mustache.vim.git' +Plugin 'puppetlabs/puppet-syntax-vim.git' " Themes -Bundle 'jnurmine/Zenburn.git' -Bundle 'ciaranm/inkpot.git' -Bundle 'nanotech/jellybeans.vim.git' -Bundle 'guns/jellyx.vim.git' -Bundle 'strange/strange.vim.git' -Bundle 'veloce/vim-aldmeris.git' -Bundle 'altercation/vim-colors-solarized.git' -Bundle 'Lokaltog/vim-distinguished.git' -Bundle 'nelstrom/vim-mac-classic-theme.git' -Bundle 'atonse/vydark.git' -Bundle 'vim-scripts/vylight.git' -Bundle 'tpope/vim-vividchalk.git' -Bundle 'ciaranm/inkpot.git' -Bundle 'jpo/vim-railscasts-theme.git' -Bundle 'oguzbilgic/sexy-railscasts-theme.git' -Bundle 'mrkn/mrkn256.vim.git' -Bundle 'bcat/abbott.vim.git' -Bundle 'twilight256.vim' -Bundle 'vilight.vim' -Bundle 'dasch/vim-mocha.git' -Bundle 'dasch/satellite.git' -Bundle 'djjcast/mirodark.git' -Bundle 'molok/vim-vombato-colorscheme.git' -"Bundle 'jelera/vim-gummybears-colorscheme.git' -Bundle 'vim-scripts/Gummybears' -Bundle 'sjl/badwolf.git' -Bundle 'shawncplus/skittles_berry.git' -Bundle 'Skittles-Dark' -Bundle 'tortex' -Bundle 'mayansmoke' -Bundle 'sjl/badwolf.git' -Bundle 'w0ng/vim-hybrid.git' -Bundle 'blackgate/tropikos-vim-theme.git' -Bundle 'zaki/zazen.git' -Bundle 'jonathanfilip/vim-lucius.git' -Bundle 'chriskempson/vim-tomorrow-theme.git' -Bundle 'tangphillip/SunburstVIM.git' -Bundle 'nelstrom/vim-blackboard.git' -Bundle 'tomasr/molokai.git' -Bundle 'zeis/vim-kolor.git' -Bundle 'morhetz/gruvbox.git' -Bundle 'trapd00r/neverland-vim-theme.git' -Bundle 'chriskempson/base16-vim.git' -Bundle 'changyuheng/color-scheme-holokai-of-vim.git' -Bundle 'noahfrederick/Hemisu.git' -Bundle 'sk1418/last256.git' -Bundle 'toupeira/vim-desertink.git' -Bundle 'junegunn/seoul256.vim.git' -Bundle 'lsdr/monokai' -Bundle 'daylerees/colour-schemes', { "rtp": "vim-themes/" } -Bundle 'Pychimp/vim-luna' -Bundle 'Pychimp/vim-sol' -Bundle 'vim-scripts/wombat256.vim' -Bundle 'vim-scripts/Wombat' +Plugin 'jnurmine/Zenburn.git' +Plugin 'nanotech/jellybeans.vim.git' +Plugin 'guns/jellyx.vim.git' +Plugin 'strange/strange.vim.git' +Plugin 'veloce/vim-aldmeris.git' +Plugin 'altercation/vim-colors-solarized.git' +Plugin 'Lokaltog/vim-distinguished.git' +Plugin 'nelstrom/vim-mac-classic-theme.git' +Plugin 'atonse/vydark.git' +Plugin 'vim-scripts/vylight.git' +Plugin 'tpope/vim-vividchalk.git' +Plugin 'ciaranm/inkpot.git' +Plugin 'jpo/vim-railscasts-theme.git' +Plugin 'oguzbilgic/sexy-railscasts-theme.git' +Plugin 'mrkn/mrkn256.vim.git' +Plugin 'bcat/abbott.vim.git' +Plugin 'twilight256.vim' +Plugin 'vilight.vim' +Plugin 'dasch/vim-mocha.git' +Plugin 'dasch/satellite.git' +Plugin 'djjcast/mirodark.git' +Plugin 'molok/vim-vombato-colorscheme.git' +"Plugin 'jelera/vim-gummybears-colorscheme.git' +Plugin 'vim-scripts/Gummybears' +Plugin 'sjl/badwolf.git' +Plugin 'shawncplus/skittles_berry.git' +Plugin 'Skittles-Dark' +Plugin 'tortex' +Plugin 'mayansmoke' +Plugin 'w0ng/vim-hybrid.git' +Plugin 'blackgate/tropikos-vim-theme.git' +Plugin 'zaki/zazen.git' +Plugin 'jonathanfilip/vim-lucius.git' +Plugin 'chriskempson/vim-tomorrow-theme.git' +Plugin 'tangphillip/SunburstVIM.git' +Plugin 'nelstrom/vim-blackboard.git' +Plugin 'tomasr/molokai.git' +Plugin 'zeis/vim-kolor.git' +Plugin 'morhetz/gruvbox.git' +Plugin 'trapd00r/neverland-vim-theme.git' +Plugin 'chriskempson/base16-vim.git' +Plugin 'changyuheng/color-scheme-holokai-of-vim.git' +Plugin 'noahfrederick/Hemisu.git' +Plugin 'sk1418/last256.git' +Plugin 'toupeira/vim-desertink.git' +Plugin 'junegunn/seoul256.vim.git' +Plugin 'lsdr/monokai' +"Plugin 'daylerees/colour-schemes', { "rtp": "vim" } +Plugin 'Pychimp/vim-luna' +Plugin 'Pychimp/vim-sol' +Plugin 'vim-scripts/wombat256.vim' +Plugin 'vim-scripts/Wombat' +Plugin 'hukl/Smyck-Color-Scheme' +Plugin 'tpope/vim-commentary' + +call vundle#end() +filetype plugin indent on colorscheme last256 -filetype plugin indent on - " Force hash comments to retain their indentation level. inoremap # X#