Merge branch 'master' into development

i3status/.i3status.conf.standard

+# i3status configuration file.
+# see "man i3status" for documentation.
+
+# It is important that this file is edited as UTF-8.
+# The following line should contain a sharp s:
+# ß
+# If the above line is not correctly displayed, fix your editor first!
+
+general {
+        colors = true
+        interval = 5
+        color_good = "#F9FAF9"
+        color_bad = "#F9FAF9"
+        color_degraded = "#DC322F"
+}
+
+order += "cpu_usage"
+# order += "load"
+order += "disk /"
+# order += "disk /home"
+order += "wireless _first_"
+order += "ethernet _first_"
+order += "battery all"
+# order += "load"
+order += "tztime local"
+# order += "ipv6"
+
+cpu_usage {
+        format = " cpu  %usage "
+}
+
+load {
+        format = " load %1min "
+        # max_threshold = 0.3
+}
+
+disk "/" {
+        # format = " hdd %avail "
+    prefix_type = decimal
+    format = " ⛁ %used / %total "
+}
+
+wireless _first_ {
+# if you use %speed, i3status requires root privileges
+        format_up = " wlan: %ip "
+        format_down = ""
+}
+
+ethernet _first_ {
+# if you use %speed, i3status requires root privileges
+        format_up = " eth: %ip "
+        format_down = ""
+}
+
+battery all {
+        # format = "%status %percentage %remaining %emptytime"
+        format = " %status %percentage %remaining "
+        format_down = "No battery"
+        last_full_capacity = true
+        integer_battery_capacity = true
+        # status_chr = ""
+        status_chr = "⚡"
+        # status_bat = "bat"
+        # status_bat = "☉"
+        status_bat = ""
+        # status_unk = "?"
+        status_unk = ""
+        # status_full = ""
+        status_full = "☻"
+        low_threshold = 15
+        threshold_type = time
+}
+
+tztime local {
+        # format = "%Y-%m-%d %H:%M:%S"
+        format = " %d.%m. %H:%M "
+}