diff --git a/home/apps/i3.nix b/home/apps/i3.nix index 155f5e2..037ff52 100644 --- a/home/apps/i3.nix +++ b/home/apps/i3.nix @@ -175,7 +175,7 @@ in { xdotool = lib.getExe pkgs.xdotool; flameshot = lib.getExe pkgs.flameshot; playerctl = lib.getExe pkgs.playerctl; - pactl = "${pkgs.pulseaudio}/bin/pactl"; + wpctl = pkgs.wireplumber + "/bin/wpctl"; in { "${mod}+Shift+b" = "border none"; "${mod}+b" = "border pixel 2"; @@ -271,9 +271,9 @@ in { "${mod}+Shift+space" = "exec ${lib.getExe pkgs._1password-gui} --quick-access"; # audio - "XF86AudioRaiseVolume" = "exec --no-startup-id ${pactl} set-sink-volume 0 +5%"; - "XF86AudioLowerVolume" = "exec --no-startup-id ${pactl} set-sink-volume 0 -5%"; - "XF86AudioMute" = "exec --no-startup-id ${pactl} set-sink-mute 0 toggle"; + "XF86AudioRaiseVolume" = "exec --no-startup-id ${wpctl} set-sink-volume @DEFAULT_AUDIO_SINK@ +5% -l 1.0"; + "XF86AudioLowerVolume" = "exec --no-startup-id ${wpctl} set-sink-volume @DEFAULT_AUDIO_SINK@ -5% -l 1.0"; + "XF86AudioMute" = "exec --no-startup-id ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"; "XF86AudioNext" = "exec --no-startup-id ${playerctl} next"; "XF86AudioPrev" = "exec --no-startup-id ${playerctl} previous"; "XF86AudioPause" = "exec --no-startup-id ${playerctl} play-pause"; diff --git a/home/apps/wayland.nix b/home/apps/wayland.nix index a7ac95a..c87abf4 100644 --- a/home/apps/wayland.nix +++ b/home/apps/wayland.nix @@ -113,8 +113,8 @@ in { bindm = SUPER,mouse:272,movewindow bindm = SUPER,mouse:273,resizewindow - binde = ,XF86AudioRaiseVolume,exec,${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+ - binde = ,XF86AudioLowerVolume,exec,${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%- + binde = ,XF86AudioRaiseVolume,exec,${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+ -l 1.0 + binde = ,XF86AudioLowerVolume,exec,${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%- -l 1.0 bind = ,XF86AudioMute,exec,${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle bind = ,XF86AudioNext,exec,${playerctl} next bind = ,XF86AudioPrev,exec,${playerctl} previous