From 84d2a5eef4e48fbed6795944b9e7df29edb5db47 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <maximilian.friedersdorff@envsys.co.uk>
Date: Wed, 16 Nov 2022 09:33:34 +0000
Subject: [PATCH] Reconfigure monitors on baryte

---
 states/sway/files/baryte       | 40 ++++++----------------------------
 states/sway/files/config.jinja |  1 +
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/states/sway/files/baryte b/states/sway/files/baryte
index f2176d0..f934f98 100644
--- a/states/sway/files/baryte
+++ b/states/sway/files/baryte
@@ -1,26 +1,9 @@
 
-bar {
-  id bar_left
-  status_command ~/.local/bin/conky-i3bar
-  position top
-  output "DP-3"
-  font pango:Liberation Mono 11
-  colors {
-    background $black_super
-    focused_background $black
-    focused_workspace $black_super $yellow_super $black
-    active_workspace $black_super $blue_super $black
-    inactive_workspace $black_super $black_super $white_super
-    urgent_workspace $black $red_super $white
-    separator $white
-  }
-}
-
 bar {
   id bar_right
   status_command ~/.local/bin/conky-i3bar
   position top
-  output "HDMI-A-1"
+  output "DP-1"
   font pango:Liberation Mono 11
   colors {
     background $black_super
@@ -53,29 +36,20 @@ bar {
 output eDP-1 {
   background ~/Pictures/Backgrounds/DSC02113.jpg fill
   position 0 0
-  scale 1
-  disable
+  scale 2
 }
 
-output DP-3 {
+output DP-1 {
   background ~/Pictures/Backgrounds/DSC02111.jpg fill
   position 0 0
   scale 1
 }
 
-output HDMI-A-1 {
-  background ~/Pictures/Backgrounds/DSC02121.jpg fill
-  position 2560 0
-  scale 1
-}
-
-
-workspace 2 output HDMI-A-1
-workspace 4 output HDMI-A-1
-workspace 1 output DP-3
-workspace 3 output DP-3
+workspace 1 output eDP-1
+workspace 3 output eDP-1
+workspace 2 output DP-1
+workspace 4 output DP-1
 
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 exec mako&
-exec ~/.local/bin/monitor_switch_sway&
 exec zoom&
diff --git a/states/sway/files/config.jinja b/states/sway/files/config.jinja
index 8185333..1a12d9d 100644
--- a/states/sway/files/config.jinja
+++ b/states/sway/files/config.jinja
@@ -265,6 +265,7 @@ bindsym $mod+Alt+l exec '{{ lockcmd }}'
 include /etc/sway/config.d/*
 # host specific section
 {%- do salt.log.error('sway/files/' + host) -%}
+
 {% include 'sway/files/' + host %}
 
 for_window [app_id="zoom" title="^zoom$"] border none, floating enable
-- 
2.46.2