Make conky output more space efficient

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 1d20e7aed9a1857cdffc69c0fcecc0b3c6cb79a4..2606323f198de8e1467fb7d035823ceaa90c2fac 100644 (file)
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -35,14 +35,15 @@ conky.text = [[
 {% if grains['host'] == 'barium' %}
   {"full_text": "Last Tea: ${execi 120 tail -n 1 ~/.local/share/teatimer.log}s", "color": "\#ffffff"},
 {% endif %}
-  {"full_text": "Home ${fs_free /home} Free", "color": "\#ffffff"},
-  {"full_text": "Root ${fs_free /root} Free", "color": "\#ffffff"},
+  {"full_text": "Home ${fs_free /home}", "color": "\#ffffff"},
+  {"full_text": "Root ${fs_free /root}", "color": "\#ffffff"},
   {"full_text": "Disk r:${diskio_read} w:${diskio_write}", "color": "\#ffffff"},
   {"full_text": "CPU ${cpu cpu0}%", "color": "\#ffffff"},
   {% for dev in ifdev %}
+  ${if_match "${addr {{ dev }}}"!="No Address"}
   {
       "full_text": 
-               "d:${downspeed {{ dev }}} u:${upspeed {{ dev }}} ${addr {{ dev }}}", 
+               "{{ dev }} d:${downspeed {{ dev }}} u:${upspeed {{ dev }}} ${addr {{ dev }}}", 
       "color":
         ${if_match "${addr {{ dev }}}"=="No Address"}
           "\#ff0000"
@@ -50,6 +51,7 @@ conky.text = [[
          "\#00ff00"
         ${endif}
   },
+  ${endif}
   {% endfor %}
   ${if_match "${addr tun0}"!="No Address"}
        {"full_text": "VPN", "color": "\#00ff00"},
@@ -74,7 +76,7 @@ conky.text = [[
          ${endif}
        },
 {% endif %}
-  {"full_text": "${time}", "color": "\#ffffff"}
+  {"full_text": "${time %Y-%m-%d %H:%M}", "color": "\#ffffff"}
 ],
 ]];