diff --git a/Configs/.config/hypr/hyprland.conf b/Configs/.config/hypr/hyprland.conf index 58bc3c71bb..ab47da91e3 100644 --- a/Configs/.config/hypr/hyprland.conf +++ b/Configs/.config/hypr/hyprland.conf @@ -38,6 +38,8 @@ 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 +exec-once = pkexec swayosd-libinput-backend # █▀▀ █▄░█ █░█ diff --git a/Configs/.config/hypr/keybindings.conf b/Configs/.config/hypr/keybindings.conf index 47c118624a..4c91b837be 100644 --- a/Configs/.config/hypr/keybindings.conf +++ b/Configs/.config/hypr/keybindings.conf @@ -40,13 +40,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 -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 +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 @@ -55,8 +55,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 diff --git a/Configs/.config/swayosd/config.toml b/Configs/.config/swayosd/config.toml new file mode 100644 index 0000000000..41c236d9b5 --- /dev/null +++ b/Configs/.config/swayosd/config.toml @@ -0,0 +1,2 @@ +[server] +top_margin = 0.85 diff --git a/Configs/.config/waybar/modules/backlight.jsonc b/Configs/.config/waybar/modules/backlight.jsonc index b289e6866d..c6e628baf3 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 }, diff --git a/Configs/.config/waybar/modules/pulseaudio.jsonc b/Configs/.config/waybar/modules/pulseaudio.jsonc index c5770a75ec..c8de9dc6a0 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 }, diff --git a/Scripts/custom_apps.lst b/Scripts/custom_apps.lst index 00fad79e7d..d28c0f3a61 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 diff --git a/Scripts/restore_cfg.lst b/Scripts/restore_cfg.lst index ab4fd24938..55cdc0bbc6 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