From b1df587d6e60823632480352590dadbaa33ad7b6 Mon Sep 17 00:00:00 2001
From: Dane Williams <dwilli36@nd.edu>
Date: Sun, 15 Mar 2020 23:15:26 -0700
Subject: [PATCH] reorganized files

---
 data/weather.txt                             |  1 +
 dracula.tmux                                 | 63 ++------------------
 battery.sh => scripts/battery.sh             |  0
 scripts/dracula.sh                           | 60 +++++++++++++++++++
 network.sh => scripts/network.sh             |  0
 sleep_weather.sh => scripts/sleep_weather.sh |  7 ++-
 weather.sh => scripts/weather.sh             |  0
 weather.txt                                  |  1 -
 8 files changed, 71 insertions(+), 61 deletions(-)
 create mode 100644 data/weather.txt
 rename battery.sh => scripts/battery.sh (100%)
 create mode 100755 scripts/dracula.sh
 rename network.sh => scripts/network.sh (100%)
 rename sleep_weather.sh => scripts/sleep_weather.sh (55%)
 rename weather.sh => scripts/weather.sh (100%)
 delete mode 100644 weather.txt

diff --git a/data/weather.txt b/data/weather.txt
new file mode 100644
index 0000000..e9666d4
--- /dev/null
+++ b/data/weather.txt
@@ -0,0 +1 @@
+☁ 45°F Pleasanton, CA
diff --git a/dracula.tmux b/dracula.tmux
index 9f163b6..a98fb3c 100755
--- a/dracula.tmux
+++ b/dracula.tmux
@@ -1,64 +1,11 @@
 #!/usr/bin/env bash
 
-# a tmux color scheme inspired by dracula
-# author: Dane Williams
+# Author: Dane Williams
+# a theme for tmux inspired by dracula
 
+# source and run dracula theme
 
-main()
-{
+current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-  # Dracula Color Pallette
-  white='#f8f8f2'
-  gray='#44475a'
-  dark_gray='#282a36'
-  light_purple='#bd93f9'
-  dark_purple='#6272a4'
-  cyan='#8be9fd'
-  green='#50fa7b'
-  orange='#ffb86c'
-  red='#ff5555'
-  pink='#ff79c6'
-  yellow='#f1fa8c'
-
-  # start weather script in background
-  ./sleep_weather.sh &
-
-  # set refresh interval
-  tmux set-option -g status-interval 5
-
-  # set clock
-  tmux set-option -g clock-mode-style 12
-
-  # set length 
-  tmux set-option -g status-left-length 100
-  tmux set-option -g status-right-length 100
-
-  # pane border styling
-  tmux set-option -g pane-active-border-style "fg=${dark_purple}"
-  tmux set-option -g pane-border-style "fg=${gray}"
-
-  # message styling
-  tmux set-option -g message-style "bg=${gray},fg=${white}"
-
-  # 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}],} ☺ " 
-
-  tmux set-option -g  status-right "#[fg=${dark_gray},bg=${pink}] #(~/.tmux/plugins/tmux-dracula/battery.sh) "
-  tmux set-option -ga status-right "#[fg=${dark_gray},bg=${cyan}]#(~/.tmux/plugins/tmux-dracula/network.sh) "
-  tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat ~/.tmux/plugins/tmux-dracula/weather.txt) " 
-  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 "
-  tmux set-window-option -g window-status-format "#[fg=${white}]#[bg=${gray}] #I #W "
-
-  # run weather update script in background 
-  #./sleep_weather.sh &
-
-}
-
-# run main function
-main
+$current_dir/scripts/dracula.sh
 
diff --git a/battery.sh b/scripts/battery.sh
similarity index 100%
rename from battery.sh
rename to scripts/battery.sh
diff --git a/scripts/dracula.sh b/scripts/dracula.sh
new file mode 100755
index 0000000..745e223
--- /dev/null
+++ b/scripts/dracula.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+# a tmux color scheme inspired by dracula
+# author: Dane Williams
+
+main()
+{
+  # set current directory variable
+  current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+  # Dracula Color Pallette
+  white='#f8f8f2'
+  gray='#44475a'
+  dark_gray='#282a36'
+  light_purple='#bd93f9'
+  dark_purple='#6272a4'
+  cyan='#8be9fd'
+  green='#50fa7b'
+  orange='#ffb86c'
+  red='#ff5555'
+  pink='#ff79c6'
+  yellow='#f1fa8c'
+
+  # start weather script in background
+  $current_dir/sleep_weather.sh &
+
+  # set refresh interval
+  tmux set-option -g status-interval 5
+
+  # set clock
+  tmux set-option -g clock-mode-style 12
+
+  # set length 
+  tmux set-option -g status-left-length 100
+  tmux set-option -g status-right-length 100
+
+  # pane border styling
+  tmux set-option -g pane-active-border-style "fg=${dark_purple}"
+  tmux set-option -g pane-border-style "fg=${gray}"
+
+  # message styling
+  tmux set-option -g message-style "bg=${gray},fg=${white}"
+
+  # 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}],} ☺ " 
+
+  tmux set-option -g  status-right "#[fg=${dark_gray},bg=${pink}] #($current_dir/battery.sh) "
+  tmux set-option -ga status-right "#[fg=${dark_gray},bg=${cyan}]#($current_dir/network.sh) "
+  tmux set-option -ga status-right "#[fg=${dark_gray},bg=${orange}] #(cat $current_dir/../data/weather.txt) " 
+  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 "
+  tmux set-window-option -g window-status-format "#[fg=${white}]#[bg=${gray}] #I #W "
+}
+
+# run main function
+main
diff --git a/network.sh b/scripts/network.sh
similarity index 100%
rename from network.sh
rename to scripts/network.sh
diff --git a/sleep_weather.sh b/scripts/sleep_weather.sh
similarity index 55%
rename from sleep_weather.sh
rename to scripts/sleep_weather.sh
index 398fc70..8eef312 100755
--- a/sleep_weather.sh
+++ b/scripts/sleep_weather.sh
@@ -4,10 +4,13 @@
 
 main()
 {
-	./weather.sh > ~/.tmux/plugins/tmux-dracula/weather.txt
+	current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+	$current_dir/weather.sh > $current_dir/../data/weather.txt
+	
 	while tmux has-session &> /dev/null
 	do
-		./weather.sh > ~/.tmux/plugins/tmux-dracula/weather.txt
+		$current_dir/weather.sh > $current_dir/../data/weather.txt
 		if tmux has-session &> /dev/null
 		then
 			sleep 1000
diff --git a/weather.sh b/scripts/weather.sh
similarity index 100%
rename from weather.sh
rename to scripts/weather.sh
diff --git a/weather.txt b/weather.txt
deleted file mode 100644
index 00d39e1..0000000
--- a/weather.txt
+++ /dev/null
@@ -1 +0,0 @@
-Loading Weather...