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

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 1d6fc96..dc051ab 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 = ['enp5s0'] %}
+	{% set ifdev = ['enp6s0'] %}
 {% elif grains['host'] == 'dubnium' %}
 	{% set ifdev = ['enp4s0'] %}
 {% elif grains['host'] == 'rhenium' %}
 	{% set ifdev = ['wlp2s0'] %}
+{% elif grains['host'] == 'baryte' %}
+	{% set ifdev = ['enp0s20f0u4u2c2'] %}
 {% else %}
 	{% set ifdev = ['eth0'] %}
 {% endif %}
@@ -68,11 +70,7 @@ conky.text = [[
 		"\#ff0000"
 	  ${endif} 
   },
-<<<<<<< HEAD
-{% if grains['host'] in ['platinum', 'rhenium', 'barium'] %}
-=======
-{% if grains['host'] in ['platinum', 'rhenium'] %}
->>>>>>> 369e162 (Configure for barium)
+{% if grains['host'] in ['platinum', 'rhenium', 'barium', 'baryte'] %}
   	{
 	  "full_text": "BAT ${battery_short} ${battery_time}", 
 	  "color":