From d316303311da0f371cea07721830ccd1bb512e9c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2024 01:14:43 +0000 Subject: [PATCH] fix: update themes --- functions/base16-dracula.fish | 90 +++++++-------- functions/base16-everforest-dark-hard.fish | 42 +++---- functions/base16-everforest.fish | 52 ++++----- functions/base16-onedark-dark.fish | 125 +++++++++++++++++++++ functions/base16-papercolor-dark.fish | 2 +- functions/base16-papercolor-light.fish | 2 +- functions/base16-shades-of-purple.fish | 2 +- functions/base16-snazzy.fish | 2 +- functions/base16-terracotta-dark.fish | 125 +++++++++++++++++++++ functions/base16-terracotta.fish | 125 +++++++++++++++++++++ functions/base16-tokyodark.fish | 78 ++++++------- 11 files changed, 510 insertions(+), 135 deletions(-) create mode 100644 functions/base16-onedark-dark.fish create mode 100644 functions/base16-terracotta-dark.fish create mode 100644 functions/base16-terracotta.fish diff --git a/functions/base16-dracula.fish b/functions/base16-dracula.fish index a305eb8..e4fbcb1 100755 --- a/functions/base16-dracula.fish +++ b/functions/base16-dracula.fish @@ -1,36 +1,36 @@ # base16-fish-shell (https://github.com/FabioAntunes/base16-fish-shell) # Inspired by base16-shell (https://github.com/chriskempson/base16-shell) -# Dracula scheme by Mike Barkmin (http://github.com/mikebarkmin) based on Dracula Theme (http://github.com/dracula) +# Dracula scheme by Jamy Golden (http://github.com/JamyGolden), based on Dracula Theme (http://github.com/dracula) function base16-dracula -d "base16 Dracula theme" set options (fish_opt --short=t --long=test) argparse $options -- $argv # colors - set color00 "28/29/36" # Base 00 - Black - set color01 "ea/51/b2" # Base 08 - Red - set color02 "eb/ff/87" # Base 0B - Green - set color03 "00/f7/69" # Base 0A - Yellow - set color04 "62/d6/e8" # Base 0D - Blue - set color05 "b4/5b/cf" # Base 0E - Magenta - set color06 "a1/ef/e4" # Base 0C - Cyan - set color07 "e9/e9/f4" # Base 05 - White - set color08 "62/64/83" # Base 03 - Bright Black + set color00 "28/2a/36" # Base 00 - Black + set color01 "ff/55/55" # Base 08 - Red + set color02 "50/fa/7b" # Base 0B - Green + set color03 "f1/fa/8c" # Base 0A - Yellow + set color04 "80/bf/ff" # Base 0D - Blue + set color05 "ff/79/c6" # Base 0E - Magenta + set color06 "8b/e9/fd" # Base 0C - Cyan + set color07 "f8/f8/f2" # Base 05 - White + set color08 "62/72/a4" # Base 03 - Bright Black set color09 $color01 # Base 08 - Bright Red set color10 $color02 # Base 0B - Bright Green set color11 $color03 # Base 0A - Bright Yellow set color12 $color04 # Base 0D - Bright Blue set color13 $color05 # Base 0E - Bright Magenta set color14 $color06 # Base 0C - Bright Cyan - set color15 "f7/f7/fb" # Base 07 - Bright White - set color16 "b4/5b/cf" # Base 09 - set color17 "00/f7/69" # Base 0F - set color18 "3a/3c/4e" # Base 01 - set color19 "4d/4f/68" # Base 02 - set color20 "62/d6/e8" # Base 04 - set color21 "f1/f2/f8" # Base 06 - set color_foreground "e9/e9/f4" # Base 05 - set color_background "28/29/36" # Base 00 + set color15 "ff/ff/ff" # Base 07 - Bright White + set color16 "ff/b8/6c" # Base 09 + set color17 "bd/93/f9" # Base 0F + set color18 "36/34/47" # Base 01 + set color19 "44/47/5a" # Base 02 + set color20 "9e/a8/c7" # Base 04 + set color21 "f0/f1/f4" # Base 06 + set color_foreground "f8/f8/f2" # Base 05 + set color_background "28/2a/36" # Base 00 # 16 color space __put_template 0 $color00 @@ -61,13 +61,13 @@ function base16-dracula -d "base16 Dracula theme" # foreground / background / cursor color if test -n "$ITERM_SESSION_ID" # iTerm2 proprietary escape codes - __put_template_custom Pg e9e9f4 # foreground - __put_template_custom Ph 282936 # background - __put_template_custom Pi e9e9f4 # bold color - __put_template_custom Pj 4d4f68 # selection color - __put_template_custom Pk e9e9f4 # selected text color - __put_template_custom Pl e9e9f4 # cursor - __put_template_custom Pm 282936 # cursor text + __put_template_custom Pg f8f8f2 # foreground + __put_template_custom Ph 282a36 # background + __put_template_custom Pi f8f8f2 # bold color + __put_template_custom Pj 44475a # selection color + __put_template_custom Pk f8f8f2 # selected text color + __put_template_custom Pl f8f8f2 # cursor + __put_template_custom Pm 282a36 # cursor text else __put_template_var 10 $color_foreground @@ -82,33 +82,33 @@ function base16-dracula -d "base16 Dracula theme" if test -z $base16_fish_shell_disable_prompt_colors set -gx fish_color_normal normal - set -gx fish_color_command "62d6e8" blue - set -gx fish_color_quote "ebff87" green - set -gx fish_color_redirection "00f769" yellow - set -gx fish_color_end "a1efe4" cyan - set -gx fish_color_error "ea51b2" red - set -gx fish_color_param "f1f2f8" cyan - set -gx fish_color_comment "626483" brblack + set -gx fish_color_command "80bfff" blue + set -gx fish_color_quote "50fa7b" green + set -gx fish_color_redirection "f1fa8c" yellow + set -gx fish_color_end "8be9fd" cyan + set -gx fish_color_error "ff5555" red + set -gx fish_color_param "f0f1f4" cyan + set -gx fish_color_comment "6272a4" brblack set -gx fish_color_match --background=brblue - set -gx fish_color_selection "e9e9f4" white --bold --background=brblack - set -gx fish_color_search_match "00f769" bryellow --background=brblack + set -gx fish_color_selection "f8f8f2" white --bold --background=brblack + set -gx fish_color_search_match "f1fa8c" bryellow --background=brblack set -gx fish_color_history_current --bold - set -gx fish_color_operator "a1efe4" cyan - set -gx fish_color_escape "a1efe4" cyan - set -gx fish_color_cwd "ebff87" green - set -gx fish_color_cwd_root "ea51b2" red + set -gx fish_color_operator "8be9fd" cyan + set -gx fish_color_escape "8be9fd" cyan + set -gx fish_color_cwd "50fa7b" green + set -gx fish_color_cwd_root "ff5555" red set -gx fish_color_valid_path --underline - set -gx fish_color_autosuggestion "626483" brblack - set -gx fish_color_user "ebff87" brgreen + set -gx fish_color_autosuggestion "6272a4" brblack + set -gx fish_color_user "50fa7b" brgreen set -gx fish_color_host normal set -gx fish_color_cancel -r set -gx fish_pager_color_completion normal - set -gx fish_pager_color_description "00f769" yellow - set -gx fish_pager_color_prefix "e9e9f4" white --bold --underline - set -gx fish_pager_color_progress "f7f7fb" brwhite --background=cyan + set -gx fish_pager_color_description "f1fa8c" yellow + set -gx fish_pager_color_prefix "f8f8f2" white --bold --underline + set -gx fish_pager_color_progress "ffffff" brwhite --background=cyan end - __base16_fish_shell_set_background "28" "29" "36" + __base16_fish_shell_set_background "28" "2a" "36" __base16_fish_shell_create_vimrc_background dracula set -U base16_fish_theme dracula diff --git a/functions/base16-everforest-dark-hard.fish b/functions/base16-everforest-dark-hard.fish index db32eab..6be07ba 100644 --- a/functions/base16-everforest-dark-hard.fish +++ b/functions/base16-everforest-dark-hard.fish @@ -1,6 +1,6 @@ # base16-fish-shell (https://github.com/FabioAntunes/base16-fish-shell) # Inspired by base16-shell (https://github.com/chriskempson/base16-shell) -# Everforest Dark Hard scheme by Oskar Liew (https://github.com/OskarLiew) +# Everforest Dark Hard scheme by Sainnhe Park (https://github.com/sainnhe) function base16-everforest-dark-hard -d "base16 Everforest Dark Hard theme" set options (fish_opt --short=t --long=test) @@ -8,12 +8,12 @@ function base16-everforest-dark-hard -d "base16 Everforest Dark Hard theme" # colors set color00 "27/2e/33" # Base 00 - Black - set color01 "7f/bb/b3" # Base 08 - Red - set color02 "83/c0/92" # Base 0B - Green + set color01 "e6/7e/80" # Base 08 - Red + set color02 "a7/c0/80" # Base 0B - Green set color03 "db/bc/7f" # Base 0A - Yellow - set color04 "a7/c0/80" # Base 0D - Blue - set color05 "e6/7e/80" # Base 0E - Magenta - set color06 "e6/98/75" # Base 0C - Cyan + set color04 "7f/bb/b3" # Base 0D - Blue + set color05 "d6/99/b6" # Base 0E - Magenta + set color06 "83/c0/92" # Base 0C - Cyan set color07 "d3/c6/aa" # Base 05 - White set color08 "85/92/89" # Base 03 - Bright Black set color09 $color01 # Base 08 - Bright Red @@ -22,13 +22,13 @@ function base16-everforest-dark-hard -d "base16 Everforest Dark Hard theme" set color12 $color04 # Base 0D - Bright Blue set color13 $color05 # Base 0E - Bright Magenta set color14 $color06 # Base 0C - Bright Cyan - set color15 "fd/f6/e3" # Base 07 - Bright White - set color16 "d6/99/b6" # Base 09 - set color17 "4c/37/43" # Base 0F + set color15 "ff/fb/ef" # Base 07 - Bright White + set color16 "e6/98/75" # Base 09 + set color17 "9d/a9/a0" # Base 0F set color18 "2e/38/3c" # Base 01 set color19 "41/4b/50" # Base 02 set color20 "9d/a9/a0" # Base 04 - set color21 "e4/e1/cd" # Base 06 + set color21 "ed/ea/da" # Base 06 set color_foreground "d3/c6/aa" # Base 05 set color_background "27/2e/33" # Base 00 @@ -82,30 +82,30 @@ function base16-everforest-dark-hard -d "base16 Everforest Dark Hard theme" if test -z $base16_fish_shell_disable_prompt_colors set -gx fish_color_normal normal - set -gx fish_color_command "a7c080" blue - set -gx fish_color_quote "83c092" green + set -gx fish_color_command "7fbbb3" blue + set -gx fish_color_quote "a7c080" green set -gx fish_color_redirection "dbbc7f" yellow - set -gx fish_color_end "e69875" cyan - set -gx fish_color_error "7fbbb3" red - set -gx fish_color_param "e4e1cd" cyan + set -gx fish_color_end "83c092" cyan + set -gx fish_color_error "e67e80" red + set -gx fish_color_param "edeada" cyan set -gx fish_color_comment "859289" brblack set -gx fish_color_match --background=brblue set -gx fish_color_selection "d3c6aa" white --bold --background=brblack set -gx fish_color_search_match "dbbc7f" bryellow --background=brblack set -gx fish_color_history_current --bold - set -gx fish_color_operator "e69875" cyan - set -gx fish_color_escape "e69875" cyan - set -gx fish_color_cwd "83c092" green - set -gx fish_color_cwd_root "7fbbb3" red + set -gx fish_color_operator "83c092" cyan + set -gx fish_color_escape "83c092" cyan + set -gx fish_color_cwd "a7c080" green + set -gx fish_color_cwd_root "e67e80" red set -gx fish_color_valid_path --underline set -gx fish_color_autosuggestion "859289" brblack - set -gx fish_color_user "83c092" brgreen + set -gx fish_color_user "a7c080" brgreen set -gx fish_color_host normal set -gx fish_color_cancel -r set -gx fish_pager_color_completion normal set -gx fish_pager_color_description "dbbc7f" yellow set -gx fish_pager_color_prefix "d3c6aa" white --bold --underline - set -gx fish_pager_color_progress "fdf6e3" brwhite --background=cyan + set -gx fish_pager_color_progress "fffbef" brwhite --background=cyan end __base16_fish_shell_set_background "27" "2e" "33" diff --git a/functions/base16-everforest.fish b/functions/base16-everforest.fish index 5e70f35..32daf49 100644 --- a/functions/base16-everforest.fish +++ b/functions/base16-everforest.fish @@ -7,13 +7,13 @@ function base16-everforest -d "base16 Everforest theme" argparse $options -- $argv # colors - set color00 "2f/38/3e" # Base 00 - Black - set color01 "7f/bb/b3" # Base 08 - Red - set color02 "83/c0/92" # Base 0B - Green + set color00 "2d/35/3b" # Base 00 - Black + set color01 "e6/7e/80" # Base 08 - Red + set color02 "a7/c0/80" # Base 0B - Green set color03 "db/bc/7f" # Base 0A - Yellow - set color04 "a7/c0/80" # Base 0D - Blue - set color05 "e6/7e/80" # Base 0E - Magenta - set color06 "e6/98/75" # Base 0C - Cyan + set color04 "7f/bb/b3" # Base 0D - Blue + set color05 "d6/99/b6" # Base 0E - Magenta + set color06 "83/c0/92" # Base 0C - Cyan set color07 "d3/c6/aa" # Base 05 - White set color08 "85/92/89" # Base 03 - Bright Black set color09 $color01 # Base 08 - Bright Red @@ -23,14 +23,14 @@ function base16-everforest -d "base16 Everforest theme" set color13 $color05 # Base 0E - Bright Magenta set color14 $color06 # Base 0C - Bright Cyan set color15 "fd/f6/e3" # Base 07 - Bright White - set color16 "d6/99/b6" # Base 09 - set color17 "ea/ed/c8" # Base 0F - set color18 "37/42/47" # Base 01 - set color19 "4a/55/5b" # Base 02 + set color16 "e6/98/75" # Base 09 + set color17 "9d/a9/a0" # Base 0F + set color18 "34/3f/44" # Base 01 + set color19 "47/52/58" # Base 02 set color20 "9d/a9/a0" # Base 04 - set color21 "e4/e1/cd" # Base 06 + set color21 "e6/e2/cc" # Base 06 set color_foreground "d3/c6/aa" # Base 05 - set color_background "2f/38/3e" # Base 00 + set color_background "2d/35/3b" # Base 00 # 16 color space __put_template 0 $color00 @@ -62,12 +62,12 @@ function base16-everforest -d "base16 Everforest theme" if test -n "$ITERM_SESSION_ID" # iTerm2 proprietary escape codes __put_template_custom Pg d3c6aa # foreground - __put_template_custom Ph 2f383e # background + __put_template_custom Ph 2d353b # background __put_template_custom Pi d3c6aa # bold color - __put_template_custom Pj 4a555b # selection color + __put_template_custom Pj 475258 # selection color __put_template_custom Pk d3c6aa # selected text color __put_template_custom Pl d3c6aa # cursor - __put_template_custom Pm 2f383e # cursor text + __put_template_custom Pm 2d353b # cursor text else __put_template_var 10 $color_foreground @@ -82,24 +82,24 @@ function base16-everforest -d "base16 Everforest theme" if test -z $base16_fish_shell_disable_prompt_colors set -gx fish_color_normal normal - set -gx fish_color_command "a7c080" blue - set -gx fish_color_quote "83c092" green + set -gx fish_color_command "7fbbb3" blue + set -gx fish_color_quote "a7c080" green set -gx fish_color_redirection "dbbc7f" yellow - set -gx fish_color_end "e69875" cyan - set -gx fish_color_error "7fbbb3" red - set -gx fish_color_param "e4e1cd" cyan + set -gx fish_color_end "83c092" cyan + set -gx fish_color_error "e67e80" red + set -gx fish_color_param "e6e2cc" cyan set -gx fish_color_comment "859289" brblack set -gx fish_color_match --background=brblue set -gx fish_color_selection "d3c6aa" white --bold --background=brblack set -gx fish_color_search_match "dbbc7f" bryellow --background=brblack set -gx fish_color_history_current --bold - set -gx fish_color_operator "e69875" cyan - set -gx fish_color_escape "e69875" cyan - set -gx fish_color_cwd "83c092" green - set -gx fish_color_cwd_root "7fbbb3" red + set -gx fish_color_operator "83c092" cyan + set -gx fish_color_escape "83c092" cyan + set -gx fish_color_cwd "a7c080" green + set -gx fish_color_cwd_root "e67e80" red set -gx fish_color_valid_path --underline set -gx fish_color_autosuggestion "859289" brblack - set -gx fish_color_user "83c092" brgreen + set -gx fish_color_user "a7c080" brgreen set -gx fish_color_host normal set -gx fish_color_cancel -r set -gx fish_pager_color_completion normal @@ -108,7 +108,7 @@ function base16-everforest -d "base16 Everforest theme" set -gx fish_pager_color_progress "fdf6e3" brwhite --background=cyan end - __base16_fish_shell_set_background "2f" "38" "3e" + __base16_fish_shell_set_background "2d" "35" "3b" __base16_fish_shell_create_vimrc_background everforest set -U base16_fish_theme everforest diff --git a/functions/base16-onedark-dark.fish b/functions/base16-onedark-dark.fish new file mode 100644 index 0000000..021f978 --- /dev/null +++ b/functions/base16-onedark-dark.fish @@ -0,0 +1,125 @@ +# base16-fish-shell (https://github.com/FabioAntunes/base16-fish-shell) +# Inspired by base16-shell (https://github.com/chriskempson/base16-shell) +# OneDark Dark scheme by olimorris (https://github.com/olimorris) + +function base16-onedark-dark -d "base16 OneDark Dark theme" + set options (fish_opt --short=t --long=test) + argparse $options -- $argv + + # colors + set color00 "00/00/00" # Base 00 - Black + set color01 "ef/59/6f" # Base 08 - Red + set color02 "89/ca/78" # Base 0B - Green + set color03 "e5/c0/7b" # Base 0A - Yellow + set color04 "61/af/ef" # Base 0D - Blue + set color05 "d5/5f/de" # Base 0E - Magenta + set color06 "2b/ba/c5" # Base 0C - Cyan + set color07 "ab/b2/bf" # Base 05 - White + set color08 "43/48/52" # Base 03 - Bright Black + set color09 $color01 # Base 08 - Bright Red + set color10 $color02 # Base 0B - Bright Green + set color11 $color03 # Base 0A - Bright Yellow + set color12 $color04 # Base 0D - Bright Blue + set color13 $color05 # Base 0E - Bright Magenta + set color14 $color06 # Base 0C - Bright Cyan + set color15 "c8/cc/d4" # Base 07 - Bright White + set color16 "d1/9a/66" # Base 09 + set color17 "be/50/46" # Base 0F + set color18 "1c/1f/24" # Base 01 + set color19 "2c/31/3a" # Base 02 + set color20 "56/5c/64" # Base 04 + set color21 "b6/bd/ca" # Base 06 + set color_foreground "ab/b2/bf" # Base 05 + set color_background "00/00/00" # Base 00 + + # 16 color space + __put_template 0 $color00 + __put_template 1 $color01 + __put_template 2 $color02 + __put_template 3 $color03 + __put_template 4 $color04 + __put_template 5 $color05 + __put_template 6 $color06 + __put_template 7 $color07 + __put_template 8 $color08 + __put_template 9 $color09 + __put_template 10 $color10 + __put_template 11 $color11 + __put_template 12 $color12 + __put_template 13 $color13 + __put_template 14 $color14 + __put_template 15 $color15 + + # 256 color space + __put_template 16 $color16 + __put_template 17 $color17 + __put_template 18 $color18 + __put_template 19 $color19 + __put_template 20 $color20 + __put_template 21 $color21 + + # foreground / background / cursor color + if test -n "$ITERM_SESSION_ID" + # iTerm2 proprietary escape codes + __put_template_custom Pg abb2bf # foreground + __put_template_custom Ph 000000 # background + __put_template_custom Pi abb2bf # bold color + __put_template_custom Pj 2c313a # selection color + __put_template_custom Pk abb2bf # selected text color + __put_template_custom Pl abb2bf # cursor + __put_template_custom Pm 000000 # cursor text + + else + __put_template_var 10 $color_foreground + if test "$BASE16_SHELL_SET_BACKGROUND" != false + __put_template_var 11 $color_background + if string match -q -- '*rxvt*' $TERM + __put_template_var 708 $color_background # internal border (rxvt) + end + end + __put_template_custom 12 ";7" # cursor (reverse video) + end + + if test -z $base16_fish_shell_disable_prompt_colors + set -gx fish_color_normal normal + set -gx fish_color_command "61afef" blue + set -gx fish_color_quote "89ca78" green + set -gx fish_color_redirection "e5c07b" yellow + set -gx fish_color_end "2bbac5" cyan + set -gx fish_color_error "ef596f" red + set -gx fish_color_param "b6bdca" cyan + set -gx fish_color_comment "434852" brblack + set -gx fish_color_match --background=brblue + set -gx fish_color_selection "abb2bf" white --bold --background=brblack + set -gx fish_color_search_match "e5c07b" bryellow --background=brblack + set -gx fish_color_history_current --bold + set -gx fish_color_operator "2bbac5" cyan + set -gx fish_color_escape "2bbac5" cyan + set -gx fish_color_cwd "89ca78" green + set -gx fish_color_cwd_root "ef596f" red + set -gx fish_color_valid_path --underline + set -gx fish_color_autosuggestion "434852" brblack + set -gx fish_color_user "89ca78" brgreen + set -gx fish_color_host normal + set -gx fish_color_cancel -r + set -gx fish_pager_color_completion normal + set -gx fish_pager_color_description "e5c07b" yellow + set -gx fish_pager_color_prefix "abb2bf" white --bold --underline + set -gx fish_pager_color_progress "c8ccd4" brwhite --background=cyan + end + + __base16_fish_shell_set_background "00" "00" "00" + __base16_fish_shell_create_vimrc_background onedark-dark + set -U base16_fish_theme onedark-dark + + if test -n "$_flag_t" + set base16_colors_hex + set padded_seq_values (seq -w 0 21) + for seq_value in $padded_seq_values + set -l color "color$seq_value" + set base16_colors_hex $base16_colors_hex (string replace -a / "" $$color) + end + + __base16_fish_shell_color_test $base16_colors_hex + end +end diff --git a/functions/base16-papercolor-dark.fish b/functions/base16-papercolor-dark.fish index 6d56c95..978c6bd 100755 --- a/functions/base16-papercolor-dark.fish +++ b/functions/base16-papercolor-dark.fish @@ -1,6 +1,6 @@ # base16-fish-shell (https://github.com/FabioAntunes/base16-fish-shell) # Inspired by base16-shell (https://github.com/chriskempson/base16-shell) -# PaperColor Dark scheme by Jon Leopard (http://github.com/jonleopard) based on PaperColor Theme (https://github.com/NLKNguyen/papercolor-theme) +# PaperColor Dark scheme by Jon Leopard (http://github.com/jonleopard), based on PaperColor Theme (https://github.com/NLKNguyen/papercolor-theme) function base16-papercolor-dark -d "base16 PaperColor Dark theme" set options (fish_opt --short=t --long=test) diff --git a/functions/base16-papercolor-light.fish b/functions/base16-papercolor-light.fish index 5aaee40..f2137b4 100755 --- a/functions/base16-papercolor-light.fish +++ b/functions/base16-papercolor-light.fish @@ -1,6 +1,6 @@ # base16-fish-shell (https://github.com/FabioAntunes/base16-fish-shell) # Inspired by base16-shell (https://github.com/chriskempson/base16-shell) -# PaperColor Light scheme by Jon Leopard (http://github.com/jonleopard) based on PaperColor Theme (https://github.com/NLKNguyen/papercolor-theme) +# PaperColor Light scheme by Jon Leopard (http://github.com/jonleopard), based on PaperColor Theme (https://github.com/NLKNguyen/papercolor-theme) function base16-papercolor-light -d "base16 PaperColor Light theme" set options (fish_opt --short=t --long=test) diff --git a/functions/base16-shades-of-purple.fish b/functions/base16-shades-of-purple.fish index aa913d0..1d83ce1 100755 --- a/functions/base16-shades-of-purple.fish +++ b/functions/base16-shades-of-purple.fish @@ -1,6 +1,6 @@ # base16-fish-shell (https://github.com/FabioAntunes/base16-fish-shell) # Inspired by base16-shell (https://github.com/chriskempson/base16-shell) -# Shades of Purple scheme by Iolar Demartini Junior (http://github.com/demartini) based on Shades of Purple Theme (https://github.com/ahmadawais/shades-of-purple-vscode). +# Shades of Purple scheme by Iolar Demartini Junior (http://github.com/demartini), based on Shades of Purple Theme (https://github.com/ahmadawais/shades-of-purple-vscode) function base16-shades-of-purple -d "base16 Shades of Purple theme" set options (fish_opt --short=t --long=test) diff --git a/functions/base16-snazzy.fish b/functions/base16-snazzy.fish index 094077a..3216819 100755 --- a/functions/base16-snazzy.fish +++ b/functions/base16-snazzy.fish @@ -1,6 +1,6 @@ # base16-fish-shell (https://github.com/FabioAntunes/base16-fish-shell) # Inspired by base16-shell (https://github.com/chriskempson/base16-shell) -# Snazzy scheme by Chawye Hsu (https://github.com/chawyehsu) based on Hyper Snazzy Theme (https://github.com/sindresorhus/hyper-snazzy) +# Snazzy scheme by Chawye Hsu (https://github.com/chawyehsu), based on Hyper Snazzy Theme (https://github.com/sindresorhus/hyper-snazzy) function base16-snazzy -d "base16 Snazzy theme" set options (fish_opt --short=t --long=test) diff --git a/functions/base16-terracotta-dark.fish b/functions/base16-terracotta-dark.fish new file mode 100644 index 0000000..678df2b --- /dev/null +++ b/functions/base16-terracotta-dark.fish @@ -0,0 +1,125 @@ +# base16-fish-shell (https://github.com/FabioAntunes/base16-fish-shell) +# Inspired by base16-shell (https://github.com/chriskempson/base16-shell) +# Terracotta Dark scheme by Alexander Rossell Hayes (https://github.com/rossellhayes) + +function base16-terracotta-dark -d "base16 Terracotta Dark theme" + set options (fish_opt --short=t --long=test) + argparse $options -- $argv + + # colors + set color00 "24/1d/1a" # Base 00 - Black + set color01 "f6/99/8f" # Base 08 - Red + set color02 "b6/c6/8a" # Base 0B - Green + set color03 "ff/c3/7a" # Base 0A - Yellow + set color04 "b0/a4/c3" # Base 0D - Blue + set color05 "d8/a2/b0" # Base 0E - Magenta + set color06 "c0/bc/db" # Base 0C - Cyan + set color07 "b8/a5/9d" # Base 05 - White + set color08 "59/47/40" # Base 03 - Bright Black + set color09 $color01 # Base 08 - Bright Red + set color10 $color02 # Base 0B - Bright Green + set color11 $color03 # Base 0A - Bright Yellow + set color12 $color04 # Base 0D - Bright Blue + set color13 $color05 # Base 0E - Bright Magenta + set color14 $color06 # Base 0C - Bright Cyan + set color15 "dc/d2/ce" # Base 07 - Bright White + set color16 "ff/a8/88" # Base 09 + set color17 "f1/ae/97" # Base 0F + set color18 "36/2b/27" # Base 01 + set color19 "47/39/33" # Base 02 + set color20 "a7/8e/84" # Base 04 + set color21 "ca/bb/b5" # Base 06 + set color_foreground "b8/a5/9d" # Base 05 + set color_background "24/1d/1a" # Base 00 + + # 16 color space + __put_template 0 $color00 + __put_template 1 $color01 + __put_template 2 $color02 + __put_template 3 $color03 + __put_template 4 $color04 + __put_template 5 $color05 + __put_template 6 $color06 + __put_template 7 $color07 + __put_template 8 $color08 + __put_template 9 $color09 + __put_template 10 $color10 + __put_template 11 $color11 + __put_template 12 $color12 + __put_template 13 $color13 + __put_template 14 $color14 + __put_template 15 $color15 + + # 256 color space + __put_template 16 $color16 + __put_template 17 $color17 + __put_template 18 $color18 + __put_template 19 $color19 + __put_template 20 $color20 + __put_template 21 $color21 + + # foreground / background / cursor color + if test -n "$ITERM_SESSION_ID" + # iTerm2 proprietary escape codes + __put_template_custom Pg b8a59d # foreground + __put_template_custom Ph 241d1a # background + __put_template_custom Pi b8a59d # bold color + __put_template_custom Pj 473933 # selection color + __put_template_custom Pk b8a59d # selected text color + __put_template_custom Pl b8a59d # cursor + __put_template_custom Pm 241d1a # cursor text + + else + __put_template_var 10 $color_foreground + if test "$BASE16_SHELL_SET_BACKGROUND" != false + __put_template_var 11 $color_background + if string match -q -- '*rxvt*' $TERM + __put_template_var 708 $color_background # internal border (rxvt) + end + end + __put_template_custom 12 ";7" # cursor (reverse video) + end + + if test -z $base16_fish_shell_disable_prompt_colors + set -gx fish_color_normal normal + set -gx fish_color_command "b0a4c3" blue + set -gx fish_color_quote "b6c68a" green + set -gx fish_color_redirection "ffc37a" yellow + set -gx fish_color_end "c0bcdb" cyan + set -gx fish_color_error "f6998f" red + set -gx fish_color_param "cabbb5" cyan + set -gx fish_color_comment "594740" brblack + set -gx fish_color_match --background=brblue + set -gx fish_color_selection "b8a59d" white --bold --background=brblack + set -gx fish_color_search_match "ffc37a" bryellow --background=brblack + set -gx fish_color_history_current --bold + set -gx fish_color_operator "c0bcdb" cyan + set -gx fish_color_escape "c0bcdb" cyan + set -gx fish_color_cwd "b6c68a" green + set -gx fish_color_cwd_root "f6998f" red + set -gx fish_color_valid_path --underline + set -gx fish_color_autosuggestion "594740" brblack + set -gx fish_color_user "b6c68a" brgreen + set -gx fish_color_host normal + set -gx fish_color_cancel -r + set -gx fish_pager_color_completion normal + set -gx fish_pager_color_description "ffc37a" yellow + set -gx fish_pager_color_prefix "b8a59d" white --bold --underline + set -gx fish_pager_color_progress "dcd2ce" brwhite --background=cyan + end + + __base16_fish_shell_set_background "24" "1d" "1a" + __base16_fish_shell_create_vimrc_background terracotta-dark + set -U base16_fish_theme terracotta-dark + + if test -n "$_flag_t" + set base16_colors_hex + set padded_seq_values (seq -w 0 21) + for seq_value in $padded_seq_values + set -l color "color$seq_value" + set base16_colors_hex $base16_colors_hex (string replace -a / "" $$color) + end + + __base16_fish_shell_color_test $base16_colors_hex + end +end diff --git a/functions/base16-terracotta.fish b/functions/base16-terracotta.fish new file mode 100644 index 0000000..3f417f2 --- /dev/null +++ b/functions/base16-terracotta.fish @@ -0,0 +1,125 @@ +# base16-fish-shell (https://github.com/FabioAntunes/base16-fish-shell) +# Inspired by base16-shell (https://github.com/chriskempson/base16-shell) +# Terracotta scheme by Alexander Rossell Hayes (https://github.com/rossellhayes) + +function base16-terracotta -d "base16 Terracotta theme" + set options (fish_opt --short=t --long=test) + argparse $options -- $argv + + # colors + set color00 "ef/ea/e8" # Base 00 - Black + set color01 "a7/50/45" # Base 08 - Red + set color02 "7a/89/4a" # Base 0B - Green + set color03 "ce/94/3e" # Base 0A - Yellow + set color04 "62/55/74" # Base 0D - Blue + set color05 "8d/59/68" # Base 0E - Magenta + set color06 "84/7f/9e" # Base 0C - Cyan + set color07 "47/37/31" # Base 05 - White + set color08 "c0/ac/a4" # Base 03 - Bright Black + set color09 $color01 # Base 08 - Bright Red + set color10 $color02 # Base 0B - Bright Green + set color11 $color03 # Base 0A - Bright Yellow + set color12 $color04 # Base 0D - Bright Blue + set color13 $color05 # Base 0E - Bright Magenta + set color14 $color06 # Base 0C - Bright Cyan + set color15 "24/1c/19" # Base 07 - Bright White + set color16 "bd/69/42" # Base 09 + set color17 "b0/71/58" # Base 0F + set color18 "df/d6/d1" # Base 01 + set color19 "d0/c1/bb" # Base 02 + set color20 "59/45/3d" # Base 04 + set color21 "35/2a/25" # Base 06 + set color_foreground "47/37/31" # Base 05 + set color_background "ef/ea/e8" # Base 00 + + # 16 color space + __put_template 0 $color00 + __put_template 1 $color01 + __put_template 2 $color02 + __put_template 3 $color03 + __put_template 4 $color04 + __put_template 5 $color05 + __put_template 6 $color06 + __put_template 7 $color07 + __put_template 8 $color08 + __put_template 9 $color09 + __put_template 10 $color10 + __put_template 11 $color11 + __put_template 12 $color12 + __put_template 13 $color13 + __put_template 14 $color14 + __put_template 15 $color15 + + # 256 color space + __put_template 16 $color16 + __put_template 17 $color17 + __put_template 18 $color18 + __put_template 19 $color19 + __put_template 20 $color20 + __put_template 21 $color21 + + # foreground / background / cursor color + if test -n "$ITERM_SESSION_ID" + # iTerm2 proprietary escape codes + __put_template_custom Pg 473731 # foreground + __put_template_custom Ph efeae8 # background + __put_template_custom Pi 473731 # bold color + __put_template_custom Pj d0c1bb # selection color + __put_template_custom Pk 473731 # selected text color + __put_template_custom Pl 473731 # cursor + __put_template_custom Pm efeae8 # cursor text + + else + __put_template_var 10 $color_foreground + if test "$BASE16_SHELL_SET_BACKGROUND" != false + __put_template_var 11 $color_background + if string match -q -- '*rxvt*' $TERM + __put_template_var 708 $color_background # internal border (rxvt) + end + end + __put_template_custom 12 ";7" # cursor (reverse video) + end + + if test -z $base16_fish_shell_disable_prompt_colors + set -gx fish_color_normal normal + set -gx fish_color_command "625574" blue + set -gx fish_color_quote "7a894a" green + set -gx fish_color_redirection "ce943e" yellow + set -gx fish_color_end "847f9e" cyan + set -gx fish_color_error "a75045" red + set -gx fish_color_param "352a25" cyan + set -gx fish_color_comment "c0aca4" brblack + set -gx fish_color_match --background=brblue + set -gx fish_color_selection "473731" white --bold --background=brblack + set -gx fish_color_search_match "ce943e" bryellow --background=brblack + set -gx fish_color_history_current --bold + set -gx fish_color_operator "847f9e" cyan + set -gx fish_color_escape "847f9e" cyan + set -gx fish_color_cwd "7a894a" green + set -gx fish_color_cwd_root "a75045" red + set -gx fish_color_valid_path --underline + set -gx fish_color_autosuggestion "c0aca4" brblack + set -gx fish_color_user "7a894a" brgreen + set -gx fish_color_host normal + set -gx fish_color_cancel -r + set -gx fish_pager_color_completion normal + set -gx fish_pager_color_description "ce943e" yellow + set -gx fish_pager_color_prefix "473731" white --bold --underline + set -gx fish_pager_color_progress "241c19" brwhite --background=cyan + end + + __base16_fish_shell_set_background "ef" "ea" "e8" + __base16_fish_shell_create_vimrc_background terracotta + set -U base16_fish_theme terracotta + + if test -n "$_flag_t" + set base16_colors_hex + set padded_seq_values (seq -w 0 21) + for seq_value in $padded_seq_values + set -l color "color$seq_value" + set base16_colors_hex $base16_colors_hex (string replace -a / "" $$color) + end + + __base16_fish_shell_color_test $base16_colors_hex + end +end diff --git a/functions/base16-tokyodark.fish b/functions/base16-tokyodark.fish index ef84844..f64e8e7 100644 --- a/functions/base16-tokyodark.fish +++ b/functions/base16-tokyodark.fish @@ -1,6 +1,6 @@ # base16-fish-shell (https://github.com/FabioAntunes/base16-fish-shell) # Inspired by base16-shell (https://github.com/chriskempson/base16-shell) -# Tokyodark scheme by Tiagovla (https://github.com/tiagovla/) +# Tokyodark scheme by Jamy Golden (https://github.com/JamyGolden), Based on Tokyodark.nvim (https://github.com/tiagovla/tokyodark.nvim) function base16-tokyodark -d "base16 Tokyodark theme" set options (fish_opt --short=t --long=test) @@ -8,28 +8,28 @@ function base16-tokyodark -d "base16 Tokyodark theme" # colors set color00 "11/12/1d" # Base 00 - Black - set color01 "a4/85/dd" # Base 08 - Red - set color02 "d7/a6/5f" # Base 0B - Green - set color03 "71/99/ee" # Base 0A - Yellow - set color04 "95/c5/61" # Base 0D - Blue - set color05 "ee/6d/85" # Base 0E - Magenta - set color06 "a4/85/dd" # Base 0C - Cyan - set color07 "ab/b2/bf" # Base 05 - White - set color08 "39/3a/45" # Base 03 - Bright Black + set color01 "ee/6d/85" # Base 08 - Red + set color02 "95/c5/61" # Base 0B - Green + set color03 "d7/a6/5f" # Base 0A - Yellow + set color04 "71/99/ee" # Base 0D - Blue + set color05 "a4/85/dd" # Base 0E - Magenta + set color06 "9f/bb/f3" # Base 0C - Cyan + set color07 "a0/a8/cd" # Base 05 - White + set color08 "35/39/45" # Base 03 - Bright Black set color09 $color01 # Base 08 - Bright Red set color10 $color02 # Base 0B - Bright Green set color11 $color03 # Base 0A - Bright Yellow set color12 $color04 # Base 0D - Bright Blue set color13 $color05 # Base 0E - Bright Magenta set color14 $color06 # Base 0C - Bright Cyan - set color15 "2c/2d/38" # Base 07 - Bright White - set color16 "a4/85/dd" # Base 09 + set color15 "bc/c2/dc" # Base 07 - Bright White + set color16 "f6/95/5b" # Base 09 set color17 "77/34/40" # Base 0F - set color18 "15/16/21" # Base 01 - set color19 "43/44/4f" # Base 02 - set color20 "1b/1c/27" # Base 04 - set color21 "55/56/61" # Base 06 - set color_foreground "ab/b2/bf" # Base 05 + set color18 "21/22/34" # Base 01 + set color19 "21/22/34" # Base 02 + set color20 "4a/50/57" # Base 04 + set color21 "ab/b2/bf" # Base 06 + set color_foreground "a0/a8/cd" # Base 05 set color_background "11/12/1d" # Base 00 # 16 color space @@ -61,12 +61,12 @@ function base16-tokyodark -d "base16 Tokyodark theme" # foreground / background / cursor color if test -n "$ITERM_SESSION_ID" # iTerm2 proprietary escape codes - __put_template_custom Pg abb2bf # foreground + __put_template_custom Pg a0a8cd # foreground __put_template_custom Ph 11121d # background - __put_template_custom Pi abb2bf # bold color - __put_template_custom Pj 43444f # selection color - __put_template_custom Pk abb2bf # selected text color - __put_template_custom Pl abb2bf # cursor + __put_template_custom Pi a0a8cd # bold color + __put_template_custom Pj 212234 # selection color + __put_template_custom Pk a0a8cd # selected text color + __put_template_custom Pl a0a8cd # cursor __put_template_custom Pm 11121d # cursor text else @@ -82,30 +82,30 @@ function base16-tokyodark -d "base16 Tokyodark theme" if test -z $base16_fish_shell_disable_prompt_colors set -gx fish_color_normal normal - set -gx fish_color_command "95c561" blue - set -gx fish_color_quote "d7a65f" green - set -gx fish_color_redirection "7199ee" yellow - set -gx fish_color_end "a485dd" cyan - set -gx fish_color_error "a485dd" red - set -gx fish_color_param "555661" cyan - set -gx fish_color_comment "393a45" brblack + set -gx fish_color_command "7199ee" blue + set -gx fish_color_quote "95c561" green + set -gx fish_color_redirection "d7a65f" yellow + set -gx fish_color_end "9fbbf3" cyan + set -gx fish_color_error "ee6d85" red + set -gx fish_color_param "abb2bf" cyan + set -gx fish_color_comment "353945" brblack set -gx fish_color_match --background=brblue - set -gx fish_color_selection "abb2bf" white --bold --background=brblack - set -gx fish_color_search_match "7199ee" bryellow --background=brblack + set -gx fish_color_selection "a0a8cd" white --bold --background=brblack + set -gx fish_color_search_match "d7a65f" bryellow --background=brblack set -gx fish_color_history_current --bold - set -gx fish_color_operator "a485dd" cyan - set -gx fish_color_escape "a485dd" cyan - set -gx fish_color_cwd "d7a65f" green - set -gx fish_color_cwd_root "a485dd" red + set -gx fish_color_operator "9fbbf3" cyan + set -gx fish_color_escape "9fbbf3" cyan + set -gx fish_color_cwd "95c561" green + set -gx fish_color_cwd_root "ee6d85" red set -gx fish_color_valid_path --underline - set -gx fish_color_autosuggestion "393a45" brblack - set -gx fish_color_user "d7a65f" brgreen + set -gx fish_color_autosuggestion "353945" brblack + set -gx fish_color_user "95c561" brgreen set -gx fish_color_host normal set -gx fish_color_cancel -r set -gx fish_pager_color_completion normal - set -gx fish_pager_color_description "7199ee" yellow - set -gx fish_pager_color_prefix "abb2bf" white --bold --underline - set -gx fish_pager_color_progress "2c2d38" brwhite --background=cyan + set -gx fish_pager_color_description "d7a65f" yellow + set -gx fish_pager_color_prefix "a0a8cd" white --bold --underline + set -gx fish_pager_color_progress "bcc2dc" brwhite --background=cyan end __base16_fish_shell_set_background "11" "12" "1d"