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

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 41d213f..2606323 100644
--- a/states/conky/files/conkyrc
+++ b/states/conky/files/conkyrc
@@ -1,15 +1,17 @@
 -- vim: ts=4 sw=4 noet ai cindent syntax=lua
 
 {% if grains['host'] == 'magnesium' %}
-	{% set ifdev = 'br0' %}
+	{% set ifdev = ['br0'] %}
 {% elif grains['host'] == 'platinum' %}
-	{% set ifdev = 'wlp2s0' %}
+	{% set ifdev = ['wlp2s0'] %}
 {% elif grains['host'] == 'barium' %}
-	{% set ifdev = 'enp3s0f1' %}
+	{% set ifdev = ['enp3s0f1', 'wlp4s0'] %}
+{% elif grains['host'] == 'dubnium' %}
+	{% set ifdev = ['enp4s0'] %}
 {% elif grains['host'] == 'rhenium' %}
-	{% set ifdev = 'wlp2s0' %}
+	{% set ifdev = ['wlp2s0'] %}
 {% else %}
-	{% set ifdev = 'eth0' %}
+	{% set ifdev = ['eth0'] %}
 {% endif %}
 
 conky.config = {
@@ -30,23 +32,27 @@ conky.config = {
 
 conky.text = [[
 [
-  ${if_running mutt} 
-    {"full_text": "${new_mails mail_aber/Inbox} new mails", "color": "\#ffa500"},
-  ${endif}
-  {"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 {{ ifdev }}} u:${upspeed {{ ifdev }}} ${addr {{ ifdev }}}", 
+		"{{ dev }} d:${downspeed {{ dev }}} u:${upspeed {{ dev }}} ${addr {{ dev }}}", 
       "color":
-        ${if_match "${addr {{ ifdev }}}"=="No Address"}
+        ${if_match "${addr {{ dev }}}"=="No Address"}
           "\#ff0000"
         ${else}
       	  "\#00ff00"
         ${endif}
   },
+  ${endif}
+  {% endfor %}
   ${if_match "${addr tun0}"!="No Address"}
 	{"full_text": "VPN", "color": "\#00ff00"},
   ${endif}
@@ -59,7 +65,7 @@ conky.text = [[
 		"\#ff0000"
 	  ${endif} 
   },
-{% if grains['host'] == 'platinum' or grains['host'] == 'rhenium' %}
+{% if grains['host'] == 'platinum' or grains['host'] == 'rhenium' or grains['host'] == 'barium' %}
   	{
 	  "full_text": "BAT ${battery_short} ${battery_time}", 
 	  "color": 
@@ -70,7 +76,7 @@ conky.text = [[
 	  ${endif}
 	},
 {% endif %}
-  {"full_text": "${time}", "color": "\#ffffff"}
+  {"full_text": "${time %Y-%m-%d %H:%M}", "color": "\#ffffff"}
 ],
 ]];