dotfiles

commit 89660c95a3e86ef21e3ff22c2e0e11521c2a0dee
parent 02a38d9b4544e3a9e8b0d1752d043de12c8a72a5
Author: maydayv7 <maydayv7@gmail.com>
Date:   Thu, 23 May 2024 14:27:38 +0530

fix(Hyprland): Shortcut Shenanigans

Diffstat:

4 files changed, 95 insertions(+), 32 deletions(-)
diff --git a/files/hyprland/kebihelp.json b/files/hyprland/kebihelp.json
@@ -71,8 +71,8 @@
             "label": "$mod"
           },
           {
-            "value": "L'/R'",
-            "label": "Left/Right Click"
+            "value": "L' / R'",
+            "label": "Left/Right Mouse Click"
           }
         ]
       },
@@ -88,11 +88,11 @@
             "label": "Activate urgent/last window"
           },
           {
-            "value": "$mod M",
+            "value": "$mod E",
             "label": "Maximize window"
           },
           {
-            "value": "$mod SHIFT M",
+            "value": "$mod SHIFT E",
             "label": "Fullscreen window"
           },
           {
@@ -141,8 +141,12 @@
             "label": "Show workspace expose view"
           },
           {
-            "value": "$mod [SHIFT] Tab",
-            "label": "Show workspace overview [for all monitors]"
+            "value": "$mod Tab",
+            "label": "Show workspace overview for current monitor"
+          },
+          {
+            "value": "$mod SHIFT Tab",
+            "label": "Show workspace overview for all monitors"
           },
           {
             "value": "ALT <ARROW>",
@@ -150,11 +154,11 @@
           },
           {
             "value": "ALT [SHIFT] Tab",
-            "label": "Cycle [backwards] through open applications"
+            "label": "Cycle [backwards] through open windows"
           },
           {
             "value": "ALT [SHIFT] `",
-            "label": "Cycle [backwards] through grouped applications"
+            "label": "Cycle [backwards] through grouped windows"
           }
         ]
       },
@@ -163,11 +167,11 @@
         "keybindings": [
           {
             "value": "$mod <NUM>",
-            "label": "Create workspace '<NUM>' {1 to 9}"
+            "label": "Create workspace 'NUM' {1 to 9}"
           },
           {
             "value": "$mod SHIFT <NUM>",
-            "label": "Move window to workspace '<NUM>' {1 to 9}"
+            "label": "Move window to workspace 'NUM' {1 to 9}"
           },
           {
             "value": "$mod , or .",
@@ -225,6 +229,10 @@
           {
             "value": "$mod SHIFT S",
             "label": "Invert active window color"
+          },
+          {
+            "value": "$mod SHIFT D",
+            "label": "Toggle main Display"
           }
         ]
       },
@@ -244,8 +252,8 @@
             "label": "Color Picker"
           },
           {
-            "value": "$mod [SHIFT] D",
-            "label": "Monitor Configuration [Toggle main Display]"
+            "value": "$mod D",
+            "label": "Monitor Configuration"
           },
           {
             "value": "$mod F",
@@ -293,10 +301,6 @@
             "label": "Window resize"
           },
           {
-            "value": "$mod CTRL L'",
-            "label": "Window resize"
-          },
-          {
             "value": "$mod SHIFT L'",
             "label": "Move window into application group"
           }
@@ -307,22 +311,58 @@
         "keybindings": [
           {
             "value": "esc",
-            "label": "Reset Submap"
+            "label": "Exit Submap"
+          },
+          {
+            "value": "",
+            "label": ""
           },
           {
             "value": "$mod R",
-            "label": "Resize"
+            "label": "Resize Submap"
+          },
+          {
+            "value": "<ARROW> or L' (Mouse Drag)",
+            "label": "Resize window"
+          },
+          {
+            "value": "",
+            "label": ""
+          },
+          {
+            "value": "$mod M",
+            "label": "Move Submap"
+          },
+          {
+            "value": "L' (Mouse Drag)",
+            "label": "Move window"
+          },
+          {
+            "value": "<ARROW>",
+            "label": "Move window (into group)"
+          },
+          {
+            "value": "SHIFT <ARROW>",
+            "label": "Move floating window"
+          },
+          {
+            "value": "C",
+            "label": "Center floating window"
+          },
+          {
+            "value": "P",
+            "label": "Pin floating window"
           },
           {
-            "value": "($mod R) L'/R'",
-            "label": "Resize / Move window"
+            "value": "",
+            "label": ""
           },
           {
             "value": "ALT SHIFT Q",
-            "label": "Minimize"
+            "label": "Minimized Submap"
           },
           {
-            "value": "(ALT SHIFT Q) Return or L'",
+            "value": "Return or L'",
             "label": "Unminimize selected window"
           }
         ]
diff --git a/files/hyprland/waybar.css b/files/hyprland/waybar.css
@@ -34,8 +34,7 @@ window#waybar {
 }
 
 .modules-left #workspaces button.active {
-  border: 2px solid @base03;
-  color: @base05;
+  background-color: @base05;
 }
 
 .modules-left #workspaces button.empty {
@@ -43,6 +42,10 @@ window#waybar {
   background-color: transparent;
 }
 
+.modules-left #workspaces button.hosting-monitor {
+  border: 2px solid @base04;
+}
+
 #submap {
   color: @base00;
   background-color: @base08;
diff --git a/modules/gui/desktop/hyprland/apps/rules.nix b/modules/gui/desktop/hyprland/apps/rules.nix
@@ -16,6 +16,7 @@ _: {
       "move cursor -50% -50%, class:^(ulauncher)$"
 
       # Keybinds Viewer
+      "pin, title:^(Kebihelp)$"
       "float, title:^(Kebihelp)$"
       "stayfocused, title:^(Kebihelp)$"
       "opacity 0.9 override, title:^(Kebihelp)"
diff --git a/modules/gui/desktop/hyprland/settings/keybindings.nix b/modules/gui/desktop/hyprland/settings/keybindings.nix
@@ -10,8 +10,8 @@
           "$mod, Q, killactive,"
           "ALT, F4, killactive,"
           "$mod, P, pin"
-          "$mod, M, fullscreen, 1"
-          "$mod SHIFT, M, fullscreen,"
+          "$mod, E, fullscreen, 1"
+          "$mod SHIFT, E, fullscreen,"
           "$mod, Space, togglesplit"
           "$mod SHIFT, D, exec, hyprutils toggle monitor ${sys.gui.display}"
 
@@ -88,7 +88,6 @@
       bindm = [
         "$mod, mouse:272, movewindow"
         "$mod, mouse:273, resizewindow"
-        "$mod CTRL, mouse:272, resizewindow"
         "$mod SHIFT, mouse:272, moveintogroup"
       ];
 
@@ -122,21 +121,41 @@
     ## Submaps
     extraConfig = ''
       # Window Resize
-      bind = $mod, R, submap, resize
-      submap = resize
+      bind = $mod, R, submap, Resize
+      submap = Resize
       binde = , right, resizeactive, 10 0
       binde = , left, resizeactive, -10 0
       binde = , up, resizeactive, 0 -10
       binde = , down, resizeactive, 0 10
       bindm = , mouse:272, resizewindow
-      bindm = , mouse:273, movewindow
+      bind = , escape, submap, reset
+      submap = reset
+
+      # Window Movement
+      bind = $mod, M, submap, Move
+      submap = Move
+      bindm = , mouse:272, movewindow
+      bind = , C, centerwindow
+      bind = , P, pin
+      bind = , left, movewindoworgroup, l
+      bind = , right, movewindoworgroup, r
+      bind = , up, movewindoworgroup, u
+      bind = , down, movewindoworgroup, d
+      bind = SHIFT, left, moveactive, -30 0
+      bind = SHIFT, right, moveactive, 30 0
+      bind = SHIFT, up, moveactive, 0 -30
+      bind = SHIFT, down, moveactive, 0 30
       bind = , escape, submap, reset
       submap = reset
 
       # Window Minimization
-      bind = ALT SHIFT, Q, submap, minimized
-      submap = minimized
+      bind = ALT SHIFT, Q, submap, Minimized
+      submap = Minimized
       bind = , F4, killactive
+      bind = , left, movefocus, l
+      bind = , right, movefocus, r
+      bind = , up, movefocus, u
+      bind = , down, movefocus, d
       bind = , Return, movetoworkspace, +0
       bind = , Return, submap, reset
       bind = , mouse:272, movetoworkspace, +0