From cb821bb737895ca3b19d5c61ce380ed2dc400e0f Mon Sep 17 00:00:00 2001 From: Darren Kidd Date: Tue, 8 Sep 2020 15:30:18 +1200 Subject: [PATCH] Added in custom colours * Also added in a placeholder to bobthefish_display_colors() so I can check theming easily. --- fish_prompt.fish | 2 +- functions/__bobthefish_colors.fish | 14 ++++++++++++++ functions/bobthefish_display_colors.fish | 4 ++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/fish_prompt.fish b/fish_prompt.fish index 318e9d0..3dcdfb8 100644 --- a/fish_prompt.fish +++ b/fish_prompt.fish @@ -666,7 +666,7 @@ function __bobthefish_prompt_aws_vault_profile -S -d 'Show AWS Vault profile' set -l segment $profile " (" $diff_mins "m)" - __bobthefish_start_segment blue white --bold + __bobthefish_start_segment $color_aws_vault echo -ns $segment " " end diff --git a/functions/__bobthefish_colors.fish b/functions/__bobthefish_colors.fish index 4ef5f41..e430d3c 100644 --- a/functions/__bobthefish_colors.fish +++ b/functions/__bobthefish_colors.fish @@ -28,6 +28,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant brcyan $colorfg set -x color_k8s magenta white --bold + set -x color_aws_vault blue $colorfg --bold set -x color_username white black --bold set -x color_hostname white black set -x color_rvm brmagenta $colorfg --bold @@ -61,6 +62,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant brcyan $colorfg set -x color_k8s magenta white --bold + set -x color_aws_vault blue $colorfg --bold set -x color_username black white --bold set -x color_hostname black white set -x color_rvm brmagenta $colorfg --bold @@ -94,6 +96,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant brcyan $colorfg set -x color_k8s magenta white --bold + set -x color_aws_vault blue $colorfg --bold set -x color_username brgrey white --bold set -x color_hostname brgrey white set -x color_rvm brmagenta $colorfg --bold @@ -127,6 +130,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant brcyan $colorfg set -x color_k8s magenta white --bold + set -x color_aws_vault blue $colorfg --bold set -x color_username grey black --bold set -x color_hostname grey black set -x color_rvm brmagenta $colorfg --bold @@ -166,6 +170,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant $blue $green --bold set -x color_k8s $green $white --bold + set -x color_aws_vault $blue $grey --bold set -x color_username $grey $blue --bold set -x color_hostname $grey $blue set -x color_rvm $red $grey --bold @@ -216,6 +221,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant $base0C $colorfg --bold set -x color_k8s $base06 $colorfg --bold + set -x color_aws_vault $base0D $colorfg --bold set -x color_username $base02 $base0D --bold set -x color_hostname $base02 $base0D set -x color_rvm $base08 $colorfg --bold @@ -266,6 +272,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant $base0C $colorfg --bold set -x color_k8s $base0B $colorfg --bold + set -x color_aws_vault $base0D $base0A --bold set -x color_username $base02 $base0D --bold set -x color_hostname $base02 $base0D set -x color_rvm $base08 $colorfg --bold @@ -316,6 +323,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant $violet $colorfg --bold set -x color_k8s $green $colorfg --bold + set -x color_aws_vault $violet $base3 --bold set -x color_username $base2 $blue --bold set -x color_hostname $base2 $blue set -x color_rvm $red $colorfg --bold @@ -366,6 +374,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant $violet $colorfg --bold set -x color_k8s $green $colorfg --bold + set -x color_aws_vault $violet $base3 --bold set -x color_username $base02 $blue --bold set -x color_hostname $base02 $blue set -x color_rvm $red $colorfg --bold @@ -409,6 +418,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant $blue[1] $white --bold set -x color_k8s $green[1] $colorfg --bold + set -x color_aws_vault $blue[3] $orange[1] --bold set -x color_username $grey[1] $blue[3] --bold set -x color_hostname $grey[1] $blue[3] set -x color_rvm $ruby_red $grey[1] --bold @@ -451,6 +461,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant $blue[2] $fg[2] --bold set -x color_k8s $green[2] $fg[2] --bold + set -x color_aws_vault $blue[2] $yellow[1] --bold set -x color_username $fg[3] $blue[2] --bold set -x color_hostname $fg[3] $blue[2] set -x color_rvm $red[2] $fg[2] --bold @@ -495,6 +506,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant $pink $bg --bold set -x color_k8s $green $fg --bold + set -x color_aws_vault $comment $yellow --bold set -x color_username $selection $cyan --bold set -x color_hostname $selection $cyan set -x color_rvm $red $bg --bold @@ -545,6 +557,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant $base02 $colorfg --bold set -x color_k8s $base02 $colorfg --bold + set -x color_aws_vault $base0A $base0D --bold set -x color_username $base02 $base0D --bold set -x color_hostname $base02 $base0D set -x color_rvm $base09 $colorfg --bold @@ -588,6 +601,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_vagrant $blue[1] $white --bold set -x color_k8s $green[2] $white --bold + set -x color_aws_vault $blue[3] $orange[1] --bold set -x color_username $grey[1] $blue[3] --bold set -x color_hostname $grey[1] $blue[3] set -x color_rvm $ruby_red $grey[1] --bold diff --git a/functions/bobthefish_display_colors.fish b/functions/bobthefish_display_colors.fish index 836de13..774aca1 100644 --- a/functions/bobthefish_display_colors.fish +++ b/functions/bobthefish_display_colors.fish @@ -141,5 +141,9 @@ function bobthefish_display_colors -a color_scheme -d 'Print example prompt colo echo -ns $desk_glyph desk ' ' __bobthefish_finish_segments + __bobthefish_start_segment $color_aws_vault + echo -ns $aws_vault_glyph ' aws-vault ' + __bobthefish_finish_segments + echo -e "\n" end