Tidy some stuff up

sway/.config/sway/config

@@ -1,14 +1,10 @@
 set $mod Mod4
 set $term kitty
-# set $menu dmenu_path | wofi --show=run --matching fuzzy | xargs swaymsg exec --
 set $menu dmenu_path | wofi --show=run --matching | xargs swaymsg exec --
 set $lock swaylock --screenshot --effect-blur 10x10 --effect-vignette 0.5:1 --ring-color 3c3836 --key-hl-color d65e0e -f
 
 
-#xwayland disable
-
 output * bg ~/.config/sway/wallpapers/mountains.jpg fill
-
 output eDP-1 scale 1.4
 
 bindswitch --reload --locked lid:on exec $lock
@@ -20,7 +16,6 @@ exec swayidle -w \
 
 bindsym Control+Mod1+l exec $lock
 
-# bindsym Print exec grim -g "$(slurp -d)" - | swappy -f -
 bindsym Print exec grim -g "$(slurp -d)" - | wl-copy
 
 bindsym $mod+p exec kitty -e python
@@ -53,7 +48,6 @@ bindsym XF86AudioPrev exec playerctl previous
 bindsym XF86MonBrightnessUp exec brightnessctl set +5%
 bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
 
-include ~/.config/sway/config.d/*
 
 bindsym $mod+c exec kitty -e python
 
@@ -71,3 +65,6 @@ blur enable
 blur_radius 8
 
 exec dbus-update-activation-environment DISPLAY
+
+
+include ~/.config/sway/config.d/*

sway/.config/sway/config.d/workspaces.conf

@@ -31,11 +31,10 @@ bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
 
-# assign [class="firefox"] $ws2
 assign [class="Spotify"] $ws7
 
-exec --no-startup-id i3-msg 'workspace $ws1; exec kitty; $ws1'
-exec --no-startup-id i3-msg 'workspace $ws2; exec firefox'
+exec i3-msg 'workspace $ws1; exec kitty; $ws1'
+exec i3-msg 'workspace $ws2; exec firefox'
 
 #
 ## Multiple monitors