From f8d99f2a46125456dd1745125bfd462ade1abc0b Mon Sep 17 00:00:00 2001
From: remche <remche@remche.org>
Date: Fri, 16 Feb 2018 15:18:48 +0100
Subject: [PATCH 1/2] adding desk prompt

---
 fish_prompt.fish | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/fish_prompt.fish b/fish_prompt.fish
index 98301f3..f2d93a6 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -673,6 +673,13 @@ function __bobthefish_prompt_virtualgo -S -d 'Display current Go virtual environ
   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 $__bobthefish_desk_glyph ' ' (basename  -a -s ".fish" "$DESK_ENV") ' '
+  set_color normal
+end
+
 
 # ==============================
 # VCS segments
@@ -927,11 +934,15 @@ function __bobthefish_maybe_display_colors -S
   echo -ns $__bobthefish_virtualenv_glyph virtualfish ' '
   __bobthefish_finish_segments
 
-  __bobthefish_start_segment $__color_virtualgo
+   __bobthefish_start_segment $__color_virtualgo
   echo -ns $__bobthefish_go_glyph virtualgo ' '
   __bobthefish_finish_segments
 
-  echo -e "\n"
+  __bobthefish_start_segment $__color_desk
+  echo -ns $__bobthefish_desk_glyph desk ' '
+  __bobthefish_finish_segments
+
+ echo -e "\n"
 
 end
 
@@ -967,6 +978,9 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
   set -l __bobthefish_ruby_glyph              ''
   set -l __bobthefish_go_glyph                ''
 
+  # Desk glyphs
+  set -l __bobthefish_desk_glyph              \u25F2
+
   # Vagrant glyphs
   set -l __bobthefish_vagrant_running_glyph   \u2191 # ↑ 'running'
   set -l __bobthefish_vagrant_poweroff_glyph  \u2193 # ↓ 'poweroff'
@@ -1074,6 +1088,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       # set -g __color_rvm                   af0000 cccccc --bold
       # set -g __color_virtualfish           005faf cccccc --bold
       # set -g __color_virtualgo             005faf cccccc --bold
+      # set -g __color_desk                  005faf cccccc --bold
 
     case 'terminal' 'terminal-dark*'
       set -l colorfg black
@@ -1103,6 +1118,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      brmagenta $colorfg --bold
       set __color_virtualfish              brblue $colorfg --bold
       set __color_virtualgo                brblue $colorfg --bold
+      set __color_desk                     brblue $colorfg --bold
 
     case 'terminal-light*'
       set -l colorfg white
@@ -1132,6 +1148,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      brmagenta $colorfg --bold
       set __color_virtualfish              brblue $colorfg --bold
       set __color_virtualgo                brblue $colorfg --bold
+      set __color_desk                brblue $colorfg --bold
 
     case 'terminal2' 'terminal2-dark*'
       set -l colorfg black
@@ -1161,6 +1178,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      brmagenta $colorfg --bold
       set __color_virtualfish              brblue $colorfg --bold
       set __color_virtualgo                brblue $colorfg --bold
+      set __color_desk                     brblue $colorfg --bold
 
     case 'terminal2-light*'
       set -l colorfg white
@@ -1190,6 +1208,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      brmagenta $colorfg --bold
       set __color_virtualfish              brblue $colorfg --bold
       set __color_virtualgo                brblue $colorfg --bold
+      set __color_desk                     brblue $colorfg --bold
 
     case 'zenburn'
       set -l grey   333333 # a bit darker than normal zenburn grey
@@ -1225,6 +1244,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      $red $grey --bold
       set __color_virtualfish              $blue $grey --bold
       set __color_virtualgo                $blue $grey --bold
+      set __color_desk                     $blue $grey --bold
 
     case 'base16-light'
       set -l base00 181818
@@ -1317,6 +1337,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      $base08 $colorfg --bold
       set __color_virtualfish              $base0D $colorfg --bold
       set __color_virtualgo                $base0D $colorfg --bold
+      set __color_desk                     $base0D $colorfg --bold
 
     case 'solarized-light'
       set -l base03  002b36
@@ -1363,6 +1384,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      $red $colorfg --bold
       set __color_virtualfish              $cyan $colorfg --bold
       set __color_virtualgo                $cyan $colorfg --bold
+      set __color_desk                     $cyan $colorfg --bold
 
     case 'solarized' 'solarized-dark'
       set -l base03  002b36
@@ -1409,6 +1431,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      $red $colorfg --bold
       set __color_virtualfish              $cyan $colorfg --bold
       set __color_virtualgo                $cyan $colorfg --bold
+      set __color_desk                $cyan $colorfg --bold
 
     case 'light'
       #               light  medium dark
@@ -1448,6 +1471,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      $ruby_red $grey[1] --bold
       set __color_virtualfish              $blue[2] $grey[1] --bold
       set __color_virtualgo                $blue[2] $grey[1] --bold
+      set __color_desk                     $blue[2] $grey[1] --bold
 
     case 'gruvbox'
       #               light  medium  dark  darkest
@@ -1486,6 +1510,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                   $red[2] $fg[2] --bold
       set __color_virtualfish           $blue[2] $fg[2] --bold
       set __color_virtualgo             $blue[2] $fg[2] --bold
+      set __color_desk                  $blue[2] $fg[2] --bold
 
     case '*' # default dark theme
       #               light  medium dark
@@ -1525,6 +1550,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      $ruby_red $grey[1] --bold
       set __color_virtualfish              $blue[2] $grey[1] --bold
       set __color_virtualgo                $blue[2] $grey[1] --bold
+      set __color_desk                     $blue[2] $grey[1] --bold
   end
 
   # Start each line with a blank slate
@@ -1546,6 +1572,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
   __bobthefish_prompt_user
 
   # Virtual environments
+  __bobthefish_prompt_desk
   __bobthefish_prompt_rubies
   __bobthefish_prompt_virtualfish
   __bobthefish_prompt_virtualgo

From 6b65311b6ce75966d38f37761c4294b0da1b930c Mon Sep 17 00:00:00 2001
From: remche <remche@remche.org>
Date: Tue, 20 Feb 2018 14:57:40 +0100
Subject: [PATCH 2/2] fixing dirty indentation

---
 fish_prompt.fish | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fish_prompt.fish b/fish_prompt.fish
index f2d93a6..bfa49fc 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -934,7 +934,7 @@ function __bobthefish_maybe_display_colors -S
   echo -ns $__bobthefish_virtualenv_glyph virtualfish ' '
   __bobthefish_finish_segments
 
-   __bobthefish_start_segment $__color_virtualgo
+  __bobthefish_start_segment $__color_virtualgo
   echo -ns $__bobthefish_go_glyph virtualgo ' '
   __bobthefish_finish_segments
 
@@ -1148,7 +1148,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      brmagenta $colorfg --bold
       set __color_virtualfish              brblue $colorfg --bold
       set __color_virtualgo                brblue $colorfg --bold
-      set __color_desk                brblue $colorfg --bold
+      set __color_desk                     brblue $colorfg --bold
 
     case 'terminal2' 'terminal2-dark*'
       set -l colorfg black
@@ -1431,7 +1431,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
       set __color_rvm                      $red $colorfg --bold
       set __color_virtualfish              $cyan $colorfg --bold
       set __color_virtualgo                $cyan $colorfg --bold
-      set __color_desk                $cyan $colorfg --bold
+      set __color_desk                     $cyan $colorfg --bold
 
     case 'light'
       #               light  medium dark