Fixed merge conflict

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@@ -0,0 +1,12 @@
+## Issue
+
+Please reference the issue that this PR is solving
+Closes #[issue id goes here]
+
+## Description of Changes
+
+Please briefly describe the changes being made
+
+## Testing
+
+Please explain how you tested these changes and how a maintainer should reproduce the test

INSTALL.md

@@ -19,3 +19,4 @@ Customize the status bar by adding any of these lines to your .tmux.conf as desi
 * Disable network functionality: `set -g @dracula-show-network false`
 * Disable weather functionality: `set -g @dracula-show-weather false`
 * Switch from default fahrenheit to celsius: `set -g @dracula-show-fahrenheit false`
+* Enable powerline symbols: `set -g @dracula-show-powerline true`

README.md

@@ -14,6 +14,7 @@ Configuration and options can be found at [draculatheme.com/tmux](https://dracul
 
 ## Features
 
+* Support for powerline
 * Day, date, time, timezone
 * Current location based on network with temperature and forecast icon (if available)
 * Network connection status and SSID

data/weather.txt

@@ -1 +1 @@
-☀ 18° Pleasanton, CA
+☁ 57° Pleasanton, CA

scripts/battery.sh

@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 
+BAT=$(ls /sys/class/power_supply/BAT* | head -1)
+
 battery_percent()
 {
 	# Check OS
 	case $(uname -s) in
 		Linux)
-			cat /sys/class/power_supply/BAT0/capacity
+			cat $BAT/capacity
 		;;
 
 		Darwin)
@@ -26,7 +28,7 @@ battery_status()
 	# Check OS
 	case $(uname -s) in
 		Linux)
-			status=$(cat /sys/class/power_supply/BAT0/status)
+			status=$(cat $BAT/status)
 		;;
 
 		Darwin)

scripts/dracula.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 get_tmux_option() {
   local option=$1
   local default_value=$2
@@ -21,6 +20,10 @@ main()
   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)
+<<<<<<< HEAD
+=======
+  show_powerline=$(get_tmux_option "@dracula-show-powerline" false)
+>>>>>>> 4084fd83c8f5b4a71eb1be8e9421c1a68cff4c3d
   show_military=$(get_tmux_option "@dracula-military-time" false)
 
   # Dracula Color Pallette
@@ -35,7 +38,11 @@ main()
   red='#ff5555'
   pink='#ff79c6'
   yellow='#f1fa8c'
-
+  
+  if $show_powerline; then
+      right_sep=''
+      left_sep=''
+  fi
   # start weather script in background
   if $show_weather; then
     $current_dir/sleep_weather.sh $show_fahrenheit &
@@ -66,26 +73,54 @@ else
   # status bar
   tmux set-option -g status-style "bg=${gray},fg=${white}"
 
-  tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ☺ " 
+  if $show_powerline; then
 
-  tmux set-option -g  status-right ""
+      tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ☺  #[fg=${green},bg=${gray}]#{?client_prefix,#[fg=${yellow}],}${left_sep}        " 
+      tmux set-option -g  status-right ""
+      powerbg=${gray}
 
-  if $show_battery; then
+      if $show_battery; then
-    tmux set-option -g  status-right "#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) "
+        tmux set-option -g  status-right "#[fg=${pink},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) "
-  fi
+        powerbg=${pink}
+      fi
 
-  if $show_network; then
+      if $show_network; then
-    tmux set-option -ga status-right "#[fg=${dark_gray},bg=${cyan}]#($current_dir/network.sh) "
+        tmux set-option -ga status-right "#[fg=${cyan},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${cyan}]#($current_dir/network.sh) "
-  fi
+        powerbg=${cyan}
+      fi
 
-  if $show_weather; then
+      if $show_weather; then
-	  tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) " 
+          tmux set-option -ga status-right "#[fg=${orange},bg=${powerbg},nobold,nounderscore,noitalics] ${right_sep}#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) " 
-  fi
+        powerbg=${orange}
+      fi
 
-  tmux set-option -ga status-right "#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
+      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 #(date +%Z) "
+      # window tabs 
+      tmux set-window-option -g window-status-current-format "#[fg=${gray},bg=${dark_purple}]${left_sep}#[fg=${white},bg=${dark_purple}] #I #W #[fg=${dark_purple},bg=${gray}]${left_sep}"
+  else
+    tmux set-option -g status-left "#[bg=${green},fg=${dark_gray}]#{?client_prefix,#[bg=${yellow}],} ☺ " 
+
+    tmux set-option -g  status-right ""
+
+      if $show_battery; then
+        tmux set-option -g  status-right "#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) "
+      fi
+
+      if $show_network; then
+        tmux set-option -ga status-right "#[fg=${dark_gray},bg=${cyan}]#($current_dir/network.sh) "
+      fi
+
+      if $show_weather; then
+          tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) " 
+      fi
+
+      tmux set-option -ga status-right "#[fg=${white},bg=${dark_purple}] %a %m/%d %I:%M %p #(date +%Z) "
+  
+      # window tabs 
+      tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${dark_purple}] #I #W "
+
+  fi
   
-  # window tabs 
-  tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${dark_purple}] #I #W "
   tmux set-window-option -g window-status-format "#[fg=${white}]#[bg=${gray}] #I #W "
 }