Merge branch 'master' of github.com:cyplo/dotfiles

.gitconfig_includes.cygwin

@@ -0,0 +1,5 @@
+[mergetool "p4merge"]
+    cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)" 
+    trustExitCode = false
+[merge]
+  tool = p4merge

.zshrc

@@ -33,6 +33,7 @@ prompt_dir() {
     prompt_segment blue black '%1~'
 }
 
+# aliases
 if [[ `uname` == 'Darwin' ]]; then
 	alias vim=/usr/local/Cellar/vim/7.4/bin/vim
 fi
@@ -43,6 +44,7 @@ else
     alias tssh="torsocks ssh"
 fi
 
+# env vars
 PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
 export PATH=$HOME/tools:$PATH
 export PATH=/usr/local/heroku/bin:$PATH

common/configure_fresh_system

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -e
 echo
 echo "configuring settings common among OSes"
 sudo true

tools/blame

@@ -0,0 +1,3 @@
+#!/bin/bash
+find -iname "*$1*" -exec echo \; -exec echo {} \; -exec git blame {} \;
+

ubuntu/configure_fresh_system

@@ -5,5 +5,5 @@ sudo apt-get install -y meld whois zsh tmux vim atop aria2 curl pv pixz gajim to
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../"
-$DIR/common/configure_fresh_system
+DIR="$DIR" $DIR/common/configure_fresh_system
 

ubuntu/install_freecad

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+set -v
+sudo add-apt-repository ppa:freecad-maintainers/freecad-daily 
+sudo apt-get update
+sudo aptitude install freecad