X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Ftermite%2Ffiles%2Fconfig;h=683912c63de38f1e63dec86a88ac4df2ac91b7f1;hb=8a1f4ad81527dfeacf0178629c76e6531f92eede;hp=2d63ae130f0731def0b3b143df29119b69cdbaa0;hpb=6070fd475cfecbf1d0f2864c7be06298e034a9c9;p=max%2Fsaltfiles.git

diff --git a/states/termite/files/config b/states/termite/files/config
index 2d63ae1..683912c 100644
--- a/states/termite/files/config
+++ b/states/termite/files/config
@@ -1,6 +1,10 @@
 {% if grains['host'] in ['rhenium', ] %}
 	{% set font_size = 16 %}
-{% elif grains['host'] in ['dubnium', ] %}
+<<<<<<< HEAD
+{% elif grains['host'] in ['dubnium'] %}
+=======
+{% elif grains['host'] in ['dubnium', 'barium'] %}
+>>>>>>> 369e162 (Configure for barium)
 	{% set font_size = 13 %}
 {% else %}
 	{% set font_size = 11 %}
@@ -35,10 +39,10 @@ scrollback_lines = 10000
 #browser = xdg-open
 
 # "system", "on" or "off"
-#cursor_blink = system
+cursor_blink = on
 
 # "block", "underline" or "ibeam"
-#cursor_shape = block
+cursor_shape = block
 
 # Hide links that are no longer valid in url select overlay mode
 #filter_unmatched_urls = true