From 369e162e5ade88da6b03b7c9b67a53bc1691ce88 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     |  4 ++--
 states/i3/files/config.jinja   | 15 +++------------
 states/i3/files/xprofile.jinja |  4 ++--
 states/termite/files/config    |  2 +-
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/states/conky/files/conkyrc b/states/conky/files/conkyrc
index 4d0fc31..27f9996 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,7 @@ conky.text = [[
 		"\#ff0000"
 	  ${endif} 
   },
-{% if grains['host'] == 'platinum' or grains['host'] == 'rhenium' or grains['host'] == 'barium' %}
+{% if grains['host'] in ['platinum', 'rhenium'] %}
   	{
 	  "full_text": "BAT ${battery_short} ${battery_time}", 
 	  "color": 
diff --git a/states/i3/files/config.jinja b/states/i3/files/config.jinja
index 5ec8bc9..aa31ec3 100644
--- a/states/i3/files/config.jinja
+++ b/states/i3/files/config.jinja
@@ -138,7 +138,6 @@ set $ws8 "8"
 set $ws9 "9"
 set $ws10 "10"
 
-set $music "Music"
 set $chat "Chat"
 
 # switch to workspace
@@ -152,7 +151,6 @@ bindsym $mod+7 workspace number $ws7
 bindsym $mod+8 workspace number $ws8
 bindsym $mod+9 workspace number $ws9
 bindsym $mod+0 workspace number $ws10
-bindsym $mod+m workspace $music
 bindsym $mod+z workspace $chat
 
 # move focused container to workspace
@@ -166,7 +164,6 @@ bindsym $mod+Shift+7 move container to workspace number $ws7
 bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
-bindsym $mod+Shift+m move container to workspace $music
 bindsym $mod+Shift+z move container to workspace $chat
 
 # reload the configuration file
@@ -211,7 +208,7 @@ bar {
   id bar_left
   status_command ~/.local/bin/conky-i3bar
   position top
-  output "HDMI-1"
+  output "DP-1"
   font pango:Liberation Mono 11
   colors {
     background $black_super
@@ -245,7 +242,7 @@ bar {
   id bar_right
   status_command ~/.local/bin/conky-i3bar
   position top
-  output "DVI-I-2-1"
+  output "DP-2"
   font pango:Liberation Mono 13
   colors {
     background $black_super
@@ -266,20 +263,14 @@ workspace 4 output HDMI-A-1
 workspace 1 output DP-1
 workspace 3 output DP-1
 
-workspace $music output DP-1
-workspace $chat output DP-1 
+workspace $chat output DP-1
 
-assign [class="music"] workspace $music
-for_window [class="music"] move workspace number $music
-assign [class="spotify"] workspace $music
-for_window [class="spotify"] move workspace number $music
 assign [class="qutebrowser"] workspace number $ws1
 for_window [class="qutebrowser"] move workspace number $ws1
 assign [class="zoom"] workspace $chat
 for_window [class="zoom"] move workspace $chat
 
 exec "zoom"
-exec "spotify"
 
 {% elif host == 'dubnium' %}
 bar {
diff --git a/states/i3/files/xprofile.jinja b/states/i3/files/xprofile.jinja
index 42627e9..52e2add 100755
--- a/states/i3/files/xprofile.jinja
+++ b/states/i3/files/xprofile.jinja
@@ -18,8 +18,8 @@ esac
 # Set screen layout
 case $HOSTNAME in
   barium)
-    xrandr --output DVI-I-2-1 --mode 3840x2160 --pos 2560x0 --rate 30
-    xrandr --output HDMI-1 --mode 2560x1440 --pos 0x360
+    xrandr --output DP-2 --mode 3840x2160 --pos 2560x0 --rate 30
+    xrandr --output DP-1 --mode 2560x1440 --pos 0x360
     xrandr --output eDP-1 --off
     ;;
   dubnium)
diff --git a/states/termite/files/config b/states/termite/files/config
index b334965..6952209 100644
--- a/states/termite/files/config
+++ b/states/termite/files/config
@@ -1,6 +1,6 @@
 {% if grains['host'] in ['rhenium', ] %}
 	{% set font_size = 16 %}
-{% elif grains['host'] in ['dubnium', ] %}
+{% elif grains['host'] in ['dubnium', 'barium'] %}
 	{% set font_size = 13 %}
 {% else %}
 	{% set font_size = 11 %}
-- 
2.46.2