From 471a567e40289b28558d8a4ea6fe7bb24ee48181 Mon Sep 17 00:00:00 2001
From: Harzo <zt@kzhub.cc>
Date: Mon, 29 May 2023 15:06:59 +0200
Subject: [PATCH] Waybar: language module; Hyprland: resize mode

---
 .config/hypr/conf.d/keybinds.conf | 26 +++++++++++++++++++++++++-
 .config/waybar/config.jsonc       | 12 +++++++++++-
 .config/waybar/style.css          |  7 +++++--
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/.config/hypr/conf.d/keybinds.conf b/.config/hypr/conf.d/keybinds.conf
index b9b4394..fe9d319 100644
--- a/.config/hypr/conf.d/keybinds.conf
+++ b/.config/hypr/conf.d/keybinds.conf
@@ -1,5 +1,6 @@
 $mmod = SUPER
 $smod = SUPER_SHIFT
+$shift = SHIFT
 
 # Managing windows
 bind = $smod, Q, killactive, 
@@ -34,6 +35,7 @@ bindl  =      , XF86AudioPlay,        exec, playerctl play-pause
 bind   =      , Caps_Lock,            exec, sleep 0.2 && swayosd --caps-lock
 bind   = $mmod, V,                    exec, clipman pick -t wofi
 bind   = $smod, P,                    exec, ~/.scripts/colorpicker
+bind   = $smod, K,                    exec, ~/.scripts/system/kblayout-picker
 bind   = $smod, Tab,                  exec, footclient -a sysmonitor btm -b
 
 # Change current workspace
@@ -60,4 +62,26 @@ bind = $mmod, mouse_up, workspace, e-1
 bindm = $mmod, mouse:272, movewindow
 bindm = $mmod, mouse:273, resizewindow
 
-# Mouse bindings
+# Window resize/move submap
+bind = $smod, R, submap, 󰩨
+submap = 󰩨
+
+binde =  $mmod, right, resizeactive, 10 0
+binde =  $mmod, left,  resizeactive, -10 0
+binde =  $mmod, up,    resizeactive, 0 -10
+binde =  $mmod, down,  resizeactive, 0 10
+binde =  $smod, right, resizeactive, 50 0
+binde =  $smod, left,  resizeactive, -50 0
+binde =  $smod, up,    resizeactive, 0 -50
+binde =  $smod, down,  resizeactive, 0 50
+binde =       , right, moveactive, 10 0
+binde =       , left,  moveactive, -10 0
+binde =       , up,    moveactive, 0 -10
+binde =       , down,  moveactive, 0 10
+binde = $shift, right, moveactive, 50 0
+binde = $shift, left,  moveactive, -50 0
+binde = $shift, up,    moveactive, 0 -50
+binde = $shift, down,  moveactive, 0 50
+
+bind = , Escape, submap, reset
+submap = reset
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 326746d..c00f539 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -7,12 +7,14 @@
         "clock",
         "custom/weather",
         "custom/pacman",
-        "idle_inhibitor"
+        "idle_inhibitor",
+	"hyprland/submap"
     ],
     "modules-center": [
         "wlr/workspaces"
     ],
     "modules-right": [
+	"hyprland/language",
         "pulseaudio",
         "network",
         "tray"
@@ -115,5 +117,13 @@
             "activated": "",
             "deactivated": ""
         }
+    },
+    "hyprland/submap": {
+        "format": "{}",
+        "tooltip": false
+    },
+    "hyprland/language": {
+        "format": "  {}",
+	"on-click-right": "~/.scripts/system/kblayout-picker"
     }
 }
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 3b2fbd7..6076866 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -71,6 +71,7 @@ tooltip {
 #tray,
 #backlight,
 #language,
+#submap,
 #custom-pacman,
 #custom-weather,
 #idle_inhibitor {
@@ -89,13 +90,15 @@ tooltip {
 #pulseaudio,
 #network,
 #tray,
-#idle_inhibitor {
+#idle_inhibitor,
+#language {
     color: @nord_light_font;
     background: @nord_bg;
 }
 
 #idle_inhibitor.activated,
-#custom-pacman.urgent {
+#custom-pacman.urgent,
+#submap {
     color: @nord_dark_font;
     background: @nord_light;
 }