diff --git a/hosts/common/programs/sane-input-handler/default.nix b/hosts/common/programs/sane-input-handler/default.nix index 4c1bddae..feb1059a 100644 --- a/hosts/common/programs/sane-input-handler/default.nix +++ b/hosts/common/programs/sane-input-handler/default.nix @@ -88,7 +88,7 @@ in pname = "sane-input-handler"; srcRoot = ./.; pkgs = { - inherit (pkgs) coreutils killall playerctl procps sane-open-desktop util-linux wireplumber wvkbd; + inherit (pkgs) coreutils killall playerctl procps sane-open-desktop util-linux wireplumber; sway = config.sane.programs.sway.package.sway-unwrapped; }; }; diff --git a/hosts/common/programs/sane-input-handler/sane-input-handler b/hosts/common/programs/sane-input-handler/sane-input-handler index e427e900..ffb18824 100755 --- a/hosts/common/programs/sane-input-handler/sane-input-handler +++ b/hosts/common/programs/sane-input-handler/sane-input-handler @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!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 +#!nix-shell -i bash -p coreutils -p killall -p playerctl -p procps -p sane-open-desktop -p sway -p util-linux -p wireplumber # input map considerations # - using compound actions causes delays. @@ -85,9 +85,7 @@ allOff() { toggleKeyboard() { local kbpid=$(pidof "$KEYBOARD") if [ -z "$kbpid" ] || ! ( env kill -s RTMIN+0 "$kbpid" ); then - echo "sane-input-handler: failed to toggle keyboard; launching manually: $KEYBOARD" - # manually launch the keyboard, as a fallback - "$KEYBOARD" & + echo "sane-input-handler: failed to toggle keyboard: $KEYBOARD" fi } diff --git a/hosts/common/programs/wvkbd.nix b/hosts/common/programs/wvkbd.nix index 304bb4e8..beabe50d 100644 --- a/hosts/common/programs/wvkbd.nix +++ b/hosts/common/programs/wvkbd.nix @@ -14,6 +14,8 @@ in sandbox.method = "bwrap"; sandbox.whitelistWayland = true; + env.KEYBOARD = "wvkbd-mobintl"; + services.wvkbd = { description = "wvkbd: wayland virtual keyboard"; after = [ "graphical-session.target" ];