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

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