From cbb5e95592cdebe545874eb0de881cb4194315ae Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Thu, 15 May 2014 23:14:40 -0400
Subject: Add OS X specific shell configurations

---
 .zsh/aliases.zsh | 12 +++++++-----
 .zshrc           | 12 +++++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.zsh/aliases.zsh b/.zsh/aliases.zsh
index e0403e95..0608a8fb 100644
--- a/.zsh/aliases.zsh
+++ b/.zsh/aliases.zsh
@@ -17,15 +17,17 @@ function tunnel {
 }
 
 alias killlall='killall'
-alias irb='ripl'
+which ripl &> /dev/null && alias irb='ripl'
 alias l='ls'
 alias ll='ls'
 
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
-alias rm='rm -vI'
+osx || alias ls='ls --color=auto'
+osx || alias grep='grep --color=auto'
+osx || alias rm='rm -vI'
+osx && alias rm='rm -v'
 
-alias gvim='gvim 2> /dev/null'
+osx || alias gvim='gvim 2> /dev/null'
+osx && alias gvim='mvim'
 
 alias b='bundle exec'
 alias .env='export $(cat .env)'
diff --git a/.zshrc b/.zshrc
index 4504d8b9..fa2d600c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,3 +1,11 @@
+# Detect platform
+if [[ "$(uname)" == "Darwin" ]]; then
+  function osx { true }
+else
+  function osx { false }
+fi
+
+# Basic zsh config
 HISTFILE=~/.histfile
 HISTSIZE=5000
 SAVEHIST=5000
@@ -59,7 +67,9 @@ source ~/.zsh/aliases.zsh
 
 # Environment
 
-EDITOR=vim
+export EDITOR=vim
+osx && PATH=$PATH:~/bin
+osx && export CLICOLOR=1
 
 # Prompt
 
-- 
cgit 1.4.1