From 64dd0c37d46c7f94fca3e07562290a0ce9960a61 Mon Sep 17 00:00:00 2001 From: Ilan Cosman Date: Sat, 22 May 2021 20:51:21 -0700 Subject: [PATCH] Merge prompt_items and functions directories --- functions/_tide_sub_configure.fish | 4 ++-- .../_fake_tide_item_cmd_duration.fish | 0 .../{prompt_items => functions}/_fake_tide_item_git.fish | 0 .../{prompt_items => functions}/_fake_tide_item_os.fish | 0 .../_fake_tide_item_prompt_char.fish | 0 .../{prompt_items => functions}/_fake_tide_item_pwd.fish | 0 .../{prompt_items => functions}/_fake_tide_item_time.fish | 0 functions/tide/configure/functions/_fake_tide_prompt.fish | 1 - 8 files changed, 2 insertions(+), 3 deletions(-) rename functions/tide/configure/{prompt_items => functions}/_fake_tide_item_cmd_duration.fish (100%) rename functions/tide/configure/{prompt_items => functions}/_fake_tide_item_git.fish (100%) rename functions/tide/configure/{prompt_items => functions}/_fake_tide_item_os.fish (100%) rename functions/tide/configure/{prompt_items => functions}/_fake_tide_item_prompt_char.fish (100%) rename functions/tide/configure/{prompt_items => functions}/_fake_tide_item_pwd.fish (100%) rename functions/tide/configure/{prompt_items => functions}/_fake_tide_item_time.fish (100%) diff --git a/functions/_tide_sub_configure.fish b/functions/_tide_sub_configure.fish index a6a3738..0e780eb 100644 --- a/functions/_tide_sub_configure.fish +++ b/functions/_tide_sub_configure.fish @@ -10,8 +10,8 @@ for func in _fake(functions --all | string match --entire _tide_item) end end -for file in (status dirname)/tide/configure/{choices, functions, prompt_items}/**.fish - source "$file" +for file in (status dirname)/tide/configure/{choices, functions}/**.fish + source $file end function _tide_sub_configure diff --git a/functions/tide/configure/prompt_items/_fake_tide_item_cmd_duration.fish b/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish similarity index 100% rename from functions/tide/configure/prompt_items/_fake_tide_item_cmd_duration.fish rename to functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish diff --git a/functions/tide/configure/prompt_items/_fake_tide_item_git.fish b/functions/tide/configure/functions/_fake_tide_item_git.fish similarity index 100% rename from functions/tide/configure/prompt_items/_fake_tide_item_git.fish rename to functions/tide/configure/functions/_fake_tide_item_git.fish diff --git a/functions/tide/configure/prompt_items/_fake_tide_item_os.fish b/functions/tide/configure/functions/_fake_tide_item_os.fish similarity index 100% rename from functions/tide/configure/prompt_items/_fake_tide_item_os.fish rename to functions/tide/configure/functions/_fake_tide_item_os.fish diff --git a/functions/tide/configure/prompt_items/_fake_tide_item_prompt_char.fish b/functions/tide/configure/functions/_fake_tide_item_prompt_char.fish similarity index 100% rename from functions/tide/configure/prompt_items/_fake_tide_item_prompt_char.fish rename to functions/tide/configure/functions/_fake_tide_item_prompt_char.fish diff --git a/functions/tide/configure/prompt_items/_fake_tide_item_pwd.fish b/functions/tide/configure/functions/_fake_tide_item_pwd.fish similarity index 100% rename from functions/tide/configure/prompt_items/_fake_tide_item_pwd.fish rename to functions/tide/configure/functions/_fake_tide_item_pwd.fish diff --git a/functions/tide/configure/prompt_items/_fake_tide_item_time.fish b/functions/tide/configure/functions/_fake_tide_item_time.fish similarity index 100% rename from functions/tide/configure/prompt_items/_fake_tide_item_time.fish rename to functions/tide/configure/functions/_fake_tide_item_time.fish diff --git a/functions/tide/configure/functions/_fake_tide_prompt.fish b/functions/tide/configure/functions/_fake_tide_prompt.fish index b954c6f..71ab67a 100644 --- a/functions/tide/configure/functions/_fake_tide_prompt.fish +++ b/functions/tide/configure/functions/_fake_tide_prompt.fish @@ -25,7 +25,6 @@ function _fake_tide_prompt printf '%s' $right_prompt[1] \n $left_prompt[-1]' ' else printf '%s' $left_prompt[-1]' ' - printf '%s' 'h' printf '%s' $right_prompt[1] end