From 9f7cee08f859a470f3a0cbaa9b85e0fb04fc74bb Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@onec.me>
Date: Fri, 21 Jun 2019 00:03:44 -0400
Subject: [PATCH] Update fish theme and new functions #fish

---
 fish/.config/fish/config.fish                 |    3 -
 fish/.config/fish/fishfile                    |    2 +-
 .../functions/bobthefish_display_colors.fish  |  133 ++
 .../.config/fish/functions/fish_greeting.fish |   10 +
 .../fish/functions/fish_mode_prompt.fish      |    9 +
 fish/.config/fish/functions/fish_prompt.fish  | 1191 ++++++++++++++---
 .../fish/functions/fish_right_prompt.fish     |   79 ++
 fish/.config/fish/functions/fish_title.fish   |   34 +
 8 files changed, 1271 insertions(+), 190 deletions(-)
 create mode 100644 fish/.config/fish/functions/bobthefish_display_colors.fish
 create mode 100644 fish/.config/fish/functions/fish_greeting.fish
 create mode 100644 fish/.config/fish/functions/fish_mode_prompt.fish
 create mode 100644 fish/.config/fish/functions/fish_right_prompt.fish
 create mode 100644 fish/.config/fish/functions/fish_title.fish

diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index deb6b81..06f88c2 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -3,6 +3,3 @@ source ~/.asdf/asdf.fish
 set PATH ~/.fzf/bin $PATH
 fzf_key_bindings
 eval (python -m virtualfish)
-
-#xinput set-prop "SynPS/2 Synaptics TouchPad" "Synaptics ClickPad" 0 
-#xinput set-prop "SynPS/2 Synaptics TouchPad" "Synaptics Tap Action" 0  
diff --git a/fish/.config/fish/fishfile b/fish/.config/fish/fishfile
index 81a53e5..309e6fc 100644
--- a/fish/.config/fish/fishfile
+++ b/fish/.config/fish/fishfile
@@ -2,4 +2,4 @@ edc/bass
 jethrokuan/fzf
 2m/fish-gpg-tty
 oh-my-fish/plugin-direnv
-oh-my-fish/theme-syl20bnr
+oh-my-fish/theme-bobthefish
diff --git a/fish/.config/fish/functions/bobthefish_display_colors.fish b/fish/.config/fish/functions/bobthefish_display_colors.fish
new file mode 100644
index 0000000..e147468
--- /dev/null
+++ b/fish/.config/fish/functions/bobthefish_display_colors.fish
@@ -0,0 +1,133 @@
+function bobthefish_display_colors -a color_scheme -d 'Print example prompt color schemes'
+
+  set -l color_schemes default light \
+    solarized solarized-light \
+    base16 base16-light \
+    gruvbox zenburn \
+    dracula \
+    terminal terminal-dark-white \
+    terminal-light terminal-light-black \
+    terminal2 terminal2-dark-white \
+    terminal2-light terminal2-light-black
+
+  switch "$color_scheme"
+    case '--all'
+      for scheme in $color_schemes
+        echo
+        echo "$scheme:"
+        bobthefish_display_colors $scheme
+      end
+      return
+
+    case $color_schemes
+      __bobthefish_colors $color_scheme
+
+    case ''
+      __bobthefish_colors $theme_color_scheme
+      type -q bobthefish_colors
+        and bobthefish_colors
+
+    case '*'
+      echo 'usage: bobthefish_display_colors [--all] [color_scheme]'
+      return
+  end
+
+  __bobthefish_glyphs
+
+  echo
+  set_color normal
+
+  __bobthefish_start_segment $color_initial_segment_exit
+  echo -n exit $nonzero_exit_glyph
+  set_color -b $color_initial_segment_su
+  echo -n su $superuser_glyph
+  set_color -b $color_initial_segment_jobs
+  echo -n jobs $bg_job_glyph
+  __bobthefish_finish_segments
+  set_color normal
+  echo -n "(<- initial_segment)"
+  echo
+
+  __bobthefish_start_segment $color_path
+  echo -n /color/path/
+  set_color -b $color_path_basename
+  echo -ns basename ' '
+  __bobthefish_finish_segments
+  echo
+
+  __bobthefish_start_segment $color_path_nowrite
+  echo -n /color/path/nowrite/
+  set_color -b $color_path_nowrite_basename
+  echo -ns basename ' '
+  __bobthefish_finish_segments
+  echo
+
+  __bobthefish_start_segment $color_path
+  echo -n /color/path/
+  set_color -b $color_path_basename
+  echo -ns basename ' '
+  __bobthefish_start_segment $color_repo
+  echo -n "$branch_glyph repo $git_stashed_glyph "
+  __bobthefish_finish_segments
+  echo
+
+  __bobthefish_start_segment $color_path
+  echo -n /color/path/
+  set_color -b $color_path_basename
+  echo -ns basename ' '
+  __bobthefish_start_segment $color_repo_dirty
+  echo -n "$tag_glyph repo_dirty $git_dirty_glyph "
+  __bobthefish_finish_segments
+  echo
+
+  __bobthefish_start_segment $color_path
+  echo -n /color/path/
+  set_color -b $color_path_basename
+  echo -ns basename ' '
+  __bobthefish_start_segment $color_repo_staged
+  echo -n "$detached_glyph repo_staged $git_staged_glyph "
+  __bobthefish_finish_segments
+  echo
+
+  __bobthefish_start_segment $color_vi_mode_default
+  echo -ns vi_mode_default ' '
+  __bobthefish_finish_segments
+  __bobthefish_start_segment $color_vi_mode_insert
+  echo -ns vi_mode_insert ' '
+  __bobthefish_finish_segments
+  __bobthefish_start_segment $color_vi_mode_visual
+  echo -ns vi_mode_visual ' '
+  __bobthefish_finish_segments
+  echo
+
+  __bobthefish_start_segment $color_vagrant
+  echo -ns $vagrant_running_glyph ' ' vagrant ' '
+  __bobthefish_finish_segments
+  echo
+
+  __bobthefish_start_segment $color_username
+  echo -n username
+  set_color normal
+  set_color -b $color_hostname[1] $color_hostname[2..-1]
+  echo -ns @hostname ' '
+  __bobthefish_finish_segments
+  echo
+
+  __bobthefish_start_segment $color_rvm
+  echo -ns $ruby_glyph rvm ' '
+  __bobthefish_finish_segments
+
+  __bobthefish_start_segment $color_virtualfish
+  echo -ns $virtualenv_glyph virtualfish ' '
+  __bobthefish_finish_segments
+
+  __bobthefish_start_segment $color_virtualgo
+  echo -ns $go_glyph virtualgo ' '
+  __bobthefish_finish_segments
+
+  __bobthefish_start_segment $color_desk
+  echo -ns $desk_glyph desk ' '
+  __bobthefish_finish_segments
+
+  echo -e "\n"
+end
diff --git a/fish/.config/fish/functions/fish_greeting.fish b/fish/.config/fish/functions/fish_greeting.fish
new file mode 100644
index 0000000..c74f50d
--- /dev/null
+++ b/fish/.config/fish/functions/fish_greeting.fish
@@ -0,0 +1,10 @@
+function fish_greeting -d "What's up, fish?"
+    set_color $fish_color_autosuggestion
+    uname -nmsr
+
+    # TODO: `command -q -s` only works on fish 2.5+, so hold off on that for now
+    command -s uptime >/dev/null
+    and uptime
+
+    set_color normal
+end
diff --git a/fish/.config/fish/functions/fish_mode_prompt.fish b/fish/.config/fish/functions/fish_mode_prompt.fish
new file mode 100644
index 0000000..304b705
--- /dev/null
+++ b/fish/.config/fish/functions/fish_mode_prompt.fish
@@ -0,0 +1,9 @@
+# This is handled inside fish_mode_prompt (see `__bobthefish_prompt_vi`)
+#
+# If you want to override this with your own mode prompt, disable bobthefish's
+# built-in mode prompt in your fish config:
+#
+#     set -g theme_display_vi no
+
+function fish_mode_prompt
+end
diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish
index 2824b1a..4150ab3 100644
--- a/fish/.config/fish/functions/fish_prompt.fish
+++ b/fish/.config/fish/functions/fish_prompt.fish
@@ -1,212 +1,1031 @@
-# name: syl20bnr
+# name: bobthefish
+#
+# bobthefish is a Powerline-style, Git-aware fish theme optimized for awesome.
+#
+# You will need a Powerline-patched font for this to work:
+#
+#     https://powerline.readthedocs.org/en/master/installation.html#patched-fonts
+#
+# I recommend picking one of these:
+#
+#     https://github.com/Lokaltog/powerline-fonts
+#
+# For more advanced awesome, install a nerd fonts patched font (and be sure to
+# enable nerd fonts support with `set -g theme_nerd_fonts yes`):
+#
+#     https://github.com/ryanoasis/nerd-fonts
+#
+# You can override some default prompt options in your config.fish:
+#
+#     set -g theme_display_git no
+#     set -g theme_display_git_dirty no
+#     set -g theme_display_git_untracked no
+#     set -g theme_display_git_ahead_verbose yes
+#     set -g theme_display_git_dirty_verbose yes
+#     set -g theme_display_git_stashed_verbose yes
+#     set -g theme_display_git_master_branch yes
+#     set -g theme_git_worktree_support yes
+#     set -g theme_display_vagrant yes
+#     set -g theme_display_docker_machine no
+#     set -g theme_display_k8s_context yes
+#     set -g theme_display_hg yes
+#     set -g theme_display_virtualenv no
+#     set -g theme_display_ruby no
+#     set -g theme_display_user ssh
+#     set -g theme_display_hostname ssh
+#     set -g theme_display_vi no
+#     set -g theme_avoid_ambiguous_glyphs yes
+#     set -g theme_powerline_fonts no
+#     set -g theme_nerd_fonts yes
+#     set -g theme_show_exit_status yes
+#     set -g default_user your_normal_user
+#     set -g theme_color_scheme dark
+#     set -g fish_prompt_pwd_dir_length 0
+#     set -g theme_project_dir_length 1
+#     set -g theme_newline_cursor yes
 
-# ----------------------------------------------------------------------------
-# Utils
-# ----------------------------------------------------------------------------
 
-set -g __syl20bnr_display_rprompt 1
+# ==============================
+# Helper methods
+# ==============================
 
-function toggle_right_prompt -d "Toggle the right prompt of the syl20bnr theme"
-  if test $__syl20bnr_display_rprompt -eq 0
-    echo "enable right prompt"
-    set __syl20bnr_display_rprompt 1
-  else
-    echo "disable right prompt"
-    set __syl20bnr_display_rprompt 0
-  end
+function __bobthefish_basename -d 'basically basename, but faster'
+    string replace -r '^.*/' '' -- $argv
 end
 
-function __syl20bnr_git_branch_name -d "Return the current branch name"
-  echo (command git symbolic-ref HEAD 2> /dev/null | sed -e 's|^refs/heads/||')
+function __bobthefish_dirname -d 'basically dirname, but faster'
+    string replace -r '/[^/]+/?$' '' -- $argv
 end
 
-function __syl20bnr_git_repo_name -d "Return the current repository name"
-  echo (command basename (git rev-parse --show-toplevel 2> /dev/null))
+function __bobthefish_pwd -d 'Get a normalized $PWD'
+    # The pwd builtin accepts `-P` on at least Fish 3.x, but fall back to $PWD if that doesn't work
+    builtin pwd -P 2>/dev/null
+    or echo $PWD
 end
 
-function __syl20bnr_git_repo_base -d "Return the current repository name"
-  echo (command git rev-parse --show-toplevel 2> /dev/null)
-end
+function __bobthefish_git_branch -S -d 'Get the current git branch (or commitish)'
+    set -l ref (command git symbolic-ref HEAD 2>/dev/null)
+    and begin
+        [ "$theme_display_git_master_branch" != 'yes' -a "$ref" = 'refs/heads/master' ]
+        and echo $branch_glyph
+        and return
 
-function __syl20bnr_git_status -d "git status command"
-  git status -b -s --ignore-submodules=dirty
-end
+        # truncate the middle of the branch name, but only if it's 25+ characters
+        set -l truncname (string replace -r '^(.{28}).{3,}(.{5})$' "\$1…\$2" $ref)
 
-function __syl20bnr_unpushed_commit_count -d "Return the number of unpushed commits"
-  echo $argv[1] | grep -E -o "ahead\ [0-9]+" | awk '{print $2}'
-end
-
-function __syl20bnr_unmerged_commit_count -d "Return the number of unmerged commits"
-  echo $argv[1] | grep -E -o "behind\ [0-9]+" | awk '{print $2}'
-end
-
-# ----------------------------------------------------------------------------
-# Aliases
-# ----------------------------------------------------------------------------
-
-alias trp toggle_right_prompt
-
-# ----------------------------------------------------------------------------
-# Prompts
-# ----------------------------------------------------------------------------
-
-function fish_prompt -d "Write out the left prompt of the syl20bnr theme"
-  set -l last_status $status
-  set -l basedir_name (basename (prompt_pwd))
-
-  # Init colors
-
-  set -l colcyan   (set_color cyan)
-  set -l colbcyan  (set_color -o cyan)
-  set -l colgreen  (set_color green)
-  set -l colbgreen (set_color -o green)
-  set -l colnormal (set_color normal)
-  set -l colred    (set_color red)
-  set -l colbred   (set_color -o red)
-  set -l colwhite  (set_color white)
-  set -l colbwhite  (set_color -o white)
-  
-  # Segments
-  
-  # git
-  # If inside a git repo then the pwd segment is replaced by the git
-  # segment.
-  # The git segment format is X:YI@Z:P(N) where:
-  #   X is git
-  #   Y is the current branch
-  #   I is the information about the current repo state
-  #   Z is the name of the repo
-  #   P is the current working path basename (name of the current directory)
-  #   C is the depth of the path starting from base directory of the repo
-  # The displayed information is:
-  #   Unpushed commits are indicated with up arrows
-  #   The number of unpushed commits is indicated right after the up arrows
-  # Note: 
-  #   Dirtiness is indicated by the color of the branch name, red is dirty,
-  #   green is up-to-date.
-  # If P = Z then P(C) is not displayed
-  set -l ps_git ""
-  set -l git_branch_name (__syl20bnr_git_branch_name)
-  if test -n "$git_branch_name"
-    set -l git_repo_name (__syl20bnr_git_repo_name)
-    set -l git_info ""
-    set -l git_status (__syl20bnr_git_status)
-    if echo $git_status | grep ahead > /dev/null
-      set git_info "["$colbgreen"↑"(__syl20bnr_unpushed_commit_count $git_status)$colnormal"]"
+        string replace -r '^refs/heads/' "$branch_glyph " $truncname
+        and return
     end
-    if echo $git_status | grep behind > /dev/null
-      set git_info "$git_info""["$colbred"↓"(__syl20bnr_unmerged_commit_count $git_status)$colnormal"]"
-    end
-    set -l colbranch $colbgreen
-    if echo $git_status | grep -E "\s\?\?\s|\sM\s|\sD\s" > /dev/null
-      set colbranch $colbred
-    end
-    set ps_git $colbwhite"git:"$colbcyan$git_branch_name$git_info$colnormal"@"$colbranch$git_repo_name
-    if test "$basedir_name" != "$git_repo_name"
-        set -l basedir_depth (echo (__syl20bnr_git_repo_base) | sed "s/\// /g" | wc -w)
-        set -l depth (echo (pwd) | sed "s/\// /g" | wc -w)
-        set depth (math $depth - $basedir_depth)
-        set ps_git $ps_git$colnormal":"$colbwhite$basedir_name$colnormal"("$depth")"
-    end
-  end
 
-  # pwd
-  # The pwd segment format is X:P(C) where:
-  #   X is either home or /
-  #   P is the current working path basename (name of the current directory)
-  #   C is the depth of the path starting from X
-  # If the pwd is home or / then the prompt format is simplified to 'home' or
-  # '/' without the current directory and depth.
-  set -l ps_pwd ""
-  if test -z "$ps_git"
-    set -l depth (echo (pwd) | sed "s/\// /g" | wc -w)
-    set -l in_home (echo (pwd) | grep ~)
-    if test -n "$in_home"
-      set ps_pwd $colbwhite"home"
+    set -l tag (command git describe --tags --exact-match 2>/dev/null)
+    and echo "$tag_glyph $tag"
+    and return
+
+    set -l branch (command git show-ref --head -s --abbrev | head -n1 2>/dev/null)
+    echo "$detached_glyph $branch"
+end
+
+function __bobthefish_hg_branch -S -d 'Get the current hg branch'
+    set -l branch (command hg branch 2>/dev/null)
+    set -l book (command hg book | command grep \* | cut -d\  -f3)
+    echo "$branch_glyph $branch @ $book"
+end
+
+function __bobthefish_pretty_parent -S -a child_dir -d 'Print a parent directory, shortened to fit the prompt'
+    set -q fish_prompt_pwd_dir_length
+    or set -l fish_prompt_pwd_dir_length 1
+
+    # Replace $HOME with ~
+    set -l real_home ~
+    set -l parent_dir (string replace -r '^'"$real_home"'($|/)' '~$1' (__bobthefish_dirname $child_dir))
+
+    # Must check whether `$parent_dir = /` if using native dirname
+    if [ -z "$parent_dir" ]
+        echo -n /
+        return
+    end
+
+    if [ $fish_prompt_pwd_dir_length -eq 0 ]
+        echo -n "$parent_dir/"
+        return
+    end
+
+    string replace -ar '(\.?[^/]{'"$fish_prompt_pwd_dir_length"'})[^/]*/' '$1/' "$parent_dir/"
+end
+
+function __bobthefish_ignore_vcs_dir -a real_pwd -d 'Check whether the current directory should be ignored as a VCS segment'
+    for p in $theme_vcs_ignore_paths
+        set ignore_path (realpath $p 2>/dev/null)
+        switch $real_pwd/
+            case $ignore_path/\*
+                echo 1
+                return
+        end
+    end
+end
+
+function __bobthefish_git_project_dir -S -a real_pwd -d 'Print the current git project base directory'
+    [ "$theme_display_git" = 'no' ]
+    and return
+
+    set -q theme_vcs_ignore_paths
+    and [ (__bobthefish_ignore_vcs_dir $real_pwd) ]
+    and return
+
+    if [ "$theme_git_worktree_support" != 'yes' ]
+        set -l git_toplevel (command git rev-parse --show-toplevel 2>/dev/null)
+
+        [ -z "$git_toplevel" ]
+        and return
+
+        # If there are no symlinks, just use git toplevel
+        switch $real_pwd/
+            case $git_toplevel/\*
+                echo $git_toplevel
+                return
+        end
+
+        # Otherwise, we need to find the equivalent directory in the $PWD
+        set -l d $real_pwd
+        while not [ -z "$d" ]
+            if [ (realpath "$d") = "$git_toplevel" ]
+                echo $d
+                return
+            end
+
+            [ "$d" = '/' ]
+            and return
+
+            set d (__bobthefish_dirname $d)
+        end
+        return
+    end
+
+    set -l git_dir (command git rev-parse --git-dir 2>/dev/null)
+    or return
+
+    pushd $git_dir
+    set git_dir $real_pwd
+    popd
+
+    switch $real_pwd/
+        case $git_dir/\*
+            # Nothing works quite right if we're inside the git dir
+            # TODO: fix the underlying issues then re-enable the stuff below
+
+            # # if we're inside the git dir, sweet. just return that.
+            # set -l toplevel (command git rev-parse --show-toplevel 2>/dev/null)
+            # if [ "$toplevel" ]
+            #   switch $git_dir/
+            #     case $toplevel/\*
+            #       echo $git_dir
+            #   end
+            # end
+            return
+    end
+
+    set -l project_dir (__bobthefish_dirname $git_dir)
+
+    switch $real_pwd/
+        case $project_dir/\*
+            echo $project_dir
+            return
+    end
+
+    set project_dir (command git rev-parse --show-toplevel 2>/dev/null)
+    switch $real_pwd/
+        case $project_dir/\*
+            echo $project_dir
+    end
+end
+
+function __bobthefish_hg_project_dir -S -a real_pwd -d 'Print the current hg project base directory'
+    [ "$theme_display_hg" = 'yes' ]
+    or return
+
+    set -q theme_vcs_ignore_paths
+    and [ (__bobthefish_ignore_vcs_dir $real_pwd) ]
+    and return
+
+    set -l d $real_pwd
+    while not [ -z "$d" ]
+        if [ -e $d/.hg ]
+            command hg root --cwd "$d" 2>/dev/null
+            return
+        end
+
+        [ "$d" = '/' ]
+        and return
+
+        set d (__bobthefish_dirname $d)
+    end
+end
+
+function __bobthefish_project_pwd -S -a project_root_dir -a real_pwd -d 'Print the working directory relative to project root'
+    set -q theme_project_dir_length
+    or set -l theme_project_dir_length 0
+
+    set -l project_dir (string replace -r '^'"$project_root_dir"'($|/)' '' $real_pwd)
+
+    if [ $theme_project_dir_length -eq 0 ]
+        echo -n $project_dir
+        return
+    end
+
+    string replace -ar '(\.?[^/]{'"$theme_project_dir_length"'})[^/]*/' '$1/' $project_dir
+end
+
+function __bobthefish_git_ahead -S -d 'Print the ahead/behind state for the current branch'
+    if [ "$theme_display_git_ahead_verbose" = 'yes' ]
+        __bobthefish_git_ahead_verbose
+        return
+    end
+
+    set -l ahead 0
+    set -l behind 0
+    for line in (command git rev-list --left-right '@{upstream}...HEAD' 2>/dev/null)
+        switch "$line"
+            case '>*'
+                if [ $behind -eq 1 ]
+                    echo '±'
+                    return
+                end
+                set ahead 1
+            case '<*'
+                if [ $ahead -eq 1 ]
+                    echo "$git_plus_minus_glyph"
+                    return
+                end
+                set behind 1
+        end
+    end
+
+    if [ $ahead -eq 1 ]
+        echo "$git_plus_glyph"
+    else if [ $behind -eq 1 ]
+        echo "$git_minus_glyph"
+    end
+end
+
+function __bobthefish_git_ahead_verbose -S -d 'Print a more verbose ahead/behind state for the current branch'
+    set -l commits (command git rev-list --left-right '@{upstream}...HEAD' 2>/dev/null)
+    or return
+
+    set -l behind (count (for arg in $commits; echo $arg; end | command grep '^<'))
+    set -l ahead (count (for arg in $commits; echo $arg; end | command grep -v '^<'))
+
+    switch "$ahead $behind"
+        case '' # no upstream
+        case '0 0' # equal to upstream
+            return
+        case '* 0' # ahead of upstream
+            echo "$git_ahead_glyph$ahead"
+        case '0 *' # behind upstream
+            echo "$git_behind_glyph$behind"
+        case '*' # diverged from upstream
+            echo "$git_ahead_glyph$ahead$git_behind_glyph$behind"
+    end
+end
+
+function __bobthefish_git_dirty_verbose -S -d 'Print a more verbose dirty state for the current working tree'
+    set -l changes (command git diff --numstat | awk '{ added += $1; removed += $2 } END { print "+" added "/-" removed }')
+    or return
+
+    echo "$changes " | string replace -r '(\+0/(-0)?|/-0)' ''
+end
+
+function __bobthefish_git_stashed -S -d 'Print the stashed state for the current branch'
+    if [ "$theme_display_git_stashed_verbose" = 'yes' ]
+        set -l stashed (command git rev-list --walk-reflogs --count refs/stash 2>/dev/null)
+        or return
+
+        echo -n "$git_stashed_glyph$stashed"
     else
-      set ps_pwd $colbwhite"/"
+        command git rev-parse --verify --quiet refs/stash >/dev/null
+        and echo -n "$git_stashed_glyph"
     end
-    if test (echo (pwd)) != ~ -a (echo (pwd)) != /
-      set ps_pwd $ps_pwd":"$colgreen$basedir_name
-      if test -n "$in_home"
-        set depth (math $depth - 2)
-      end
-      set ps_pwd $ps_pwd$colnormal"("$depth")"
+end
+
+
+# ==============================
+# Segment functions
+# ==============================
+
+function __bobthefish_start_segment -S -d 'Start a prompt segment'
+    set -l bg $argv[1]
+    set -e argv[1]
+    set -l fg $argv[1]
+    set -e argv[1]
+
+    set_color normal # clear out anything bold or underline...
+    set_color -b $bg $fg $argv
+
+    switch "$__bobthefish_current_bg"
+        case ''
+            # If there's no background, just start one
+            echo -n ' '
+        case "$bg"
+            # If the background is already the same color, draw a separator
+            echo -ns $right_arrow_glyph ' '
+        case '*'
+            # otherwise, draw the end of the previous segment and the start of the next
+            set_color $__bobthefish_current_bg
+            echo -ns $right_black_arrow_glyph ' '
+            set_color $fg $argv
     end
-  end
-      
-  # vi mode
-  # If vi_mode plugin or native vi mode is activated then print the vi mode
-  # in the prompt.
-  set -l ps_vi ""
-  if test -n "$vi_mode"
-    set ps_vi $colnormal"["$vi_mode$colnormal"]"
-  end
-  if test "$fish_key_bindings" = "fish_vi_key_bindings" -o "$fish_key_bindings" = "my_fish_key_bindings" 
+
+    set __bobthefish_current_bg $bg
+end
+
+function __bobthefish_path_segment -S -a segment_dir -d 'Display a shortened form of a directory'
+    set -l segment_color $color_path
+    set -l segment_basename_color $color_path_basename
+
+    if not [ -w "$segment_dir" ]
+        set segment_color $color_path_nowrite
+        set segment_basename_color $color_path_nowrite_basename
+    end
+
+    __bobthefish_start_segment $segment_color
+
+    set -l directory
+    set -l parent
+
+    switch "$segment_dir"
+        case /
+            set directory '/'
+        case "$HOME"
+            set directory '~'
+        case '*'
+            set parent (__bobthefish_pretty_parent "$segment_dir")
+            set directory (__bobthefish_basename "$segment_dir")
+    end
+
+    echo -n $parent
+    set_color -b $segment_basename_color
+    echo -ns $directory ' '
+end
+
+function __bobthefish_finish_segments -S -d 'Close open prompt segments'
+    if [ -n "$__bobthefish_current_bg" ]
+        set_color normal
+        set_color $__bobthefish_current_bg
+        echo -ns $right_black_arrow_glyph ' '
+    end
+
+    if [ "$theme_newline_cursor" = 'yes' ]
+        echo -ens "\n"
+        set_color $fish_color_autosuggestion
+
+        if set -q theme_newline_prompt
+            echo -ens "$theme_newline_prompt"
+        else if [ "$theme_powerline_fonts" = "no" ]
+            echo -ns '> '
+        else
+            echo -ns "$right_arrow_glyph "
+        end
+    else if [ "$theme_newline_cursor" = 'clean' ]
+        echo -ens "\n"
+    end
+
+    set_color normal
+    set __bobthefish_current_bg
+end
+
+
+# ==============================
+# Status and input mode segments
+# ==============================
+
+function __bobthefish_prompt_status -S -a last_status -d 'Display flags for a non-zero exit status, root user, and background jobs'
+    set -l nonzero
+    set -l superuser
+    set -l bg_jobs
+
+    # Last exit was nonzero
+    [ $last_status -ne 0 ]
+    and set nonzero 1
+
+    # If superuser (uid == 0)
+    #
+    # Note that iff the current user is root and '/' is not writeable by root this
+    # will be wrong. But I can't think of a single reason that would happen, and
+    # it is literally 99.5% faster to check it this way, so that's a tradeoff I'm
+    # willing to make.
+    [ -w / ]
+    and [ (id -u) -eq 0 ]
+    and set superuser 1
+
+    # Jobs display
+    jobs -p >/dev/null
+    and set bg_jobs 1
+
+    if [ "$nonzero" -o "$superuser" -o "$bg_jobs" ]
+        __bobthefish_start_segment $color_initial_segment_exit
+        if [ "$nonzero" ]
+            set_color normal
+            set_color -b $color_initial_segment_exit
+            if [ "$theme_show_exit_status" = 'yes' ]
+                echo -ns $last_status ' '
+            else
+                echo -n $nonzero_exit_glyph
+            end
+        end
+
+        if [ "$superuser" ]
+            set_color normal
+            if [ -z "$FAKEROOTKEY" ]
+                set_color -b $color_initial_segment_su
+            else
+                set_color -b $color_initial_segment_exit
+            end
+
+            echo -n $superuser_glyph
+        end
+
+        if [ "$bg_jobs" ]
+            set_color normal
+            set_color -b $color_initial_segment_jobs
+            echo -n $bg_job_glyph
+        end
+    end
+end
+
+function __bobthefish_prompt_vi -S -d 'Display vi mode'
+    [ "$theme_display_vi" != 'no' ]
+    or return
+
+    [ "$fish_key_bindings" = 'fish_vi_key_bindings' \
+        -o "$fish_key_bindings" = 'hybrid_bindings' \
+        -o "$fish_key_bindings" = 'fish_hybrid_key_bindings' \
+        -o "$theme_display_vi" = 'yes' ]
+    or return
+
     switch $fish_bind_mode
-      case default
-        set ps_vi $colnormal"("$colred"N"$colnormal")"
-      case insert
-        set ps_vi $colnormal"("$colgreen"I"$colnormal")"
-      case visual
-        set ps_vi $colnormal"("$colwhite"V"$colnormal")"
+        case default
+            __bobthefish_start_segment $color_vi_mode_default
+            echo -n 'N '
+        case insert
+            __bobthefish_start_segment $color_vi_mode_insert
+            echo -n 'I '
+        case replace_one replace-one
+            __bobthefish_start_segment $color_vi_mode_insert
+            echo -n 'R '
+        case visual
+            __bobthefish_start_segment $color_vi_mode_visual
+            echo -n 'V '
     end
-  end
-
-  # end of prompt
-  # The color of the end of the prompt depends on the $status value of the
-  # last executed command. It is green or red depending on the last command
-  # success or failure respectively.
-  # Since I often use ranger and use its 'shift+s' key binding to bring a shell
-  # session, there is discreet indicator when the parent process of the current
-  # shell pid is a ranger process. In this case the end of the prompt is written
-  # twice.
-  # With this indicator I can quickly remember that I can "ctrl+d" to end the
-  # the current shell process and get back to the ranger process.
-  set -l ps_end ">"
-  # indicator for ranger parent process
-  set -l ranger ""
-  set -l os (uname)
-  if test "$os" = "Darwin"
-    if pstree -s ranger | grep (echo %self) | grep -v grep > /dev/null
-      set ranger 1
-    end
-  end
-  if test "$os" = "Linux"
-    if pstree -p -l | grep "fish("(echo %self)")" | grep 'ranger([0-9]*)' > /dev/null
-      set ranger 1
-    end
-  end
-  if test -n "$ranger"
-    set ps_end $ps_end$ps_end
-  end
-  # last status give the color of the right arrows at the end of the prompt
-  if test $last_status -ne 0 
-    set ps_end $colnormal$colbred$ps_end
-  else
-    set ps_end $colnormal$colgreen$ps_end
-  end
-
-  # Left Prompt
-
-  echo -n -s $ps_git $ps_pwd $ps_vi $ps_git_dirty $ps_end ' '
 end
 
 
-function fish_right_prompt -d "Write out the right prompt of the syl20bnr theme"
-  set -l colnormal (set_color normal)
+# ==============================
+# Container and VM segments
+# ==============================
 
-  # Segments
+function __bobthefish_prompt_vagrant -S -d 'Display Vagrant status'
+    [ "$theme_display_vagrant" = 'yes' -a -f Vagrantfile ]
+    or return
 
-  # The where segment format is X@Y where:
-  #   X is the username
-  #   Y is the hostname
-  set -l ps_where $colnormal(whoami)@(hostname|cut -d . -f 1)
-  
-  # Right Prompt
+    # .vagrant/machines/$machine/$provider/id
+    for file in .vagrant/machines/*/*/id
+        read -l id <"$file"
 
-  if test $__syl20bnr_display_rprompt -eq 1
-    echo -n -s $ps_where
-  end
+        if [ -n "$id" ]
+            switch "$file"
+                case '*/virtualbox/id'
+                    __bobthefish_prompt_vagrant_vbox $id
+                case '*/vmware_fusion/id'
+                    __bobthefish_prompt_vagrant_vmware $id
+                case '*/parallels/id'
+                    __bobthefish_prompt_vagrant_parallels $id
+            end
+        end
+    end
 end
 
+function __bobthefish_prompt_vagrant_vbox -S -a id -d 'Display VirtualBox Vagrant status'
+    set -l vagrant_status
+    set -l vm_status (VBoxManage showvminfo --machinereadable $id 2>/dev/null | command grep 'VMState=' | tr -d '"' | cut -d '=' -f 2)
+
+    switch "$vm_status"
+        case 'running'
+            set vagrant_status "$vagrant_status$vagrant_running_glyph"
+        case 'poweroff'
+            set vagrant_status "$vagrant_status$vagrant_poweroff_glyph"
+        case 'aborted'
+            set vagrant_status "$vagrant_status$vagrant_aborted_glyph"
+        case 'saved'
+            set vagrant_status "$vagrant_status$vagrant_saved_glyph"
+        case 'stopping'
+            set vagrant_status "$vagrant_status$vagrant_stopping_glyph"
+        case ''
+            set vagrant_status "$vagrant_status$vagrant_unknown_glyph"
+    end
+
+    [ -z "$vagrant_status" ]
+    and return
+
+    __bobthefish_start_segment $color_vagrant
+    echo -ns $vagrant_status ' '
+end
+
+function __bobthefish_prompt_vagrant_vmware -S -a id -d 'Display VMWare Vagrant status'
+    set -l vagrant_status
+    if [ (pgrep -f "$id") ]
+        set vagrant_status "$vagrant_status$vagrant_running_glyph"
+    else
+        set vagrant_status "$vagrant_status$vagrant_poweroff_glyph"
+    end
+
+    [ -z "$vagrant_status" ]
+    and return
+
+    __bobthefish_start_segment $color_vagrant
+    echo -ns $vagrant_status ' '
+end
+
+function __bobthefish_prompt_vagrant_parallels -S -d 'Display Parallels Vagrant status'
+    set -l vagrant_status
+    set -l vm_status (prlctl list $id -o status 2>/dev/null | command tail -1)
+
+    switch "$vm_status"
+        case 'running'
+            set vagrant_status "$vagrant_status$vagrant_running_glyph"
+        case 'stopped'
+            set vagrant_status "$vagrant_status$vagrant_poweroff_glyph"
+        case 'paused'
+            set vagrant_status "$vagrant_status$vagrant_saved_glyph"
+        case 'suspended'
+            set vagrant_status "$vagrant_status$vagrant_saved_glyph"
+        case 'stopping'
+            set vagrant_status "$vagrant_status$vagrant_stopping_glyph"
+        case ''
+            set vagrant_status "$vagrant_status$vagrant_unknown_glyph"
+    end
+
+    [ -z "$vagrant_status" ]
+    and return
+
+    __bobthefish_start_segment $color_vagrant
+    echo -ns $vagrant_status ' '
+end
+
+function __bobthefish_prompt_docker -S -d 'Display Docker machine name'
+    [ "$theme_display_docker_machine" = 'no' -o -z "$DOCKER_MACHINE_NAME" ]
+    and return
+
+    __bobthefish_start_segment $color_vagrant
+    echo -ns $DOCKER_MACHINE_NAME ' '
+end
+
+function __bobthefish_prompt_k8s_context -S -d 'Show current Kubernetes context'
+    [ "$theme_display_k8s_context" = 'yes' ]
+    or return
+
+    set -l config_paths "$HOME/.kube/config"
+    [ -n "$KUBECONFIG" ]
+    and set config_paths (string split ':' "$KUBECONFIG") $config_paths
+
+    for file in $config_paths
+        [ -f "$file" ]
+        or continue
+
+        while read -l key val
+            if [ "$key" = 'current-context:' ]
+                set -l context (string trim -c '"\' ' -- $val)
+                [ -z "$context" ]
+                and return
+
+                __bobthefish_start_segment $color_k8s
+                echo -ns $context ' '
+                return
+            end
+        end <$file
+    end
+end
+
+
+# ==============================
+# User / hostname info segments
+# ==============================
+
+# Polyfill for fish < 2.5.0
+if not type -q prompt_hostname
+    if not set -q __bobthefish_prompt_hostname
+        set -g __bobthefish_prompt_hostname (hostname | string replace -r '\..*' '')
+    end
+
+    function prompt_hostname
+        echo $__bobthefish_prompt_hostname
+    end
+end
+
+function __bobthefish_prompt_user -S -d 'Display current user and hostname'
+    [ "$theme_display_user" = 'yes' -o \( "$theme_display_user" != 'no' -a -n "$SSH_CLIENT" \) -o \( -n "$default_user" -a "$USER" != "$default_user" \) ]
+    and set -l display_user
+
+    [ "$theme_display_hostname" = 'yes' -o \( "$theme_display_hostname" != 'no' -a -n "$SSH_CLIENT" \) ]
+    and set -l display_hostname
+
+    if set -q display_user
+        __bobthefish_start_segment $color_username
+        echo -ns (whoami)
+    end
+
+    if set -q display_hostname
+        if set -q display_user
+            # reset colors without starting a new segment...
+            # (so we can have a bold username and non-bold hostname)
+            set_color normal
+            set_color -b $color_hostname[1] $color_hostname[2..-1]
+            echo -ns '@' (prompt_hostname)
+        else
+            __bobthefish_start_segment $color_hostname
+            echo -ns (prompt_hostname)
+        end
+    end
+
+    set -q display_user
+    or set -q display_hostname
+    and echo -ns ' '
+end
+
+
+# ==============================
+# Virtual environment segments
+# ==============================
+
+function __bobthefish_rvm_parse_ruby -S -a ruby_string -a scope -d 'Parse RVM Ruby string'
+    # Function arguments:
+    # - 'ruby-2.2.3@rails', 'jruby-1.7.19'...
+    # - 'default' or 'current'
+    set -l IFS @
+    echo "$ruby_string" | read __ruby __rvm_{$scope}_ruby_gemset __
+    set IFS -
+    echo "$__ruby" | read __rvm_{$scope}_ruby_interpreter __rvm_{$scope}_ruby_version __
+    set -e __ruby
+    set -e __
+end
+
+function __bobthefish_rvm_info -S -d 'Current Ruby information from RVM'
+    # look for rvm install path
+    set -q rvm_path
+    or set -l rvm_path ~/.rvm /usr/local/rvm
+
+    # More `sed`/`grep`/`cut` magic...
+    set -l __rvm_default_ruby (grep GEM_HOME $rvm_path/environments/default 2>/dev/null | sed -e"s/'//g" | sed -e's/.*\///')
+    set -l __rvm_current_ruby (rvm-prompt i v g)
+
+    [ "$__rvm_default_ruby" = "$__rvm_current_ruby" ]
+    and return
+
+    set -l __rvm_default_ruby_gemset
+    set -l __rvm_default_ruby_interpreter
+    set -l __rvm_default_ruby_version
+    set -l __rvm_current_ruby_gemset
+    set -l __rvm_current_ruby_interpreter
+    set -l __rvm_current_ruby_version
+
+    # Parse default and current Rubies to global variables
+    __bobthefish_rvm_parse_ruby $__rvm_default_ruby default
+    __bobthefish_rvm_parse_ruby $__rvm_current_ruby current
+    # Show unobtrusive RVM prompt
+
+    # If interpreter differs form default interpreter, show everything:
+    if [ "$__rvm_default_ruby_interpreter" != "$__rvm_current_ruby_interpreter" ]
+        if [ "$__rvm_current_ruby_gemset" = 'global' ]
+            rvm-prompt i v
+        else
+            rvm-prompt i v g
+        end
+        # If version differs form default version
+    else if [ "$__rvm_default_ruby_version" != "$__rvm_current_ruby_version" ]
+        if [ "$__rvm_current_ruby_gemset" = 'global' ]
+            rvm-prompt v
+        else
+            rvm-prompt v g
+        end
+        # If gemset differs form default or 'global' gemset, just show it
+    else if [ "$__rvm_default_ruby_gemset" != "$__rvm_current_ruby_gemset" ]
+        rvm-prompt g
+    end
+end
+
+function __bobthefish_prompt_rubies -S -d 'Display current Ruby information'
+    [ "$theme_display_ruby" = 'no' ]
+    and return
+
+    set -l ruby_version
+    if type -fq rvm-prompt
+        set ruby_version (__bobthefish_rvm_info)
+    else if type -fq rbenv
+        set ruby_version (rbenv version-name)
+        # Don't show global ruby version...
+        set -q RBENV_ROOT
+        or set -l RBENV_ROOT $HOME/.rbenv
+
+        [ -e "$RBENV_ROOT/version" ]
+        and read -l global_ruby_version <"$RBENV_ROOT/version"
+
+        [ "$global_ruby_version" ]
+        or set -l global_ruby_version system
+
+        [ "$ruby_version" = "$global_ruby_version" ]
+        and return
+    else if type -q chruby # chruby is implemented as a function, so omitting the -f is intentional
+        set ruby_version $RUBY_VERSION
+    else if type -fq asdf
+        asdf current ruby 2>/dev/null | read -l asdf_ruby_version asdf_provenance
+        or return
+
+        # If asdf changes their ruby version provenance format, update this to match
+        [ "$asdf_provenance" = "(set by $HOME/.tool-versions)" ]
+        and return
+
+        set ruby_version $asdf_ruby_version
+    end
+
+    [ -z "$ruby_version" ]
+    and return
+
+    __bobthefish_start_segment $color_rvm
+    echo -ns $ruby_glyph $ruby_version ' '
+end
+
+function __bobthefish_virtualenv_python_version -S -d 'Get current Python version'
+    switch (python --version 2>&1 | tr '\n' ' ')
+        case 'Python 2*PyPy*'
+            echo $pypy_glyph
+        case 'Python 3*PyPy*'
+            echo -s $pypy_glyph $superscript_glyph[3]
+        case 'Python 2*'
+            echo $superscript_glyph[2]
+        case 'Python 3*'
+            echo $superscript_glyph[3]
+    end
+end
+
+function __bobthefish_prompt_virtualfish -S -d "Display current Python virtual environment (only for virtualfish, virtualenv's activate.fish changes prompt by itself) or conda environment."
+    [ "$theme_display_virtualenv" = 'no' -o -z "$VIRTUAL_ENV" -a -z "$CONDA_DEFAULT_ENV" ]
+    and return
+
+    set -l version_glyph (__bobthefish_virtualenv_python_version)
+
+    if [ "$version_glyph" ]
+        __bobthefish_start_segment $color_virtualfish
+        echo -ns $virtualenv_glyph $version_glyph ' '
+    end
+
+    if [ "$VIRTUAL_ENV" ]
+        echo -ns (basename "$VIRTUAL_ENV") ' '
+    else if [ "$CONDA_DEFAULT_ENV" ]
+        echo -ns (basename "$CONDA_DEFAULT_ENV") ' '
+    end
+end
+
+function __bobthefish_prompt_virtualgo -S -d 'Display current Go virtual environment'
+    [ "$theme_display_virtualgo" = 'no' -o -z "$VIRTUALGO" ]
+    and return
+
+    __bobthefish_start_segment $color_virtualgo
+    echo -ns $go_glyph ' ' (basename "$VIRTUALGO") ' '
+    set_color normal
+end
+
+function __bobthefish_prompt_desk -S -d 'Display current desk environment'
+    [ "$theme_display_desk" = 'no' -o -z "$DESK_ENV" ]
+    and return
+
+    __bobthefish_start_segment $color_desk
+    echo -ns $desk_glyph ' ' (basename  -a -s ".fish" "$DESK_ENV") ' '
+    set_color normal
+end
+
+
+# ==============================
+# VCS segments
+# ==============================
+
+function __bobthefish_prompt_hg -S -a hg_root_dir -a real_pwd -d 'Display the actual hg state'
+    set -l dirty (command hg stat; or echo -n '*')
+
+    set -l flags "$dirty"
+    [ "$flags" ]
+    and set flags ""
+
+    set -l flag_colors $color_repo
+    if [ "$dirty" ]
+        set flag_colors $color_repo_dirty
+    end
+
+    __bobthefish_path_segment $hg_root_dir
+
+    __bobthefish_start_segment $flag_colors
+    echo -ns $hg_glyph ' '
+
+    __bobthefish_start_segment $flag_colors
+    echo -ns (__bobthefish_hg_branch) $flags ' '
+    set_color normal
+
+    set -l project_pwd (__bobthefish_project_pwd $hg_root_dir $real_pwd)
+    if [ "$project_pwd" ]
+        if [ -w "$real_pwd" ]
+            __bobthefish_start_segment $color_path
+        else
+            __bobthefish_start_segment $color_path_nowrite
+        end
+
+        echo -ns $project_pwd ' '
+    end
+end
+
+function __bobthefish_prompt_git -S -a git_root_dir -a real_pwd -d 'Display the actual git state'
+    set -l dirty ''
+    if [ "$theme_display_git_dirty" != 'no' ]
+        set -l show_dirty (command git config --bool bash.showDirtyState 2>/dev/null)
+        if [ "$show_dirty" != 'false' ]
+            set dirty (command git diff --no-ext-diff --quiet --exit-code 2>/dev/null; or echo -n "$git_dirty_glyph")
+            if [ "$dirty" -a "$theme_display_git_dirty_verbose" = 'yes' ]
+                set dirty "$dirty"(__bobthefish_git_dirty_verbose)
+            end
+        end
+    end
+
+    set -l staged (command git diff --cached --no-ext-diff --quiet --exit-code 2>/dev/null; or echo -n "$git_staged_glyph")
+    set -l stashed (__bobthefish_git_stashed)
+    set -l ahead (__bobthefish_git_ahead)
+
+    set -l new ''
+    if [ "$theme_display_git_untracked" != 'no' ]
+        set -l show_untracked (command git config --bool bash.showUntrackedFiles 2>/dev/null)
+        if [ "$show_untracked" != 'false' ]
+            set new (command git ls-files --other --exclude-standard --directory --no-empty-directory 2>/dev/null)
+            if [ "$new" ]
+                set new "$git_untracked_glyph"
+            end
+        end
+    end
+
+    set -l flags "$dirty$staged$stashed$ahead$new"
+
+    [ "$flags" ]
+    and set flags " $flags"
+
+    set -l flag_colors $color_repo
+    if [ "$dirty" ]
+        set flag_colors $color_repo_dirty
+    else if [ "$staged" ]
+        set flag_colors $color_repo_staged
+    end
+
+    __bobthefish_path_segment $git_root_dir
+
+    __bobthefish_start_segment $flag_colors
+    echo -ns (__bobthefish_git_branch) $flags ' '
+    set_color normal
+
+    if [ "$theme_git_worktree_support" != 'yes' ]
+        set -l project_pwd (__bobthefish_project_pwd $git_root_dir $real_pwd)
+        if [ "$project_pwd" ]
+            if [ -w "$real_pwd" ]
+                __bobthefish_start_segment $color_path
+            else
+                __bobthefish_start_segment $color_path_nowrite
+            end
+
+            echo -ns $project_pwd ' '
+        end
+        return
+    end
+
+    set -l project_pwd (command git rev-parse --show-prefix 2>/dev/null | string trim --right --chars=/)
+    set -l work_dir (command git rev-parse --show-toplevel 2>/dev/null)
+
+    # only show work dir if it's a parent…
+    if [ "$work_dir" ]
+        switch $real_pwd/
+            case $work_dir/\*
+                string match "$git_root_dir*" $work_dir >/dev/null
+                and set work_dir (string sub -s (math 1 + (string length $git_root_dir)) $work_dir)
+            case \*
+                set -e work_dir
+        end
+    end
+
+    if [ "$project_pwd" -o "$work_dir" ]
+        set -l colors $color_path
+        if not [ -w "$real_pwd" ]
+            set colors $color_path_nowrite
+        end
+
+        __bobthefish_start_segment $colors
+
+        # handle work_dir != project dir
+        if [ "$work_dir" ]
+            set -l work_parent (__bobthefish_dirname $work_dir)
+            if [ "$work_parent" ]
+                echo -n "$work_parent/"
+            end
+
+            set_color normal
+            set_color -b $color_repo_work_tree
+            echo -n (__bobthefish_basename $work_dir)
+
+            set_color normal
+            set_color -b $colors
+            [ "$project_pwd" ]
+            and echo -n '/'
+        end
+
+        echo -ns $project_pwd ' '
+    else
+        set project_pwd $real_pwd
+
+        string match "$git_root_dir*" $project_pwd >/dev/null
+        and set project_pwd (string sub -s (math 1 + (string length $git_root_dir)) $project_pwd)
+
+        set project_pwd (string trim --left --chars=/ -- $project_pwd)
+
+        if [ "$project_pwd" ]
+            set -l colors $color_path
+            if not [ -w "$real_pwd" ]
+                set colors $color_path_nowrite
+            end
+
+            __bobthefish_start_segment $colors
+
+            echo -ns $project_pwd ' '
+        end
+    end
+end
+
+function __bobthefish_prompt_dir -S -a real_pwd -d 'Display a shortened form of the current directory'
+    __bobthefish_path_segment "$real_pwd"
+end
+
+
+# ==============================
+# Apply theme
+# ==============================
+
+function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
+    # Save the last status for later (do this before anything else)
+    set -l last_status $status
+
+    # Use a simple prompt on dumb terminals.
+    if [ "$TERM" = "dumb" ]
+        echo "> "
+        return
+    end
+
+    __bobthefish_glyphs
+    __bobthefish_colors $theme_color_scheme
+
+    type -q bobthefish_colors
+    and bobthefish_colors
+
+    # Start each line with a blank slate
+    set -l __bobthefish_current_bg
+
+    # Status flags and input mode
+    __bobthefish_prompt_status $last_status
+    __bobthefish_prompt_vi
+
+    # Containers and VMs
+    __bobthefish_prompt_vagrant
+    __bobthefish_prompt_docker
+    __bobthefish_prompt_k8s_context
+
+    # User / hostname info
+    __bobthefish_prompt_user
+
+    # Virtual environments
+    __bobthefish_prompt_desk
+    __bobthefish_prompt_rubies
+    __bobthefish_prompt_virtualfish
+    __bobthefish_prompt_virtualgo
+
+    set -l real_pwd (__bobthefish_pwd)
+
+    # VCS
+    set -l git_root_dir (__bobthefish_git_project_dir $real_pwd)
+    set -l hg_root_dir (__bobthefish_hg_project_dir $real_pwd)
+
+    if [ "$git_root_dir" -a "$hg_root_dir" ]
+        # only show the closest parent
+        switch $git_root_dir
+            case $hg_root_dir\*
+                __bobthefish_prompt_git $git_root_dir $real_pwd
+            case \*
+                __bobthefish_prompt_hg $hg_root_dir $real_pwd
+        end
+    else if [ "$git_root_dir" ]
+        __bobthefish_prompt_git $git_root_dir $real_pwd
+    else if [ "$hg_root_dir" ]
+        __bobthefish_prompt_hg $hg_root_dir $real_pwd
+    else
+        __bobthefish_prompt_dir $real_pwd
+    end
+
+    __bobthefish_finish_segments
+end
diff --git a/fish/.config/fish/functions/fish_right_prompt.fish b/fish/.config/fish/functions/fish_right_prompt.fish
new file mode 100644
index 0000000..d0bb3b1
--- /dev/null
+++ b/fish/.config/fish/functions/fish_right_prompt.fish
@@ -0,0 +1,79 @@
+# You can override some default right prompt options in your config.fish:
+#     set -g theme_date_format "+%a %H:%M"
+
+function __bobthefish_cmd_duration -S -d 'Show command duration'
+    [ "$theme_display_cmd_duration" = "no" ]
+    and return
+
+    [ -z "$CMD_DURATION" -o "$CMD_DURATION" -lt 100 ]
+    and return
+
+    if [ "$CMD_DURATION" -lt 5000 ]
+        echo -ns $CMD_DURATION 'ms'
+    else if [ "$CMD_DURATION" -lt 60000 ]
+        __bobthefish_pretty_ms $CMD_DURATION s
+    else if [ "$CMD_DURATION" -lt 3600000 ]
+        set_color $fish_color_error
+        __bobthefish_pretty_ms $CMD_DURATION m
+    else
+        set_color $fish_color_error
+        __bobthefish_pretty_ms $CMD_DURATION h
+    end
+
+    set_color $fish_color_normal
+    set_color $fish_color_autosuggestion
+
+    [ "$theme_display_date" = "no" ]
+    or echo -ns ' ' $__bobthefish_left_arrow_glyph
+end
+
+function __bobthefish_pretty_ms -S -a ms -a interval -d 'Millisecond formatting for humans'
+    set -l interval_ms
+    set -l scale 1
+
+    switch $interval
+        case s
+            set interval_ms 1000
+        case m
+            set interval_ms 60000
+        case h
+            set interval_ms 3600000
+            set scale 2
+    end
+
+    switch $FISH_VERSION
+        case 2.0.\* 2.1.\* 2.2.\* 2.3.\*
+            # Fish 2.3 and lower doesn't know about the -s argument to math.
+            math "scale=$scale;$ms/$interval_ms" | string replace -r '\\.?0*$' $interval
+        case 2.\*
+            # Fish 2.x always returned a float when given the -s argument.
+            math -s$scale "$ms/$interval_ms" | string replace -r '\\.?0*$' $interval
+        case \*
+            math -s$scale "$ms/$interval_ms"
+            echo -ns $interval
+    end
+end
+
+function __bobthefish_timestamp -S -d 'Show the current timestamp'
+    [ "$theme_display_date" = "no" ]
+    and return
+
+    set -q theme_date_format
+    or set -l theme_date_format "+%c"
+
+    echo -n ' '
+    date $theme_date_format
+end
+
+function fish_right_prompt -d 'bobthefish is all about the right prompt'
+    set -l __bobthefish_left_arrow_glyph \uE0B3
+    if [ "$theme_powerline_fonts" = "no" ]
+        set __bobthefish_left_arrow_glyph '<'
+    end
+
+    set_color $fish_color_autosuggestion
+
+    __bobthefish_cmd_duration
+    __bobthefish_timestamp
+    set_color normal
+end
diff --git a/fish/.config/fish/functions/fish_title.fish b/fish/.config/fish/functions/fish_title.fish
new file mode 100644
index 0000000..a14e1b6
--- /dev/null
+++ b/fish/.config/fish/functions/fish_title.fish
@@ -0,0 +1,34 @@
+# You can override some default title options in your config.fish:
+#     set -g theme_title_display_process no
+#     set -g theme_title_display_path no
+#     set -g theme_title_display_user yes
+#     set -g theme_title_use_abbreviated_path no
+
+function __bobthefish_title_user -S -d 'Display actual user if different from $default_user'
+    if [ "$theme_title_display_user" = 'yes' ]
+        if [ "$USER" != "$default_user" -o -n "$SSH_CLIENT" ]
+            set -l IFS .
+            hostname | read -l hostname __
+            echo -ns (whoami) '@' $hostname ' '
+        end
+    end
+end
+
+function fish_title
+    __bobthefish_title_user
+
+    if [ "$theme_title_display_process" = 'yes' ]
+        echo $_
+
+        [ "$theme_title_display_path" != 'no' ]
+        and echo ' '
+    end
+
+    if [ "$theme_title_display_path" != 'no' ]
+        if [ "$theme_title_use_abbreviated_path" = 'no' ]
+            echo $PWD
+        else
+            prompt_pwd
+        end
+    end
+end