From 153d70beb083cc5d15616e336e9ce75dd6a1cf6f Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 20 Oct 2014 16:41:14 -0700
Subject: [PATCH] fix ls colors issue somehow...

---
 dotfiles/MacOSX/environment.plist | 11 +++++++++++
 dotfiles/emacs.d                  |  2 +-
 dotfiles/lib/bash/prompt.sh       |  2 ++
 dotfiles/lib/shellrc.sh           |  4 ++--
 dotfiles/lib/shellrc/aliases.sh   |  4 +++-
 dotfiles/zshrc                    |  2 +-
 6 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 dotfiles/MacOSX/environment.plist

diff --git a/dotfiles/MacOSX/environment.plist b/dotfiles/MacOSX/environment.plist
new file mode 100644
index 00000000..7b383555
--- /dev/null
+++ b/dotfiles/MacOSX/environment.plist
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
+"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>PATH</key>
+    <integer></integer>
+    <key></key>
+    <array/>
+  </dict>
+</plist>
diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 6929aa19..7e87d26e 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 6929aa194c4759e6115bcc20464653700dd3a657
+Subproject commit 7e87d26e6e063d00f73f10219eb8d36942a7b847
diff --git a/dotfiles/lib/bash/prompt.sh b/dotfiles/lib/bash/prompt.sh
index d3fa5a36..b47e880f 100644
--- a/dotfiles/lib/bash/prompt.sh
+++ b/dotfiles/lib/bash/prompt.sh
@@ -8,6 +8,7 @@ Purple='\e[0;35m'       # Purple
 Cyan='\e[0;36m'         # Cyan
 White='\e[0;37m'        # White
 BoldYellow='\e[1;33m'   # Yellow
+Gray="\[\033[1;30m\]"
 
 
 function current_directory() {
@@ -54,6 +55,7 @@ function prompt_basic_colors() {
     export SEPARATOR_COLOR="$Black"
     export HOSTNAME_COLOR="$Blue"
     export CURRENT_DIRECTORY_COLOR="$BoldYellow"
+    export SEPARATOR_COLOR="$Gray"
 }
 
 function print_with_color() {
diff --git a/dotfiles/lib/shellrc.sh b/dotfiles/lib/shellrc.sh
index 9d3da47c..4542c277 100644
--- a/dotfiles/lib/shellrc.sh
+++ b/dotfiles/lib/shellrc.sh
@@ -10,8 +10,6 @@ add_to_back_of_path "$HOME/.local/lib/python2.6/site-packages"
 hash brew 2>/dev/null && add_to_front_of_path "$(brew --prefix coreutils)/libexec/gnubin"
 add_to_front_of_path "/usr/local/bin"
 
-add_to_back_of_path "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/"
-
 for filename in ~/.lib/shellrc/*; do
     source $filename
 done
@@ -19,9 +17,11 @@ done
 if is_osx; then
     export CFLAGS=-Qunused-arguments
     export CPPFLAGS=-Qunused-arguments
+    add_to_back_of_path "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/"
 fi
 
 add_to_back_of_path "$(dotfiles_directory)/resources/python"
+add_to_back_of_path "/usr/local/sbin"
 
 # Access gnu man pages.
 MANPATH="$HOMEBREW_PREFIX/opt/coreutils/libexec/gnuman:$MANPATH"
diff --git a/dotfiles/lib/shellrc/aliases.sh b/dotfiles/lib/shellrc/aliases.sh
index c0fd6444..1240c01b 100644
--- a/dotfiles/lib/shellrc/aliases.sh
+++ b/dotfiles/lib/shellrc/aliases.sh
@@ -6,8 +6,10 @@ alias tmux_cb_to_remote_cb='tmux saveb - | linux_nc_paste_to_remote_clipboard'
 alias timestamp='date +%s'
 alias fn='find . -name '
 alias prj='cd ~/Projects'
-alias tox27='tox -e py27 --'
+alias t27='tox -e py27 -- '
+alias tvenv='tox -e venv -- '
 alias reload_tmux='tmux source-file ~/.tmux.conf'
+alias which='type'
 
 # enables the sudoing of aliases.
 alias sudo='sudo '
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 0d2872dc..b7c7a2f0 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -1,3 +1,3 @@
 source ~/.lib/shellrc.sh
 source ~/.lib/zsh.sh
-test -r ~/custom.zsh && source ~/custom.zsh
\ No newline at end of file
+test -r ~/custom.zsh && source ~/custom.zsh