resolve #42, Enhancement: Make status bar modules / color more configurable

INSTALL.md

@@ -4,7 +4,7 @@
 
 If you are a tpm user, you can install the theme and keep up to date by adding the following to your .tmux.conf file:
 
-	set -g @plugin 'dracula/tmux'  
+	set -g @plugin 'dracula/tmux'
 
 Add any configuration options below this line in your tmux config.
 
@@ -44,25 +44,122 @@ programs.tmux = {
 
 #### Configuration
 
-Customize the status bar by adding any of these lines to your .tmux.conf as desired:  
+To enable plugins set up the `@dracula-plugins` option in you `.tmux.conf` file, separate plugin by space.
-* Disable battery functionality: `set -g @dracula-show-battery false`
+The order that you define the plugins will be the order on the status bar left to right.
-* Disable network functionality: `set -g @dracula-show-network false`
+
-* Enable network bandwith functionality: `set -g @dracula-network-bandwith $network_name`
+```bash
-  - You could get the `$network_name` through the command: `sudo lshw -class network -short | grep wl | awk '{print $2}'`
+# available plugins: battery, cpu-usage, gpu-usage, ram-usage, network, network-bandwith, weather, time
-* Disable weather functionality: `set -g @dracula-show-weather false`
+set -g @dracula-plugins "cpu-usage gpu-usage ram-usage"
-* Disable time functionality: `set -g @dracula-show-time false`
+```
-* Disable location information: `set -g @dracula-show-location false`
+
-* Switch from default fahrenheit to celsius: `set -g @dracula-show-fahrenheit false`
+For each plugin is possible to customize background and foreground colors
-* Enable powerline symbols: `set -g @dracula-show-powerline true`
+
-* Switch powerline symbols `set -g @dracula-show-left-sep ` for left and `set -g @dracula-show-right-sep ` for right symbol (can set any symbol you like as seperator)
+```bash
-* Enable window flags: `set -g @dracula-show-flags true`
+# available colors: white, gray, dark_gray, light_purple, dark_purple, cyan, green, orange, red, pink, yellow
-* Adjust the refresh rate for the bar `set -g @dracula-refresh-rate 5` the default is 5, it can accept any number
+# set -g @dracula-[plugin-name]-colors "[background] [foreground]"
-* Enable military time: `set -g @dracula-military-time true`
+set -g @dracula-cpu-usage-colors "pink dark_gray"
-* Disable timezone: `set -g @dracula-show-timezone false`
+```
-* Switch the left smiley icon `set -g @dracula-show-left-icon session` it can accept `session`, `smiley`, `window`, or any character.
+
-* Add padding to the left smiley icon `set -g @dracula-left-icon-padding` default is 1, it can accept any number and 0 disables padding.
+#### Status bar options
-* Enable high contrast pane border: `set -g @dracula-border-contrast true`
+
-* Enable cpu usage: `set -g @dracula-cpu-usage true`
+Enable powerline symbols
-* Enable ram usage: `set -g @dracula-ram-usage true`
+
-* Enable gpu usage: `set -g @dracula-gpu-usage true`
+```bash
-* Swap date to day/month `set -g @dracula-day-month true`
+set -g @dracula-show-powerline true
+```
+
+Switch powerline symbols
+
+```bash
+# for left
+set -g @dracula-show-left-sep 
+
+# for right symbol (can set any symbol you like as seperator)
+set -g @dracula-show-right-sep 
+```
+
+Enable window flags
+
+```bash
+set -g @dracula-show-flags true
+```
+
+Adjust the refresh rate for the status bar
+
+```bash
+# the default is 5, it can accept any number
+set -g @dracula-refresh-rate 5
+```
+
+Switch the left smiley icon
+
+```bash
+# it can accept `session`, `smiley`, `window`, or any character.
+set -g @dracula-show-left-icon session
+```
+
+Add padding to the left smiley icon
+
+```bash
+# default is 1, it can accept any number and 0 disables padding.
+set -g @dracula-left-icon-padding 1
+```
+
+Enable high contrast pane border
+
+```bash
+set -g @dracula-border-contrast true
+```
+
+#### cpu-usage options
+
+Customize label
+
+```bash
+set -g @dracula-cpu-usage-label "CPU"
+```
+
+#### gpu-usage options
+
+Customize label
+
+```bash
+set -g @dracula-gpu-usage-label "GPU"
+```
+
+#### ram-usage options
+
+Customize label
+
+```bash
+set -g @dracula-ram-usage-label "RAM"
+```
+
+#### time options
+
+Disable timezone
+
+```bash
+set -g @dracula-show-timezone false
+```
+
+Swap date to day/month
+
+```bash
+set -g @dracula-day-month true
+```
+
+Enable military time
+
+```bash
+set -g @dracula-military-time true
+```
+
+#### weather options
+
+Switch from default fahrenheit to celsius
+
+```bash
+set -g @dracula-show-fahrenheit false
+```
+

scripts/dracula.sh

@@ -9,13 +9,7 @@ main()
 {
   datafile=/tmp/.dracula-tmux-data
 
-  # set current directory variable
-  current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
   # set configuration option variables
-  show_battery=$(get_tmux_option "@dracula-show-battery" true)
-  show_network=$(get_tmux_option "@dracula-show-network" true)
-  show_weather=$(get_tmux_option "@dracula-show-weather" true)
   show_fahrenheit=$(get_tmux_option "@dracula-show-fahrenheit" true)
   show_location=$(get_tmux_option "@dracula-show-location" true)
   show_powerline=$(get_tmux_option "@dracula-show-powerline" false)
@@ -27,13 +21,8 @@ main()
   show_left_sep=$(get_tmux_option "@dracula-show-left-sep" )
   show_right_sep=$(get_tmux_option "@dracula-show-right-sep" )
   show_border_contrast=$(get_tmux_option "@dracula-border-contrast" false)
-  show_cpu_usage=$(get_tmux_option "@dracula-cpu-usage" false)
-  show_ram_usage=$(get_tmux_option "@dracula-ram-usage" false)
-  show_gpu_usage=$(get_tmux_option "@dracula-gpu-usage" false)
   show_day_month=$(get_tmux_option "@dracula-day-month" false)
-  show_time=$(get_tmux_option "@dracula-show-time" true)
   show_refresh=$(get_tmux_option "@dracula-refresh-rate" 5)
-  show_network_bandwith=$(get_tmux_option "@dracula-network-bandwith" "")
 
   # Dracula Color Pallette
   white='#f8f8f2'
@@ -130,111 +119,83 @@ main()
     sleep 0.01
   done
 
-  # Powerline Configuration
+  # 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=${gray}]#{?client_prefix,#[fg=${yellow}],}${left_sep}"
-    tmux set-option -g  status-right ""
     powerbg=${gray}
+  else
+    tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ${left_icon}"
+  fi
 
-    if $show_battery; then # battery
+  # Status right
-      tmux set-option -g  status-right "#[fg=${pink},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh)"
+  tmux set-option -g status-right ""
-      powerbg=${pink}
+  IFS=' ' read -r -a plugins <<< $(get_tmux_option "@dracula-plugins" "battery network weather")
+
+  for plugin in "${plugins[@]}"; do
+    if [ $plugin = "battery" ]; then
+      IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-battery-colors" "pink dark_gray")
+      script="#($current_dir/battery.sh)"
     fi
 
-    if $show_ram_usage; then
+    if [ $plugin = "gpu-usage" ]; then
-      tmux set-option -ga status-right "#[fg=${cyan},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${cyan}] #($current_dir/ram_info.sh)"
+      IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-gpu-usage-colors" "pink dark_gray")
-      powerbg=${cyan}
+      script="#($current_dir/gpu_usage.sh)"
     fi
 
-    if $show_cpu_usage; then
+    if [ $plugin = "cpu-usage" ]; then
-      tmux set-option -ga status-right "#[fg=${orange},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${orange}] #($current_dir/cpu_info.sh)"
+      IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-cpu-usage-colors" "orange dark_gray")
-      powerbg=${orange}
+      script="#($current_dir/cpu_info.sh)"
     fi
 
-    if $show_gpu_usage; then
+    if [ $plugin = "ram-usage" ]; then
-      tmux set-option -ga status-right "#[fg=${pink},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${pink}] #($current_dir/gpu_usage.sh)"
+      IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-ram-usage-colors" "cyan dark_gray")
-      powerbg=${pink}
+      script="#($current_dir/ram_info.sh)"
     fi
 
-    if $show_network; then # network
+    if [ $plugin = "network" ]; then
-      tmux set-option -ga status-right "#[fg=${cyan},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${cyan}] #($current_dir/network.sh)"
+      IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-network-colors" "cyan dark_gray")
-      powerbg=${cyan}
+      script="#($current_dir/network.sh)"
     fi
 
-    if [[ "$show_network_bandwith" != "" ]]; then # network bandwith
+    if [ $plugin = "network-bandwith" ]; then
+      IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-network-bandwith-colors" "cyan dark_gray")
       tmux set-option -g status-right-length 250
-      tmux set-option -ga status-right "#[fg=${green},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${green}] #($current_dir/network_bandwith.sh)"
+      script="#($current_dir/network_bandwith.sh)"
-      powerbg=${green}
     fi
 
-    if $show_weather; then # weather
+    if [ $plugin = "weather" ]; then
-      tmux set-option -ga status-right "#[fg=${orange},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${orange}] #(cat $datafile)"
+      IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-weather-colors" "orange dark_gray")
-      powerbg=${orange}
+      script="#(cat $datafile)"
     fi
 
-    if $show_time; then
+    if [ $plugin = "time" ]; then
+      IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-weather-colors" "dark_purple white")
       if $show_day_month && $show_military ; then # military time and dd/mm
-        tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %d/%m %R ${timezone} "
+        script="%a %d/%m %R ${timezone} "
       elif $show_military; then # only military time
-        tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %R ${timezone} "
+        script="%a %m/%d %R ${timezone} "
       elif $show_day_month; then # only dd/mm
-        tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %d/%m %I:%M %p ${timezone} "
+        script="%a %d/%m %I:%M %p ${timezone} "
       else
-        tmux set-option -ga status-right "#[fg=${dark_purple},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p ${timezone} "
+        script="%a %m/%d %I:%M %p ${timezone} "
       fi
     fi
 
-    tmux set-window-option -g window-status-current-format "#[fg=${gray},bg=${dark_purple}]${left_sep}#[fg=${white},bg=${dark_purple}] #I #W${current_flags} #[fg=${dark_purple},bg=${gray}]${left_sep}"
+    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"
-  # Non Powerline Configuration
+      powerbg=${!colors[0]}
-else
-  tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ${left_icon}"
-
-  tmux set-option -g  status-right ""
-
-  if $show_battery; then # battery
-    tmux set-option -g  status-right "#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) "
-  fi
-  if $show_ram_usage; then
-    tmux set-option -ga status-right "#[fg=${dark_gray},bg=${cyan}] #($current_dir/ram_info.sh) "
-  fi
-
-  if $show_cpu_usage; then
-    tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #($current_dir/cpu_info.sh) "
-  fi
-
-  if $show_gpu_usage; then
-    tmux set-option -ga status-right "#[fg=${dark_gray},bg=${pink}] #($current_dir/gpu_usage.sh) "
-  fi
-
-  if $show_network; then # network
-    tmux set-option -ga status-right "#[fg=${dark_gray},bg=${cyan}] #($current_dir/network.sh) "
-  fi
-
-  if [[ "$show_network_bandwith" != "" ]]; then # network bandwith
-    tmux set-option -g status-right-length 250
-    tmux set-option -ga status-right "#[fg=${dark_gray},bg=${green}] #($current_dir/network_bandwith.sh) "
-  fi
-
-  if $show_weather; then # weather
-    tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat $datafile) "
-  fi
-
-  if $show_time; then
-    if $show_day_month && $show_military ; then # military time and dd/mm
-      tmux set-option -ga status-right "#[fg=${white},bg=${dark_purple}] %a %d/%m %R ${timezone} "
-    elif $show_military; then # only military time
-      tmux set-option -ga status-right "#[fg=${white},bg=${dark_purple}] %a %m/%d %R ${timezone} "
-    elif $show_day_month; then # only dd/mm
-      tmux set-option -ga status-right "#[fg=${white},bg=${dark_purple}] %a %d/%m %I:%M %p ${timezone} "
     else
-      tmux set-option -ga status-right "#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p ${timezone} "
+      tmux set-option -ga status-right "#[fg=${!colors[1]},bg=${!colors[0]}] $script"
     fi
-  fi
+  done
 
-  tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${dark_purple}] #I #W${current_flags} "
+  tmux set-option -ga status-right " "
 
+  # Window option
+  if $show_powerline; then
+    tmux set-window-option -g window-status-current-format "#[fg=${gray},bg=${dark_purple}]${left_sep}#[fg=${white},bg=${dark_purple}] #I #W${current_flags} #[fg=${dark_purple},bg=${gray}]${left_sep}"
+  else
+    tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${dark_purple}] #I #W${current_flags} "
   fi
 
   tmux set-window-option -g window-status-format "#[fg=${white}]#[bg=${gray}] #I #W${flags}"
@@ -244,3 +205,4 @@ else
 
 # run main function
 main
+