From 959844df3a0494ca2c76a38af96985e6c9674da0 Mon Sep 17 00:00:00 2001 From: Gregory Pakosz Date: Sat, 30 Jul 2016 17:48:56 +0200 Subject: [PATCH] added new variables for separators and removed separator in windows-status-current-format tmux_conf_theme_left_separator_main tmux_conf_theme_left_separator_sub tmux_conf_theme_right_separator_main tmux_conf_theme_right_separator_sub closes #24 --- .tmux.conf | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/.tmux.conf b/.tmux.conf index be966c0..80bca02 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -153,17 +153,16 @@ run 'cut -c3- ~/.tmux.conf | sh -s apply_configuration' # tmux_conf_theme=${tmux_conf_theme:-default} # case "${tmux_conf_theme}" in # powerline|powerline_patched_font) -# left_separator='' -# left_separator_black='' -# right_separator='' -# right_separator_black='' -# session_symbol='' +# tmux_conf_theme_left_separator_main=${tmux_conf_theme_left_separator_main-''} +# tmux_conf_theme_left_separator_sub=${tmux_conf_theme_left_separator_sub-''} +# tmux_conf_theme_right_separator_main=${tmux_conf_theme_right_separator_sub-''} +# tmux_conf_theme_right_separator_sub=${tmux_conf_theme_right_separator_sub-''} # ;; # ""|default) -# left_separator='|' -# left_separator_black='' -# right_separator='|' -# right_separator_black='' +# tmux_conf_theme_left_separator_main=${tmux_conf_theme_left_separator_main-''} +# tmux_conf_theme_left_separator_sub=${tmux_conf_theme_left_separator_sub-'|'} +# tmux_conf_theme_right_separator_main=${tmux_conf_theme_right_separator_main-''} +# tmux_conf_theme_right_separator_sub=${tmux_conf_theme_right_separator_sub-'|'} # ;; # esac # @@ -215,7 +214,7 @@ run 'cut -c3- ~/.tmux.conf | sh -s apply_configuration' # # tmux_conf_theme_session_fg=${tmux_conf_theme_session_fg:-colour16} # black # tmux_conf_theme_session_bg=${tmux_conf_theme_session_bg:-colour226} # yellow -# status_left="#[fg=$tmux_conf_theme_session_fg,bg=$tmux_conf_theme_session_bg,bold] ❐ #S #[fg=$tmux_conf_theme_session_bg,bg=$tmux_conf_theme_status_bg,nobold]$left_separator_black" +# status_left="#[fg=$tmux_conf_theme_session_fg,bg=$tmux_conf_theme_session_bg,bold] ❐ #S #[fg=$tmux_conf_theme_session_bg,bg=$tmux_conf_theme_status_bg,nobold]$tmux_conf_theme_left_separator_main" # if [ x"`tmux -q -L tmux_theme_status_left_test -f /dev/null new-session -d \; show -g -v status-left \; kill-session`" = x"[#S] " ] ; then # status_left="$status_left " # fi @@ -228,7 +227,7 @@ run 'cut -c3- ~/.tmux.conf | sh -s apply_configuration' # # tmux_conf_theme_window_status_current_fg=${tmux_conf_theme_window_status_current_fg:-colour16} # black # tmux_conf_theme_window_status_current_bg=${tmux_conf_theme_window_status_current_bg:-colour39} # light blue -# window_status_current_format="#[fg=$tmux_conf_theme_window_status_bg,bg=$tmux_conf_theme_window_status_current_bg]$left_separator_black#[fg=$tmux_conf_theme_window_status_current_fg,bg=$tmux_conf_theme_window_status_current_bg,bold] #I $left_separator #W #[fg=$tmux_conf_theme_window_status_current_bg,bg=$tmux_conf_theme_status_bg,nobold]$left_separator_black" +# window_status_current_format="#[fg=$tmux_conf_theme_window_status_bg,bg=$tmux_conf_theme_window_status_current_bg]$tmux_conf_theme_left_separator_main#[fg=$tmux_conf_theme_window_status_current_fg,bg=$tmux_conf_theme_window_status_current_bg,bold] #I #W #[fg=$tmux_conf_theme_window_status_current_bg,bg=$tmux_conf_theme_status_bg,nobold]$tmux_conf_theme_left_separator_main" # tmux setw -g window-status-current-format "$window_status_current_format" # tmux set -g status-justify left # @@ -276,20 +275,20 @@ run 'cut -c3- ~/.tmux.conf | sh -s apply_configuration' # status_right_battery="${tmux_conf_battery:-#(cut -c3- ~/.tmux.conf | sh -s battery ${tmux_conf_battery_style:-bar} ${tmux_conf_battery_symbol:-block} ${tmux_conf_battery_symbol_count:-auto} \"${tmux_conf_battery_palette:-colour160,colour254,colour16}\" ${tmux_conf_battery_status:-enabled})} " # has_battery=$(eval echo \$${status_right_battery#\#}) # if [ -n "$has_battery" ] && ([ x"$time_enabled" = x"true" ] || [ x"$date_enabled" = x"true" ]) ; then -# status_right_battery="${status_right_battery}#[fg=$tmux_conf_theme_time_date_fg,nobold]$right_separator" +# status_right_battery="${status_right_battery}#[fg=$tmux_conf_theme_time_date_fg,nobold]$tmux_conf_theme_right_separator_sub" # fi # fi # if [ x"$time_enabled" = x"true" ] ; then # status_right_time="#[fg=$tmux_conf_theme_time_date_fg,nobold]${status_right_time} %R " # if [ x"$date_enabled" = x"true" ] ; then -# status_right_time="${status_right_time}#[fg=$tmux_conf_theme_time_date_fg,nobold]$right_separator" +# status_right_time="${status_right_time}#[fg=$tmux_conf_theme_time_date_fg,nobold]$tmux_conf_theme_right_separator_sub" # fi # fi # if [ x"$date_enabled" = x"true" ] ; then # status_right_date="#[fg=$tmux_conf_theme_time_date_fg,nobold] %d %b " # fi # if [ x"$username_enabled" = x"true" ] ; then -# status_right_username="#[fg=$tmux_conf_theme_username_bg,bg=$tmux_conf_theme_time_date_bg,nobold]$right_separator_black#[fg=$tmux_conf_theme_username_fg,bg=$tmux_conf_theme_username_bg,nobold] #(whoami) " +# status_right_username="#[fg=$tmux_conf_theme_username_bg,bg=$tmux_conf_theme_time_date_bg,nobold]$tmux_conf_theme_right_separator_main#[fg=$tmux_conf_theme_username_fg,bg=$tmux_conf_theme_username_bg,nobold] #(whoami) " # fi # if [ x"$hostname_enabled" = x"true" ] ; then # if [ x"$username_enabled" = x"true" ] ; then @@ -297,7 +296,7 @@ run 'cut -c3- ~/.tmux.conf | sh -s apply_configuration' # else # status_right_hostname="#[bg=$tmux_conf_theme_time-data_bg]" # fi -# status_right_hostname="#[fg=$tmux_conf_theme_hostname_bg,nobold]${status_right_hostname}$right_separator_black#[fg=$tmux_conf_theme_hostname_fg,bg=$tmux_conf_theme_hostname_bg,bold] #h " +# status_right_hostname="#[fg=$tmux_conf_theme_hostname_bg,nobold]${status_right_hostname}$tmux_conf_theme_right_separator_main#[fg=$tmux_conf_theme_hostname_fg,bg=$tmux_conf_theme_hostname_bg,bold] #h " # fi # # status_right="${status_right_prefix}${status_right_battery}${status_right_time}${status_right_date}${status_right_username}${status_right_hostname}"