colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sane-input-handler: port pulseaudio -> pipewire native

Browse Source
This commit is contained in:
Colin
2024-03-03 07:13:23 +00:00
parent ed87792f9b
commit fd072883dc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hosts/common/programs/sane-input-handler/default.nix
View File

@@ -88,7 +88,7 @@ in
pname = "sane-input-handler"; pname = "sane-input-handler";
srcRoot = ./.; srcRoot = ./.;
pkgs = { pkgs = {
inherit (pkgs) coreutils killall playerctl procps pulseaudio sane-open-desktop util-linux wvkbd; inherit (pkgs) coreutils killall playerctl procps sane-open-desktop util-linux wireplumber wvkbd;
sway = config.sane.programs.sway.package.sway-unwrapped; sway = config.sane.programs.sway.package.sway-unwrapped;
}; };
}; };
@@ -97,9 +97,9 @@ in
"killall" "killall"
"playerctl" "playerctl"
"procps" "procps"
"pulseaudio" #< TODO: replace with just the pulseaudio util we actually need, for proper sandboxing
"sane-open-desktop" "sane-open-desktop"
"sway" "sway"
"wireplumber"
"wvkbd" "wvkbd"
]; ];
sandbox.method = "bwrap"; sandbox.method = "bwrap";

8
hosts/common/programs/sane-input-handler/sane-input-handler
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i bash -p coreutils -p killall -p playerctl -p procps -p pulseaudio -p sane-open-desktop -p sway -p util-linux -p wvkbd #!nix-shell -i bash -p coreutils -p killall -p playerctl -p procps -p sane-open-desktop -p sway -p util-linux -p wireplumber -p wvkbd
# input map considerations # input map considerations
# - using compound actions causes delays. # - using compound actions causes delays.
@@ -35,7 +35,7 @@
# - seeking backward isn't possible except by first tapping volup. # - seeking backward isn't possible except by first tapping volup.
# increments to use for volume adjustment # increments to use for volume adjustment (in %)
VOL_INCR=5 VOL_INCR=5
KEYBOARD="${KEYBOARD:-wvkbd-mobintl}" KEYBOARD="${KEYBOARD:-wvkbd-mobintl}"
@@ -119,10 +119,10 @@ dispatchDefault() {
# powerbutton_three: intentional no-op because overloading the kill-window handler is risky # powerbutton_three: intentional no-op because overloading the kill-window handler is risky
volup_tap*|modal_volup_tap*) volup_tap*|modal_volup_tap*)
handleWith pactl set-sink-volume @DEFAULT_SINK@ +"$VOL_INCR%" handleWith wpctl set-volume @DEFAULT_AUDIO_SINK@ "$VOL_INCR"%+
;; ;;
voldown_tap*|modal_voldown_tap*) voldown_tap*|modal_voldown_tap*)
handleWith pactl set-sink-volume @DEFAULT_SINK@ -"$VOL_INCR%" handleWith wpctl set-volume @DEFAULT_AUDIO_SINK@ "$VOL_INCR"%-
;; ;;
volup_hold*|modal_volup_hold*) volup_hold*|modal_volup_hold*)