From 1d78c5198258b2b3894e68cfd23222d54c7073c7 Mon Sep 17 00:00:00 2001 From: Ilan Cosman Date: Thu, 12 Nov 2020 07:26:06 -0800 Subject: [PATCH] Add virtual_env item to pure style (fixes #46) --- .../choices/pure/pure_nonperm_content_location.fish | 9 +++++---- .../tide/configure/choices/pure/pure_prompt_height.fish | 4 ++-- functions/tide/configure/configs/lean.fish | 3 ++- functions/tide/configure/configs/pure.fish | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/functions/tide/configure/choices/pure/pure_nonperm_content_location.fish b/functions/tide/configure/choices/pure/pure_nonperm_content_location.fish index 4971d61..72bc8ea 100644 --- a/functions/tide/configure/choices/pure/pure_nonperm_content_location.fish +++ b/functions/tide/configure/choices/pure/pure_nonperm_content_location.fish @@ -2,24 +2,25 @@ function pure_nonperm_content_location _tide_title 'Non-permanent content location' _tide_option 1 'Left' - set -g fake_tide_left_prompt_items 'pwd' 'git_prompt' 'cmd_duration' 'newline' 'prompt_char' + set -g fake_tide_left_prompt_items 'pwd' 'git_prompt' 'cmd_duration' 'newline' 'virtual_env' 'prompt_char' + set -g fake_tide_right_prompt_items _tide_display_prompt _tide_option 2 'Right' set -g fake_tide_left_prompt_items 'pwd' 'git_prompt' 'newline' 'prompt_char' - set -g fake_tide_right_prompt_items 'cmd_duration' + set -g fake_tide_right_prompt_items 'cmd_duration' 'virtual_env' _tide_display_prompt _tide_display_restart_and_tide_quit switch (_tide_menu) case 1 - set -g fake_tide_left_prompt_items 'pwd' 'git_prompt' 'cmd_duration' 'newline' 'prompt_char' + set -g fake_tide_left_prompt_items 'pwd' 'git_prompt' 'cmd_duration' 'newline' 'virtual_env' 'prompt_char' set -g fake_tide_right_prompt_items _next_choice 'pure/pure_show_time' case 2 set -g fake_tide_left_prompt_items 'pwd' 'git_prompt' 'newline' 'prompt_char' - set -g fake_tide_right_prompt_items 'cmd_duration' + set -g fake_tide_right_prompt_items 'cmd_duration' 'virtual_env' _next_choice 'pure/pure_show_time' case r _tide_begin diff --git a/functions/tide/configure/choices/pure/pure_prompt_height.fish b/functions/tide/configure/choices/pure/pure_prompt_height.fish index f167304..37470db 100644 --- a/functions/tide/configure/choices/pure/pure_prompt_height.fish +++ b/functions/tide/configure/choices/pure/pure_prompt_height.fish @@ -6,7 +6,7 @@ function pure_prompt_height _tide_display_prompt _tide_option 2 'Two lines' - set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items[1..-2] 'newline' $fake_tide_left_prompt_items[-1] + set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items[1..-3] 'newline' $fake_tide_left_prompt_items[-2..-1] _tide_display_prompt _tide_display_restart_and_tide_quit @@ -17,7 +17,7 @@ function pure_prompt_height _next_choice 'all/prompt_connection_andor_frame_color' case 2 set -e fake_tide_left_prompt_items[(contains --index 'newline' $fake_tide_left_prompt_items)] - set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items[1..-2] 'newline' $fake_tide_left_prompt_items[-1] + set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items[1..-3] 'newline' $fake_tide_left_prompt_items[-2..-1] _next_choice 'all/prompt_connection_andor_frame_color' case r _tide_begin diff --git a/functions/tide/configure/configs/lean.fish b/functions/tide/configure/configs/lean.fish index 17fe18b..02f7b13 100644 --- a/functions/tide/configure/configs/lean.fish +++ b/functions/tide/configure/configs/lean.fish @@ -100,4 +100,5 @@ tide_vi_mode_visual_color tide_vi_mode_visual_icon tide_virtual_env_bg_color normal tide_virtual_env_color 00AFAF -tide_virtual_env_display_mode 'projectName' \ No newline at end of file +tide_virtual_env_display_mode 'projectName' +tide_virtual_env_icon '' \ No newline at end of file diff --git a/functions/tide/configure/configs/pure.fish b/functions/tide/configure/configs/pure.fish index 1493445..84695e9 100644 --- a/functions/tide/configure/configs/pure.fish +++ b/functions/tide/configure/configs/pure.fish @@ -99,6 +99,6 @@ tide_vi_mode_visual_bg_color tide_vi_mode_visual_color tide_vi_mode_visual_icon tide_virtual_env_bg_color normal -tide_virtual_env_color 00AFAF -tide_virtual_env_display_mode 'projectName' -tide_virtual_env_icon '' \ No newline at end of file +tide_virtual_env_color brblack +tide_virtual_env_display_mode 'venvName' +tide_virtual_env_icon \ No newline at end of file