Configure for barium

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index f0a3f16e835954d5dcf2740120687d613f610d5d..1d6fc965ce4dfaee40633e717a22802e47b1ab0a 100644 (file)
--- 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": 

diff --git a/states/i3/files/config.jinja b/states/i3/files/config.jinja
index fced39fd715a17d0271207eb6577fe1aef152570..aa31ec3c18527a41011b9973470d25451b0e6f1c 100644 (file)
--- a/states/i3/files/config.jinja
+++ b/states/i3/files/config.jinja
@@ -208,8 +208,8 @@ bar {
   id bar_left
   status_command ~/.local/bin/conky-i3bar
   position top
-  output "HDMI-1"
-  font pango:Liberation Mono 10
+  output "DP-1"
+  font pango:Liberation Mono 11
   colors {
     background $black_super
     focused_background $black

diff --git a/states/i3/files/xprofile.jinja b/states/i3/files/xprofile.jinja
index 98a78bb3b51883721654d3d7749490f3be63ae34..aea5c9a20c0786e6d9667093e4df1557c31f8a91 100755 (executable)
--- a/states/i3/files/xprofile.jinja
+++ b/states/i3/files/xprofile.jinja
@@ -18,9 +18,9 @@ esac
 # Set screen layout
 case $HOSTNAME in
   barium)
-    #xrandr --output DP-2 --mode 3840x2160 --pos 2560x0 --rate 60
-    xrandr --output HDMI-1 --mode 2560x1440
-    xrandr --output eDP-1 --off
+    xrandr --output DP-2 --mode 3840x2160 --pos 2560x0 --rate 30
+    xrandr --output DP-1 --mode 2560x1440 --pos 0x360
+    #xrandr --output eDP-1 --off
     ;;
   dubnium)
     xrandr --output DP-0 --mode 2560x1440 --pos 0x0

diff --git a/states/termite/files/config b/states/termite/files/config
index c795eb1d0cc66cea0cc6f599fbdef0bd115e3390..683912c63de38f1e63dec86a88ac4df2ac91b7f1 100644 (file)
--- a/states/termite/files/config
+++ b/states/termite/files/config
@@ -1,6 +1,10 @@
 {% if grains['host'] in ['rhenium', ] %}
        {% set font_size = 16 %}
+<<<<<<< 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 %}