From 8c11e3fca4bfa242471e22adf4b63c833bbeeb11 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Sun, 8 Sep 2024 21:09:01 +0330
Subject: [PATCH 01/14] add swayosd

---
 Configs/.config/hypr/hyprland.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configs/.config/hypr/hyprland.conf b/Configs/.config/hypr/hyprland.conf
index 58bc3c71b..3c7b73da7 100644
--- a/Configs/.config/hypr/hyprland.conf
+++ b/Configs/.config/hypr/hyprland.conf
@@ -38,6 +38,7 @@ exec-once = wl-paste --type text --watch cliphist store # clipboard store text d
 exec-once = wl-paste --type image --watch cliphist store # clipboard store image data
 exec-once = $scrPath/swwwallpaper.sh # start wallpaper daemon
 exec-once = $scrPath/batterynotify.sh # battery notification
+exec-once = swayosd-server
 
 
 # █▀▀ █▄░█ █░█

From 2f52b003466079f87094277b9081eb3c6972e367 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Sun, 8 Sep 2024 21:10:00 +0330
Subject: [PATCH 02/14] replace swayosd binds

---
 Configs/.config/hypr/keybindings.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Configs/.config/hypr/keybindings.conf b/Configs/.config/hypr/keybindings.conf
index 8d87d7f5a..df43063f8 100644
--- a/Configs/.config/hypr/keybindings.conf
+++ b/Configs/.config/hypr/keybindings.conf
@@ -42,10 +42,10 @@ bind = $mainMod+Shift, E, exec, pkill -x rofi || $scrPath/rofilaunch.sh f # laun
 bindl  = , F10, exec, $scrPath/volumecontrol.sh -o m # toggle audio mute
 bindel = , F11, exec, $scrPath/volumecontrol.sh -o d # decrease volume
 bindel = , F12, exec, $scrPath/volumecontrol.sh -o i # increase volume
-bindl  = , XF86AudioMute, exec, $scrPath/volumecontrol.sh -o m # toggle audio mute
-bindl  = , XF86AudioMicMute, exec, $scrPath/volumecontrol.sh -i m # toggle microphone mute
-bindel = , XF86AudioLowerVolume, exec, $scrPath/volumecontrol.sh -o d # decrease volume
-bindel = , XF86AudioRaiseVolume, exec, $scrPath/volumecontrol.sh -o i # increase volume
+bind= , XF86AudioMute, exec, swayosd-client --output-volume mute-toggle # toggle audio mute
+bind= , XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle # toggle microphone mute
+bind= , XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise # increase volume
+bind= , XF86AudioLowerVolume, exec, swayosd-client --output-volume lower # decrease volume
 
 # Media control
 bindl  = , XF86AudioPlay, exec, playerctl play-pause # toggle between media play and pause
@@ -54,8 +54,8 @@ bindl  = , XF86AudioNext, exec, playerctl next # media next
 bindl  = , XF86AudioPrev, exec, playerctl previous # media previous
 
 # Brightness control
-bindel = , XF86MonBrightnessUp, exec, $scrPath/brightnesscontrol.sh i # increase brightness
-bindel = , XF86MonBrightnessDown, exec, $scrPath/brightnesscontrol.sh d # decrease brightness
+bind = , XF86MonBrightnessUp,exec,swayosd-client --brightness raise # increase brightness
+bind = , XF86MonBrightnessDown,exec,swayosd-client --brightness lower # decrease brightness
 
 # Move between grouped windows
 bind = $mainMod CTRL , H, changegroupactive, b

From b1bfc27577f1cae89f98a9ff401b5b27ab66832c Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Sun, 8 Sep 2024 21:11:29 +0330
Subject: [PATCH 03/14] replace swayosd

---
 Configs/.config/waybar/modules/backlight.jsonc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configs/.config/waybar/modules/backlight.jsonc b/Configs/.config/waybar/modules/backlight.jsonc
index b289e6866..c6e628baf 100644
--- a/Configs/.config/waybar/modules/backlight.jsonc
+++ b/Configs/.config/waybar/modules/backlight.jsonc
@@ -3,8 +3,8 @@
         "rotate": ${r_deg},
         "format": "{icon} {percent}%",
         "format-icons": ["", "", "", "", "", "", "", "", ""],
-        "on-scroll-up": "brightnessctl set 1%+",
-        "on-scroll-down": "brightnessctl set 1%-",
+        "on-scroll-up": "swayosd-client --brightness raise",
+        "on-scroll-down": "swayosd-client --brightness lower",
         "min-length": 6
     },
 

From c2853862dd7abf138fcbd950cbbfc4b5d6737291 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Sun, 8 Sep 2024 21:11:57 +0330
Subject: [PATCH 04/14] replace swayosd

---
 Configs/.config/waybar/modules/pulseaudio.jsonc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Configs/.config/waybar/modules/pulseaudio.jsonc b/Configs/.config/waybar/modules/pulseaudio.jsonc
index c5770a75e..c8de9dc6a 100644
--- a/Configs/.config/waybar/modules/pulseaudio.jsonc
+++ b/Configs/.config/waybar/modules/pulseaudio.jsonc
@@ -4,9 +4,9 @@
     "format-muted": "婢",
     "on-click": "pavucontrol -t 3",
     "on-click-right": "volumecontrol.sh -s ''",
-    "on-click-middle": "volumecontrol.sh -o m",
-    "on-scroll-up": "volumecontrol.sh -o i",
-    "on-scroll-down": "volumecontrol.sh -o d",
+    "on-click-middle": "swayosd-client --output-volume mute-toggle",
+    "on-scroll-up": "swayosd-client --output-volume raise",
+    "on-scroll-down": "swayosd-client --output-volume lower",
     "tooltip-format": "{icon} {desc} // {volume}%",
     "scroll-step": 5,
     "format-icons": {
@@ -26,9 +26,9 @@
     "format-source": "",
     "format-source-muted": "",
     "on-click": "pavucontrol -t 4",
-    "on-click-middle": "volumecontrol.sh -i m",
-    "on-scroll-up": "volumecontrol.sh -i i",
-    "on-scroll-down": "volumecontrol.sh -i d",
+    "on-click-middle": "swayosd-client --input-volume mute-toggle",
+    "on-scroll-up": "swayosd-client --input-volume raise",
+    "on-scroll-down": "swayosd-client --input-volume lower",
     "tooltip-format": "{format_source} {source_desc} // {source_volume}%",
     "scroll-step": 5
 },

From 78368bb479f684d63b9606d2fc191d1923509056 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Sun, 8 Sep 2024 21:13:11 +0330
Subject: [PATCH 05/14] Update system_ctl.lst

---
 Scripts/system_ctl.lst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Scripts/system_ctl.lst b/Scripts/system_ctl.lst
index 3e3671ace..87a59f037 100644
--- a/Scripts/system_ctl.lst
+++ b/Scripts/system_ctl.lst
@@ -1,3 +1,4 @@
 NetworkManager
 bluetooth
 sddm
+swayosd-libinput-backend

From 9dddbef22690ebece511073011713692259f9995 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Sun, 8 Sep 2024 21:14:31 +0330
Subject: [PATCH 06/14] add swayosd

---
 Scripts/custom_hypr.lst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Scripts/custom_hypr.lst b/Scripts/custom_hypr.lst
index 869682caf..868f85274 100644
--- a/Scripts/custom_hypr.lst
+++ b/Scripts/custom_hypr.lst
@@ -48,6 +48,7 @@ qt5-imageformats                                       # for dolphin image thumb
 ffmpegthumbs                                           # for dolphin video thumbnails
 kde-cli-tools                                          # for dolphin file type defaults
 libnotify                                              # for notifications
+swayosd-git                                            # for on screen display for keyboard shortcuts
 
 # --------------------------------------------------- // Theming
 nwg-look                                               # gtk configuration tool

From f65104c5489f00f4a0512c0eae6eb46427dc23f5 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Sun, 8 Sep 2024 21:16:15 +0330
Subject: [PATCH 07/14] add swayosd

---
 Configs/.config/swayosd/config.toml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Configs/.config/swayosd/config.toml

diff --git a/Configs/.config/swayosd/config.toml b/Configs/.config/swayosd/config.toml
new file mode 100644
index 000000000..41c236d9b
--- /dev/null
+++ b/Configs/.config/swayosd/config.toml
@@ -0,0 +1,2 @@
+[server]
+top_margin = 0.85

From 819a4dad791d8b0c1bb4e0c19d323023769efc43 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Sun, 8 Sep 2024 21:32:09 +0330
Subject: [PATCH 08/14] replace swayosd binds

---
 Configs/.config/hypr/keybindings.conf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Configs/.config/hypr/keybindings.conf b/Configs/.config/hypr/keybindings.conf
index df43063f8..a24572292 100644
--- a/Configs/.config/hypr/keybindings.conf
+++ b/Configs/.config/hypr/keybindings.conf
@@ -39,13 +39,13 @@ bind = $mainMod, Tab, exec, pkill -x rofi || $scrPath/rofilaunch.sh w # launch w
 bind = $mainMod+Shift, E, exec, pkill -x rofi || $scrPath/rofilaunch.sh f # launch file explorer
 
 # Audio control
-bindl  = , F10, exec, $scrPath/volumecontrol.sh -o m # toggle audio mute
-bindel = , F11, exec, $scrPath/volumecontrol.sh -o d # decrease volume
-bindel = , F12, exec, $scrPath/volumecontrol.sh -o i # increase volume
-bind= , XF86AudioMute, exec, swayosd-client --output-volume mute-toggle # toggle audio mute
-bind= , XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle # toggle microphone mute
-bind= , XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise # increase volume
-bind= , XF86AudioLowerVolume, exec, swayosd-client --output-volume lower # decrease volume
+bindl  = , F10, exec, swayosd-client --output-volume mute-toggle # toggle audio mute
+bindel = , F11, exec, swayosd-client --output-volume lower # decrease volume
+bindel = , F12, exec, swayosd-client --output-volume raise # increase volume
+bind = , XF86AudioMute, exec, swayosd-client --output-volume mute-toggle # toggle audio mute
+bind = , XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle # toggle microphone mute
+bind = , XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise # increase volume
+bind = , XF86AudioLowerVolume, exec, swayosd-client --output-volume lower # decrease volume
 
 # Media control
 bindl  = , XF86AudioPlay, exec, playerctl play-pause # toggle between media play and pause

From a7a526e209c85310f90f36ec180e80f61b6144e0 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:08:35 +0330
Subject: [PATCH 09/14] Update restore_cfg.lst

---
 Scripts/restore_cfg.lst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Scripts/restore_cfg.lst b/Scripts/restore_cfg.lst
index ab4fd2493..55cdc0bbc 100644
--- a/Scripts/restore_cfg.lst
+++ b/Scripts/restore_cfg.lst
@@ -33,3 +33,4 @@ Y|Y|${HOME}/.local/share|dolphin|dolphin
 Y|Y|${HOME}/.local/share/kxmlgui5|dolphin|dolphin
 Y|Y|${HOME}/.local/share/kio/servicemenus|hydewallpaper.desktop|dolphin
 N|Y|${HOME}/.config|libinput-gestures.conf|libinput-gestures
+N|Y|${HOME}/.config/swayosd|config.toml | swayosd-git

From 01831f21f1a6c4ff195d3e0a31446281ac9b7254 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:10:27 +0330
Subject: [PATCH 10/14] Update custom_apps.lst

---
 Scripts/custom_apps.lst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Scripts/custom_apps.lst b/Scripts/custom_apps.lst
index 00fad79e7..d28c0f3a6 100644
--- a/Scripts/custom_apps.lst
+++ b/Scripts/custom_apps.lst
@@ -6,6 +6,7 @@
 
 # --------------------------------------------------- // Dependencies
 xdg-desktop-portal-gtk                                 # xdg desktop portal using gtk
+swayosd-git                                            # for on screen display for keyboard shortcuts
 # emote                                                # emoji picker gtk3
 
 # --------------------------------------------------- // Gaming

From a22dc9ef80d12e5845a0ba8d3a1f71c5c4cde919 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:10:51 +0330
Subject: [PATCH 11/14] Update custom_hypr.lst

---
 Scripts/custom_hypr.lst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Scripts/custom_hypr.lst b/Scripts/custom_hypr.lst
index 868f85274..869682caf 100644
--- a/Scripts/custom_hypr.lst
+++ b/Scripts/custom_hypr.lst
@@ -48,7 +48,6 @@ qt5-imageformats                                       # for dolphin image thumb
 ffmpegthumbs                                           # for dolphin video thumbnails
 kde-cli-tools                                          # for dolphin file type defaults
 libnotify                                              # for notifications
-swayosd-git                                            # for on screen display for keyboard shortcuts
 
 # --------------------------------------------------- // Theming
 nwg-look                                               # gtk configuration tool

From dbca3c9640124b9d3806dcd23b977d7af8284fc5 Mon Sep 17 00:00:00 2001
From: TheyCallMeSecond <73380906+TheyCallMeSecond@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:12:47 +0330
Subject: [PATCH 12/14] Update keyboardswitch.sh

---
 Configs/.local/share/bin/keyboardswitch.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Configs/.local/share/bin/keyboardswitch.sh b/Configs/.local/share/bin/keyboardswitch.sh
index f38c52a18..9a4fcdd3b 100755
--- a/Configs/.local/share/bin/keyboardswitch.sh
+++ b/Configs/.local/share/bin/keyboardswitch.sh
@@ -3,10 +3,7 @@
 scrDir=`dirname "$(realpath "$0")"`
 source $scrDir/globalcontrol.sh
 
-hyprctl devices -j | jq -r '.keyboards[].name' | while read keyName
-do
-    hyprctl switchxkblayout "$keyName" next
-done
+hyprctl switchxkblayout all next
 
 layMain=$(hyprctl -j devices | jq '.keyboards' | jq '.[] | select (.main == true)' | awk -F '"' '{if ($2=="active_keymap") print $4}')
 notify-send -a "t1" -r 91190 -t 800 -i "~/.config/dunst/icons/keyboard.svg" "${layMain}"

From 19323170a7da595dee9178c08d61077268d6b69f Mon Sep 17 00:00:00 2001
From: Khing <53417443+kRHYME7@users.noreply.github.com>
Date: Fri, 13 Sep 2024 11:22:33 +0800
Subject: [PATCH 13/14] Update system_ctl.lst

---
 Scripts/system_ctl.lst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Scripts/system_ctl.lst b/Scripts/system_ctl.lst
index 87a59f037..3e3671ace 100644
--- a/Scripts/system_ctl.lst
+++ b/Scripts/system_ctl.lst
@@ -1,4 +1,3 @@
 NetworkManager
 bluetooth
 sddm
-swayosd-libinput-backend

From f92564a22abd0a673cfdd035b0ef7009d9091c45 Mon Sep 17 00:00:00 2001
From: Khing <53417443+kRHYME7@users.noreply.github.com>
Date: Fri, 13 Sep 2024 13:21:06 +0800
Subject: [PATCH 14/14] Update hyprland.conf

---
 Configs/.config/hypr/hyprland.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configs/.config/hypr/hyprland.conf b/Configs/.config/hypr/hyprland.conf
index 3c7b73da7..ab47da91e 100644
--- a/Configs/.config/hypr/hyprland.conf
+++ b/Configs/.config/hypr/hyprland.conf
@@ -39,6 +39,7 @@ exec-once = wl-paste --type image --watch cliphist store # clipboard store image
 exec-once = $scrPath/swwwallpaper.sh # start wallpaper daemon
 exec-once = $scrPath/batterynotify.sh # battery notification
 exec-once = swayosd-server
+exec-once = pkexec swayosd-libinput-backend
 
 
 # █▀▀ █▄░█ █░█