mirror of
https://github.com/oh-my-fish/theme-bobthefish.git
synced 2024-10-27 20:34:23 +00:00
Merge f74cf8ac33 into 05c0765c4e
This commit is contained in:
Peng Mei Yu
GitHub
commit
c99e2e0563
@ -83,6 +83,7 @@ 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_guix no
|
||||
set -g theme_display_nix no
|
||||
set -g theme_display_ruby no
|
||||
set -g theme_display_node yes
|
||||
|
||||
@ -37,6 +37,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish brblue $colorfg --bold
|
||||
set -x color_virtualgo brblue $colorfg --bold
|
||||
set -x color_desk brblue $colorfg --bold
|
||||
set -x color_guix brblue $colorfg --bold
|
||||
set -x color_nix brblue $colorfg --bold
|
||||
|
||||
case 'terminal-light*'
|
||||
@ -72,6 +73,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish brblue $colorfg --bold
|
||||
set -x color_virtualgo brblue $colorfg --bold
|
||||
set -x color_desk brblue $colorfg --bold
|
||||
set -x color_guix brblue $colorfg --bold
|
||||
set -x color_nix brblue $colorfg --bold
|
||||
|
||||
case 'terminal2' 'terminal2-dark*'
|
||||
@ -107,6 +109,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish brblue $colorfg --bold
|
||||
set -x color_virtualgo brblue $colorfg --bold
|
||||
set -x color_desk brblue $colorfg --bold
|
||||
set -x color_guix brblue $colorfg --bold
|
||||
set -x color_nix brblue $colorfg --bold
|
||||
|
||||
case 'terminal2-light*'
|
||||
@ -142,6 +145,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish brblue $colorfg --bold
|
||||
set -x color_virtualgo brblue $colorfg --bold
|
||||
set -x color_desk brblue $colorfg --bold
|
||||
set -x color_guix brblue $colorfg --bold
|
||||
set -x color_nix brblue $colorfg --bold
|
||||
|
||||
case 'zenburn'
|
||||
@ -183,6 +187,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish $blue $grey --bold
|
||||
set -x color_virtualgo $blue $grey --bold
|
||||
set -x color_desk $blue $grey --bold
|
||||
set -x color_guix $blue $grey --bold
|
||||
set -x color_nix $blue $grey --bold
|
||||
|
||||
case 'base16-light'
|
||||
@ -235,6 +240,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish $base0D $colorfg --bold
|
||||
set -x color_virtualgo $base0D $colorfg --bold
|
||||
set -x color_desk $base0D $colorfg --bold
|
||||
set -x color_guix $base0D $colorfg --bold
|
||||
set -x color_nix $base0D $colorfg --bold
|
||||
|
||||
case 'base16' 'base16-dark'
|
||||
@ -287,6 +293,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish $base0D $colorfg --bold
|
||||
set -x color_virtualgo $base0D $colorfg --bold
|
||||
set -x color_desk $base0D $colorfg --bold
|
||||
set -x color_guix $base0D $colorfg --bold
|
||||
set -x color_nix $base0D $colorfg --bold
|
||||
|
||||
case 'solarized-light'
|
||||
@ -339,6 +346,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish $cyan $colorfg --bold
|
||||
set -x color_virtualgo $cyan $colorfg --bold
|
||||
set -x color_desk $cyan $colorfg --bold
|
||||
set -x color_guix $cyan $colorfg --bold
|
||||
set -x color_nix $cyan $colorfg --bold
|
||||
|
||||
case 'solarized' 'solarized-dark'
|
||||
@ -391,6 +399,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish $cyan $colorfg --bold
|
||||
set -x color_virtualgo $cyan $colorfg --bold
|
||||
set -x color_desk $cyan $colorfg --bold
|
||||
set -x color_guix $cyan $colorfg --bold
|
||||
set -x color_nix $cyan $colorfg --bold
|
||||
|
||||
case 'light'
|
||||
@ -436,6 +445,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish $blue[2] $grey[1] --bold
|
||||
set -x color_virtualgo $blue[2] $grey[1] --bold
|
||||
set -x color_desk $blue[2] $grey[1] --bold
|
||||
set -x color_guix $blue[2] $grey[1] --bold
|
||||
set -x color_nix $blue[2] $grey[1] --bold
|
||||
|
||||
case 'gruvbox'
|
||||
@ -480,6 +490,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish $blue[2] $fg[2] --bold
|
||||
set -x color_virtualgo $blue[2] $fg[2] --bold
|
||||
set -x color_desk $blue[2] $fg[2] --bold
|
||||
set -x color_guix $blue[2] $fg[2] --bold
|
||||
set -x color_nix $blue[2] $fg[2] --bold
|
||||
|
||||
case 'dracula' # https://draculatheme.com
|
||||
@ -526,6 +537,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish $comment $bg --bold
|
||||
set -x color_virtualgo $cyan $bg --bold
|
||||
set -x color_desk $comment $bg --bold
|
||||
set -x color_guix $cyan $bg --bold
|
||||
set -x color_nix $cyan $bg --bold
|
||||
|
||||
case 'nord'
|
||||
@ -623,6 +635,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe
|
||||
set -x color_virtualfish $blue[2] $grey[1] --bold
|
||||
set -x color_virtualgo $go_blue $black --bold
|
||||
set -x color_desk $blue[2] $grey[1] --bold
|
||||
set -x color_guix $blue[2] $grey[1] --bold
|
||||
set -x color_nix $blue[2] $grey[1] --bold
|
||||
end
|
||||
end
|
||||
@ -650,6 +663,7 @@ function __bobthefish_user_color_scheme_deprecated
|
||||
set -q __color_virtualfish; or set -l __color_virtualfish 005faf cccccc --bold
|
||||
set -q __color_virtualgo; or set -l __color_virtualgo 005faf cccccc --bold
|
||||
set -q __color_desk; or set -l __color_desk 005faf cccccc --bold
|
||||
set -q __color_guix; or set -l __color_guix 005faf cccccc --bold
|
||||
set -q __color_nix; or set -l __color_nix 005faf cccccc --bold
|
||||
|
||||
set_color black -b red --bold
|
||||
@ -690,6 +704,7 @@ function __bobthefish_user_color_scheme_deprecated
|
||||
set -x color_virtualfish $__color_virtualfish
|
||||
set -x color_virtualgo $__color_virtualgo
|
||||
set -x color_desk $__color_desk
|
||||
set -x color_guix $__color_guix
|
||||
set -x color_nix $__color_nix
|
||||
end"
|
||||
|
||||
|
||||
@ -22,6 +22,7 @@ function __bobthefish_glyphs -S -d 'Define glyphs used by bobthefish'
|
||||
|
||||
set -x ruby_glyph ''
|
||||
set -x go_glyph ''
|
||||
set -x guix_glyph ''
|
||||
set -x nix_glyph ''
|
||||
|
||||
# Desk glyphs
|
||||
|
||||
@ -142,6 +142,10 @@ function bobthefish_display_colors -a color_scheme -d 'Print example prompt colo
|
||||
__bobthefish_finish_segments
|
||||
echo
|
||||
|
||||
__bobthefish_start_segment $color_guix
|
||||
echo -ns $guix_glyph 'guix '
|
||||
__bobthefish_finish_segments
|
||||
|
||||
__bobthefish_start_segment $color_aws_vault
|
||||
echo -ns aws-vault ' (' active ') '
|
||||
__bobthefish_finish_segments
|
||||
|
||||
@ -33,6 +33,7 @@
|
||||
# set -g theme_display_aws_vault_profile yes
|
||||
# set -g theme_display_hg yes
|
||||
# set -g theme_display_virtualenv no
|
||||
# set -g theme_display_guix no
|
||||
# set -g theme_display_nix no
|
||||
# set -g theme_display_ruby no
|
||||
# set -g theme_display_user ssh
|
||||
@ -961,6 +962,16 @@ function __bobthefish_prompt_node -S -d 'Display current node version'
|
||||
set_color normal
|
||||
end
|
||||
|
||||
function __bobthefish_prompt_guix -S -d 'Display current Guix environment'
|
||||
[ "$theme_display_guix" = 'no' -o -z "$GUIX_ENVIRONMENT" ]
|
||||
and return
|
||||
|
||||
__bobthefish_start_segment $color_guix
|
||||
echo -ns $guix_glyph 'guix '
|
||||
|
||||
set_color normal
|
||||
end
|
||||
|
||||
function __bobthefish_prompt_nix -S -d 'Display current nix environment'
|
||||
[ "$theme_display_nix" = 'no' -o -z "$IN_NIX_SHELL" ]
|
||||
and return
|
||||
@ -1171,6 +1182,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
|
||||
__bobthefish_prompt_aws_vault_profile
|
||||
|
||||
# Virtual environments
|
||||
__bobthefish_prompt_guix
|
||||
__bobthefish_prompt_nix
|
||||
__bobthefish_prompt_desk
|
||||
__bobthefish_prompt_rubies
|
||||
|
||||
Loading…
Reference in New Issue
Block a user