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

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 86d818b..88b5931 100644
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -5,7 +5,7 @@
 {% elif grains['host'] == 'platinum' %}
 	{% set ifdev = ['wlp2s0'] %}
 {% elif grains['host'] == 'barium' %}
-	{% set ifdev = ['enp3s0f1', 'wlp4s0'] %}
+	{% set ifdev = ['enp6s0'] %}
 {% elif grains['host'] == 'dubnium' %}
 	{% set ifdev = ['enp4s0'] %}
 {% elif grains['host'] == 'rhenium' %}
@@ -32,14 +32,21 @@ conky.config = {
 
 conky.text = [[
 [
-  {"full_text": "Home ${fs_free /home} Free", "color": "\#ffffff"},
-  {"full_text": "Root ${fs_free /root} Free", "color": "\#ffffff"},
-  {"full_text": "Disk r:${diskio_read} w:${diskio_write}", "color": "\#ffffff"},
+  ${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": "Tea: ${execi 120 tail -n 1 ~/.local/share/teatimer.log}s", "color": "\#ffffff"},
+{% endif %}
+  {"full_text": "~ ${fs_free /home}", "color": "\#ffffff"},
+  {"full_text": "/ ${fs_free /root}", "color": "\#ffffff"},
+  {"full_text": "IO 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 +54,7 @@ conky.text = [[
       	  "\#00ff00"
         ${endif}
   },
+  ${endif}
   {% endfor %}
   ${if_match "${addr tun0}"!="No Address"}
 	{"full_text": "VPN", "color": "\#00ff00"},
@@ -60,7 +68,7 @@ conky.text = [[
 		"\#ff0000"
 	  ${endif} 
   },
-{% if grains['host'] == 'platinum' or grains['host'] == 'rhenium' or grains['host'] == 'barium' %}
+{% if grains['host'] in ['platinum', 'rhenium'] %}
   	{
 	  "full_text": "BAT ${battery_short} ${battery_time}", 
 	  "color": 
@@ -71,7 +79,7 @@ conky.text = [[
 	  ${endif}
 	},
 {% endif %}
-  {"full_text": "${time}", "color": "\#ffffff"}
+  {"full_text": "${time %Y-%m-%d %H:%M}", "color": "\#ffffff"}
 ],
 ]];