diff --git a/tide_theme/configure/choices/all/style.fish b/tide_theme/configure/choices/all/style.fish index 4b46f05..9007026 100644 --- a/tide_theme/configure/choices/all/style.fish +++ b/tide_theme/configure/choices/all/style.fish @@ -43,10 +43,6 @@ function _load_config -a name for var in $fake__tide_var_list set -e $var end - - set -g tideColorDarkerGreen 5FAF00 - set -g tideColorGold D7AF00 - set -g fake__tide_var_list for line in fake_(cat "$_tide_dir/configure/configs/$name.fish") diff --git a/tide_theme/configure/configs/classic.fish b/tide_theme/configure/configs/classic.fish index 7a4a0f7..4b4d9d2 100644 --- a/tide_theme/configure/configs/classic.fish +++ b/tide_theme/configure/configs/classic.fish @@ -7,8 +7,8 @@ __fish_git_prompt_char_untrackedfiles ' ?' __fish_git_prompt_char_upstream_ahead ' ⇡' __fish_git_prompt_char_upstream_behind ' ⇣' __fish_git_prompt_color_branch $_tide_color_green -__fish_git_prompt_color_dirtystate $tideColorGold -__fish_git_prompt_color_stagedstate $tideColorGold +__fish_git_prompt_color_dirtystate $_tide_color_gold +__fish_git_prompt_color_stagedstate $_tide_color_gold __fish_git_prompt_color_stashstate $_tide_color_green __fish_git_prompt_color_untrackedfiles $_tide_color_light_blue __fish_git_prompt_color_upstream $_tide_color_green @@ -21,11 +21,11 @@ tide_cmd_duration_threshold 3000 tide_context_always_display false tide_context_bg_color 444444 tide_context_default_color D7AF87 -tide_context_root_color $tideColorGold +tide_context_root_color $_tide_color_gold tide_context_ssh_color D7AF87 tide_git_prompt_bg_color 444444 tide_jobs_bg_color 444444 -tide_jobs_color $tideColorDarkerGreen +tide_jobs_color $_tide_color_dark_green tide_jobs_icon '' tide_left_prompt_frame_color 6C6C6C tide_left_prompt_frame_enabled true @@ -78,7 +78,7 @@ tide_status_failure_bg_color 444444 tide_status_failure_color D70000 tide_status_failure_icon '✘' tide_status_success_bg_color 444444 -tide_status_success_color $tideColorDarkerGreen +tide_status_success_color $_tide_color_dark_green tide_status_success_icon '✔' tide_time_bg_color 444444 tide_time_color 5F8787 diff --git a/tide_theme/configure/configs/lean.fish b/tide_theme/configure/configs/lean.fish index 8990a48..6f9b554 100644 --- a/tide_theme/configure/configs/lean.fish +++ b/tide_theme/configure/configs/lean.fish @@ -7,8 +7,8 @@ __fish_git_prompt_char_untrackedfiles ' ?' __fish_git_prompt_char_upstream_ahead ' ⇡' __fish_git_prompt_char_upstream_behind ' ⇣' __fish_git_prompt_color_branch $_tide_color_green -__fish_git_prompt_color_dirtystate $tideColorGold -__fish_git_prompt_color_stagedstate $tideColorGold +__fish_git_prompt_color_dirtystate $_tide_color_gold +__fish_git_prompt_color_stagedstate $_tide_color_gold __fish_git_prompt_color_stashstate $_tide_color_green __fish_git_prompt_color_untrackedfiles $_tide_color_light_blue __fish_git_prompt_color_upstream $_tide_color_green @@ -21,11 +21,11 @@ tide_cmd_duration_threshold 3000 tide_context_always_display false tide_context_bg_color normal tide_context_default_color D7AF87 -tide_context_root_color $tideColorGold +tide_context_root_color $_tide_color_gold tide_context_ssh_color D7AF87 tide_git_prompt_bg_color normal tide_jobs_bg_color normal -tide_jobs_color $tideColorDarkerGreen +tide_jobs_color $_tide_color_dark_green tide_jobs_icon '' tide_left_prompt_frame_color 6C6C6C tide_left_prompt_frame_enabled false @@ -78,7 +78,7 @@ tide_status_failure_bg_color normal tide_status_failure_color D70000 tide_status_failure_icon '✘' tide_status_success_bg_color normal -tide_status_success_color $tideColorDarkerGreen +tide_status_success_color $_tide_color_dark_green tide_status_success_icon '✔' tide_time_bg_color normal tide_time_color 5F8787 diff --git a/tide_theme/configure/configs/pure.fish b/tide_theme/configure/configs/pure.fish index 205c60d..6500d42 100644 --- a/tide_theme/configure/configs/pure.fish +++ b/tide_theme/configure/configs/pure.fish @@ -21,11 +21,11 @@ tide_cmd_duration_threshold 3000 tide_context_always_display false tide_context_bg_color normal tide_context_default_color D7AF87 -tide_context_root_color $tideColorGold +tide_context_root_color $_tide_color_gold tide_context_ssh_color D7AF87 tide_git_prompt_bg_color normal tide_jobs_bg_color normal -tide_jobs_color $tideColorDarkerGreen +tide_jobs_color $_tide_color_dark_green tide_jobs_icon '' tide_left_prompt_frame_color 6C6C6C tide_left_prompt_frame_enabled false @@ -78,7 +78,7 @@ tide_status_failure_bg_color normal tide_status_failure_color D70000 tide_status_failure_icon '✘' tide_status_success_bg_color normal -tide_status_success_color $tideColorDarkerGreen +tide_status_success_color $_tide_color_dark_green tide_status_success_icon '✔' tide_time_bg_color normal tide_time_color 6C6C6C diff --git a/tide_theme/configure/configs/rainbow.fish b/tide_theme/configure/configs/rainbow.fish index ee1c087..2591203 100644 --- a/tide_theme/configure/configs/rainbow.fish +++ b/tide_theme/configure/configs/rainbow.fish @@ -21,7 +21,7 @@ tide_cmd_duration_threshold 3000 tide_context_always_display false tide_context_bg_color 444444 tide_context_default_color D7AF87 -tide_context_root_color $tideColorGold +tide_context_root_color $_tide_color_gold tide_context_ssh_color D7AF87 tide_git_prompt_bg_color 4E9A06 tide_jobs_bg_color 444444 diff --git a/tools/_tide_actual_install.fish b/tools/_tide_actual_install.fish index bd6a501..9b17bb9 100644 --- a/tools/_tide_actual_install.fish +++ b/tools/_tide_actual_install.fish @@ -65,6 +65,8 @@ function _set_immutables set -U _tide_var_immutable_list _set_immutable _tide_color_dark_blue 0087AF + _set_immutable _tide_color_dark_green 5FAF00 + _set_immutable _tide_color_gold D7AF00 _set_immutable _tide_color_green 5FD700 _set_immutable _tide_color_light_blue 00AFFF _set_immutable _tide_color_normal (set_color normal)