From 2324d75165bc48092037d035fb05b5be53ffc26c Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 1 Mar 2024 18:49:44 +0000 Subject: [PATCH] switch psmisc -> killall otherwise a really shitty `pstree` makes its way onto my PATH --- hosts/common/programs/assorted.nix | 2 -- hosts/common/programs/sane-input-handler/default.nix | 4 ++-- hosts/common/programs/sane-input-handler/sane-input-handler | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix index b7a93db60..2305534ed 100644 --- a/hosts/common/programs/assorted.nix +++ b/hosts/common/programs/assorted.nix @@ -722,8 +722,6 @@ in procps = {}; - psmisc = {}; - pstree.sandbox.method = "landlock"; pstree.sandbox.extraPaths = [ "/proc" diff --git a/hosts/common/programs/sane-input-handler/default.nix b/hosts/common/programs/sane-input-handler/default.nix index 6f51d87fd..9937f20be 100644 --- a/hosts/common/programs/sane-input-handler/default.nix +++ b/hosts/common/programs/sane-input-handler/default.nix @@ -88,11 +88,11 @@ in pname = "sane-input-handler"; srcRoot = ./.; pkgs = { - inherit (pkgs) coreutils playerctl procps psmisc pulseaudio util-linux wvkbd; + inherit (pkgs) coreutils killall playerctl procps pulseaudio util-linux wvkbd; sway = config.sane.programs.sway.package.sway-unwrapped; }; }; - suggestedPrograms = [ "bonsai" "playerctl" "procps" "psmisc" "pulseaudio" "sway" "wvkbd" ]; + suggestedPrograms = [ "bonsai" "killall" "playerctl" "procps" "pulseaudio" "sway" "wvkbd" ]; }; # sane.programs.actkbd = { diff --git a/hosts/common/programs/sane-input-handler/sane-input-handler b/hosts/common/programs/sane-input-handler/sane-input-handler index 827dfa8ed..582c0e824 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 playerctl -p procps -p psmisc -p pulseaudio -p sway -p util-linux -p wvkbd +#!nix-shell -i bash -p coreutils -p killall -p playerctl -p procps -p pulseaudio -p sway -p util-linux -p wvkbd # input map considerations # - using compound actions causes delays.