From 0a9484f35e7726c697e1e64b27355a5f9ebc53b0 Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Fri, 14 Nov 2025 12:27:19 -0500
Subject: Fixed SUPER J/K ping ponging

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	new file:   CHANGES-v2.3.18.md
	modified:   config/hypr/scripts/ChangeLayout.sh
	modified:   config/hypr/scripts/KeybindsLayoutInit.sh
---
 CHANGES-v2.3.18.md                        | 19 +++++++++++++++
 config/hypr/scripts/ChangeLayout.sh       | 10 ++------
 config/hypr/scripts/KeybindsLayoutInit.sh | 40 +++++++------------------------
 3 files changed, 29 insertions(+), 40 deletions(-)
 create mode 100644 CHANGES-v2.3.18.md

diff --git a/CHANGES-v2.3.18.md b/CHANGES-v2.3.18.md
new file mode 100644
index 00000000..97af5183
--- /dev/null
+++ b/CHANGES-v2.3.18.md
@@ -0,0 +1,19 @@
+# CHANGES: Hyprland-Dots v2.3.18
+
+## FIXES:
+
+- Changed to Hyprland (only) Packages from SID
+  - No longer build from source
+  - Hyprland Version @ v0.51.1
+  - If/When SID it updated, updates will be done as normal process
+- Overview Toggle keyind SUPER + A now properly detects QS
+- If QS fails, or not installed AGS will be started instead
+- Fixed Super J/K cycle next/prev being activated switch
+
+## CHANGES:
+
+- Lock screen
+  - Clock now horizontal and smaller
+  - Adjust spacing margines of the various fields
+  - Small changes to color variabbles Trying to balance colors
+  - Fixed both 1080 and 2K+ configurations
diff --git a/config/hypr/scripts/ChangeLayout.sh b/config/hypr/scripts/ChangeLayout.sh
index 78428188..e2436b79 100755
--- a/config/hypr/scripts/ChangeLayout.sh
+++ b/config/hypr/scripts/ChangeLayout.sh
@@ -9,20 +9,14 @@ LAYOUT=$(hyprctl -j getoption general:layout | jq '.str' | sed 's/"//g')
 case $LAYOUT in
 "master")
 	hyprctl keyword general:layout dwindle
-	hyprctl keyword unbind SUPER,J
-	hyprctl keyword unbind SUPER,K
-	hyprctl keyword bind SUPER,J,cyclenext
-	hyprctl keyword bind SUPER,K,cyclenext,prev
+	# SUPER+J/K are global and managed by KeybindsLayoutInit.sh; only manage SUPER+O here
 	hyprctl keyword bind SUPER,O,togglesplit
   notify-send -e -u low -i "$notif" " Dwindle Layout"
 	;;
 "dwindle")
 	hyprctl keyword general:layout master
-	hyprctl keyword unbind SUPER,J
-	hyprctl keyword unbind SUPER,K
+	# Drop togglesplit binding on SUPER+O when switching back to master
 	hyprctl keyword unbind SUPER,O
-	hyprctl keyword bind SUPER,J,layoutmsg,cyclenext
-	hyprctl keyword bind SUPER,K,layoutmsg,cycleprev
   notify-send -e -u low -i "$notif" " Master Layout"
 	;;
 *) ;;
diff --git a/config/hypr/scripts/KeybindsLayoutInit.sh b/config/hypr/scripts/KeybindsLayoutInit.sh
index fd34f90e..0a53eaaf 100755
--- a/config/hypr/scripts/KeybindsLayoutInit.sh
+++ b/config/hypr/scripts/KeybindsLayoutInit.sh
@@ -1,38 +1,14 @@
 #!/usr/bin/env bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# Initialize J/K keybinds to match the current default layout at startup
+# Initialize J/K keybinds so they always cycle windows globally (no layout-specific behavior)
+# This avoids double-actions when layouts change.
 
 set -euo pipefail
 
-# Determine current layout (master|dwindle); be robust to null at startup
-LAYOUT=$(hyprctl -j getoption general:layout | jq -r '.str // empty' 2>/dev/null || true)
-if [ -z "${LAYOUT:-}" ]; then
-  # Fallback: parse non-JSON output (e.g., "str: dwindle")
-  LAYOUT=$(hyprctl getoption general:layout 2>/dev/null | awk -F'str:' 'NF>1 {gsub(/^ +| +$/,"",$2); print $2}')
-fi
-[ -z "${LAYOUT:-}" ] && exit 0
+# Always reset and bind SUPER+J/K the same way on startup
+hyprctl keyword unbind SUPER,J || true
+hyprctl keyword unbind SUPER,K || true
 
-case "$LAYOUT" in
-  master)
-    # Ensure master layout-style binds
-    hyprctl keyword unbind SUPER,J
-    hyprctl keyword unbind SUPER,K
-    hyprctl keyword unbind SUPER,O
-    hyprctl keyword bind SUPER,J,layoutmsg,cyclenext
-    hyprctl keyword bind SUPER,K,layoutmsg,cycleprev
-    ;;
-  dwindle)
-    # Ensure dwindle layout-style binds
-    hyprctl keyword unbind SUPER,J
-    hyprctl keyword unbind SUPER,K
-    hyprctl keyword unbind SUPER,O
-    hyprctl keyword bind SUPER,J,cyclenext
-    hyprctl keyword bind SUPER,K,cyclenext,prev
-    # ensure SUPER+O togglesplit is available on dwindle
-    hyprctl keyword bind SUPER,O,togglesplit
-    ;;
-  *)
-    # Do nothing for unexpected values
-    :
-    ;;
- esac
+# Cycle windows globally: J = next, K = previous
+hyprctl keyword bind SUPER,J,cyclenext
+hyprctl keyword bind SUPER,K,cyclenext,prev
-- 
cgit v1.2.3