From 7b5fd0570c5fffd7c5115a2f537092a4e0440a57 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 28 Jun 2023 08:40:34 +0100
Subject: [PATCH] Update hyprland config

---
 home/desktop/hyprland.nix | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix
index f4d0acb0..7222219a 100644
--- a/home/desktop/hyprland.nix
+++ b/home/desktop/hyprland.nix
@@ -37,7 +37,7 @@
         kb_layout = gb
         follow_mouse = 1
         touchpad {
-            natural_scroll = no
+            natural_scroll = yes
         }
     }
 
@@ -49,12 +49,7 @@
         col.group_border_active = $mauve
         col.inactive_border = $surface2
         col.group_border = $surface2
-        layout = dwindle
-    }
-
-    dwindle {
-      force_split = 2
-      preserve_split = true
+        layout = master
     }
 
     decoration {
@@ -84,16 +79,15 @@
     # See https://wiki.hyprland.org/Configuring/Keywords/ for more
     bind = SUPER, Return, exec, wezterm
     bind = SUPER, Q, killactive,
-    bind = SUPER, E, exec, power-profiles
-    bind = SUPER, P, exec, powermenu
     bind = SUPER, V, togglefloating,
-    bind = SUPER, Space, exec, pkill rofi || rofi -show drun
+    bind = SUPER, R, exec, pkill rofi || rofi -show drun
     bind = SUPER, S, exec, grim -g "$(slurp)"
-    bind = SUPER, F1, exec, swaylock
+    bind = SUPER, P, exec, swaylock
     bind = SUPER, W, exec, firefox
     bind = SUPER, F, exec, thunar
-    bind = SUPER, M, fullscreen, 1
-    bind = SUPER, A, layoutmsg, togglesplit
+    bind = SUPER, M, fullscreen, 0
+    bind = SUPER SHIFT, M, fullscreen, 1
+    bind = SUPER SHIFT, P, exec, powermenu
 
     bind = , XF86AudioMute, exec, pamixer -t
     binde = , XF86AudioRaiseVolume, exec, pamixer -i 2
@@ -171,15 +165,14 @@
 
     # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
     windowrule = float, ^(foot)$
-    windowrule = float, ^(pavucontrol)$
-    windowrule = float, ^(.blueman-manager-wrapped)$
-    windowrule = float, ^(otpclient)$
-    windowrule = float, ^(thunar)$
-
     windowrule = center, ^(foot)$
+    windowrule = float, ^(pavucontrol)$
     windowrule = center, ^(pavucontrol)$
+    windowrule = float, ^(.blueman-manager-wrapped)$
     windowrule = center, ^(.blueman-manager-wrapped)$
+    windowrule = float, ^(otpclient)$
     windowrule = move 2% 6%, ^(otpclient)$
+    windowrule = float, ^(thunar)$
   '';
   xdg.configFile."hypr/macchiato.conf".text = ''
     $rosewaterAlpha = f4dbd6