From 15b06d5196f37a5a0b4357cb37b5ff21fdf072c5 Mon Sep 17 00:00:00 2001 From: Abhishek Keshri Date: Sun, 17 Mar 2024 03:21:43 +0530 Subject: [PATCH] refactor: update colors --- scripts/tmux2k.sh | 84 +++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 53 deletions(-) diff --git a/scripts/tmux2k.sh b/scripts/tmux2k.sh index 95ab09a..94b579b 100755 --- a/scripts/tmux2k.sh +++ b/scripts/tmux2k.sh @@ -1,11 +1,10 @@ #!/usr/bin/env bash -# setting the locale, some users have issues with different locales, this forces the correct one + export LC_ALL=en_US.UTF-8 current_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "$current_dir"/utils.sh -# set configuration option variables show_powerline=$(get_tmux_option "@tmux2k-show-powerline" true) show_refresh=$(get_tmux_option "@tmux2k-refresh-rate" 60) show_left_icon=$(get_tmux_option "@tmux2k-show-left-icon" rocket) @@ -14,41 +13,39 @@ show_right_sep=$(get_tmux_option "@tmux2k-show-right-sep" ) 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) - 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', -gray='#15152a' -red='#ff001f', -green='#3dd50A', -yellow='#ffd21a', blue='#1688f0', -purple='#BF58FF', cyan='#11dddd', +gray='#15152a' +green='#3dd50A', orange='#ffb86c' pink='#ff79c6' -light_purple='#bd93f9' +purple='#BF58FF', +red='#ff001f', +white='#d5d5da' +yellow='#ffd21a', light_cyan='#8be9fd' +light_gray='#45455a' light_green='#50fa7b' +light_purple='#bd93f9' light_red='#ff0055' light_yellow='#f1fa8c' -dark_gray='#282a36' -light_gray='#45455a' -dark_gray='#282a36' +plugin_fg='#282a36' declare -A plugin_colors=( - ["git"]="green dark_gray" - ["battery"]="pink dark_gray" - ["gpu"]="orange dark_gray" - ["cpu"]="blue dark_gray" - ["ram"]="yellow dark_gray" - ["network"]="purple dark_gray" - ["bandwidth"]="purple dark_gray" - ["ping"]="purple dark_gray" - ["weather"]="orange dark_gray" - ["time"]="cyan dark_gray" + ["git"]="green plugin_fg" + ["battery"]="pink plugin_fg" + ["gpu"]="orange plugin_fg" + ["cpu"]="blue plugin_fg" + ["ram"]="yellow plugin_fg" + ["network"]="purple plugin_fg" + ["bandwidth"]="purple plugin_fg" + ["ping"]="purple plugin_fg" + ["weather"]="orange plugin_fg" + ["time"]="cyan plugin_fg" ) get_plugin_colors() { @@ -97,30 +94,18 @@ build_status_bar() { main() { case $show_left_icon in - rocket) - left_icon="" - ;; - session) - left_icon="#S" - ;; - window) - left_icon="#W" - ;; - *) - left_icon=$show_left_icon - ;; + rocket) left_icon="" ;; + session) left_icon="#S" ;; + window) left_icon="#W" ;; + *) left_icon=$show_left_icon ;; esac - # 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 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}" @@ -130,34 +115,27 @@ main() { 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) - flags="" - current_flags="" - ;; - true) - flags="#{?window_flags,#[fg=${light_purple}]#{window_flags},}" - current_flags="#{?window_flags,#[fg=${light_red}]#{window_flags},}" - ;; - esac + + if $show_flags; then + flags="#{?window_flags,#[fg=${light_red}]#{window_flags},}" + current_flags="#{?window_flags,#[fg=${light_yellow}]#{window_flags},}" + fi if $show_powerline; then 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}" + tmux set-option -g status-left "#[bg=${green},fg=${plugin_fg}]#{?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}" + tmux set-option -g status-left "#[bg=${green},fg=${plugin_fg}]#{?client_prefix,#[bg=${yellow}],} ${left_icon}" fi build_status_bar "left" build_status_bar "right" } -# run main function main