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

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 2606323..27f9996 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 = ['enp5s0'] %}
 {% elif grains['host'] == 'dubnium' %}
 	{% set ifdev = ['enp4s0'] %}
 {% elif grains['host'] == 'rhenium' %}
@@ -32,12 +32,15 @@ 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"},
+  {"full_text": "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": "~ ${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"}
@@ -65,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":