feat(home/desktop): add wsNum field to workspaces, fix discord workspace

Author: redxtech

home/gabe/shared.nix

@@ -37,7 +37,7 @@ in {
         }
         {
           class = "discord|vesktop";
-          ws = "chat";
+          wsNum = 3;
           follow = false;
         }
         {

home/gabe/voyager.nix

@@ -52,8 +52,9 @@
           icon = "󰉋";
         }
         {
-          name = "five";
+          name = "music";
           number = 5;
+          icon = "󰓇";
         }
         {
           name = "six";

modules/home-manager/desktop/wm/hyprland/rules.nix

@@ -9,7 +9,7 @@ in {
       windowrulev2 = let
         inherit (lib) flatten optional;
 
-        mkWindowRule2 = opts@{ class, title, ws, ... }:
+        mkWindowRule2 = opts@{ class, title, ws, wsNum, ... }:
           let
             wrapSel = type: sel: "${type}:(${sel})";
             sel = if opts.initialTitle != "" then
@@ -20,17 +20,20 @@ in {
               wrapSel "title" title
             else
               wrapSel "class" class;
-            workspace = if ws == "*" then "unset" else "name:${ws}";
-          in ([ ] # all the rules
-            ++ optional (ws != "") "workspace ${workspace},${sel}"
-            ++ optional (opts.float) "float,${sel}"
-            ++ optional (opts.tile) "tile,${sel}"
-            ++ optional (opts.fullscreen) "fullscreen,${sel}"
-            ++ optional (opts.psuedo) "psuedo,${sel}"
-            ++ optional (opts.pin) "pin,${sel}"
-            ++ optional (!opts.follow) "noinitialfocus,${sel}"
-            ++ optional (opts.maxSize != "") "maxsize ${opts.maxSize},${sel}"
-            ++ optional (opts.opacity != "") "opacity ${opts.opacity},${sel}");
+            workspace = if (wsNum == null) then
+              if ws == "*" then "unset" else "name:${ws}"
+            else
+              "${toString wsNum}";
+            # all the rules
+          in optional (workspace != "name:") "workspace ${workspace},${sel}"
+          ++ optional opts.float "float,${sel}"
+          ++ optional opts.tile "tile,${sel}"
+          ++ optional opts.fullscreen "fullscreen,${sel}"
+          ++ optional opts.psuedo "psuedo,${sel}"
+          ++ optional opts.pin "pin,${sel}"
+          ++ optional (!opts.follow) "noinitialfocus,${sel}"
+          ++ optional (opts.maxSize != "") "maxsize ${opts.maxSize},${sel}"
+          ++ optional (opts.opacity != "") "opacity ${opts.opacity},${sel}";
 
         rules = flatten (map mkWindowRule2 cfg.wm.rules);
       in rules;

modules/home-manager/desktop/wm/rules.nix

@@ -18,6 +18,13 @@ in {
           type = bool;
           example = toString (!default);
         };
+      mkInt = description:
+        mkOption {
+          inherit description;
+          type = nullOr int;
+          default = null;
+          example = "1";
+        };
     in mkOption {
       type = listOf (submodule {
         options = {
@@ -28,6 +35,7 @@ in {
 
           # which workspace/desktop to send the window to
           ws = mkStr "Workspace to send window" "1";
+          wsNum = mkInt "Workspace number to send window";
 
           # window state
           float = mkBool "Float the window" false;