X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fconky%2Ffiles%2Fconkyrc;h=2606323f198de8e1467fb7d035823ceaa90c2fac;hb=d214955d8b2d4143b32cf9695b4b66071dea0ea4;hp=86d818b3b99d2469b4587f9983a4bb3c88596247;hpb=bf087cba3236f1487a345cdd9c2b94f05a283208;p=max%2Fsaltfiles.git

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 86d818b..2606323 100644
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -32,14 +32,18 @@ conky.config = {
 
 conky.text = [[
 [
-  {"full_text": "Home ${fs_free /home} Free", "color": "\#ffffff"},
-  {"full_text": "Root ${fs_free /root} Free", "color": "\#ffffff"},
+{% 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}", "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"
@@ -47,6 +51,7 @@ conky.text = [[
       	  "\#00ff00"
         ${endif}
   },
+  ${endif}
   {% endfor %}
   ${if_match "${addr tun0}"!="No Address"}
 	{"full_text": "VPN", "color": "\#00ff00"},
@@ -71,7 +76,7 @@ conky.text = [[
 	  ${endif}
 	},
 {% endif %}
-  {"full_text": "${time}", "color": "\#ffffff"}
+  {"full_text": "${time %Y-%m-%d %H:%M}", "color": "\#ffffff"}
 ],
 ]];