modify fish prompt

dot_config/fish/functions/fish_prompt.fish

@@ -1,4 +1,3 @@
-# name: sashimi
 function fish_prompt
   set -l last_status $status
   set -l cyan (set_color -o cyan)
@@ -7,61 +6,25 @@ function fish_prompt
   set -g blue (set_color -o blue)
   set -l green (set_color -o green)
   set -g normal (set_color normal)
+  set -l host (hostname -s)
+  set -l user (whoami)
+  set initial_indicator "$user@$host"
 
-  set -l ahead (_git_ahead)
   set -g whitespace ' '
 
   if test $last_status = 0
-    set initial_indicator "$green◆"
+    set status_indicator "$green>"
-    set status_indicator "$normal❯$cyan❯$green❯"
   else
-    set initial_indicator "$red✖ $last_status"
+    set status_indicator "$red>"
-    set status_indicator "$red❯$red❯$red❯"
   end
   set -l cwd $cyan(basename (prompt_pwd))
 
-  if [ (_git_branch_name) ]
+  if [ (_git_branch_name) -a (_is_git_dirty) ]
-
+    set -l dirty "$yellow ?"
-    if test (_git_branch_name) = 'master'
+    set git_info "$dirty"
-      set -l git_branch (_git_branch_name)
-      set git_info "$normal git:($red$git_branch$normal)"
-    else
-      set -l git_branch (_git_branch_name)
-      set git_info "$normal git:($blue$git_branch$normal)"
-    end
-
-    if [ (_is_git_dirty) ]
-      set -l dirty "$yellow ✗"
-      set git_info "$git_info$dirty"
-    end
   end
 
-  # Notify if a command took more than 5 minutes
+  echo -n -s $initial_indicator $whitespace $cwd $git_info $whitespace $status_indicator $whitespace
-  if [ "$CMD_DURATION" -gt 300000 ]
-    echo The last command took (math "$CMD_DURATION/1000") seconds.
-  end
-
-  echo -n -s $initial_indicator $whitespace $cwd $git_info $whitespace $ahead $status_indicator $whitespace
-end
-
-function _git_ahead
-  set -l commits (command git rev-list --left-right '@{upstream}...HEAD' 2>/dev/null)
-  if [ $status != 0 ]
-    return
-  end
-  set -l behind (count (for arg in $commits; echo $arg; end | grep '^<'))
-  set -l ahead  (count (for arg in $commits; echo $arg; end | grep -v '^<'))
-  switch "$ahead $behind"
-    case ''     # no upstream
-    case '0 0'  # equal to upstream
-      return
-    case '* 0'  # ahead of upstream
-      echo "$blue↑$normal_c$ahead$whitespace"
-    case '0 *'  # behind upstream
-      echo "$red↓$normal_c$behind$whitespace"
-    case '*'    # diverged from upstream
-      echo "$blue↑$normal$ahead $red↓$normal_c$behind$whitespace"
-  end
 end
 
 function _git_branch_name