Merge branch 'master' of github.com:Jab2870/dotfiles

i3/blocks/homeServerUpdates

@@ -1,13 +1,14 @@
 #!/usr/bin/sh
 
-count=$(ssh homeServer checkupdates | wc -l)
+count=$(ssh homeServer -t checkupdates | wc -l)
 if [ "$count" = "0" ]; then
-	count=""
-fi
-echo $count
-echo $count
-if [ "$count" -gt "5" ]; then
-	echo "#FFOOOO"
+	echo ""
 else
+	echo $count
+	echo $count
+	if [ "$count" -gt "5" ]; then
+		echo "#FFOOOO"
+	else
 		echo "#FF8000"
+	fi
 fi

x/xinitrc

@@ -8,4 +8,4 @@ dbus-update-activation-environment --systemd DISPLAY
 #exec xrdb .Xresources
 xbindkeys
 exec i3 -V >> ~/i3log-$(date + '%F-%k-%M-%S') 2>&1
-exec sh /home/jonathan/.conky/conky-startup.sh
+#exec sh /home/jonathan/.conky/conky-startup.sh