fixes and improvements

user/modules/sway.nix

@@ -35,8 +35,16 @@ in
       terminal = "alacritty";
       startup = [
 	{ command = "blueman-applet";}
+	{ command = "mullvad-vpn";}
+	{ command = "swaymsg workspace 1";}
+	{ command = "thunderbird";}
+	{ command = "nextcloud";}
+	{ command = "spotify";}
+	{ command = "brave";}
+	{ command = "alacritty";}
       ];
       defaultWorkspace = "1";
+      workspaceAutoBackAndForth = true;
       bars = [];
       fonts = {
         names = [ "MesloLGS NF" ];
@@ -144,18 +152,17 @@ in
           value = "workspace ${key}";
         }
         {
-          name = "${mod}+Ctrl+${key}";
+          name = "${mod}+Shift+${key}";
           value = "move container to workspace ${key}";
         }
         {
-          name = "${mod}+Shift+${key}";
+          name = "${mod}+Ctrl+${key}";
           value = "move container to workspace ${key}; workspace ${key}";
         }
-      ]) (lib.range 0 8));
+      ]) (lib.range 1 9));
 
       assigns = {
-	"2: web" = [{ class = "^Brave$"; }];
-        "9: mail" = [{ class = "Thunderbird"; }];
+        "9: mail" = [{ app_id = "thunderbird"; }];
       };
 
       modes = {
@@ -213,7 +220,7 @@ in
       };
     };
     extraConfig = ''
-        default_border pixel 1
+        default_border pixel 2
         floating_modifier ${mod}
 
         # === Floating Windows ===
@@ -224,8 +231,15 @@ in
         for_window [class="Blueman-manager"] floating enable border normal
         for_window [class="GParted"] floating enable border normal
         for_window [class="pavucontrol"] floating enable
-        for_window [class="Volume Control"] floating enable
-        for_window [class="(?i)VirtualBox"] floating enable border normal
+        for_window [title="Volume Control"] floating enable
+        for_window [class="Spotify"] move scratchpad
+	 
+        # Float all windows with "VirtualBox" in the title
+        for_window [class=".*VirtualBox.*"] floating enable
+        # EXCEPT: unfloat those that also contain "Manager" or "Machine"
+        for_window [class=".*VirtualBox Manager.*"] floating disable
+        for_window [class=".*VirtualBox Machine"] floating disable
+
     '';
   };
 }