screen: making it opt-in (verbose off), example and using string command

Signed-off-by: Paulo Flabiano Smorigo <pfsmorigo@gmail.com>
pull/264/head
Paulo Flabiano Smorigo 4 years ago
parent cde6108d7b
commit 30b289cd5a
No known key found for this signature in database
GPG Key ID: 6D4A7990BDE2CC66

@ -35,7 +35,8 @@
# set -g theme_display_ruby no
# set -g theme_display_user ssh
# set -g theme_display_hostname ssh
# set -g theme_display_screen no
# set -g theme_display_screen yes
# set -g theme_display_screen_verbose no
# set -g theme_display_sudo_user yes
# set -g theme_display_vi no
# set -g theme_display_nvm yes
@ -913,14 +914,16 @@ function __bobthefish_prompt_hg -S -a hg_root_dir -a real_pwd -d 'Display the ac
end
function __bobthefish_prompt_screen -S -d 'Display the screen name'
[ "$theme_display_screen" != 'yes' ]
[ "$theme_display_screen" = 'no' ]
and return
[ -z "$STY" ]
and return
__bobthefish_start_segment $color_screen
echo -ns (command echo $STY | cut -d. -f2) ' '
[ "$theme_display_screen_verbose" = "yes" ]
and echo -ns (string split "." -- $STY)[2]
echo -ns ' '
set_color normal
end
@ -1077,6 +1080,8 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
# User / hostname info
__bobthefish_prompt_user
# Screen
__bobthefish_prompt_screen
# Containers and VMs

@ -29,7 +29,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s magenta white --bold
set -x color_username white black --bold
set -x color_hostname white black
set -x color_screen brgreen $colorfg
set -x color_screen brgreen $colorfg --bold
set -x color_rvm brmagenta $colorfg --bold
set -x color_nvm brgreen $colorfg --bold
set -x color_virtualfish brblue $colorfg --bold
@ -62,7 +62,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s magenta white --bold
set -x color_username black white --bold
set -x color_hostname black white
set -x color_screen brgreen $colorfg
set -x color_screen brgreen $colorfg --bold
set -x color_rvm brmagenta $colorfg --bold
set -x color_nvm brgreen $colorfg --bold
set -x color_virtualfish brblue $colorfg --bold
@ -95,7 +95,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s magenta white --bold
set -x color_username brgrey white --bold
set -x color_hostname brgrey white
set -x color_screen brgreen $colorfg
set -x color_screen brgreen $colorfg --bold
set -x color_rvm brmagenta $colorfg --bold
set -x color_nvm brgreen $colorfg --bold
set -x color_virtualfish brblue $colorfg --bold
@ -128,7 +128,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s magenta white --bold
set -x color_username grey black --bold
set -x color_hostname grey black
set -x color_screen brgreen $colorfg
set -x color_screen brgreen $colorfg --bold
set -x color_rvm brmagenta $colorfg --bold
set -x color_nvm brgreen $colorfg --bold
set -x color_virtualfish brblue $colorfg --bold
@ -167,7 +167,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s $green $white --bold
set -x color_username $grey $blue --bold
set -x color_hostname $grey $blue
set -x color_screen $green $grey
set -x color_screen $green $grey --bold
set -x color_rvm $red $grey --bold
set -x color_nvm $green $white --bold
set -x color_virtualfish $blue $grey --bold
@ -217,7 +217,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s $base06 $colorfg --bold
set -x color_username $base02 $base0D --bold
set -x color_hostname $base02 $base0D
set -x color_screen $base06 $colorfg
set -x color_screen $base06 $colorfg --bold
set -x color_rvm $base08 $colorfg --bold
set -x color_nvm $base0B $colorfg --bold
set -x color_virtualfish $base0D $colorfg --bold
@ -267,7 +267,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s $base0B $colorfg --bold
set -x color_username $base02 $base0D --bold
set -x color_hostname $base02 $base0D
set -x color_screen $base0B $colorfg
set -x color_screen $base0B $colorfg --bold
set -x color_rvm $base08 $colorfg --bold
set -x color_nvm $base0B $colorfg --bold
set -x color_virtualfish $base0D $colorfg --bold
@ -317,7 +317,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s $green $colorfg --bold
set -x color_username $base2 $blue --bold
set -x color_hostname $base2 $blue
set -x color_screen $green $colorfg
set -x color_screen $green $colorfg --bold
set -x color_rvm $red $colorfg --bold
set -x color_nvm $green $colorfg --bold
set -x color_virtualfish $cyan $colorfg --bold
@ -367,7 +367,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s $green $colorfg --bold
set -x color_username $base02 $blue --bold
set -x color_hostname $base02 $blue
set -x color_screen $green $colorfg
set -x color_screen $green $colorfg --bold
set -x color_rvm $red $colorfg --bold
set -x color_nvm $green $colorfg --bold
set -x color_virtualfish $cyan $colorfg --bold
@ -410,7 +410,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s $green[1] $colorfg --bold
set -x color_username $grey[1] $blue[3] --bold
set -x color_hostname $grey[1] $blue[3]
set -x color_screen $green[1] $colorfg
set -x color_screen $green[1] $colorfg --bold
set -x color_rvm $ruby_red $grey[1] --bold
set -x color_nvm $green $grey[1] --bold
set -x color_virtualfish $blue[2] $grey[1] --bold
@ -452,7 +452,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s $green[2] $fg[2] --bold
set -x color_username $fg[3] $blue[2] --bold
set -x color_hostname $fg[3] $blue[2]
set -x color_screen $green[1] $fg[2]
set -x color_screen $green[1] $fg[2] --bold
set -x color_rvm $red[2] $fg[2] --bold
set -x color_nvm $green[1] $fg[2] --bold
set -x color_virtualfish $blue[2] $fg[2] --bold
@ -496,7 +496,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s $green $fg --bold
set -x color_username $selection $cyan --bold
set -x color_hostname $selection $cyan
set -x color_screen $green $fg
set -x color_screen $green $bg --bold
set -x color_rvm $red $bg --bold
set -x color_nvm $green $bg --bold
set -x color_virtualfish $comment $bg --bold
@ -546,7 +546,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s $base02 $colorfg --bold
set -x color_username $base02 $base0D --bold
set -x color_hostname $base02 $base0D
set -x color_screen $base02 $colorfg
set -x color_screen $base02 $colorfg --bold
set -x color_rvm $base09 $colorfg --bold
set -x color_nvm $base09 $colorfg --bold
set -x color_virtualfish $base09 $colorfg --bold
@ -589,7 +589,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
set -x color_k8s $green[2] $white --bold
set -x color_username $grey[1] $blue[3] --bold
set -x color_hostname $grey[1] $blue[3]
set -x color_screen $green[1] $white
set -x color_screen $green[1] $white --bold
set -x color_rvm $ruby_red $grey[1] --bold
set -x color_nvm $green[1] $white --bold
set -x color_virtualfish $blue[2] $grey[1] --bold

@ -123,6 +123,10 @@ function bobthefish_display_colors -a color_scheme -d 'Print example prompt colo
__bobthefish_finish_segments
echo
__bobthefish_start_segment $color_screen
echo -ns 'screen '
__bobthefish_finish_segments
__bobthefish_start_segment $color_rvm
echo -ns $ruby_glyph rvm ' '
__bobthefish_finish_segments

Loading…
Cancel
Save