From a76b0323abbfc2a0de9cc3ae54bedc99c724b4e8 Mon Sep 17 00:00:00 2001
From: Mark Hoekveen <mark@hoekveen.net>
Date: Tue, 7 Sep 2021 09:03:18 +0200
Subject: [PATCH] fixes display workspace assignment

---
 .config/sway/config     | 34 +---------------------------------
 .config/sway/workspaces | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 33 deletions(-)
 create mode 100644 .config/sway/workspaces

diff --git a/.config/sway/config b/.config/sway/config
index df60204..92c138f 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -18,6 +18,7 @@ exec wal -c
 exec wal -i $wallpaper
 exec autotiling
 
+include workspaces
 include display
 include input
 
@@ -108,39 +109,6 @@ bindsym $mod+semicolon		focus output right
 bindsym $mod+Shift+g		move workspace to output left
 bindsym $mod+Shift+semicolon	move workspace to output right
 
-# Workspaces:
-set $ws1 1
-set $ws2 2
-set $ws3 3
-set $ws4 4
-set $ws5 5
-set $ws6 6
-set $ws7 7
-set $ws8 8
-set $ws9 9
-set $ws10 10
-
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
-bindsym $mod+Shift+1 move container to workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $ws10
-
 # App fixes
 assign [class="discord"] $ws3
 assign [class="lightcord"] $ws3
diff --git a/.config/sway/workspaces b/.config/sway/workspaces
new file mode 100644
index 0000000..b38a533
--- /dev/null
+++ b/.config/sway/workspaces
@@ -0,0 +1,31 @@
+set $ws1 1
+set $ws2 2
+set $ws3 3
+set $ws4 4
+set $ws5 5
+set $ws6 6
+set $ws7 7
+set $ws8 8
+set $ws9 9
+set $ws10 10
+
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
+bindsym $mod+7 workspace $ws7
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+bindsym $mod+0 workspace $ws10
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9
+bindsym $mod+Shift+0 move container to workspace $ws10