Latest changes from macbook

.bash_aliases

@@ -9,6 +9,15 @@ alias be="bundle exec"
 
 alias share="python -m SimpleHTTPServer"
 
+# Mac OS Specific
+# Need to export these to a different file for mac specific aliases
+alias showfiles="defaults write com.apple.finder AppleShowAllFiles YES; killall Finder /System/Library/CoreServices/Finder.app"
+alias hidefiles="defaults write com.apple.finder AppleShowAllFiles NO; killall Finder /System/Library/CoreServices/Finder.app"
+alias startvpn="sudo launchctl load -w /Library/LaunchDaemons/net.juniper.AccessService.plist; open -a '/Applications/Junos Pulse.app/Contents/Plugins/JamUI/PulseTray.app/Contents/MacOS/PulseTray'"
+alias quitvpn="osascript -e 'tell application \"PulseTray.app\" to quit';sudo launchctl unload -w /Library/LaunchDaemons/net.juniper.AccessService.plist"
+
+alias cask="brew cask"
+
 # Easier APT
 alias install="sudo apt-get install"
 alias purge="sudo apt-get purge"

.gitconfig

@@ -3,10 +3,11 @@
     path=~/.gitconfig-local
 [core]
 	editor = gvim --nofork
+	excludesfile = /Users/georgi/.gitignore_global
 [merge]
-    tool = meld
+    tool = kdiff3
 [diff]
-    tool = meld
+    tool = kdiff3
 [color]
     diff = auto
     status = auto
@@ -38,3 +39,13 @@
     ll = log --graph --date=short
 [push]
 	default = simple
+[filter "media"]
+	clean = git media clean %f
+	smudge = git media smudge %f
+	required = true
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /opt/homebrew-cask/Caskroom/sourcetree/2.0.4/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true

.zshrc

@@ -24,9 +24,10 @@ if [ -x /usr/bin/dircolors ]; then
 fi
 
 # some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
+alias ls='ls -G'
+alias ll='ls -alFG'
+alias la='ls -AG'
+alias l='ls -CFG'
 
 
 autoload -U compinit promptinit
@@ -80,3 +81,4 @@ export PATH="/usr/local/heroku/bin:$PATH"
 
 export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"  # This loads RVM
+