From 1b6d111668781136fe2cfca82a65a562eb2749b9 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sat, 26 Jul 2025 11:54:57 +0200 Subject: [PATCH] fixes --- sh/tmux.sh | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/sh/tmux.sh b/sh/tmux.sh index 6af7969..dfc2ce4 100644 --- a/sh/tmux.sh +++ b/sh/tmux.sh @@ -230,7 +230,7 @@ ${RWX_TMUX_BORDER_BACKGROUND}#{?window_zoomed_flag,\ #= tms #/ tmux_setup rwx_tmux_setup() { - local file script + local file script space if rwx_root; then file="/etc/tmux.conf" script="/etc/tmux.sh" @@ -238,6 +238,7 @@ rwx_tmux_setup() { file="${HOME}/.tmux.conf" script="${HOME}/.tmux.sh" fi + space="${RWX_TMUX_RESET} " # FIXME skip parsing these functions rwx_file_write "${script}" "\ # ╭─────┬──────┬────────╮ @@ -260,9 +261,7 @@ rwx_tmux_servers() { sockets=\"\$(find \"\${root}\" -type s -printf \"%P\\n\")\" while IFS= read -r name; do if tmux -L \"\${name}\" list-sessions >/dev/null; then - text=\"\${text}\\ -${RWX_TMUX_RESET} \\ -\" + [ -n \"\${text}\" ] && text=\"\${text}${space}\" if [ \"\${name}\" = \"\${active}\" ]; then text=\"\${text}#[fg=green]\" else @@ -331,7 +330,7 @@ ${RWX_TMUX_BORDER_BACKGROUND} \\ \" } " - local date host pane session space time user window + local date host pane session time user window local server servers title uptime date="$(rwx_tmux_item_date)" host="$(rwx_tmux_item_host)" @@ -339,7 +338,6 @@ ${RWX_TMUX_BORDER_BACKGROUND} \\ server="$(rwx_tmux_item_script "${script}" server)" servers="$(rwx_tmux_item_script "${script}" servers)" session="$(rwx_tmux_item_session)" - space="${RWX_TMUX_RESET} " time="$(rwx_tmux_item_time)" title="$(rwx_tmux_item_title)" uptime="$(rwx_tmux_item_script "${script}" uptime)" @@ -425,12 +423,9 @@ set-option -g status-format[0] '\ ${window}\ ${space}\ }\ -${space}\ \ #[align=right]\ \ -${date}\ -${space}\ ${time}\ ' @@ -440,23 +435,22 @@ set-option -g status-format[1] '\ ${session}\ ${space}\ }\ -${space}\ \ #[align=right]\ \ -${servers}\ +${date}\ ' # line 3 set-option -g status-format[2] '\ -#{P:\ -${pane}\ -${space}\ -}\ -${space}\ +${servers}\ \ #[align=right]\ \ +#{P:\ +${space}\ +${pane}\ +}\ ' # line 4