From 3a6a0eb3e3a89e12c22c45621bd615500adb2ea8 Mon Sep 17 00:00:00 2001 From: rek Date: Tue, 9 Apr 2024 14:23:48 -0400 Subject: [PATCH] Add icons for git item --- functions/_tide_item_git.fish | 27 +++++++++++++------ .../tide/configure/choices/all/icons.fish | 2 ++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/functions/_tide_item_git.fish b/functions/_tide_item_git.fish index c472f073..a1ae3fcd 100644 --- a/functions/_tide_item_git.fish +++ b/functions/_tide_item_git.fish @@ -61,12 +61,23 @@ function _tide_item_git set -g tide_git_bg_color $tide_git_bg_color_unstable end - _tide_print_item git $_tide_location_color$tide_git_icon' ' (set_color white; echo -ns $location $tide_git_icon_spacer - set_color $tide_git_color_operation; echo -ns ' '$operation ' '$step/$total_steps - set_color $tide_git_color_upstream; echo -ns $tide_git_icon_upstream_behind$behind tide_git_icon_upstream_ahead$ahead - set_color $tide_git_color_stash; echo -ns $tide_git_icon_stash$stash - set_color $tide_git_color_conflicted; echo -ns $tide_git_icon_conflicted$conflicted - set_color $tide_git_color_staged; echo -ns $tide_git_icon_staged$staged - set_color $tide_git_color_dirty; echo -ns $tide_git_icon_dirty$dirty - set_color $tide_git_color_untracked; echo -ns $tide_git_icon_untracked$untracked) + if set -q tide_git_icon_true + _tide_print_item git $_tide_location_color$tide_git_icon' ' (set_color white; echo -ns $location $tide_git_icon_spacer + set_color $tide_git_color_operation; echo -ns ' '$operation ' '$step/$total_steps + set_color $tide_git_color_upstream; echo -ns $tide_git_icon_upstream_behind$behind tide_git_icon_upstream_ahead$ahead + set_color $tide_git_color_stash; echo -ns $tide_git_icon_stash$stash + set_color $tide_git_color_conflicted; echo -ns $tide_git_icon_conflicted$conflicted + set_color $tide_git_color_staged; echo -ns $tide_git_icon_staged$staged + set_color $tide_git_color_dirty; echo -ns $tide_git_icon_dirty$dirty + set_color $tide_git_color_untracked; echo -ns $tide_git_icon_untracked$untracked) + else + _tide_print_item git $_tide_location_color$tide_git_icon' ' (set_color white; echo -ns $location + set_color $tide_git_color_operation; echo -ns ' '$operation ' '$step/$total_steps + set_color $tide_git_color_upstream; echo -ns ' ⇣'$behind ' ⇡'$ahead + set_color $tide_git_color_stash; echo -ns ' *'$stash + set_color $tide_git_color_conflicted; echo -ns ' ~'$conflicted + set_color $tide_git_color_staged; echo -ns ' +'$staged + set_color $tide_git_color_dirty; echo -ns ' !'$dirty + set_color $tide_git_color_untracked; echo -ns ' ?'$untracked) + end end diff --git a/functions/tide/configure/choices/all/icons.fish b/functions/tide/configure/choices/all/icons.fish index 58e84516..0feb7d6d 100644 --- a/functions/tide/configure/choices/all/icons.fish +++ b/functions/tide/configure/choices/all/icons.fish @@ -22,6 +22,7 @@ function _enable_icons set -g fake_tide_pwd_icon_home  set -g fake_tide_cmd_duration_icon  set -g fake_tide_git_icon  + set -g fake_tide_git_icon_true true set -g fake_tide_git_icon_spacer '' set -g fake_tide_git_icon_upstream_behind ⇣ set -g fake_tide_git_icon_upstream_ahead ⇡ @@ -38,6 +39,7 @@ function _disable_icons set -g fake_tide_pwd_icon_home set -g fake_tide_cmd_duration_icon set -g fake_tide_git_icon + set -e fake_tide_git_icon_true set -g fake_tide_git_icon_spacer ' ' set -g fake_tide_git_icon_upstream_behind ⇣ set -g fake_tide_git_icon_upstream_ahead ⇡