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

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 8e8fcc1..ede13d7 100644
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -5,11 +5,13 @@
 {% 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' %}
 	{% set ifdev = ['wlp2s0'] %}
+{% elif grains['host'] == 'baryte' %}
+	{% set ifdev = ['enx00f001e00121'] %}
 {% else %}
 	{% set ifdev = ['eth0'] %}
 {% endif %}
@@ -36,11 +38,11 @@ conky.text = [[
     {"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"}
@@ -68,7 +70,7 @@ conky.text = [[
 		"\#ff0000"
 	  ${endif} 
   },
-{% if grains['host'] == 'platinum' or grains['host'] == 'rhenium' or grains['host'] == 'barium' %}
+{% if grains['host'] in ['platinum', 'rhenium', 'barium', 'baryte'] %}
   	{
 	  "full_text": "BAT ${battery_short} ${battery_time}", 
 	  "color":