From 10fedae860b154c45d5c9acffd4d8483bb4b4ea6 Mon Sep 17 00:00:00 2001 From: Valentin Uveges Date: Fri, 18 Aug 2023 09:30:27 +0300 Subject: [PATCH] feat(options): add the option to set a value to null --- catppuccin.tmux | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/catppuccin.tmux b/catppuccin.tmux index 63718b2..d0201b0 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -5,12 +5,21 @@ get_tmux_option() { local option value default option="$1" default="$2" - value="$(tmux show-option -gqv "$option")" + value=$(tmux show-option -gqv "$option") + + if [ -n "$value" ] + then + if [ "$value" = "null" ] + then + echo "" + + else + echo "$value" + fi - if [ -n "$value" ]; then - echo "$value" else echo "$default" + fi } @@ -27,15 +36,15 @@ setw() { } build_window_icon() { - local window_status_icon_enable="$(get_tmux_option "@catppuccin_window_status_icon_enable" "yes")" + local window_status_icon_enable=$(get_tmux_option "@catppuccin_window_status_icon_enable" "yes") - local custom_icon_window_last="$(get_tmux_option "@catppuccin_icon_window_last" "󰖰")" - local custom_icon_window_current="$(get_tmux_option "@catppuccin_icon_window_current" "󰖯")" - local custom_icon_window_zoom="$(get_tmux_option "@catppuccin_icon_window_zoom" "󰁌")" - local custom_icon_window_mark="$(get_tmux_option "@catppuccin_icon_window_mark" "󰃀")" - local custom_icon_window_silent="$(get_tmux_option "@catppuccin_icon_window_silent" "󰂛")" - local custom_icon_window_activity="$(get_tmux_option "@catppuccin_icon_window_activity" "󰖲")" - local custom_icon_window_bell="$(get_tmux_option "@catppuccin_icon_window_bell" "󰂞")" + local custom_icon_window_last=$(get_tmux_option "@catppuccin_icon_window_last" "󰖰") + local custom_icon_window_current=$(get_tmux_option "@catppuccin_icon_window_current" "󰖯") + local custom_icon_window_zoom=$(get_tmux_option "@catppuccin_icon_window_zoom" "󰁌") + local custom_icon_window_mark=$(get_tmux_option "@catppuccin_icon_window_mark" "󰃀") + local custom_icon_window_silent=$(get_tmux_option "@catppuccin_icon_window_silent" "󰂛") + local custom_icon_window_activity=$(get_tmux_option "@catppuccin_icon_window_activity" "󰖲") + local custom_icon_window_bell=$(get_tmux_option "@catppuccin_icon_window_bell" "󰂞") if [ "$window_status_icon_enable" = "yes" ] then