Cleanup prompt

1 files changed, 17 insertions, 28 deletions

diff --git a/home/.bashrc.d/prompt.sh b/home/.bashrc.d/prompt.sh
index 0875ef5..59e587f 100644
--- a/home/.bashrc.d/prompt.sh
+++ b/home/.bashrc.d/prompt.sh
@@ -2,48 +2,37 @@ function __prompt_command() {
     local exit="$?"
     PS1=""
     # set title for terminal emulators
-    PS1+="\\[\\e]0;${debian_chroot:+($debian_chroot)}\\u@\\h: \\w\\a\\]"
+    PS1+="\\[\\e]0;\\u@\\h: \\w\\a\\]"
 
     local red='\[\e[31m\]'
     local green='\[\e[32m\]'
-    local light_green='\[\e[92m\]'
+    local yellow='\[\e[33m\]'
     local light_blue='\[\e[94m\]'
     local reset='\[\e[0m\]'
 
     PS1+="╭"
 
-    if [ "$exit" -eq 0 ]; then
-	PS1+="${green}(✔)${reset} "
-    else
-	PS1+="${red}(✗)${reset} "
-    fi
-
-#    if [[ $(command -v kubectl) ]]; then
-#	PS1+="[$(kubectl config current-context)] "
-#    fi
-
-    PS1+="${debian_chroot:+($debian_chroot)}${light_green}\\u@\\h${reset}:${light_blue}\\W${reset}"
+    PS1+="${light_blue}\\w${reset}"
 
-    ### Add Git Status ###
+    ### Add Git Status
     ## Inspired by http://www.terminally-incoherent.com/blog/2013/01/14/whats-in-your-bash-prompt/
     if [[ $(command -v git) ]]; then
-	local git_status
-	if git_status="$(git status --porcelain 2>/dev/null)"; then
-	    if [[ -z $git_status ]]; then
-		git_color="${green}"
-	    else
-		git_color="${red}"
-	    fi
-	    local git_branch
-	    git_branch="$(git status --porcelain --branch 2>/dev/null \
-	    		      | grep '^##' \
-			      | cut -c4-)"
-	    PS1+=" ${git_color}[${git_branch}]${reset}"
-	fi
+        local git_status
+        if git_status="$(git status --porcelain=2 2>/dev/null)"; then
+            if [[ -z $git_status ]]; then
+                git_color="${green}"
+            else
+                git_color="${yellow}"
+            fi
+            local git_branch
+            git_branch="$(git status --porcelain=2 --branch 2>/dev/null \
+                            | sed --quiet 's/# branch.head //p' - )"
+            PS1+=" ${git_color}[${git_branch}]${reset}"
+        fi
     fi
 
     if [ "$exit" -ne 0 ]; then
-	PS1+=" ${red}(exit $exit)${reset}"
+        PS1+=" ${red}(exit $exit)${reset}"
     fi
 
     PS1+="\\n╰\$ ${reset}"