From 4ab501e2ddd0afb71d68d56628dc0e76274ef3cc Mon Sep 17 00:00:00 2001
From: Abhishek Keshri <iam2kabhishek@gmail.com>
Date: Sun, 17 Mar 2024 02:41:14 +0530
Subject: [PATCH] refactor: clean unused code

---
 scripts/tmux2k.sh | 149 +++++++++++++---------------------------------
 1 file changed, 42 insertions(+), 107 deletions(-)

diff --git a/scripts/tmux2k.sh b/scripts/tmux2k.sh
index 801d726..4e19fc7 100755
--- a/scripts/tmux2k.sh
+++ b/scripts/tmux2k.sh
@@ -6,21 +6,17 @@ current_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$current_dir"/utils.sh
 
 # set configuration option variables
-show_fahrenheit=$(get_tmux_option "@tmux2k-show-fahrenheit" false)
-show_location=$(get_tmux_option "@tmux2k-show-location" false)
-fixed_location=$(get_tmux_option "@tmux2k-fixed-location")
 show_powerline=$(get_tmux_option "@tmux2k-show-powerline" true)
-show_flags=$(get_tmux_option "@tmux2k-show-flags" true)
+show_refresh=$(get_tmux_option "@tmux2k-refresh-rate" 60)
 show_left_icon=$(get_tmux_option "@tmux2k-show-left-icon" rocket)
-show_left_icon_padding=$(get_tmux_option "@tmux2k-left-icon-padding" 0)
 show_left_sep=$(get_tmux_option "@tmux2k-show-left-sep" )
 show_right_sep=$(get_tmux_option "@tmux2k-show-right-sep" )
-show_border_contrast=$(get_tmux_option "@tmux2k-border-contrast" true)
-show_refresh=$(get_tmux_option "@tmux2k-refresh-rate" 60)
-IFS=' ' read -r -a rplugins <<<"$(get_tmux_option '@tmux2k-right-plugins' 'battery network time')"
-IFS=' ' read -r -a lplugins <<<"$(get_tmux_option '@tmux2k-left-plugins' 'git cpu ram')"
+win_left_sep=$(get_tmux_option "@tmux2k-window-left-sep" )
+win_right_sep=$(get_tmux_option "@tmux2k-window-right-sep" )
+show_flags=$(get_tmux_option "@tmux2k-show-flags" true)
 
-datafile=/tmp/.tmux2k-data
+IFS=' ' read -r -a lplugins <<<"$(get_tmux_option '@tmux2k-left-plugins' 'git cpu ram')"
+IFS=' ' read -r -a rplugins <<<"$(get_tmux_option '@tmux2k-right-plugins' 'battery network time')"
 
 white='#d5d5da'
 black='#0a0a0f',
@@ -76,94 +72,25 @@ main() {
         ;;
     esac
 
-    # Handle left icon padding
-    padding=""
-    if [ "$show_left_icon_padding" -gt "0" ]; then
-        padding="$(printf '%*s' "$show_left_icon_padding")"
-    fi
-    left_icon="$left_icon$padding"
-
-    # Handle powerline option
-    if $show_powerline; then
-        right_sep="$show_right_sep"
-        left_sep="$show_left_sep"
-    fi
-
-    # start weather script in background
-    if [[ "${rplugins[@]}" =~ "weather" ]]; then
-        "$current_dir"/sleep_weather.sh "$show_fahrenheit" "$show_location" "$fixed_location" &
-    fi
-
     # sets refresh interval to every 5 seconds
     tmux set-option -g status-interval "$show_refresh"
 
     # set length
     tmux set-option -g status-left-length 100
     tmux set-option -g status-right-length 100
-
-    # pane border styling
-    if $show_border_contrast; then
-        tmux set-option -g pane-active-border-style "fg=${blue}"
-    else
-        tmux set-option -g pane-active-border-style "fg=${light_purple}"
-    fi
-    tmux set-option -g pane-border-style "fg=${gray}"
+    tmux set-option -g status-left ""
+    tmux set-option -g status-right ""
 
     # message styling
+    tmux set-option -g pane-active-border-style "fg=${blue}"
+    tmux set-option -g pane-border-style "fg=${gray}"
     tmux set-option -g message-style "bg=${gray},fg=${blue}"
-
-    # status bar
     tmux set-option -g status-style "bg=${gray},fg=${white}"
-
-    # Status left
-    if $show_powerline; then
-        tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}} ${left_icon} #[fg=${green},bg=${green}]#{?client_prefix,#[fg=${yellow}}${left_sep}"
-        powerbg=${gray}
-    else
-        tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ${left_icon}"
-    fi
-
-    for lplugin_index in "${!lplugins[@]}"; do
-        lplugin="${lplugins[$lplugin_index]}"
-        # Check if colors are defined for the plugin
-        if [ -z "${plugin_colors[$lplugin]}" ]; then
-            continue
-        fi
-
-        IFS=' ' read -r -a colors <<<"$(get_plugin_colors "$lplugin")"
-        case $lplugin in
-        "weather")
-            # Wait until $datafile exists just to avoid errors
-            # This should almost never need to wait unless something unexpected occurs
-            while [ ! -f "$datafile" ]; do
-                sleep 0.01
-            done
-            script="#(cat $datafile)"
-            powerbg=${lplugins[$((lplugin_index + 1))]}
-            ;;
-        *)
-            script="#($current_dir/$lplugin.sh)"
-            next_plugin=${lplugins[$((lplugin_index + 1))]}
-            IFS=' ' read -r -a next_colors <<<"$(get_plugin_colors "$next_plugin")"
-            powerbg=${!next_colors[0]:-$gray}
-            ;;
-        esac
-
-        if $show_powerline; then
-            tmux set-option -ga status-left "#[fg=${!colors[1]},bg=${!colors[0]}] $script #[fg=${!colors[0]},bg=${powerbg},nobold,nounderscore,noitalics]${left_sep}"
-            powerbg=${gray}
-            # powerbg=${!colors[0]}
-        else
-            tmux set-option -ga status-left "#[fg=${!colors[1]},bg=${!colors[0]}] $script "
-        fi
-    done
-
-    # Status middle
-    left_win_sep=""
-    right_win_sep=""
-    # Set window list at centre
     tmux set -g status-justify absolute-centre
 
+    tmux set-window-option -g window-status-activity-style "bold"
+    tmux set-window-option -g window-status-bell-style "bold"
+    tmux set-window-option -g window-status-current-style "bold"
     # Window option
     case $show_flags in
     false)
@@ -177,41 +104,49 @@ main() {
     esac
 
     if $show_powerline; then
-        tmux set-window-option -g window-status-current-format "#[fg=${blue},bg=${gray}]${left_win_sep}#[bg=${blue}]${current_flags}#[fg=${black}] #I:#W #[fg=${blue},bg=${gray}]${right_win_sep}"
-        tmux set-window-option -g window-status-format "#[fg=${light_gray},bg=${gray}]${left_win_sep}#[bg=${light_gray}]${flags}#[fg=${white}] #I:#W #[fg=${light_gray},bg=${gray}]${right_win_sep}"
+        right_sep="$show_right_sep"
+        left_sep="$show_left_sep"
+        tmux set-window-option -g window-status-current-format "#[fg=${blue},bg=${gray}]${win_left_sep}#[bg=${blue}]${current_flags}#[fg=${black}] #I:#W #[fg=${blue},bg=${gray}]${win_right_sep}"
+        tmux set-window-option -g window-status-format "#[fg=${light_gray},bg=${gray}]${win_left_sep}#[bg=${light_gray}]${flags}#[fg=${white}] #I:#W #[fg=${light_gray},bg=${gray}]${win_right_sep}"
+        tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}} ${left_icon} #[fg=${green},bg=${green}]#{?client_prefix,#[fg=${yellow}}${left_sep}"
+        powerbg=${gray}
     else
         tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${blue}] #I:#W ${current_flags} "
         tmux set-window-option -g window-status-format "#[fg=${white},bg=${light_gray}] #I:#W ${flags} "
+        tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ${left_icon}"
     fi
 
-    tmux set-window-option -g window-status-activity-style "bold"
-    tmux set-window-option -g window-status-bell-style "bold"
-    tmux set-window-option -g window-status-current-style "bold"
+    # Status left
+    for lplugin_index in "${!lplugins[@]}"; do
+        lplugin="${lplugins[$lplugin_index]}"
+        # Check if colors are defined for the plugin
+        if [ -z "${plugin_colors[$lplugin]}" ]; then
+            continue
+        fi
+
+        IFS=' ' read -r -a colors <<<"$(get_plugin_colors "$lplugin")"
+        script="#($current_dir/$lplugin.sh)"
+
+        if $show_powerline; then
+            next_plugin=${lplugins[$((lplugin_index + 1))]}
+            IFS=' ' read -r -a next_colors <<<"$(get_plugin_colors "$next_plugin")"
+            powerbg=${!next_colors[0]:-$gray}
+            tmux set-option -ga status-left "#[fg=${!colors[1]},bg=${!colors[0]}] $script #[fg=${!colors[0]},bg=${powerbg},nobold,nounderscore,noitalics]${left_sep}"
+            powerbg=${gray}
+        else
+            tmux set-option -ga status-left "#[fg=${!colors[1]},bg=${!colors[0]}] $script "
+        fi
+    done
 
     # Status right
-    tmux set-option -g status-right ""
-
     for rplugin_index in "${!rplugins[@]}"; do
         rplugin="${rplugins[$rplugin_index]}"
-        # Check if colors are defined for the plugin
         if [ -z "${plugin_colors[$rplugin]}" ]; then
             continue
         fi
 
         IFS=' ' read -r -a colors <<<"$(get_plugin_colors "$rplugin")"
-        case $rplugin in
-        "weather")
-            # Wait until $datafile exists just to avoid errors
-            # This should almost never need to wait unless something unexpected occurs
-            while [ ! -f "$datafile" ]; do
-                sleep 0.01
-            done
-            script="#(cat $datafile)"
-            ;;
-        *)
-            script="#($current_dir/$rplugin.sh)"
-            ;;
-        esac
+        script="#($current_dir/$rplugin.sh)"
 
         if $show_powerline; then
             tmux set-option -ga status-right "#[fg=${!colors[0]},bg=${powerbg},nobold,nounderscore,noitalics]${right_sep}#[fg=${!colors[1]},bg=${!colors[0]}] $script "