pass $tmux_conf_theme_root to the _root() helper instead of using a tmux variable

This commit is contained in:
Gregory Pakosz 2019-09-18 23:17:04 +02:00
parent f657d6959c
commit f54cede368
1 changed files with 5 additions and 9 deletions

View File

@ -587,13 +587,11 @@ run -b '[ -z "#{window_active}" ] && [ -z "#{version}" ] && tmux set display-tim
# #
# _root() { # _root() {
# tty=${1:-$(tmux display -p '#{pane_tty}')} # tty=${1:-$(tmux display -p '#{pane_tty}')}
# root=$2
#
# username=$(_username "$tty" false) # username=$(_username "$tty" false)
# #
# if [ x"$username" = x"root" ]; then # [ x"$username" = x"root" ] && echo "$root"
# tmux show -gqv '@root'
# else
# echo ""
# fi
# } # }
# #
# _uptime() { # _uptime() {
@ -938,7 +936,7 @@ run -b '[ -z "#{window_active}" ] && [ -z "#{version}" ] && tmux set display-tim
# -e "s/#{prefix}/#[fg=$tmux_conf_theme_prefix_fg]#[bg=$tmux_conf_theme_prefix_bg]#[$tmux_conf_theme_prefix_attr]#{?client_prefix,$tmux_conf_theme_prefix,}/g") # -e "s/#{prefix}/#[fg=$tmux_conf_theme_prefix_fg]#[bg=$tmux_conf_theme_prefix_bg]#[$tmux_conf_theme_prefix_attr]#{?client_prefix,$tmux_conf_theme_prefix,}/g")
# #
# tmux_conf_theme_status_left=$(echo "$tmux_conf_theme_status_left" | sed \ # tmux_conf_theme_status_left=$(echo "$tmux_conf_theme_status_left" | sed \
# -e "s%#{root}%#[fg=$tmux_conf_theme_root_fg]#[bg=$tmux_conf_theme_root_bg]#[$tmux_conf_theme_root_attr]#(cut -c3- ~/.tmux.conf | sh -s _root #{pane_tty} #D)#[inherit]%g") # -e "s%#{root}%#[fg=$tmux_conf_theme_root_fg]#[bg=$tmux_conf_theme_root_bg]#[$tmux_conf_theme_root_attr]#(cut -c3- ~/.tmux.conf | sh -s _root #{pane_tty} $tmux_conf_theme_root #D)#[inherit]%g")
# #
# tmux_conf_theme_status_left=$(echo "$tmux_conf_theme_status_left" | sed \ # tmux_conf_theme_status_left=$(echo "$tmux_conf_theme_status_left" | sed \
# -e "s%#{synchronized}%#[fg=$tmux_conf_theme_synchronized_fg]#[bg=$tmux_conf_theme_synchronized_bg]#[$tmux_conf_theme_synchronized_attr]#{?pane_synchronized,$tmux_conf_theme_synchronized,}%g") # -e "s%#{synchronized}%#[fg=$tmux_conf_theme_synchronized_fg]#[bg=$tmux_conf_theme_synchronized_bg]#[$tmux_conf_theme_synchronized_attr]#{?pane_synchronized,$tmux_conf_theme_synchronized,}%g")
@ -1026,7 +1024,7 @@ run -b '[ -z "#{window_active}" ] && [ -z "#{version}" ] && tmux set display-tim
# -e "s/#{prefix}/#[fg=$tmux_conf_theme_prefix_fg]#[bg=$tmux_conf_theme_prefix_bg]#[$tmux_conf_theme_prefix_attr]#{?client_prefix,$tmux_conf_theme_prefix,}/g") # -e "s/#{prefix}/#[fg=$tmux_conf_theme_prefix_fg]#[bg=$tmux_conf_theme_prefix_bg]#[$tmux_conf_theme_prefix_attr]#{?client_prefix,$tmux_conf_theme_prefix,}/g")
# #
# tmux_conf_theme_status_right=$(echo "$tmux_conf_theme_status_right" | sed \ # tmux_conf_theme_status_right=$(echo "$tmux_conf_theme_status_right" | sed \
# -e "s%#{root}%#[fg=$tmux_conf_theme_root_fg]#[bg=$tmux_conf_theme_root_bg]#[$tmux_conf_theme_root_attr]#(cut -c3- ~/.tmux.conf | sh -s _root #{pane_tty} #D)#[inherit]%g") # -e "s%#{root}%#[fg=$tmux_conf_theme_root_fg]#[bg=$tmux_conf_theme_root_bg]#[$tmux_conf_theme_root_attr]#(cut -c3- ~/.tmux.conf | sh -s _root #{pane_tty} $tmux_conf_theme_root #D)#[inherit]%g")
# #
# tmux_conf_theme_status_right=$(echo "$tmux_conf_theme_status_right" | sed \ # tmux_conf_theme_status_right=$(echo "$tmux_conf_theme_status_right" | sed \
# -e "s%#{synchronized}%#[fg=$tmux_conf_theme_synchronized_fg]#[bg=$tmux_conf_theme_synchronized_bg]#[$tmux_conf_theme_synchronized_attr]#{?pane_synchronized,$tmux_conf_theme_synchronized,}%g") # -e "s%#{synchronized}%#[fg=$tmux_conf_theme_synchronized_fg]#[bg=$tmux_conf_theme_synchronized_bg]#[$tmux_conf_theme_synchronized_attr]#{?pane_synchronized,$tmux_conf_theme_synchronized,}%g")
@ -1093,8 +1091,6 @@ run -b '[ -z "#{window_active}" ] && [ -z "#{version}" ] && tmux set display-tim
# #
# # -- variables # # -- variables
# #
# tmux set -g '@root' "$tmux_conf_theme_root"
#
# tmux_conf_battery_bar_symbol_full=${tmux_conf_battery_bar_symbol_full:-◼} # tmux_conf_battery_bar_symbol_full=${tmux_conf_battery_bar_symbol_full:-◼}
# tmux_conf_battery_bar_symbol_empty=${tmux_conf_battery_bar_symbol_empty:-◻} # tmux_conf_battery_bar_symbol_empty=${tmux_conf_battery_bar_symbol_empty:-◻}
# tmux_conf_battery_bar_length=${tmux_conf_battery_bar_length:-auto} # tmux_conf_battery_bar_length=${tmux_conf_battery_bar_length:-auto}