Merge pull request #48 from feinstruktur/master

Docker machine display and conditional date

README.md

@@ -68,12 +68,14 @@ set -g theme_display_git_untracked no
 set -g theme_display_git_ahead_verbose 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_hg yes
 set -g theme_display_virtualenv no
 set -g theme_display_ruby no
 set -g theme_display_user yes
 set -g theme_display_vi yes
 set -g theme_display_vi_hide_mode default
+set -g theme_display_date no
 set -g theme_title_display_process yes
 set -g theme_title_display_path no
 set -g theme_title_use_abbreviated_path no

fish_prompt.fish

@@ -292,6 +292,13 @@ function __bobthefish_prompt_vagrant_vmware -S -d 'Display VMWare Vagrant status
   set_color normal
 end
 
+function __bobthefish_prompt_docker -S -d 'Show docker machine name'
+    [ "$theme_display_docker_machine" = 'no' -o -z "$DOCKER_MACHINE_NAME" ]; and return
+    __bobthefish_start_segment $__bobthefish_vagrant fff --bold
+    echo -ns $DOCKER_MACHINE_NAME ' '
+    set_color normal
+end
+
 function __bobthefish_prompt_status -S -a last_status -d 'Display symbols for a non zero exit status, root and background jobs'
   set -l nonzero
   set -l superuser
@@ -1193,6 +1200,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
   __bobthefish_prompt_status $last_status
   __bobthefish_prompt_vi
   __bobthefish_prompt_vagrant
+  __bobthefish_prompt_docker
   __bobthefish_prompt_user
   __bobthefish_prompt_rubies
   __bobthefish_prompt_virtualfish

fish_right_prompt.fish

@@ -21,13 +21,14 @@ function __bobthefish_cmd_duration -S -d 'Show command duration'
 
   set_color $fish_color_normal
   set_color $fish_color_autosuggestion
-  echo -n $__bobthefish_left_arrow_glyph
 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 $__bobthefish_left_arrow_glyph
   echo -n ' '
   date $theme_date_format
 end