Merge pull request #16 from New-Bamboo/2.0

2.0 upgrade

.gitignore

@@ -1,2 +1,6 @@
 *.log
 *.gz
+hermes/vim/bundle
+hermes/vim/spell/*.add
+hermes/vim/spell/*.add.spl
+hermes/bashrc.d/hermes-install-path.bash

Brewfile

@@ -0,0 +1,17 @@
+update
+install ack
+install autojump
+install bash
+install bash-completion
+install ctags
+install direnv
+install git
+install grc
+install rbenv
+install reattach-to-user-namespace
+install ruby-build
+install the_silver_searcher
+install tmux
+install tree
+install vim
+install wget

README.md

@@ -269,43 +269,39 @@ recalculation. This means that a manual installation may be spread
 across multiple directories, resulting in a structure that is
 difficult to maintain and update.
 
-Enter [Pathogen](https://github.com/tpope/vim-pathogen), a package
+Enter [Vundle](https://github.com/gmarik/vundle), a package
 manager that makes this process painless and that inverts the
 usual installation pattern, as it lets you organize plugins based
-on their name. With Pathogen, you can simply clone a repository into
-your `~/.vim` folder and you're done. This is the first stepping
-stone to efficient dotfile management through a git repository
-where you can add all your plugins as git submodules and update
-all of them with a single command.
+on their name.
 
-Hermes uses git submodules extensively: since Pathogen allows
-us to keep each plugin in a separate folder, we can include all of
-our plugins as submodules in the `hermes/vim/bundle` folder. This
-makes it dead easy to add other plugins and keep them up-to-date:
+Vundle has been inspired by [Bundler](http://gembundler.com), the package
+manager for Ruby and it uses a similar approach. Let's say that we want to add
+the NerdTree plugin to our configuration, available at
+<http://github.com/scrooloose/nerdtree>.
 
-    cd ~/.hermes
-    git submodule add <github-url> hermes/vim/bundle/<plugin-name>
+We can just open `~/.vimrc`, add a single line:
 
-And you're done! Updating plugins is similarly straightforward:
+    Bundle 'scrooloose/nerdtree'
 
-    cd ~/.hermes
-    git submodule foreach git pull origin master
+And then run `:BundleInstall` as a normal mode command. Done!
+
+Under the hood, Vundle will download the plugin, store it into `vim/bundle` and
+load it into the runtime.
 
-As in every other Github-based project, it's advisable
-to fork a plugin if you need to make changes that go
-beyond simple configuration (which we usually add to
-`~/.hermes/vim/plugins.vim`). In that case, you would need to
-remove the original submodule completely and add it back again
-using your fork as the source.
+Using Vundle requires just a preliminary installation (included in the Hermes
+installation script) and a few lines at the top of our `~/.vimrc`:
 
-Pathogen loads the contents of `~/.vim/bundle` by default.
-including itself. This is controlled by the first two lines in the
-`~/.vimrc` file:
+    " Options required by Vundle
+    set nocompatible
+    filetype off
 
-    " loading pathogen at runtime as it's bundled
-    runtime bundle/vim-pathogen/autoload/pathogen.vim
-    call pathogen#infect()
+    " Setup Vundle
+    set rtp+=bundle/vundle/
+    call vundle#rc()
 
+Vundle is capable of searching, updating and installing other plugins and
+features an interactive mode. Be sure to run `:help vundle` to learn all of
+these tricks.
 
 ### Managing configuration
 

hermes/bashrc

@@ -23,9 +23,8 @@ function source_modules {
   unset f
 }
 
-function configure_rvm {
-  [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-  export PATH=$PATH:$HOME/.rvm/bin
+function configure_rbenv {
+  if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
 }
 
 function tmuxify_command_prompt {
@@ -40,8 +39,8 @@ export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 
 load_homebrew_command_completions
 source_modules
-configure_rvm
+configure_rbenv
 configure_editor
 tmuxify_command_prompt
 
-eval `direnv hook $0`
+eval "$(direnv hook $0)"

hermes/bashrc.d/hermes.bash

@@ -1 +1 @@
-export PATH=$HOME/.hermes/bin:$PATH
+export PATH=$HERMES_PATH/hermes/bin:$PATH

hermes/bashrc.d/git-rvm.bash → hermes/bashrc.d/prompt.bash

@@ -1,21 +1,20 @@
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-
-function __git_dirty {
-  git diff --quiet HEAD &>/dev/null 
-  [ $? == 1 ] && echo "!"
-}
-
 function __git_branch {
   __git_ps1 " %s"
 }
 
-function __my_rvm_ruby_version {
-  local gemset=$(echo $GEM_HOME | awk -F'@' '{print $2}')
-  [ "$gemset" != "" ] && gemset="@$gemset"
-  local version=$(echo $MY_RUBY_HOME | awk -F'-' '{print $2}')
-  [ "$version" == "1.8.7" ] && version=""
-  local full="$version$gemset"
-  [ "$full" != "" ] && echo "$full "
+_pwd ()
+{
+    local PRE= NAME="$PWD" LENGTH="$1";
+    [[ "$NAME" != "${NAME#$HOME/}" || -z "${NAME#$HOME}" ]] &&
+        PRE+='~' NAME="${NAME#$HOME}" LENGTH=$[LENGTH-1];
+    ((${#NAME}>$LENGTH)) && NAME="/...${NAME:$[${#NAME}-LENGTH+4]}";
+    echo "$PRE$NAME"
+}
+
+__rbenv_ps1 ()
+{
+  rbenv_ruby_version=`rbenv version | sed -e 's/ .*//'`
+  printf $rbenv_ruby_version
 }
 
 bash_prompt() {
@@ -54,8 +53,9 @@ bash_prompt() {
   local UC=$W                 # user's color
   [ $UID -eq "0" ] && UC=$R   # root's color
 
-  PS1="$C\$(__my_rvm_ruby_version)$Y\h$W:$EMY\w$EMW\$(__git_branch)$EMY\$(__git_dirty)${NONE}
-$ "
+  GIT_PS1_SHOWDIRTYSTATE=true
+  GIT_PS1_SHOWUNTRACKEDFILES=true
+  PS1="$C\$(__rbenv_ps1) $EMY\$(_pwd 20)$EMW\$(__git_branch)${NONE} 🚀  "
 }
 
 bash_prompt

hermes/powconfig

@@ -1,3 +1,3 @@
 export POW_TIMEOUT=1800
 export POW_WORKERS=1
-export PATH=/usr/local/bin:$HOME/.rvm/bin:$PATH
+export PATH=/usr/local/bin:$PATH

hermes/tmux.conf

@@ -1,6 +1,9 @@
 set-option -g default-command "reattach-to-user-namespace -l $SHELL; cd ."
 set -g default-terminal "screen-256color"
 set -g history-limit 20000
+set -g set-titles on
+set -g set-titles-string "#W"
+
 # use VI
 set-window-option -g mode-keys vi
 
@@ -43,7 +46,7 @@ bind _ split-window
 
 # Zoom
 unbind z
-bind z run ". ~/.hermes/hermes/tmux/zoom"
+bind z resize-pane -Z
 
 # tile all windows
 unbind =
@@ -78,7 +81,11 @@ unbind p
 bind p paste-buffer
 
 bind -t vi-copy 'v' begin-selection
-bind -t vi-copy 'y' copy-selection
+bind -t vi-copy 'V' rectangle-toggle
+bind -t vi-copy 'y' copy-pipe "reattach-to-user-namespace pbcopy"
+
+unbind -t vi-copy Enter
+bind -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"
 
 set-option -g status on
 set-option -g status-interval 1
@@ -92,7 +99,8 @@ set -g mouse-resize-pane on
 set -g mouse-select-pane on
 set-window-option -g mode-mouse on
 set -g base-index 1
+set -g renumber-windows on
 set -s escape-time 0
 
 # Source the hermes tmux theme
-source ~/.hermes/hermes/tmux/hermes.tmux
+source $HERMES_PATH/hermes/tmux/hermes.tmux

hermes/vim/autocommands.vim

@@ -2,15 +2,21 @@ augroup vimrcEx
   au!
 
   " For all text files set 'textwidth' to 78 characters.
-  autocmd FileType text setlocal textwidth=78
+  au FileType text setlocal textwidth=78
 
   " When editing a file, always jump to the last known cursor position.
   " Don't do it when the position is invalid or when inside an event handler
   " (happens when dropping a file on gvim).
-  autocmd BufReadPost *
+  au BufReadPost *
     \ if line("'\"") > 0 && line("'\"") <= line("$") |
     \   exe "normal g`\"" |
     \ endif
+  " Instead of reverting the cursor to the last position in the buffer, we
+  " set it to the first line when editing a git commit message
+  " Thanks: https://github.com/spf13/spf13-vim/blob/3.0/.vimrc#L92-L94
+  au FileType gitcommit au! BufEnter COMMIT_EDITMSG call setpos('.', [0, 1, 1, 0])
+  " Remove trailing whitespace before saving a file
+  au FileType ruby,javascript,css,scss,sass,html autocmd BufWritePre <buffer> :%s/\s\+$//e
 augroup END
 
 " Save when losing focus