From 40a74cbf1fee6baf366839556442918b3c796fab Mon Sep 17 00:00:00 2001
From: Valentin Boettcher <hiro@protagon.space>
Date: Fri, 1 Jan 2021 18:07:02 +0100
Subject: [PATCH] some desktop updates

---
 config.desktop.sh                      | 2 +-
 dots/bspwm/bspwmrc.template            | 8 +++++---
 dots/bspwm/monitor_desktop.sh.template | 6 +++---
 dots/screenlayout/desktop.sh           | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/config.desktop.sh b/config.desktop.sh
index edeeeb4..1fe639b 100644
--- a/config.desktop.sh
+++ b/config.desktop.sh
@@ -10,4 +10,4 @@ RYGEL="true"
 BAR_POS="bottom"
 DPI=91
 TERM_FONT_SIZE=9
-SCREENLAYOUT=".screenlayout/desktop.sh"
+SCREENLAYOUT="~/.screenlayout/desktop.sh"
diff --git a/dots/bspwm/bspwmrc.template b/dots/bspwm/bspwmrc.template
index 4b976a5..db9cb69 100755
--- a/dots/bspwm/bspwmrc.template
+++ b/dots/bspwm/bspwmrc.template
@@ -33,12 +33,14 @@ bspc config remove_unplugged_monitors true
 #                                   Scripts                                   #
 ###############################################################################
 
+sh {{ SCREENLAYOUT }}
+
 {{ #laptop }}
-~/.config/bspwm/monitor_laptop.sh
+bash ~/.config/bspwm/monitor_laptop.sh
 {{ /laptop }}
 
 {{ ^laptop }}
-~/.config/bspwm/monitor_desktop.sh
+bash ~/.config/bspwm/monitor_desktop.sh
 {{ /laptop }}
 
-~/.config/polybar/launch.sh
+bash ~/.config/polybar/launch.sh
diff --git a/dots/bspwm/monitor_desktop.sh.template b/dots/bspwm/monitor_desktop.sh.template
index 440b059..d515ba6 100755
--- a/dots/bspwm/monitor_desktop.sh.template
+++ b/dots/bspwm/monitor_desktop.sh.template
@@ -3,9 +3,9 @@
 ###############################################################################
 
 declare -A workspaces
-workspaces[2]="I V VI VIII IX X"
+workspaces[2]="I V VI VIII IX"
 workspaces[0]="II IV VII"
-workspaces[1]="III IX"
+workspaces[1]="III IX X"
 
 MONITORS=({{ MONITORS[@] }})
 
@@ -16,7 +16,7 @@ move_to_monitor() {
 }
 
 I=0
-for MONITOR in $MONITORS; do
+for MONITOR in ${MONITORS[@]}; do
     bspc monitor $MONITOR -d ${workspaces[${I}]}
     ((I=I+1))
     # move_to_monitor "${workspaces[${I}]}" $MONITOR
diff --git a/dots/screenlayout/desktop.sh b/dots/screenlayout/desktop.sh
index f3dbb0d..e978c3c 100755
--- a/dots/screenlayout/desktop.sh
+++ b/dots/screenlayout/desktop.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output DisplayPort-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DisplayPort-1 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output HDMI-A-0 --off --output HDMI-A-1 --off --output DVI-D-0 --mode 1920x1080 --pos 3840x0 --rotate normal
+xrandr --output DisplayPort-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DisplayPort-1 --mode 1920x1080 --pos 3840x0 --rotate normal --output HDMI-A-0 --off --output HDMI-A-1 --off --output DVI-D-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal