From 8a1f4ad81527dfeacf0178629c76e6531f92eede Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 22 Mar 2022 08:27:33 +0000
Subject: [PATCH] Configure for barium

---
 states/conky/files/conkyrc     | 6 +++++-
 states/i3/files/config.jinja   | 4 ++--
 states/i3/files/xprofile.jinja | 6 +++---
 states/termite/files/config    | 4 ++++
 4 files changed, 14 insertions(+), 6 deletions(-)

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": 
diff --git a/states/i3/files/config.jinja b/states/i3/files/config.jinja
index fced39f..aa31ec3 100644
--- 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 98a78bb..aea5c9a 100755
--- 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 c795eb1..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 %}
+<<<<<<< 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 %}
-- 
2.45.2