feat(module): rework the session module, format code, rework module loader

This commit is contained in:
Valentin Uveges 2023-08-18 08:17:37 +03:00
parent 465eb977f5
commit 2beae09938
9 changed files with 100 additions and 91 deletions

View file

@ -1,10 +1,10 @@
show_application() {
local index=$1
local icon="$(get_tmux_option "@catppuccin_application_icon" "")"
local color="$(get_tmux_option "@catppuccin_application_color" "$thm_pink")"
local text="$(get_tmux_option "@catppuccin_application_text" "#W")"
local index=$1
local icon=$(get_tmux_option "@catppuccin_application_icon" "")
local color=$(get_tmux_option "@catppuccin_application_color" "$thm_pink")
local text=$(get_tmux_option "@catppuccin_application_text" "#W")
local module=$( build_status_module "$index" "$icon" "$color" "$text" )
echo $module
echo $module
}

View file

@ -12,12 +12,12 @@ show_battery() {
tmux set-option -g @batt_icon_status_discharging '󰂃'
tmux set-option -g @batt_icon_status_unknown '󰂑'
local index=$1
local icon="$(get_tmux_option "@catppuccin_battery_icon" "#{battery_icon}")"
local color="$(get_tmux_option "@catppuccin_battery_color" "$thm_yellow")"
local text="$(get_tmux_option "@catppuccin_battery_text" "#{battery_percentage}")"
local index=$1
local icon=$(get_tmux_option "@catppuccin_battery_icon" "#{battery_icon}")
local color=$(get_tmux_option "@catppuccin_battery_color" "$thm_yellow")
local text=$(get_tmux_option "@catppuccin_battery_text" "#{battery_percentage}")
local module=$( build_status_module "$index" "$icon" "$color" "$text" )
echo $module
echo $module
}

View file

@ -1,11 +1,11 @@
show_date_time() {
local index=$1
local index=$1
local icon="$(get_tmux_option "@catppuccin_date_time_icon" "󰃰")"
local color="$(get_tmux_option "@catppuccin_date_time_color" "$thm_blue")"
local text="$(get_tmux_option "@catppuccin_date_time_text" "%Y-%m-%d %H:%M")"
local module=$( build_status_module "$index" "$icon" "$color" "$text" )
echo $module
echo $module
}

View file

@ -1,10 +1,10 @@
show_directory() {
local index=$1
local icon="$(get_tmux_option "@catppuccin_directory_icon" "")"
local color="$(get_tmux_option "@catppuccin_directory_color" "$thm_pink")"
local text="$(get_tmux_option "@catppuccin_directory_text" "#{b:pane_current_path}")"
local index=$1
local icon=$(get_tmux_option "@catppuccin_directory_icon" "")
local color=$(get_tmux_option "@catppuccin_directory_color" "$thm_pink")
local text=$(get_tmux_option "@catppuccin_directory_text" "#{b:pane_current_path}")
local module=$( build_status_module "$index" "$icon" "$color" "$text" )
echo $module
echo $module
}

View file

@ -1,10 +1,10 @@
show_host() {
local index=$1
local icon="$(get_tmux_option "@catppuccin_host_icon" "󰒋")"
local color="$(get_tmux_option "@catppuccin_host_color" "$thm_magenta")"
local text="$(get_tmux_option "@catppuccin_host_text" "#H")"
local index=$1
local icon=$(get_tmux_option "@catppuccin_host_icon" "󰒋")
local color=$(get_tmux_option "@catppuccin_host_color" "$thm_magenta")
local text=$(get_tmux_option "@catppuccin_host_text" "#H")
local module=$( build_status_module "$index" "$icon" "$color" "$text" )
echo $module
echo $module
}

View file

@ -1,33 +1,10 @@
show_session() {
local index=$1
local icon="$(get_tmux_option "@catppuccin_session_icon" "")"
local text="$(get_tmux_option "@catppuccin_session_text" "#S")"
local index=$1
local icon=$(get_tmux_option "@catppuccin_session_icon" "")
local color=$(get_tmux_option "@catppuccin_session_color" "#{?client_prefix,$thm_red,$thm_green}")
local text=$(get_tmux_option "@catppuccin_session_text" "#S")
if [[ $index -eq 0 || $status_connect_separator == "no" ]]
then
local show_left_separator="#[fg=$thm_green]#[bg=$thm_bg]#{?client_prefix,#[fg=$thm_red],#[fg=$thm_green]}$status_left_separator"
else
local show_left_separator="#[fg=$thm_green]#[bg=$thm_gray]#{?client_prefix,#[fg=$thm_red],#[fg=$thm_green]}$status_left_separator"
fi
local show_icon="#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green]}#[fg=$thm_bg]$icon "
if [[ $status_fill == "icon" ]]
then
local show_text="#[fg=$thm_fg,bg=$thm_gray] $text"
local show_right_separator="#[fg=$thm_gray,bg=$thm_bg,nobold,nounderscore,noitalics]$status_right_separator"
fi
local module=$( build_status_module "$index" "$icon" "$color" "$text" )
if [[ $status_fill == "all" ]]
then
local show_text="#[fg=$thm_bg]$text"
local show_right_separator="#[fg=$thm_green]#[bg=$thm_bg]#{?client_prefix,#[fg=$thm_red],#[fg=$thm_green]}$status_right_separator"
fi
if [[ $status_right_separator_inverse == "yes" ]]
then
local show_right_separator="#[fg=$thm_bg]$status_right_separator"
fi
echo "$show_left_separator$show_icon$show_text$show_right_separator"
echo $module
}

View file

@ -1,10 +1,10 @@
show_user() {
local index=$1
local icon="$(get_tmux_option "@catppuccin_user_icon" "")"
local color="$(get_tmux_option "@catppuccin_user_color" "$thm_cyan")"
local text="$(get_tmux_option "@catppuccin_user_text" "#(whoami)")"
local index=$1
local icon=$(get_tmux_option "@catppuccin_user_icon" "")
local color=$(get_tmux_option "@catppuccin_user_color" "$thm_cyan")
local text=$(get_tmux_option "@catppuccin_user_text" "#(whoami)")
local module=$( build_status_module "$index" "$icon" "$color" "$text" )
echo $module
echo $module
}