diff --git a/modules/gui/mako.nix b/modules/gui/mako.nix index baf7125..37375b2 100644 --- a/modules/gui/mako.nix +++ b/modules/gui/mako.nix @@ -1,4 +1,4 @@ -{ ... }: +{ isNixOS, pkgs, ... }: { services.mako = { @@ -20,7 +20,11 @@ border-color = "#89b4fa"; progress-color = "over #313244"; output = "DP-1"; - on-notify = "exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga"; + on-notify = + if isNixOS then + "exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga" + else + "exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga"; }; extraConfig = '' @@ -31,7 +35,13 @@ border-color=#FF6347 [urgency=critical] - on-notify=exec paplay /usr/share/sounds/freedesktop/stereo/window-attention.oga + on-notify = + ${ + if isNixOS then + "exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga" + else + "exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga" + }; border-color=#FF0000 [mode=do-not-disturb] diff --git a/modules/hypr/hyprland.nix b/modules/hypr/hyprland.nix index 91b762b..5ea0a98 100644 --- a/modules/hypr/hyprland.nix +++ b/modules/hypr/hyprland.nix @@ -2,6 +2,7 @@ isNixOS, lib, userConfig, + pkgs, ... }: @@ -288,7 +289,17 @@ ]; bindl = [ - ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle && ~/.local/bin/check-if-muted.sh" + ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle && ${pkgs.writeShellScript "check-muted" '' + MUTED=$(${ + if isNixOS then "${pkgs.wireplumber}/bin/wpctl" else "/usr/bin/wpctl" + } get-volume @DEFAULT_AUDIO_SINK@ | ${pkgs.gnugrep}/bin/grep -iq muted; echo $?) + + if [[ $MUTED -eq 0 ]]; then + ${pkgs.libnotify}/bin/notify-send "Audio muted" -a 'wp-vol' -t 1000 + else + ${pkgs.libnotify}/bin/notify-send "Audio unmuted" -a 'wp-vol' -t 1000 + fi + ''}" ", XF86AudioNext, exec, playerctl next" ", Pause, exec, playerctl play-pause" "$mainMod, Pause, exec, playerctl play-pause --player spotify"