Commits

j committed 760f60b

Split .vimrc into separate files. Manage plugins via Vundle.

Comments (0)

Files changed (5)

 fish/completions
 fish/fish_history
 fish/fishd*
+vim/bundle
         echo "/usr/local/bin/fish" | sudo tee -a /etc/shells
         chsh -s /usr/local/bin/fish
     fi
-
 fi
 
-mkdir -p $HOME/.config $VIRTUALENVS_HOME
-
 # Create .hgrc and .hgrc_local files if not present
 if [ ! -f ~/.hgrc ]; then
     echo -e "\nNo ~/.hgrc detected."
 # If ~/.hgrc isn't a symlink, move it out of the way so symlink can be created
 test -L $HOME/.hgrc || mv $HOME/.hgrc $HOME/.hgrc.bak
 
+# Create needed directories
+mkdir -p $HOME/.config $TOOLS_HOME/vim/bundle $VIRTUALENVS_HOME
+
+# Install Vundle
+test -d $TOOLS_HOME/vim/bundle/vundle || git clone http://github.com/gmarik/vundle.git $TOOLS_HOME/vim/bundle/vundle
+SHELL=$(which sh) vim +BundleInstall +qall
+
 # Ensure symlinks
 function ensure_link {
     test -L "$HOME/$2" || ln -s "$TOOLS_HOME/$1" "$HOME/$2"
+" Basic options ----------------------------------------------------------------
+
+syntax on
+set visualbell t_vb=      " Turn off bell: most annoying default ever created
+
+" Tabs and spaces --------------------------------------------------------------
+
+set shiftwidth=4          " Spaces to use for each indent step (>>, <<, etc.)
+set softtabstop=4         " Spaces to use for <tab> and <BS> editing operations
+set expandtab             " Use appropriate # of spaces for <tab> in insert mode
 " .vimrc
-" Author: Justin Mayer <entroP@gmail.com>
+" Author: Justin Mayer (@jmayer)
 " Source: https://bitbucket.org/j/dotfiles/src/tip/vim/
 
-" Preamble ---------------------------------------------------------------------
+set nocompatible          " Use vim instead of vi settings; this must come first
 
-set nocompatible          " Use vim instead of vi settings; this must come first
-syntax on                 " Enable syntax highlighting
+source ~/.vim/vundle.vim  " Plugins contained within are installed via Vundle
+
 filetype plugin indent on " Load filetype-specific indent and plugin files
 
-" Basic options ----------------------------------------------------------------
-
-set visualbell t_vb=      " Turn off bell: most annoying default ever created
-
-" Tabs and spaces --------------------------------------------------------------
-
-set shiftwidth=4          " Spaces to use for each indent step (>>, <<, etc.)
-set softtabstop=4         " Spaces to use for <tab> and <BS> editing operations
-set expandtab             " Use appropriate # of spaces for <tab> in insert mode
+source ~/.vim/config.vim  " Core configuration
+" Vundle ----------------------------------------------------------------------
+
+filetype off
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+
+Bundle 'gmarik/vundle'
+
+" Plugin bundles --------------------------------------------------------------
+
+" Language syntax
+Bundle 'fish.vim'
+Bundle 'mutewinter/nginx.vim'