From a595fd1b46a3cb798fc893d372d6e43ad656801f Mon Sep 17 00:00:00 2001
From: Buddy Sandidge <buddy.sandidge@convertro.com>
Date: Mon, 2 Dec 2013 17:32:20 -0800
Subject: [PATCH] Update bash files for os x

---
 bash/aliases     | 4 ++++
 bash/environment | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bash/aliases b/bash/aliases
index 103aa59..1cc3bdd 100644
--- a/bash/aliases
+++ b/bash/aliases
@@ -40,6 +40,10 @@ fi
 
 alias dash-v1='cd ~/code/insight-platform && ~/src/grails-1.2.2/bin/grails run-app -https -Xms800m -Xmx1000m  -XX:PermSize=200m'
 
+# Fix vagrant up errors on Mavericks
+# http://davidwalsh.name/fixing-vagrant-errors
+alias fix-vagrant='sudo /Library/StartupItems/VirtualBox/VirtualBox restart'
+
 # Some common aliases
 alias ll='ls -alF'
 alias df='df -h'
diff --git a/bash/environment b/bash/environment
index 05cf2a1..edc85c0 100644
--- a/bash/environment
+++ b/bash/environment
@@ -2,7 +2,9 @@
 
 # Disable capslock
 if [[ -x `which setxkbmap` ]]; then
-    setxkbmap -option ctrl:nocaps
+    if [[ `uname` == 'Linux' ]]; then
+        setxkbmap -option ctrl:nocaps
+    fi
 fi
 
 # Go package info
@@ -51,6 +53,7 @@ _add-path ~/bin
 _add-path ~/code/cli/bin
 _add-path ~/code/ci/phpunit-git-deploy/bin
 _add-path ~/.bin
+_add-path $HOME/Library/Haskell/bin
 
 if [[ `uname` == 'Darwin' ]]; then
     export BS_OS='osx'