too many small changes to list

1 files changed, 62 insertions, 34 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 2fe1b14..bcf0143 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -4,7 +4,7 @@
 #
 
 # See https://wiki.hyprland.org/Configuring/Monitors/
-monitor = , preferred, auto, auto
+monitor = , preferred, auto, 1
 
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
@@ -56,7 +56,7 @@ general {
     col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     col.inactive_border = rgba(595959aa)
 
-    layout = master
+    layout = dwindle
 }
 
 misc {
@@ -98,6 +98,7 @@ dwindle {
     # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
     pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
     preserve_split = yes # you probably want this
+    special_scale_factor = 0.55
 }
 
 master {
@@ -136,29 +137,46 @@ bind = $mainMod+SHIFT, SPACE, togglefloating,
 bind = $mainMod, R, exec, exec j4-dmenu-desktop --dmenu="bemenu -l 10 -p \"Run:\""
 bind = $mainMod, D, exec, exec bemenu-run -l 15 -p "Run:"
 bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod+$secdMod, S, togglesplit, # dwindle
+bind = $mainMod $secdMod, S, togglesplit, # dwindle
+
+# Layout toggle
+bind = $mainMod $secdMod, A, exec, hypr-layout -t
 
 # Master layout binds
-bind = $mainMod+SHIFT, Return, layoutmsg, swapwithmaster auto
-bind = $mainMod+SHIFT, J, layoutmsg, swapnext
-bind = $mainMod+SHIFT, K, layoutmsg, swapprev
-bind = $mainMod, H, layoutmsg, addmaster
-bind = $mainMod, L, layoutmsg, removemaster
-bind = $mainMod, J, movefocus, d
-bind = $mainMod, K, movefocus, u
+#bind = $mainMod+SHIFT, Return, layoutmsg, swapwithmaster auto #MASTER
+#bind = $mainMod+SHIFT, J, layoutmsg, swapnext #MASTER
+#bind = $mainMod+SHIFT, K, layoutmsg, swapprev #MASTER
+#bind = $mainMod, H, layoutmsg, addmaster #MASTER
+#bind = $mainMod, L, layoutmsg, removemaster #MASTER
+#bind = $mainMod, J, movefocus, d #MASTER
+#bind = $mainMod, K, movefocus, u #MASTER
 
 
+# Dwindle layout binds
 # Move focus with mainMod + HJKL
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-
+bind = $mainMod, H, movefocus, l #DWINDLE
+bind = $mainMod, L, movefocus, r #DWINDLE
+bind = $mainMod, K, movefocus, u #DWINDLE
+bind = $mainMod, J, movefocus, d #DWINDLE
+# Move window with mainMod + HJKL
+bind = $mainMod SHIFT, L, movewindow, r #DWINDLE
+bind = $mainMod SHIFT, H, movewindow, l #DWINDLE
+bind = $mainMod SHIFT, J, movewindow, d #DWINDLE
+bind = $mainMod SHIFT, K, movewindow, u #DWINDLE
 # Resize clients with mainMod + secdMod + HJKL
-bind = $mainMod+$secdMod, L, resizeactive, 10 0
-bind = $mainMod+$secdMod, H, resizeactive, -10 0
-bind = $mainMod+$secdMod, K, resizeactive, 0 -10
-bind = $mainMod+$secdMod, J, resizeactive, 0 10
+bind = $mainMod $secdMod, L, resizeactive, 10 0 #DWINDLE
+bind = $mainMod $secdMod, H, resizeactive, -10 0 #DWINDLE
+bind = $mainMod $secdMod, K, resizeactive, 0 -10 #DWINDLE
+bind = $mainMod $secdMod, J, resizeactive, 0 10 #DWINDLE
+
+# Group binds
+#bind = $mainMod CONTROL, G, togglegroup,
+#bind = $mainMod CONTROL, I, lockgroups, lock
+#bind = $mainMod CONTROL, U, lockgroups, unlock
+#bind = $mainMod CONTROL, H, moveintogroup, r
+#bind = $mainMod CONTROL, L, moveintogroup, l
+#bind = $mainMod CONTROL, J, moveintogroup, d
+#bind = $mainMod CONTROL, K, moveintogroup, u
 
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
@@ -183,6 +201,16 @@ bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
 bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
 bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
 bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10
+bind = $mainMod CONTROL SHIFT, 1, movetoworkspace, 1
+bind = $mainMod CONTROL SHIFT, 2, movetoworkspace, 2
+bind = $mainMod CONTROL SHIFT, 3, movetoworkspace, 3
+bind = $mainMod CONTROL SHIFT, 4, movetoworkspace, 4
+bind = $mainMod CONTROL SHIFT, 5, movetoworkspace, 5
+bind = $mainMod CONTROL SHIFT, 6, movetoworkspace, 6
+bind = $mainMod CONTROL SHIFT, 7, movetoworkspace, 7
+bind = $mainMod CONTROL SHIFT, 8, movetoworkspace, 8
+bind = $mainMod CONTROL SHIFT, 9, movetoworkspace, 9
+bind = $mainMod CONTROL SHIFT, 0, movetoworkspace, 10
 
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1
@@ -193,7 +221,7 @@ bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
 # resize submap
-bind = $mainMod+$secdMod, R, submap, resize
+bind = $mainMod $secdMod, R, submap, resize
 submap = resize
 binde = CONTROL, L, resizeactive, 10 0
 binde = CONTROL, H, resizeactive, -10 0
@@ -209,26 +237,26 @@ bind = $mainMod, B, submap, reset
 submap = reset
 
 # Media bindings
-bindl = $mainMod+$secdMod, P, exec, playerctl -p mpd play-pause
+bindl = $mainMod $secdMod, P, exec, playerctl -p mpd play-pause
 bindel = , XF86AudioRaiseVolume, exec, volsv -i 5
 bindel = , XF86AudioLowerVolume, exec, volsv -d 5
 
 # OBS bindings
-bind = $mainMod+$secdMod, 1, pass, ^(com\.obsproject\.Studio)$
-bind = $mainMod+$secdMod, 2, pass, ^(com\.obsproject\.Studio)$
-bind = $mainMod+$secdMod, 3, pass, ^(com\.obsproject\.Studio)$
-bind = $mainMod+$secdMod, 4, pass, ^(com\.obsproject\.Studio)$
-bind = $mainMod+$secdMod, 5, pass, ^(com\.obsproject\.Studio)$
-bind = $mainMod+$secdMod, 6, pass, ^(com\.obsproject\.Studio)$
-bind = $mainMod+$secdMod, 7, pass, ^(com\.obsproject\.Studio)$
-bind = $mainMod+$secdMod, 8, pass, ^(com\.obsproject\.Studio)$
-bind = $mainMod+$secdMod, 9, pass, ^(com\.obsproject\.Studio)$
-bind = $mainMod+$secdMod, 0, pass, ^(com\.obsproject\.Studio)$
+bind = $mainMod $secdMod, 1, pass, ^(com\.obsproject\.Studio)$
+bind = $mainMod $secdMod, 2, pass, ^(com\.obsproject\.Studio)$
+bind = $mainMod $secdMod, 3, pass, ^(com\.obsproject\.Studio)$
+bind = $mainMod $secdMod, 4, pass, ^(com\.obsproject\.Studio)$
+bind = $mainMod $secdMod, 5, pass, ^(com\.obsproject\.Studio)$
+bind = $mainMod $secdMod, 6, pass, ^(com\.obsproject\.Studio)$
+bind = $mainMod $secdMod, 7, pass, ^(com\.obsproject\.Studio)$
+bind = $mainMod $secdMod, 8, pass, ^(com\.obsproject\.Studio)$
+bind = $mainMod $secdMod, 9, pass, ^(com\.obsproject\.Studio)$
+bind = $mainMod $secdMod, 0, pass, ^(com\.obsproject\.Studio)$
 
 # Menu bindings
-bind = $mainMod+$secdMod, Q, exec, qbc -w
-bind = $mainMod+$secdMod, W, exec, lwc -w
-bind = $mainMod+$secdMod, P, exec, passmenu
+bind = $mainMod $secdMod, Q, exec, qbc -w
+bind = $mainMod $secdMod, W, exec, lwc -w
+bind = $mainMod $secdMod, P, exec, passmenu
 
 # Misc bindings
 bind = $mainMod, W, exec, waytoggle