Updates

ackrc

@@ -0,0 +1 @@
+--ignore-dir=tmp

aliases

@@ -74,7 +74,7 @@ alias ungit="find . -name '.git' -exec rm -rf {} \;"
 alias gb='git branch'
 alias gc='git commit -vm'
 alias gd='git diff --color'
-alias gdm='git diff master --color'
+alias gdw='git diff --word-diff=porcelain'
 alias gl='git pull'
 alias gp='git push'
 alias g='git status -sb'

bash/env

@@ -36,7 +36,7 @@ if [ $(id -u) == "0" ]; then
 elif [ "$username" == "$DEPLOY_USR" ]; then
   PROMPT_COMMAND='PS1="$EMW\n\u@\h:\w \n→ $N"'
 else
-  PROMPT_COMMAND='PS1="$N\n\u@\h:$EMC \w$N \$(rvmp i v)$EMB\$(rvmp g)$N$(git_prompt)\n→ "'
+  PROMPT_COMMAND='PS1="$N\n\u@\h:$EMC \w$N$(git_prompt)\n→ "'
 fi
 
 # Suppress duplicate entries by using the & switch.

bashrc

@@ -9,10 +9,7 @@ if [ `uname` == 'Darwin' ]; then
   source ~/dotfiles/bash/mac_aliases
 fi
 
-# RVM
-source ~/dotfiles/rvmrc
-
-FILES=(vimrc gitignore gitconfig screenrc pryrc rdebugrc tm_properties)
+FILES=(vimrc gitignore gitconfig screenrc pryrc rdebugrc tm_properties ackrc)
 ELEMENTS=${#FILES[@]}
 
 for (( i=0;i<$ELEMENTS;i++)); do
@@ -37,7 +34,4 @@ if [ ! -d ~/.vim ]; then
   echo Symlinking .vim directory
 fi
 
-# This loads RVM into a shell session.
-if [[ -s "$HOME/.rvm/scripts/rvm" ]]  ; then . "$HOME/.rvm/scripts/rvm" > /dev/null; fi		# If RVM is installed in user's home
-if [[ -s "/usr/local/bin/rvm" ]]  ; then . "/usr/local/bin/rvm" > /dev/null; fi		# If RVM is installed system-wide
 [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator

gitconfig

@@ -21,3 +21,5 @@
 [user]
 	email = tispratik@gmail.com
 	name = Pratik Khadloya
+[grep]
+	lineNumber = true

gitignore

@@ -6,3 +6,7 @@ mkmf.log
 sqlnet.log
 *.tmproj
 postgresql*
+.bundle
+vendor/bundle
+bin
+.rbenv-version

tmux.conf

@@ -42,14 +42,6 @@ set-window-option -g mode-mouse on
 # Highlight active window
 set-window-option -g window-status-current-bg yellow
 
-# Copy Paste
-unbind [
-bind Escape copy-mode
-unbind p
-bind p paste-buffer
-bind -t vi-copy 'v' begin-selection
-bind -t vi-copy 'y' copy-selection
-
 # Transfer buffer to system clipboard
 set-option -g default-command "reattach-to-user-namespace -l zsh"
 bind-key C-c run-shell "tmux save-buffer - | reattach-to-user-namespace pbcopy"

vim/vimrc

@@ -94,7 +94,7 @@ vnoremap <tab> %
 " Quickly edit/reload the vimrc file
 nmap <silent> <leader>ev :e $MYVIMRC<CR>
 nmap <silent> <leader>sv :so $MYVIMRC<CR>
-set pastetoggle=<F2>
+set pastetoggle=<F2> " Enter paste/copy mode, so that vim does not try to indent lines when copying
 
 map <S-Enter> O<Esc>  " Hit Enter to create new line before current line
 map <CR> o<Esc>       " Hit Shift+Enter to add a new line after the current line

zshrc

@@ -2,14 +2,14 @@
 ZSH=$HOME/.oh-my-zsh
 
 # Look in ~/.oh-my-zsh/themes/
-ZSH_THEME="robbyrussell"
+ZSH_THEME="bira"
 
 DISABLE_AUTO_TITLE="true" # Do not set terminal title automatically
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git, rvm)
+plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -18,8 +18,23 @@ export PATH=~/bin:~/.bin:/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:/us
 source ~/dotfiles/aliases
 source ~/dotfiles/zsh/functions
 
+# for (( i=0;i<$ELEMENTS;i++)); do
+#   FILE=${FILES[${i}]}
+#   if [ ! -f ~/.${FILE} ]; then
+#     ln -s ~/dotfiles/${FILE} ~/.${FILE}
+#     echo Symlinking ${FILE}
+#   fi
+# done
+#
+# if [ ! -f ~/.tmux.conf ]; then
+#   ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
+#   echo Symlinking tmux conf
+# fi
+
 if [ -f ~/.local_settings ]; then
   . ~/.local_settings
 fi
 
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
+[[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator
+
+eval "$(rbenv init -)"