Merge branch 'master' of https://github.com/thytom/dwmbar

4 files changed, 10 insertions, 5 deletions

diff --git a/TODO.org b/TODO.org
index 5a59529..b4a4ca4 100644
--- a/TODO.org
+++ b/TODO.org
@@ -16,10 +16,12 @@ Modules:
 - Disk Usage
 - Mail
 - CPU Usage
-- Network
 - Volume Bar
+- Backlight
+- Memory Usage
 
 Finished Modules:
+- Network
 - Volume
 - Battery
 - Temperature
@@ -30,4 +32,5 @@ Finished Modules:
 - Date
 
 Scripts
+- Individual module delays.
 - Modules that don't output anything shouldn't get a separator.
diff --git a/dwmbar b/dwmbar
index a4818b6..a5ca45c 100755
--- a/dwmbar
+++ b/dwmbar
@@ -1,7 +1,7 @@
 #!/bin/bash
 VERSION="0.0.1"
 
-RC_LOCATION="./dwmbarrc"
+RC_LOCATION="/home/$USER/.config/dwmbar/dwmbarrc"
 
 if [[ -f $DEFAULT_RC_LOCATION ]]; then
 	>&2 echo "No dwmbarrc found."
diff --git a/dwmbarrc b/dwmbarrc
index 69dbe29..a1039e8 100755
--- a/dwmbarrc
+++ b/dwmbarrc
@@ -2,8 +2,8 @@
 
 # Example file, designed to be edited.
 
+DELAY=5
 MODULES_DIR="modules/"
-
 SEPARATOR=" | "
 
 MODULES="wifi internet bluetooth volume temperature date time battery"
@@ -17,8 +17,8 @@ run_modules(){
 
 run(){
 	run_modules
-	sleep 5; # Delays script before it's called again
 	echo $OUTPUT
+	sleep $DELAY;
 }
 
 run
diff --git a/install.sh b/install.sh
index 7d07847..40d8170 100755
--- a/install.sh
+++ b/install.sh
@@ -11,10 +11,12 @@ fi
 
 install()
 {
-	cp "./dwmbar /usr/bin/dwmbar"
+	cp "./dwmbar" "/usr/bin/dwmbar"
 
 	mkdir -p "$CONFIG_DIR"
 
 	[[ ! -f "$MODULES_DIR" ]] && cp  -r "./modules" "$CONFIG_DIR/modules"
 	[[ ! -f "$DWMBARRC" ]] && cp "./dwmbarrc" "$DWMBARRC"
 }
+
+install