Fixes for Linux

vimrc

@@ -6,12 +6,11 @@ let mapleader=","
 call pathogen#infect()
 call pathogen#helptags()
 
-" # selecta
 " Run a given vim command on the results of fuzzy selecting from a given shell
 " command. See usage below.
 function! SelectaCommand(choice_command, selecta_args, vim_command)
   try
-    silent let selection = system(a:choice_command . " | selecta " . a:selecta_args)
+    let selection = system(a:choice_command . " | selecta " . a:selecta_args)
   catch /Vim:Interrupt/
     " Swallow the ^C so that the redraw below happens; otherwise there will be
     " leftovers from selecta on the screen

zsh/aliases

@@ -17,7 +17,7 @@ alias cd..='cd ..'
 alias cd...='cd ../..'
 alias cd....='cd ../../..'
 alias cd.....='cd ../../../..'
-alias ls='ls -lG'
+alias ls='ls -lG --color'
 
 alias aliases='vim ~/.dotfiles/zsh/aliases'
 alias al='aliases'
@@ -203,12 +203,17 @@ alias what='cd ~/brain/writing/2014/what-happened'
 alias projects='cd ~/code/projects'
 alias web='cd ~/code/projects/websites/michael.is'
 alias weba='cd ~/code/projects/websites/michael.is/angular'
-alias dot='cd ~/code/projects/dotfiles'
 alias work='cd ~/work'
 alias brain='cd ~/brain'
 alias school='cd ~/brain/school'
-alias pcg='cd ~/work/pcg'
+
-alias dive='cd ~/work/pcg/dive-network/dive'
+if [[ $platform == 'Linux' ]]; then
+  alias pcg='cd ~/code/pcg'
+  alias dive='cd ~/code/pcg/dive'
+elif [[ $platform == 'Darwin' ]]; then
+  alias pcg='cd ~/work/pcg'
+  alias dive='cd ~/work/pcg/dive-network/dive'
+fi
 
 # Work
 alias pcgn='vim ~/work/pcg/files/notes/personal-notes.txt'

zshrc

@@ -1,4 +1,4 @@
-platform=`uname`
+platform='uname'
 
 # Path to your oh-my-zsh configuration.
 ZSH=$HOME/.zsh