From 08a678973527a6cf232646d56187031fad5525a1 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 2 May 2023 11:54:57 +0100
Subject: [PATCH] Add grouping for dwindle layout, add window rules for Zoom

---
 nixos/home/desktop/wayland/config/hypr/hyprland.conf     | 2 ++
 nixos/home/desktop/wayland/config/hypr/keybinds.conf     | 3 ++-
 nixos/home/desktop/wayland/config/hypr/window-rules.conf | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/home/desktop/wayland/config/hypr/hyprland.conf b/nixos/home/desktop/wayland/config/hypr/hyprland.conf
index 8a9e09c3..931dabfa 100644
--- a/nixos/home/desktop/wayland/config/hypr/hyprland.conf
+++ b/nixos/home/desktop/wayland/config/hypr/hyprland.conf
@@ -40,7 +40,9 @@ general {
     gaps_out = 20
     border_size = 2
     col.active_border = rgba(b4befeff) rgba(b4befeff) 45deg
+    col.group_border_active = rgba(b4befeff) rgba(b4befeff) 45deg
     col.inactive_border = rgba(595959aa)
+    col.group_border = rgba(595959aa)
 
     layout = dwindle
 }
diff --git a/nixos/home/desktop/wayland/config/hypr/keybinds.conf b/nixos/home/desktop/wayland/config/hypr/keybinds.conf
index 7c9afb3c..d26a2c29 100644
--- a/nixos/home/desktop/wayland/config/hypr/keybinds.conf
+++ b/nixos/home/desktop/wayland/config/hypr/keybinds.conf
@@ -12,7 +12,8 @@ bind = $mainMod, E, exec, neovide --multigrid --maximized
 bind = $mainMod, P, exec, ~/.dotfiles/scripts/powermenu
 bind = $mainMod, V, togglefloating,
 bind = $mainMod, Space, exec, rofi -show drun
-bind = $mainMod, S, pseudo, # dwindle
+bind = $mainMod, S, togglegroup, # dwindle
+bind = $mainMod SHIFT, S, changegroupactive, # dwindle
 bind = $mainMod, G, togglesplit, # dwindle
 bind = $mainMod, F1, exec, swaylock
 bind = $mainMod, W, exec, $browser
diff --git a/nixos/home/desktop/wayland/config/hypr/window-rules.conf b/nixos/home/desktop/wayland/config/hypr/window-rules.conf
index c3706b1b..43619ea1 100644
--- a/nixos/home/desktop/wayland/config/hypr/window-rules.conf
+++ b/nixos/home/desktop/wayland/config/hypr/window-rules.conf
@@ -8,6 +8,8 @@ windowrule = float, ^(marktext)$
 windowrule = center, ^(marktext)$
 windowrule = float, ^(otpclient)$
 windowrule = move 2% 6%, ^(otpclient)$
+windowrule = float, title:^(Zoom)(.*)$
+windowrule = center, title:^(Zoom)(.*)$
 
 windowrulev2 = float,class:^(Nxplayer.bin)$,title:^(NoMachine)$
 windowrulev2 = center,class:^(Nxplayer.bin)$,title:^(NoMachine)$
@@ -23,6 +25,7 @@ windowrule = workspace 4, ^(Microsoft Teams - Preview)$
 windowrule = workspace 5, ^(Element)$
 windowrule = workspace 5, ^(Signal)$
 windowrule = workspace 5, ^(discord)$
+windowrule = workspace 5, title:^(Zoom)(.*)$
 windowrule = workspace 6, ^(Steam)$
 windowrule = workspace 6, ^(steamwebhelper)$
 windowrule = workspace 7, ^(Bitwarden)$