From 9c1e2162bc5499839e014756af1c8832bc9d53ec Mon Sep 17 00:00:00 2001
From: "Ja.KooLit" <ejhay.games@gmail.com>
Date: Mon, 18 Dec 2023 10:27:25 +0900
Subject: [PATCH 1/2] updated passthrough keybinds

---
 config/hypr/configs/Keybinds.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 177861c..43afa89 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -177,8 +177,8 @@ bind = $mainMod SHIFT, Print, exec, $screenshot --area
 bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | swappy -f -
 
 # If you are using Ja's Hyprland dots as Host and wants to passthrough keyboard into a VM
-bind = CTRL SHIFT, P, submap, passthru
+bind = $mainMod ALT, P, submap, passthru
 submap = passthru
 # to unbind
-bind = CTRL SHIFT, Escape, submap, reset
+bind = $mainMod ALT, P, submap, reset
 submap = reset
\ No newline at end of file

From be0d3cede8df46613930ccc00ef14bb1e5929506 Mon Sep 17 00:00:00 2001
From: "Ja.KooLit" <ejhay.games@gmail.com>
Date: Tue, 19 Dec 2023 17:10:06 +0900
Subject: [PATCH 2/2] keybinds hotfix

---
 config/hypr/configs/Keybinds.conf | 18 ++++++++++--------
 config/hypr/scripts/KeyHints.sh   |  9 +++++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 43afa89..b5f565b 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -23,7 +23,7 @@ bind = $mainMod, D, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,r
 
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod SHIFT, R, exec, hyprctl reload
-bind = $mainMod SHIFT, Q, killactive, 
+bind = $mainMod SHIFT, Q, closewindow, 
 bind = $mainMod SHIFT, F, togglefloating,
 bind = $mainMod ALT, F, exec, hyprctl dispatch workspaceopt allfloat
 bind = $mainMod, F, fullscreen
@@ -36,15 +36,17 @@ bind = $mainMod CTRL, S, exec, $scriptsDir/RofiBeats.sh
 bind = $mainMod ALT, E, exec, $scriptsDir/RofiEmoji.sh
 bind = $mainMod, H, exec, $scriptsDir/KeyHints.sh
 bind = $mainMod, E, exec, $scriptsDir/QuickEdit.sh
-bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings
-bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar  
+bind = $mainMod SHIFT, B, exec, $scriptsDir/ChangeBlur.sh # Toggle blur settings 
 bind = $mainMod SHIFT, G, exec, $scriptsDir/GameMode.sh
-bind = CTRL SHIFT, W, exec, $scriptsDir/Refresh.sh
 bind = CTRL ALT, W, exec, $scriptsDir/Wallpaper.sh
-bind = CTRL, W, exec, $scriptsDir/WaybarStyles.sh
 bind = $mainMod, W, exec, $scriptsDir/WallpaperSelect.sh
-bind = ALT, W, exec, $scriptsDir/WaybarLayout.sh
-bind = ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh
+bind = $mainMod ALT, K, exec, $scriptsDir/SwitchKeyboardLayout.sh
+bind = $mainMod ALT, R, exec, $scriptsDir/Refresh.sh
+
+# Waybar / Bar related
+bind = $mainMod, B, exec, killall -SIGUSR1 waybar # Toggle hide/show waybar 
+bind = $mainMod CTRL, B, exec, $scriptsDir/WaybarStyles.sh
+bind = $mainMod ALT, B, exec, $scriptsDir/WaybarLayout.sh
 
 bind = $mainMod CTRL, D, layoutmsg, removemaster
 bind = $mainMod, Escape, exec, hyprctl kill
@@ -62,7 +64,7 @@ bind = $mainMod SHIFT, M, exec, hyprctl dispatch splitratio -0.3
 bind = $mainMod, G, togglegroup
 bind = $mainMod, tab, workspace, m+1
 bind = $mainMod SHIFT, tab, workspace, m-1
-bind = ALT, tab, cyclenext,          # change focus to another window
+bind = ALT, tab, cyclenext,  # change focus to another window  
 bind = ALT SHIFT, tab, bringactivetotop,   # bring it to the top
 
 # Special Keys / Hot Keys
diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
index b2c506f..7bb80e1 100755
--- a/config/hypr/scripts/KeyHints.sh
+++ b/config/hypr/scripts/KeyHints.sh
@@ -40,14 +40,15 @@ yad --width=$dynamic_width --height=$dynamic_height \
 " enter" "Terminal" "(kitty)" \
 " or  D" "App Launcher" "(rofi)" \
 " T" "Open File Manager" "(Thunar)" \
-" Q or  Shift Q  " "close focused app" "(kill)" \
+" Q" "close active window" "(not kill)" \
+" Shift Q " "closes a specified window" "(window)" \
 " Alt V" "Clipboard Manager" "(cliphist)" \
 " W" "Choose wallpaper" "(swww)" \
 "CTRL ALT W" "Random wallpaper" "(swww)" \
-"CTRL W" "Choose waybar styles" "(waybar styles)" \
+" CTRL B" "Choose waybar styles" "(waybar styles)" \
 " B" "Hide/UnHide Waybar" "waybar" \
-"ALT W" "Choose waybar layout" "(waybar layout)" \
-"CTRL SHIFT W" "Reload Waybar Dunst Rofi" "" \
+" ALT B" "Choose waybar layout" "(waybar layout)" \
+" ALT R" "Reload Waybar Dunst Rofi" "" \
 " Print" "screenshot" "(grim)" \
 " Shift Print" "screenshot region" "(grim + slurp)" \
 " Shift S" "screenshot region" "(swappy)" \