Making changes

3 files changed, 30 insertions, 3 deletions

diff --git a/bin/battery b/bin/battery
new file mode 100755
index 0000000..c16f969
--- /dev/null
+++ b/bin/battery
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+var=$(cat /sys/class/power_supply/BAT0/status)
+battery=$(cat /sys/class/power_supply/BAT0/capacity)
+echo $var  $battery%
diff --git a/bin/network b/bin/network
new file mode 100755
index 0000000..4565d4b
--- /dev/null
+++ b/bin/network
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+file="/tmp/network"
+if ! [ -f $file ]; then
+    echo 0 > $file
+    echo 0 >> $file
+fi
+
+tx_prev=$(cat $file | sed 1q)
+rx_prev=$(cat $file | sed '2q;d')
+
+cat /sys/class/net/wlp3s0/statistics/rx_bytes > $file
+cat /sys/class/net/wlp3s0/statistics/tx_bytes >> $file
+
+tx_now=$(cat $file | sed 1q)
+rx_now=$(cat $file | sed '2q;d')
+
+echo "dw: $(((tx_now-tx_prev)/1024))kB/s, up: $(((rx_now-rx_prev)/1024))kB/s"
diff --git a/blocks.def.h b/blocks.def.h
index 9c22d68..7db515e 100644
--- a/blocks.def.h
+++ b/blocks.def.h
@@ -1,9 +1,13 @@
 //Modify this file to change what commands output to your statusbar, and recompile using the make command.
 static const Block blocks[] = {
 	/*Icon*/	/*Command*/		/*Update Interval*/	/*Update Signal*/
-	{"Mem:", "free -h | awk '/^Mem/ { print $3\"/\"$2 }' | sed s/i//g",	30,		0},
-
-	{"", "date '+%b %d (%a) %I:%M%p'",					5,		0},
+	{"",            "network",                                                      1,      0},
+	{"Cpu: ",       "top -bn 1 | sed '3q;d' | awk {'print $2i\"%\"'}",          	5,      0},
+	{"Mem:",        "free -h | awk '/^Mem/ { print $3\"/\"$2 }' | sed s/i//g",    	5,	0},
+	{"",            "battery",                                                 	60,     0},
+	{"Brightness:", "echo $(xbacklight -get)%",                                 	0,      6},
+	{"Volume:",     "pamixer --get-volume-human",                              	0,      10},
+	{"",            "date '+%d.%m.%Y. %H:%M'",			         	60,     0},
 };
 
 //sets delimeter between status commands. NULL character ('\0') means no delimeter.