2 files changed, 37 insertions, 33 deletions

diff --git a/extras/HOME/.xmonad/xmobar-bluetooth b/extras/HOME/.xmonad/xmobar-bluetooth
index 9b4f5cc..16a6d70 100755
--- a/extras/HOME/.xmonad/xmobar-bluetooth
+++ b/extras/HOME/.xmonad/xmobar-bluetooth
@@ -2,17 +2,21 @@
 
 cur=""
 
-bluetoothctl -- info | while read line ; do
-  key=${line%%: *}
-  value=${line//*: }
+if [ -d /sys/class/bluetooth ] ; then
 
-  if [ "$key" == "Name" ] ; then
-    cur="$value"
-  fi
+  bluetoothctl -- info | while read line ; do
+    key=${line%%: *}
+    value=${line//*: }
 
-  if [ "$key" == "Connected" -a "$value" == "yes" ] ; then
-    exec echo "<fc=#4287f5></fc> <fc=#a0a0a0><fn=3>$cur</fn></fc> <fc=#404040>│</fc> "
-  fi
-done
+    if [ "$key" == "Name" ] ; then
+      cur="$value"
+    fi
+
+    if [ "$key" == "Connected" -a "$value" == "yes" ] ; then
+      exec echo "<fc=#4287f5></fc> <fc=#a0a0a0><fn=3>$cur</fn></fc> <fc=#404040>│</fc> "
+    fi
+  done
+
+fi
 
 exec echo "<fc=#404040></fc> <fc=#404040>│</fc> "
diff --git a/extras/HOME/.xmonad/xmobar-weather b/extras/HOME/.xmonad/xmobar-weather
index 6b5c409..0fee524 100755
--- a/extras/HOME/.xmonad/xmobar-weather
+++ b/extras/HOME/.xmonad/xmobar-weather
@@ -69,30 +69,30 @@ if ($current_str gt $sunrise_str and $current_str lt $sunset_str) {
 $dir=%directions{$wind_direction};
 
 %conditions_day = (
-  clear => "<fc=#ddcf04>",
-  sunny => "<fc=#ddcf04>",
-  mostly_clear => "<fc=#00a3c4>",
-  mostly_sunny => "<fc=#ddcf04>",
-  partly_sunny => "<fc=#ddcf04>",
-  fair => "<fc=#a0a0a0>🌑",
-  cloudy =>"<fc=#a0a0a0>摒",
-  overcast =>"<fc=#808080>",
-  partly_cloudy => "<fc=#a0a0a0>杖",
-  mostly_cloudy => "<fc=#808080>",
-  considerable_cloudiness => "<fc=#a0a0a0>ﭽ" );
+  clear => "<fc=#ddcf04></fc>",
+  sunny => "<fc=#ddcf04></fc>",
+  mostly_clear => "<fc=#00a3c4></fc>",
+  mostly_sunny => "<fc=#ddcf04></fc>",
+  partly_sunny => "<fc=#ddcf04></fc>",
+  fair => "<fc=#a0a0a0>🌑</fc>",
+  cloudy =>"<fc=#a0a0a0>摒</fc>",
+  overcast =>"<fc=#808080></fc>",
+  partly_cloudy => "<fc=#a0a0a0>杖</fc>",
+  mostly_cloudy => "<fc=#808080></fc>",
+  considerable_cloudiness => "<fc=#a0a0a0>ﭽ</fc>" );
 
 %conditions_night = (
-  clear => "<fc=#00a3c4>",
-  sunny => "<fc=#00a3c4>",
-  mostly_clear => "<fc=#00a3c4>",
-  mostly_sunny => "<fc=#00a3c4>",
-  partly_sunny => "<fc=#00a3c4>",
-  fair => "<fc=#808080>🌑",
-  cloudy =>"<fc=#808080>摒",
-  overcast =>"<fc=#404040>",
-  partly_cloudy => "<fc=#a0a0a0>",
-  mostly_cloudy => "<fc=#808080>",
-  considerable_cloudiness => "<fc=#a0a0a0>ﭽ" );
+  clear => "<fc=#00a3c4></fc>",
+  sunny => "<fc=#00a3c4></fc>",
+  mostly_clear => "<fc=#00a3c4></fc>",
+  mostly_sunny => "<fc=#00a3c4></fc>",
+  partly_sunny => "<fc=#00a3c4></fc>",
+  fair => "<fc=#808080>🌑</fc>",
+  cloudy =>"<fc=#808080>摒</fc>",
+  overcast =>"<fc=#404040></fc>",
+  partly_cloudy => "<fc=#a0a0a0></fc>",
+  mostly_cloudy => "<fc=#808080></fc>",
+  considerable_cloudiness => "<fc=#a0a0a0>ﭽ</fc>" );
 
 if ($is_day) {
   $conditions = %conditions_day{$sky_conditions};
@@ -100,4 +100,4 @@ if ($is_day) {
   $conditions = %conditions_night{$sky_conditions};  
 }
 
-printf("<fc=#a0a0a0><fn=3>$city</fn> <fn=3>$dir</fn> <fn=3>${wind_speed}</fn></fc> $conditions</fc><fn=3>   <fc=#a0a0a0>%.0f°F</fc></fn>\n", $temp);
+printf("<fc=#a0a0a0><fn=3>$city</fn> <fn=3>$dir</fn> <fn=3>${wind_speed}</fn></fc> $conditions<fn=3>   <fc=#a0a0a0>%.0f°F</fc></fn>\n", $temp);