From 9c95244b424b35a2ba09441a331fef27d23f2fd8 Mon Sep 17 00:00:00 2001 From: marcplustwo <39213657+marcplustwo@users.noreply.github.com> Date: Tue, 3 Dec 2019 17:59:18 +0100 Subject: [PATCH 1/4] add nord color scheme --- README.md | 1 + functions/__bobthefish_colors.fish | 48 ++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/README.md b/README.md index 05a22de..00aa6a0 100644 --- a/README.md +++ b/README.md @@ -156,6 +156,7 @@ one of the following options to change the prompt colors. - `zenburn`. An adaptation of Zenburn. - `gruvbox`. An adaptation of gruvbox. - `dracula`. An adaptation of dracula. +- `nord`. An adaptation of nord. Some of these may not look right if your terminal does not support 24 bit color, in which case you can try one of the `terminal` schemes (below). However, if diff --git a/functions/__bobthefish_colors.fish b/functions/__bobthefish_colors.fish index 04f0307..5d46a7c 100644 --- a/functions/__bobthefish_colors.fish +++ b/functions/__bobthefish_colors.fish @@ -480,6 +480,54 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_virtualgo $cyan $bg --bold set -x color_desk $comment $bg --bold + case 'nord' + set -l base00 2E3440 + set -l base01 3B4252 + set -l base02 434C5E + set -l base03 4C566A + set -l base04 D8DEE9 + set -l base05 E5E9F0 + set -l base06 ECEFF4 + set -l base07 8FBCBB + set -l base08 88C0D0 + set -l base09 81A1C1 + set -l base0A 5E81AC + set -l base0B BF616A + set -l base0C D08770 + set -l base0D EBCB8B + set -l base0E A3BE8C + set -l base0F B48EAD + + set -l colorfg $base00 + + set -x color_initial_segment_exit $base05 $base08 --bold + set -x color_initial_segment_su $base05 $base0B --bold + set -x color_initial_segment_jobs $base08 $base0D --bold + + set -x color_path $base02 $base05 + set -x color_path_basename $base02 $base06 --bold + set -x color_path_nowrite $base02 $base08 + set -x color_path_nowrite_basename $base02 $base08 --bold + + set -x color_repo $base0E $colorfg + set -x color_repo_work_tree $base02 $colorfg --bold + set -x color_repo_dirty $base0B $colorfg + set -x color_repo_staged $base0D $colorfg + + set -x color_vi_mode_default $base08 $colorfg --bold + set -x color_vi_mode_insert $base06 $colorfg --bold + set -x color_vi_mode_visual $base07 $colorfg --bold + + set -x color_vagrant $base02 $colorfg --bold + set -x color_k8s $base02 $colorfg --bold + set -x color_username $base02 $base0D --bold + set -x color_hostname $base02 $base0D + set -x color_rvm $base08 $colorfg --bold + set -x color_nvm $base08 $colorfg --bold + set -x color_virtualfish $base08 $colorfg --bold + set -x color_virtualgo $base08 $colorfg --bold + set -x color_desk $base08 $colorfg --bold + case '*' # default dark theme # light medium dark # ------ ------ ------ From 0d2525e923dd47c90dc8cf749421682e1dc1f9f9 Mon Sep 17 00:00:00 2001 From: Marc <39213657+marcplustwo@users.noreply.github.com> Date: Tue, 7 Jan 2020 14:40:41 +0100 Subject: [PATCH 2/4] fix background job colors --- functions/__bobthefish_colors.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/__bobthefish_colors.fish b/functions/__bobthefish_colors.fish index 5d46a7c..3048bfb 100644 --- a/functions/__bobthefish_colors.fish +++ b/functions/__bobthefish_colors.fish @@ -502,7 +502,7 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe set -x color_initial_segment_exit $base05 $base08 --bold set -x color_initial_segment_su $base05 $base0B --bold - set -x color_initial_segment_jobs $base08 $base0D --bold + set -x color_initial_segment_jobs $base05 $base0C --bold set -x color_path $base02 $base05 set -x color_path_basename $base02 $base06 --bold From 10b19564aea2c4a5d87f25c40723d61b706bda99 Mon Sep 17 00:00:00 2001 From: Marc <39213657+marcplustwo@users.noreply.github.com> Date: Tue, 21 Jan 2020 14:53:55 +0100 Subject: [PATCH 3/4] fix indents, color contrast --- functions/__bobthefish_colors.fish | 42 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/functions/__bobthefish_colors.fish b/functions/__bobthefish_colors.fish index 3048bfb..8b25309 100644 --- a/functions/__bobthefish_colors.fish +++ b/functions/__bobthefish_colors.fish @@ -482,27 +482,27 @@ function __bobthefish_colors -S -a color_scheme -d 'Define colors used by bobthe case 'nord' set -l base00 2E3440 - set -l base01 3B4252 - set -l base02 434C5E - set -l base03 4C566A - set -l base04 D8DEE9 - set -l base05 E5E9F0 - set -l base06 ECEFF4 - set -l base07 8FBCBB - set -l base08 88C0D0 - set -l base09 81A1C1 - set -l base0A 5E81AC - set -l base0B BF616A - set -l base0C D08770 - set -l base0D EBCB8B - set -l base0E A3BE8C - set -l base0F B48EAD + set -l base01 3B4252 + set -l base02 434C5E + set -l base03 4C566A + set -l base04 D8DEE9 + set -l base05 E5E9F0 + set -l base06 ECEFF4 + set -l base07 8FBCBB + set -l base08 88C0D0 + set -l base09 81A1C1 + set -l base0A 5E81AC + set -l base0B BF616A + set -l base0C D08770 + set -l base0D EBCB8B + set -l base0E A3BE8C + set -l base0F B48EAD set -l colorfg $base00 set -x color_initial_segment_exit $base05 $base08 --bold set -x color_initial_segment_su $base05 $base0B --bold - set -x color_initial_segment_jobs $base05 $base0C --bold + set -x color_initial_segment_jobs $base08 $base0D --bold set -x color_path $base02 $base05 set -x color_path_basename $base02 $base06 --bold @@ -522,11 +522,11 @@ 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_rvm $base08 $colorfg --bold - set -x color_nvm $base08 $colorfg --bold - set -x color_virtualfish $base08 $colorfg --bold - set -x color_virtualgo $base08 $colorfg --bold - set -x color_desk $base08 $colorfg --bold + set -x color_rvm $base09 $colorfg --bold + set -x color_nvm $base09 $colorfg --bold + set -x color_virtualfish $base09 $colorfg --bold + set -x color_virtualgo $base09 $colorfg --bold + set -x color_desk $base09 $colorfg --bold case '*' # default dark theme # light medium dark From 7d6f9634ac82f9786cd305f0cc8b5e8233e1feda Mon Sep 17 00:00:00 2001 From: Marc Radau Date: Tue, 21 Jan 2020 15:11:02 +0100 Subject: [PATCH 4/4] Add screenshot to README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 00aa6a0..efa445b 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,7 @@ set -g theme_newline_prompt '$ ' | ![solarized][solarized] | ![solarized-light][solarized-light] | | ![base16][base16] | ![base16-light][base16-light] | | ![zenburn][zenburn] | ![terminal-dark][terminal-dark] | +| ![nord][nord] | | You can use the function `bobthefish_display_colors` to preview the prompts in any color scheme. @@ -235,3 +236,4 @@ end [base16-light]: https://cloud.githubusercontent.com/assets/53660/16141579/02f7245e-3412-11e6-97c6-5f3cecffb73c.png "base16-light" [zenburn]: https://cloud.githubusercontent.com/assets/53660/16141580/06229dd4-3412-11e6-84aa-a48de127b6da.png "zenburn" [terminal-dark]: https://cloud.githubusercontent.com/assets/53660/16141583/0b3e8eea-3412-11e6-8068-617c5371f6ea.png "terminal-dark" +[nord]: https://user-images.githubusercontent.com/39213657/72811435-f64ca800-3c5f-11ea-8711-dcce8cfc50fb.png "nord"