X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fconky%2Ffiles%2Fconkyrc;h=8e8fcc115bca963592e99d3bf4e9ac6d19132bcf;hb=77488771e5cc1bde1a918e3c4fac73ea1c8bfbc6;hp=1d20e7aed9a1857cdffc69c0fcecc0b3c6cb79a4;hpb=026d10ae5b5832180481b3c71f66f4e80d52413e;p=max%2Fsaltfiles.git

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 1d20e7a..8e8fcc1 100644
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -32,17 +32,21 @@ conky.config = {
 
 conky.text = [[
 [
+  ${if_match "${exec cat ~/.local/share/pomodoro}"!="done"}
+    {"full_text": "Pomodoro: ${exec cat ~/.local/share/pomodoro}", "color": "\#ea0501"},
+  ${endif}
 {% 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 +54,7 @@ conky.text = [[
       	  "\#00ff00"
         ${endif}
   },
+  ${endif}
   {% endfor %}
   ${if_match "${addr tun0}"!="No Address"}
 	{"full_text": "VPN", "color": "\#00ff00"},
@@ -74,7 +79,7 @@ conky.text = [[
 	  ${endif}
 	},
 {% endif %}
-  {"full_text": "${time}", "color": "\#ffffff"}
+  {"full_text": "${time %Y-%m-%d %H:%M}", "color": "\#ffffff"}
 ],
 ]];