From e5b924714b285cd66804e69740b7418c799fbdb8 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Mon, 9 Jul 2012 11:40:16 -0500
Subject: [PATCH] Adding fish config

---
 fish/config.fish  | 17 +++++++++++++++++
 oh-my-zsh         |  2 +-
 vim/bundle/vundle |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 fish/config.fish

diff --git a/fish/config.fish b/fish/config.fish
new file mode 100644
index 0000000..6b7ac12
--- /dev/null
+++ b/fish/config.fish
@@ -0,0 +1,17 @@
+alias vi vim
+set -x EDITOR vim
+
+# VCS stuff
+set -x P4USER dswan
+set -x P4PORT "humu.insors.net:1666"
+set -x P4CONFIG p4.cfg
+set -x P4EDITOR vim
+set -x SVN_EDITOR vim
+
+# sync visidev to latest Perforce
+alias visidev "ssh root@visidev.iocom.com 'cd /; p4 sync'"
+
+set -x PATH /usr/local/bin $PATH # Homebrew
+set -x PATH $HOME/.rvm/bin $PATH # RVM
+set -x PATH /Applications/Postgres.app/Contents/MacOS/bin $PATH # Postgres
+set -x PATH $HOME/Library/Haskell/bin $PATH # Haskell
diff --git a/oh-my-zsh b/oh-my-zsh
index 1120f97..caa1554 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 1120f973054836eeb53750f57d69fbec41a340dc
+Subproject commit caa15548c107b9c31f61a67547ffab0b0cfe4934
diff --git a/vim/bundle/vundle b/vim/bundle/vundle
index 03ed2bd..dd8356a 160000
--- a/vim/bundle/vundle
+++ b/vim/bundle/vundle
@@ -1 +1 @@
-Subproject commit 03ed2bd39e37c5ff035c05197af81558eb5d8a89
+Subproject commit dd8356aea7499fed92f7c37227b1625a2b3dc190