hyprland: fix group rules

Signed-off-by: Myned <dev@bjork.tech>

options/custom/desktops/hyprland/binds.nix

@@ -134,17 +134,17 @@ in {
         (key "Bracketright" "Super" "layoutmsg" "rollprev")
         (key "Bracketright" "Super+Shift" "splitratio" "+0.1")
         (key "Comma" "Super" "layoutmsg" "swapprev")
-        (key "Down" "Super" "movewindow" "d")
-        (key "Down" "Super+Shift" "movewindoworgroup" "d")
+        (key "Down" "Super" "movewindoworgroup" "d")
+        (key "Down" "Super+Shift" "movewindow" "d")
         (key "Equal" "Super" "exec" "${swayosd-client} --output-volume raise")
         (key "Equal" "Super+Shift" "exec" "${zoom} +0.1")
         (key "Escape" "Super" "togglefloating" null)
         (key "Escape" "Super+Alt" "exec" "lifx state --color red")
         (key "Escape" "Super+Shift" "centerwindow" null)
         (key "Grave" "Super" "exec" smile)
-        (key "Left" "Super" "movewindow" "l")
+        (key "Left" "Super" "movewindoworgroup" "l")
         (key "Left" "Super+Alt" "exec" "${left} --scroll kensington-orbit-wireless-tb-mouse")
-        (key "Left" "Super+Shift" "movewindoworgroup" "l")
+        (key "Left" "Super+Shift" "movewindow" "l")
         (key "Minus" "Super" "exec" "${swayosd-client} --output-volume lower")
         (key "Minus" "Super+Shift" "exec" "${zoom} -0.1")
         (key "Period" "Super" "layoutmsg" "swapnext")
@@ -154,8 +154,8 @@ in {
         (key "Apostrophe" "Super+Alt+Shift" "exec" "${screenshot} display --edit")
         (key "Return" "Super" "fullscreen" "1") # Maximize
         (key "Return" "Super+Shift" "fullscreen" "0") # Fullscreen
-        (key "Right" "Super" "movewindow" "r")
-        (key "Right" "Super+Shift" "movewindoworgroup" "r")
+        (key "Right" "Super" "movewindoworgroup" "r")
+        (key "Right" "Super+Shift" "movewindow" "r")
         (key "Semicolon" "Super" "exec" "${hyprpicker} --autocopy")
         (key "Semicolon" "Super+Shift" "exec" "${hyprpicker} --autocopy --format rgb")
         (key "Slash" "Super" "exec" vrr)
@@ -188,8 +188,8 @@ in {
         (key "Tab" "Super" "layoutmsg" "cyclenext")
         (key "Tab" "Super+Shift" "alterzorder" "top")
         (key "Tab" "Super+Shift" "cyclenext" "floating")
-        (key "Up" "Super" "movewindow" "u")
-        (key "Up" "Super+Shift" "movewindoworgroup" "u")
+        (key "Up" "Super" "movewindoworgroup" "u")
+        (key "Up" "Super+Shift" "movewindow" "u")
 
         (key "0" "Super" "exec" "${swayosd-client} --output-volume mute-toggle")
         (key "0" "Super+Shift" "exec" "${zoom}")
@@ -241,7 +241,7 @@ in {
         (key "P" "Super" "togglespecialworkspace" "password")
         (key "P" "Super+Shift" "movetoworkspacesilent" "special:password")
         (key "Q" "Ctrl+Alt" "exec" "${kill} -9 $(${hyprctl} -j activewindow | ${jq} .pid)")
-        (key "Q" "Ctrl+Alt+Shift" "exec" "close") # Quit all windows
+        #// (key "Q" "Ctrl+Alt+Shift" "exec" "close") # Quit all windows
         (key "Q" "Super" "killactive" null)
         (key "S" "Ctrl+Alt" "exec" "${pkill} steam")
         (key "S" "Super" "togglespecialworkspace" "steam")

options/custom/desktops/hyprland/rules.nix

@@ -155,7 +155,7 @@ in {
           ];
           editor = rules: [
             (class "codium-url-handler" rules) # VSCode
-            (class "obsidian" (rules ++ ["group override barred"]))
+            (class "obsidian" (rules ++ ["group barred"]))
           ];
           files = rules: [
             (class "org\\.gnome\\.Nautilus" rules)
@@ -190,7 +190,6 @@ in {
             (class "discord" rules)
             (class "Element" rules)
             (class "org\\.telegram\\.desktop" rules)
-            (class "signal" rules)
           ];
           steam = rules: [
             (class "SDL Application" rules) # Steam
@@ -221,7 +220,7 @@ in {
           (tag.android ["tile" "workspace special:android"])
           (tag.clipboard ["move ${clipboard.x} ${clipboard.y}" "pin" "size ${clipboard.w} ${clipboard.h}" "stayfocused"])
           (tag.dropdown ["move ${dropdown.x} ${dropdown.y}" "pin" "size ${dropdown.w} ${dropdown.h}"])
-          (tag.editor ["group override set invade" "tile"])
+          (tag.editor ["group override set" "tile"])
           (tag.files ["center" "size 1000 625"])
           (tag.game ["fullscreen" "idleinhibit always" "noborder" "noshadow" "renderunfocused" "workspace name:game"])
           (tag.media ["center" "keepaspectratio"])
@@ -229,14 +228,14 @@ in {
           (tag.office ["group override set" "workspace special:office"])
           (tag.password ["center" "workspace special:password"])
           (tag.pip ["keepaspectratio" "move ${pip.x} ${pip.y}" "noinitialfocus" "pin" "size ${pip.w} ${pip.h}"])
-          (tag.social ["group override set invade" "tile"])
+          (tag.social ["group override set" "tile"])
           (tag.steam ["suppressevent activate activatefocus" "workspace special:steam"])
           (tag.terminal ["tile"])
           (tag.vm ["workspace special:vm"])
           (tag.wine ["noborder" "noshadow"])
 
           ### Overrides
-          (class "signal" ["group override new lock"])
+          (class "signal" ["group override new" "tile"]) # Initial window in social group
           (class "steam_app_1473350" ["workspace 0"]) # (the) Gnorp Apologue
           (class "Tap Wizard 2\\.x86_64" ["workspace 0"])
           (class "Xdg-desktop-portal-gtk" ["noborder" "noshadow"])