From b92fc323e6a17c6019cb5f0fe35a480b93171ae6 Mon Sep 17 00:00:00 2001
From: Ethan Edwards <ethancarteredwards@outlook.com>
Date: Wed, 20 May 2020 13:28:35 -0400
Subject: [PATCH] Tested, working on both powerline mode, and normal mode

---
 INSTALL.md         |  1 +
 scripts/dracula.sh | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 9ccb56b..59f7394 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -20,3 +20,4 @@ Customize the status bar by adding any of these lines to your .tmux.conf as desi
 * 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`
+* Enable military time: `set -g @dracula-military-time true`
diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index 11d16be..2430d02 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -49,12 +49,7 @@ main()
   tmux set-option -g status-interval 5
 
   # set clock
-  # tmux set-option -g clock-mode-style 12
-  if $show_military; then
-    tmux set-option -g clock-mode-style 24 &
-else
-    tmux set-option -g clock-mode-style 12 &
-  fi
+  tmux set-option -g clock-mode-style 12
 
   # set length 
   tmux set-option -g status-left-length 100
@@ -91,7 +86,12 @@ else
         powerbg=${orange}
       fi
 
-      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) "
+      if $show_military; then
+	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 %p #(date +%Z) "
+      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 #(date +%Z) "
+      fi
+
       # 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
@@ -111,8 +111,12 @@ else
           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) "
-  
+      if $show_military; then
+	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 %p #(date +%Z) "
+      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 #(date +%Z) "
+      fi
+
       # window tabs 
       tmux set-window-option -g window-status-current-format "#[fg=${white},bg=${dark_purple}] #I #W "