fix(sway): simplify workspaces

3 files changed, 19 insertions, 72 deletions

diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 150a969..b3163e7 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -9,28 +9,16 @@ set $menu wmenu -i -f 'monospace 12' -n$base06 -N$base00 -S$base00 -s$base09 -m$
 set $passmenu find $PASSWORD_STORE_DIR/ -name '*.gpg' -printf '%P\n' | sed "s/\.gpg$//" | sort | $menu | xargs -r pass show
 set $swayssh xargs -I_ swaymsg exec -- $TERMINAL -e ssh '_' -t -- "zsh -l -c 'tmux -L ssh new -A'"
 
-set $ws11 $ws11
-set $ws12 $ws12
-set $ws01 1:a1
-set $ws02 2:a2
-set $ws03 3:a3
-set $ws04 4:a4
-set $ws05 5:a5
-set $ws06 6:a6
-set $ws07 7:a7
-set $ws08 8:a8
-set $ws09 9:a9
-set $ws10 10:a10
-set $ws11 1:b1
-set $ws12 2:b2
-set $ws13 3:b3
-set $ws14 4:b4
-set $ws15 5:b5
-set $ws16 6:b6
-set $ws17 7:b7
-set $ws18 8:b8
-set $ws19 9:b9
-set $ws20 10:b10
+set $ws01 1
+set $ws02 2
+set $ws03 3
+set $ws04 4
+set $ws05 5
+set $ws06 6
+set $ws07 7
+set $ws08 8
+set $ws09 9
+set $ws10 10
 
 include ~/.config/sway/config.d/*
 
@@ -53,21 +41,11 @@ workspace $ws02 output $out1 $out2
 workspace $ws03 output $out1 $out2
 workspace $ws04 output $out1 $out2
 workspace $ws05 output $out1 $out2
-workspace $ws06 output $out1 $out2
-workspace $ws07 output $out1 $out2
-workspace $ws08 output $out1 $out2
-workspace $ws09 output $out1 $out2
-workspace $ws10 output $out1 $out2
-workspace $ws11 output $out2 $out1
-workspace $ws12 output $out2 $out1
-workspace $ws13 output $out2 $out1
-workspace $ws14 output $out2 $out1
-workspace $ws15 output $out2 $out1
-workspace $ws16 output $out2 $out1
-workspace $ws17 output $out2 $out1
-workspace $ws18 output $out2 $out1
-workspace $ws19 output $out2 $out1
-workspace $ws20 output $out2 $out1
+workspace $ws06 output $out2 $out1
+workspace $ws07 output $out2 $out1
+workspace $ws08 output $out2 $out1
+workspace $ws09 output $out2 $out1
+workspace $ws10 output $out2 $out1
 
 output * bg ~/.local/share/gruvbox/sway.png fill
 
@@ -82,8 +60,8 @@ for_window [app_id="" title="^Streamlink Twitch GUI$"] floating enable
 for_window [app_id="deno" title="^Peek preview$"] resize set width 980px
 for_window [class="^discord$" title="^Discord$"] move to scratchpad
 
-assign [app_id="mpv"] $ws11
-assign [class="^discord$" instance="^discord$"] $ws12
+assign [app_id="mpv"] $ws06
+assign [class="^discord$" instance="^discord$"] $ws07
 
 no_focus [app_id="deno" title="^Peek preview$"]
 
@@ -174,8 +152,8 @@ bindsym $mod+Ctrl+Right move workspace to output right
 bindsym $mod+Ctrl+6 workspace back_and_forth
 bindsym $mod+Tab workspace back_and_forth
 
-bindsym $mod+s   workspace $ws11
-bindsym $mod+d   workspace $ws12
+bindsym $mod+s   workspace $ws06
+bindsym $mod+d   workspace $ws07
 bindsym $mod+1   workspace $ws01
 bindsym $mod+2   workspace $ws02
 bindsym $mod+3   workspace $ws03
@@ -186,16 +164,6 @@ bindsym $mod+7   workspace $ws07
 bindsym $mod+8   workspace $ws08
 bindsym $mod+9   workspace $ws09
 bindsym $mod+0   workspace $ws10
-bindsym $mod+F1  workspace $ws11
-bindsym $mod+F2  workspace $ws12
-bindsym $mod+F3  workspace $ws13
-bindsym $mod+F4  workspace $ws14
-bindsym $mod+F5  workspace $ws15
-bindsym $mod+F6  workspace $ws16
-bindsym $mod+F7  workspace $ws17
-bindsym $mod+F8  workspace $ws18
-bindsym $mod+F9  workspace $ws19
-bindsym $mod+F10 workspace $ws20
 
 bindsym $mod+Shift+s   move container to workspace $ws11, workspace $ws11
 bindsym $mod+Shift+d   move container to workspace $ws12, workspace $ws12
@@ -209,16 +177,6 @@ bindsym $mod+Shift+7   move container to workspace $ws07, workspace $ws07
 bindsym $mod+Shift+8   move container to workspace $ws08, workspace $ws08
 bindsym $mod+Shift+9   move container to workspace $ws09, workspace $ws09
 bindsym $mod+Shift+0   move container to workspace $ws10, workspace $ws10
-bindsym $mod+Shift+F1  move container to workspace $ws11, workspace $ws11
-bindsym $mod+Shift+F2  move container to workspace $ws12, workspace $ws12
-bindsym $mod+Shift+F3  move container to workspace $ws13, workspace $ws13
-bindsym $mod+Shift+F4  move container to workspace $ws14, workspace $ws14
-bindsym $mod+Shift+F5  move container to workspace $ws15, workspace $ws15
-bindsym $mod+Shift+F6  move container to workspace $ws16, workspace $ws16
-bindsym $mod+Shift+F7  move container to workspace $ws17, workspace $ws17
-bindsym $mod+Shift+F8  move container to workspace $ws18, workspace $ws18
-bindsym $mod+Shift+F9  move container to workspace $ws19, workspace $ws19
-bindsym $mod+Shift+F10 move container to workspace $ws20, workspace $ws20
 
 bindsym $mod+minus move scratchpad
 bindsym $mod+plus scratchpad show
diff --git a/sway/.config/systemd/user/sway-session-pre.target b/sway/.config/systemd/user/sway-session-pre.target
deleted file mode 100644
index 99c36c9..0000000
--- a/sway/.config/systemd/user/sway-session-pre.target
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Session services which should run early before the sway session is brought up
-Documentation=man:systemd.special(7)
-Before=sway-session.target
-BindsTo=wayland-session-pre.target
-Before=wayland-session-pre.target
diff --git a/sway/.config/systemd/user/sway-session.target b/sway/.config/systemd/user/sway-session.target
deleted file mode 100644
index 0c57b61..0000000
--- a/sway/.config/systemd/user/sway-session.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=Current sway user session
-Documentation=man:systemd.special(7)
-BindsTo=wayland-session.target
-Before=wayland-session.target