Merge branch 'development' into patch-2

7 files changed, 111 insertions, 47 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebbb51d8..fc6bf78e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog — JAK's Hyprland Dotfiles
 
+## v2.3.19
+
+- 2025-12-29
+  - Fixed pathing in Wallust script
+    - Thank you [Lumethra](https://github.com/Lumethra)
+
+— 2025-12-22
+
+- Added:
+  - Optional keybinding to increment/decrement audio in 1% steps vs. 5%
+    - Thanks [rgarofono](https://github.com/rgarofano) for the code
+- Fixed:
+  - Switch Layout was looking in wrong location
+  - SUPER - J/K not working in both `master` and `dwindle` layouts
+    - You also get notification message on layout change
+    - Thanks [@suresh466](https://github.com/suresh466) for fixing it
+
 ## v2.3.18 — 2025-12-10
 
 ## FIXES:
diff --git a/README.md b/README.md
index d0d7169f..dd347e28 100644
--- a/README.md
+++ b/README.md
@@ -62,8 +62,8 @@ https://github.com/user-attachments/assets/49bc12b2-abaf-45de-a21c-67aacd9bb872
 sh <(curl -L https://raw.githubusercontent.com/JaKooLit/Hyprland-Dots/main/Distro-Hyprland.sh)
 ```
 
-- you can now use above command to automatically clone the Distro-Hyprland install scripts below
-- it will clone the install scripts and start the `install.sh` 😎
+- You can use the above command to automatically clone the `Distro-Hyprland` install scripts
+- It will clone the install script and start the `install.sh` 😎
 
 ### 👁️‍🗨️ My Hyprland install Scripts 👁️‍🗨️
 
@@ -88,8 +88,8 @@ sh <(curl -L https://raw.githubusercontent.com/JaKooLit/Hyprland-Dots/main/Distr
 
 ### 🪧 Attention 🪧
 
-- This repo does NOT contain or will NOT install any packages. These are only pre-configured-hyprland configs or dotfiles
-- refer to install scripts what packages needed to install... but atleast, Hyprland packages is needed 😏😏😏 duh!!
+- This repo does not install any packages. This repo only contains pre-configured-hyprland configs aka `dotfiles`
+- Refer to the install scripts for what packages needed to install. At mimimum, the Hyprland packages are needed 😏😏😏 duh!!
 - This repo will be pulled by the Distro-Hyprland install scripts above if you opt to download pre-configured dots
 
 ### 👀 Screenshots 👀
@@ -101,16 +101,23 @@ sh <(curl -L https://raw.githubusercontent.com/JaKooLit/Hyprland-Dots/main/Distr
 - To easily track changes, I will be updating the [CHANGELOGS](https://github.com/JaKooLit/Hyprland-Dots/wiki/Changelogs) Screenshots will be included if worth mentioning the changes!
 
 > [!NOTE]
-> Kindly note that by defeault, Kools Dots are adjusted / configured for 2k (1440p) display without scaling.
+> Kindly note that by default, Kools Dots are adjusted / configured for 2k (1440p) display without scaling.
 
 ### 💥 Copying / Installation / Update instructions 💥
 
 - [`MORE INFO HERE`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Install_&_Update)
   > [!Note]
-  > The auto copy script "copy.sh" will create backups of intended directories to be copied. However, still a good idea to manually backup just incase script failed to backup!
-- clone this repo by using git. Change directory, make executable and run the script
+  > The auto copy script `copy.sh` will create backups of intended directories to be copied. 
+  > However, it's still a good idea to manually backup just incase script fails to backup your configuration. 
+  > If you already have a hyprland configuration, uninstall it first, or create a new user, and install it with that user
+  
+- Clone this repo by using `git`. 
+- Change directory, i.e. `cd Arch-Hyprland`  
+- Make `install.sh` executable  `chmod +x ./install.sh` 
+- Run the script `./install.sh` 
 
-> to download from Master branch
+> To download from Master branch
+> Note: Ubuntu is exception, it has version specific branches
 
 ```bash
 git clone --depth=1 https://github.com/JaKooLit/Hyprland-Dots.git
@@ -118,7 +125,8 @@ cd Hyprland-Dots
 ```
 
 > to download from Development branch (development and testing)
-> Not recommeded for non-testing systems 
+> Not recommeded for non-testing systems!! 
+> REALLY, not recommended. 
 
 ```bash
 git clone --depth=1 https://github.com/JaKooLit/Hyprland-Dots.git -b development
@@ -162,9 +170,9 @@ chmod +x upgrade.sh
 #### ⚠️⚠️⚠️ ATTENTION - BACKUPS CREATED by SCRIPT
 
 > [!CAUTION]
-> copy.sh, release.sh and even upgrade.sh creates a backup!
-> Kindly investigate manually contents on your $HOME/.config
-> Delete manually all the backups which you dont need
+> `copy.sh`, `release.sh` and even `upgrade.sh` creates a backup!
+> Kindly investigate manually contents on your `$HOME/.config`
+> Delete manually any backups which you dont want.
 
 #### 🛎️ a small note on wallpapers
 
@@ -172,7 +180,8 @@ chmod +x upgrade.sh
 
 #### ⚠️⚠️⚠️ A MUST! after copying / Installing these dots
 
-- Press SUPER W and set a wallpaper. This is also to initiate wallust for waybar, kitty (tty) and rofi themes. However, If you use the copy.sh or the release.sh, there will be a preset initial Wallpaper and you dont have to do this
+- Press `SUPER W` and set a wallpaper. This is also to initiate wallust for waybar, kitty (tty) and rofi themes.
+- However, If you use the `copy.sh` or the `release.sh`, there will be a preset initial Wallpaper and you dont have to do this
 
 - Nvidia Owners. Make sure to edit your `~/.config/hypr/UserConfigs/ENVariables.conf` (highly recommended).
 
@@ -197,11 +206,13 @@ chmod +x upgrade.sh
 
 #### 🙏 Special request
 
-- If you have improvements on the dotfiles or configuration, feel free to submit a PR for improvement. I always welcome improvements as I am also just learning just like you guys!
+- If you have improvements on the dotfiles or configuration, feel free to submit a PR for improvement.
+- I always welcome improvements as I am also just learning just like you guys!
 
 #### ✍️ Contributing
 
 - Want to contribute? Click [`HERE`](https://github.com/JaKooLit/Hyprland-Dots/blob/main/CONTRIBUTING.md) for a guide how to contribute
+>  Thanks to all who have contributed code, or support on the Discord server. You efforts are greatly appreciated 
 
 #### 🤷‍♂️ TO DO!
 
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 1ddbc81a..ddc516bc 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -97,6 +97,8 @@ bindd = $mainMod, P, toggle pseudo (dwindle), pseudo,
 
 # Works on either layout (Master or Dwindle)
 bindd = $mainMod, M, set split ratio 0.3, exec, hyprctl dispatch splitratio 0.3
+# layout aware keybinds
+exec-once = $scriptsDir/ChangeLayout.sh init
 
 
 # Cycle windows; if floating bring to top
@@ -106,6 +108,8 @@ bindd = ALT, tab, bring active to top, bringactivetotop
 # Special Keys / Hot Keys
 bindeld = , xf86audioraisevolume, volume up, exec, $scriptsDir/Volume.sh --inc
 bindeld = , xf86audiolowervolume, volume down, exec, $scriptsDir/Volume.sh --dec
+bindeld = ALT, xf86audioraisevolume, volume up precise, exec, $scriptsDir/Volume.sh --inc-precise
+bindeld = ALT, xf86audiolowervolume, volume down precise, exec, $scriptsDir/Volume.sh --dec-precise
 bindld = , xf86AudioMicMute, toggle mic mute, exec, $scriptsDir/Volume.sh --toggle-mic
 bindld = , xf86audiomute, toggle mute, exec, $scriptsDir/Volume.sh --toggle
 bindld = , xf86Sleep, sleep, exec, systemctl suspend
diff --git a/config/hypr/configs/Startup_Apps.conf b/config/hypr/configs/Startup_Apps.conf
index 0cfb6427..27c8d26a 100644
--- a/config/hypr/configs/Startup_Apps.conf
+++ b/config/hypr/configs/Startup_Apps.conf
@@ -19,7 +19,6 @@ exec-once = swww-daemon --format xrgb
 ### Startup ###
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = $scriptsDir/KeybindsLayoutInit.sh
 
 # Drop Down terminal
 # See Bug#810 https://github.com/JaKooLit/Hyprland-Dots/issues/810#issuecomment-3351947644
diff --git a/config/hypr/scripts/ChangeLayout.sh b/config/hypr/scripts/ChangeLayout.sh
index e2436b79..221f9637 100755
--- a/config/hypr/scripts/ChangeLayout.sh
+++ b/config/hypr/scripts/ChangeLayout.sh
@@ -6,19 +6,34 @@ notif="$HOME/.config/swaync/images/ja.png"
 
 LAYOUT=$(hyprctl -j getoption general:layout | jq '.str' | sed 's/"//g')
 
+# Reverse layout value to reuse toggle logic. So layouts don't get swapped initially.
+if [ "$1" = "init" ]; then
+  if [ "$LAYOUT" = "master" ]; then
+    LAYOUT="dwindle"
+  else
+    LAYOUT="master"
+  fi
+fi
+
 case $LAYOUT in
 "master")
-	hyprctl keyword general:layout dwindle
-	# SUPER+J/K are global and managed by KeybindsLayoutInit.sh; only manage SUPER+O here
-	hyprctl keyword bind SUPER,O,togglesplit
+  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
+  hyprctl keyword bind SUPER,O,togglesplit
   notify-send -e -u low -i "$notif" " Dwindle Layout"
-	;;
+  ;;
 "dwindle")
-	hyprctl keyword general:layout master
-	# Drop togglesplit binding on SUPER+O when switching back to master
-	hyprctl keyword unbind SUPER,O
+  hyprctl keyword general:layout master
+  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
   notify-send -e -u low -i "$notif" " Master Layout"
-	;;
+  ;;
 *) ;;
 
 esac
diff --git a/config/hypr/scripts/Volume.sh b/config/hypr/scripts/Volume.sh
index 4c82f543..d870519c 100755
--- a/config/hypr/scripts/Volume.sh
+++ b/config/hypr/scripts/Volume.sh
@@ -44,7 +44,7 @@ inc_volume() {
     if [ "$(pamixer --get-mute)" == "true" ]; then
         toggle_mute
     else
-        pamixer -i 5 --allow-boost --set-limit 150 && notify_user
+        pamixer -i "$1" --allow-boost --set-limit 150 && notify_user
     fi
 }
 
@@ -53,7 +53,7 @@ dec_volume() {
     if [ "$(pamixer --get-mute)" == "true" ]; then
         toggle_mute
     else
-        pamixer -d 5 && notify_user
+        pamixer -d "$1" && notify_user
     fi
 }
 
@@ -120,24 +120,41 @@ dec_mic_volume() {
 }
 
 # Execute accordingly
-if [[ "$1" == "--get" ]]; then
-	get_volume
-elif [[ "$1" == "--inc" ]]; then
-	inc_volume
-elif [[ "$1" == "--dec" ]]; then
-	dec_volume
-elif [[ "$1" == "--toggle" ]]; then
-	toggle_mute
-elif [[ "$1" == "--toggle-mic" ]]; then
-	toggle_mic
-elif [[ "$1" == "--get-icon" ]]; then
-	get_icon
-elif [[ "$1" == "--get-mic-icon" ]]; then
-	get_mic_icon
-elif [[ "$1" == "--mic-inc" ]]; then
-	inc_mic_volume
-elif [[ "$1" == "--mic-dec" ]]; then
-	dec_mic_volume
-else
-	get_volume
-fi
\ No newline at end of file
+case "$1" in
+"--get")
+  get_volume
+  ;;
+"--inc")
+  inc_volume 5
+  ;;
+"--inc-precise")
+  inc_volume 1
+  ;;
+"--dec")
+  dec_volume 5
+  ;;
+"--dec-precise")
+  dec_volume 1
+  ;;
+"--toggle")
+  toggle_mute
+  ;;
+"--toggle-mic")
+  toggle_mic
+  ;;
+"--get-icon")
+  get_icon
+  ;;
+"--get-mic-icon")
+  get_mic_icon
+  ;;
+"--mic-inc")
+  inc_mic_volume
+  ;;
+"--mic-dec")
+  dec_mic_volume
+  ;;
+*)
+  get_volume
+  ;;
+esac
diff --git a/config/hypr/scripts/WallustSwww.sh b/config/hypr/scripts/WallustSwww.sh
index 657f41ab..f3da3e35 100755
--- a/config/hypr/scripts/WallustSwww.sh
+++ b/config/hypr/scripts/WallustSwww.sh
@@ -40,7 +40,8 @@ else
   if [[ -f "$cache_file" ]]; then
     # The first non-filter line is the original wallpaper path
     # wallpaper_path="$(grep -v 'Lanczos3' "$cache_file" | head -n 1)"
-    wallpaper_path=$(swww query | grep $current_monitor | awk '{print $9}')
+    # wallpaper_path=$(swww query | grep $current_monitor | awk '{print $9}')
+    wallpaper_path=$(swww query | sed 's/.*image: //')
   fi
 fi