From 4f4e2087b01f148108ae145723ca31045d3c71c9 Mon Sep 17 00:00:00 2001
From: Jan-Bulthuis <git@bulthuis.dev>
Date: Wed, 12 Feb 2025 03:32:53 +0100
Subject: [PATCH] Updated river configuration

---
 user-modules/desktop/window-manager/river.nix | 73 ++++++++++---------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/user-modules/desktop/window-manager/river.nix b/user-modules/desktop/window-manager/river.nix
index dcebe62..3adad7e 100644
--- a/user-modules/desktop/window-manager/river.nix
+++ b/user-modules/desktop/window-manager/river.nix
@@ -65,7 +65,7 @@ in
       settings =
         let
           layout = "filtile";
-          layoutOptions = "-outer-padding ${toString config.theming.layout.windowPadding} -view-padding ${toString config.theming.layout.windowPadding}";
+          layoutOptions = "-outer-padding ${toString config.theming.layout.windowPadding} -view-padding ${toString config.theming.layout.windowPadding} -main-ratio 0.5";
           modes = [
             "normal"
             "locked"
@@ -119,6 +119,43 @@ in
           map = (
             lib.attrsets.recursiveUpdate
               {
+                "-repeat".normal = {
+                  # Basic utilities
+                  "${ssm} Return" = "spawn foot";
+
+                  # Window focus
+                  "${main} J" = "focus-view next";
+                  "${main} K" = "focus-view previous";
+
+                  # Swap windows
+                  "${ssm} J" = "swap next";
+                  "${ssm} K" = "swap previous";
+                  "${main} Return" = "zoom";
+
+                  # Main ratio
+                  "${main} H" = "send-layout-cmd ${layout} 'main-ratio -0.05'";
+                  "${main} L" = "send-layout-cmd ${layout} 'main-ratio +0.05'";
+
+                  # Main count
+                  "${ssm} H" = "send-layout-cmd ${layout} 'main-count +1'";
+                  "${ssm} L" = "send-layout-cmd ${layout} 'main-count -1'";
+
+                  # Move floating windows
+                  "${sam} H" = "move left 100";
+                  "${sam} J" = "move down 100";
+                  "${sam} K" = "move up 100";
+                  "${sam} L" = "move right 100";
+
+                  # Resize floating windows
+                  "${sas} H" = "resize horizontal -100";
+                  "${sas} J" = "resize vertical 100";
+                  "${sas} K" = "resize vertical -100";
+                  "${sas} L" = "resize horizontal 100";
+
+                  # Toggle modes
+                  "${main} Space" = "toggle-float";
+                  "${main} F" = "toggle-fullscreen";
+                };
                 normal =
                   {
                     "${main} Q" = "close";
@@ -126,29 +163,11 @@ in
 
                     # Basic utilities
                     "${main} X " = "spawn \"waylock -fork-on-lock ${waylockOptions}\"";
-                    "${ssm} Return" = "spawn foot";
                     "${main} P" = "spawn \"rofi -show drun\"";
                     "${ssm} P" = "spawn rofi-rbw";
                     "${main} S" =
                       "spawn \"grim -g \\\"\\\$(slurp)\\\" ~/Images/Screenshots/\\\$(date +'%s_grim.png')\"";
 
-                    # Window focus
-                    "${main} J" = "focus-view next";
-                    "${main} K" = "focus-view previous";
-
-                    # Swap windows
-                    "${ssm} J" = "swap next";
-                    "${ssm} K" = "swap previous";
-                    "${main} Return" = "zoom";
-
-                    # Main ratio
-                    "${main} H" = "send-layout-cmd ${layout} 'main-ratio -0.05'";
-                    "${main} L" = "send-layout-cmd ${layout} 'main-ratio +0.05'";
-
-                    # Main count
-                    "${ssm} H" = "send-layout-cmd ${layout} 'main-count +1'";
-                    "${ssm} L" = "send-layout-cmd ${layout} 'main-count -1'";
-
                     # Tags
                     "${main} 0" = "set-focused-tags ${toString (pow2 32 - 1)}";
                     "${ssm} 0" = "set-view-tags ${toString (pow2 32 - 1)}";
@@ -159,27 +178,11 @@ in
                     "${main} Down" = "send-layout-cmd ${layout} \"main-location bottom\"";
                     "${main} Left" = "send-layout-cmd ${layout} \"main-location left\"";
 
-                    # Move floating windows
-                    "${sam} H" = "move left 100";
-                    "${sam} J" = "move down 100";
-                    "${sam} K" = "move up 100";
-                    "${sam} L" = "move right 100";
-
                     # Snap floating windows
                     "${scam} H" = "snap left";
                     "${scam} J" = "snap down";
                     "${scam} K" = "snap up";
                     "${scam} L" = "snap right";
-
-                    # Resize floating windows
-                    "${sas} H" = "resize horizontal -100";
-                    "${sas} J" = "resize vertical 100";
-                    "${sas} K" = "resize vertical -100";
-                    "${sas} L" = "resize horizontal 100";
-
-                    # Toggle modes
-                    "${main} Space" = "toggle-float";
-                    "${main} F" = "toggle-fullscreen";
                   }
                   // builtins.listToAttrs (
                     builtins.concatLists (