From ab33ef7a58eff95d0acd041c6650492bedb33dc1 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sat, 8 Nov 2014 15:28:01 -0800
Subject: [PATCH] Fix bash prompt, cabal-install and ghc.

---
 dotfiles/cider/bootstrap.json | 2 ++
 dotfiles/emacs.d              | 2 +-
 dotfiles/lib/bash/prompt.sh   | 9 +--------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/dotfiles/cider/bootstrap.json b/dotfiles/cider/bootstrap.json
index a107acfd..0bcc5602 100644
--- a/dotfiles/cider/bootstrap.json
+++ b/dotfiles/cider/bootstrap.json
@@ -32,6 +32,7 @@
     "bash",
     "binutils",
     "brew-cask",
+    "cabal-install",
     "cairo",
     "cmake",
     "coreutils",
@@ -50,6 +51,7 @@
     "gdbm",
     "gdk-pixbuf",
     "gettext",
+    "ghc",
     "gist",
     "git",
     "giter8",
diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 4cfc0e42..30d80f49 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 4cfc0e42cca13c26ec02bd4beea26c37e02da8e9
+Subproject commit 30d80f4998d74155818e6db48bc5c8d17c4926ae
diff --git a/dotfiles/lib/bash/prompt.sh b/dotfiles/lib/bash/prompt.sh
index b47e880f..fc86f30f 100644
--- a/dotfiles/lib/bash/prompt.sh
+++ b/dotfiles/lib/bash/prompt.sh
@@ -34,13 +34,6 @@ function git_status_character() {
     fi
 }
 
-function sandbox_prompt() {
-    if [ ! -z "$(sandbox_prompt_info)" ];
-    then
-        echo " $(separator "with") $(colored_sandbox_string)%{$reset_color%}"
-    fi
-}
-
 function command_line_character() {
     if ! test -z $(git branch-or-sha);
     then 
@@ -68,7 +61,7 @@ function separator() {
 
 prompt_basic_colors
 function set_bash_prompt() {
-    PS1="╭─$(print_with_color "$(whoami)" "$USERNAME_COLOR") $(separator "at") $(print_with_color "`hostname -s`" "$HOSTNAME_COLOR") $(separator "in") $(print_with_color "`current_directory`" "$CURRENT_DIRECTORY_COLOR")$(git_prompt_info)$(sandbox_prompt)
+    PS1="╭─$(print_with_color "$(whoami)" "$USERNAME_COLOR") $(separator "at") $(print_with_color "`hostname -s`" "$HOSTNAME_COLOR") $(separator "in") $(print_with_color "`current_directory`" "$CURRENT_DIRECTORY_COLOR")$(git_prompt_info)
 ╰─$(command_line_character) "
 }