Merge branch 'master' into laptop

i3/.config/i3blocks/config

@@ -0,0 +1,34 @@
+# i3blocks configuration file
+#
+# The i3blocks man page describes the usage of the binary,
+# and its website describes the configuration:
+#
+#     https://vivien.github.io/i3blocks
+
+# Sources:
+# https://github.com/hastinbe/i3blocks-battery-plus
+# https://github.com/zakariaGatter/i3blocks-gate
+
+# Global properties
+separator=true
+separator_block_width=15
+
+[activity]
+command=./activity
+interval=10
+LABEL=
+
+[volume]
+command=./volume
+LABEL=
+interval=10
+signal=10
+
+[battery]
+command=./i3b-gate 6
+interval=120
+
+[calendar]
+command=./calendar
+interval=1
+