Updating to currently used settings

.bashrc

@@ -1 +1,42 @@
-source ~/.shell_settings
+# Navigation
+if [[ ! "$OSTYPE" == darwin* ]];
+then 
+    alias ls="ls --color=auto"
+fi
+alias c="clear"
+alias ..="cd .."
+alias la="ls -lha"
+alias rmr="rm -r"
+
+# Applications
+alias tmux="tmux -2"
+
+# Maven
+alias mvnc="mvn clean"
+alias mvnp="mvn clean package"
+alias mvni="mvn clean install"
+alias mvna="mvn clean assembly:assembly"
+alias mvnd="mvn clean dependency:copy-dependencies"
+
+# Tar
+alias tar-gz="tar xzvf"
+alias tar-bz="tar xjvf"
+alias tar-xz="tar Jxvf"
+
+# Computer information & control
+alias df="df -h"
+alias reboot="echo That would be bad..."
+alias shutdown="echo Don't do that"
+
+# Functions
+
+# (f)ind by (n)ame
+# usage: fn foo
+# to find all files containing 'foo' in the name
+function fn() { 
+	if [ $# -eq 2 ]; then
+		sudo find $1 -name $2
+	elif [ $# -eq 1 ]; then
+		find `pwd` -name $1
+	fi
+}

.gitconfig

@@ -11,5 +11,9 @@
   pp = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
   type = cat-file -t
   dump = cat-file -p
-[push]
-	default = simple
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true

.inputrc

@@ -1,4 +1,3 @@
 "\e[A": history-search-backward
 "\e[B": history-search-forward
 set show-all-if-ambiguous on
-set completion-ignore-case on

.shell_settings

@@ -1,36 +0,0 @@
-# Navigation
-if [[ ! "$OSTYPE" == darwin* ]];
-then 
-    alias ls="ls --color=auto"
-fi
-alias c="clear & ls"
-alias ..="cd .."
-alias la="ls -lha"
-
-# Applications
-alias tmux="tmux -2"
-
-# Maven
-alias mvnc="mvn clean"
-alias mvnp="mvn clean package"
-alias mvni="mvn clean install"
-alias mvna="mvn assembly:assembly"
-alias mvnd="mvn clean dependency:copy-dependencies"
-
-# Computer information & control
-alias df="df -h"
-alias reboot="echo That would be bad..."
-alias shutdown="echo Don't do that"
-
-# Functions
-
-# (f)ind by (n)ame
-# usage: fn foo
-# to find all files containing 'foo' in the name
-function fn() { 
-	if [ $# -eq 2 ]; then
-		sudo find $1 -name $2
-	elif [ $# -eq 1 ]; then
-		find `pwd` -name $1
-	fi
-}

.zshrc

@@ -1,30 +0,0 @@
-# Lines configured by zsh-newuser-install
-HISTFILE=~/.histfile
-HISTSIZE=1000
-SAVEHIST=1000
-setopt appendhistory autocd
-bindkey -v
-bindkey '^R' history-incremental-search-backward
-# End of lines configured by zsh-newuser-install
-# The following lines were added by compinstall
-zstyle :compinstall filename '/home/tony/.zshrc'
-
-autoload -Uz compinit promptinit
-compinit
-promptinit
-prompt walters
-# End of lines added by compinstall
-
-# Fix the home and end keys
-typeset -A key
-key[Home]=${terminfo[khome]}
-key[End]=${terminfo[kend]}
-[[ -n "${key[Home]}"    ]]  && bindkey  "${key[Home]}"    beginning-of-line
-[[ -n "${key[End]}"     ]]  && bindkey  "${key[End]}"     end-of-line
-
-precmd () {
-    # tmux support
-    PROMPT="$PS1"`[ -n "$TMUX" ] && tmux setenv TMUXPWD_$(tmux display -p "#I_#P") "$PWD"`
-}
-
-source ~/.shell_settings

install.sh

@@ -35,9 +35,7 @@ case "$choice" in
         cd ~;
         
         echo "Linking shell configs...";
-        linkFile .zshrc
         linkFile .bashrc
-        linkFile .shell_settings
 
         echo "Linking vim...";
         linkFile .vimrc