Merge branch 'master' of git.friedersdorff.com:max/saltfiles

diff --git a/states/conky/arch.sls b/states/conky/arch.sls
index 7c2f408b9016d078e72b5845b76ebf6cd08dc49f..d5da829227f03a8d23904af1b8a6632ddac3f81b 100644 (file)
--- a/states/conky/arch.sls
+++ b/states/conky/arch.sls
@@ -1,3 +1,3 @@
 install conky:
   pkg.installed:
-    - name: conky
+    - name: conky-git

diff --git a/states/sway/files/barium b/states/sway/files/barium
index 39da4a7aa05fe2eb76031785c537def53b508ddf..8949b79a50183157c84ec07924781775aa5eccc3 100644 (file)
--- a/states/sway/files/barium
+++ b/states/sway/files/barium
@@ -16,7 +16,7 @@ bar {
 }
 
 bar {
-  id bar_center
+  id bar_external
   status_command ~/.local/bin/conky-i3bar
   position top
   output "eDP-1"
@@ -33,6 +33,7 @@ bar {
 
 bar {
   id bar_right
+  status_command ~/.local/bin/conky-i3bar
   position top
   output "DP-1"
   font pango:Liberation Mono 12
@@ -53,18 +54,26 @@ output HDMI-A-1 {
 }
 
 output eDP-1 {
-  position 1920 530
+  position 5000 0
   background ~/Pictures/background_1080_1.png fit
   scale 1.15
 }
 output DP-1 {
-  position 3590 0
+  position 1920 0
   background ~/Pictures/background_1080_1.png fit
 }
 
 workspace 1 output HDMI-A-1
-workspace 2 output eDP-1
-workspace 3 output DP-1
+workspace 10 output eDP-1
+workspace 2 output DP-1
+
+workspace $music output HDMI-A-1
+workspace $chat output HDMI-A-1
+
+assign [class="music"] workspace $music
+
+exec "termite --class 'music' -e 'tmux'"
+
 
 
 font pango:Liberation Mono 10