diff options
| -rw-r--r-- | modules/lidControl.nix | 2 | ||||
| -rw-r--r-- | pkgs/simple/q/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/simple/xkiller.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/lidControl.nix b/modules/lidControl.nix index 6beb032..a35e178 100644 --- a/modules/lidControl.nix +++ b/modules/lidControl.nix @@ -11,7 +11,7 @@ # usage: vt_is_xserver NUMBER vt_is_xserver() { - ${pkgs.iproute}/bin/ss -lp src unix:/tmp/.X11-unix/X* | + ${pkgs.iproute2}/bin/ss -lp src unix:/tmp/.X11-unix/X* | ${pkgs.gnused}/bin/sed -n 's|.*/tmp/.X11-unix/X\([0-9]\+\)\>.*|\1|p' | ${pkgs.gnugrep}/bin/grep -Fqx "$1" } diff --git a/pkgs/simple/q/default.nix b/pkgs/simple/q/default.nix index a1e60e3..ca4a466 100644 --- a/pkgs/simple/q/default.nix +++ b/pkgs/simple/q/default.nix @@ -83,13 +83,13 @@ let q-net = /* sh */ '' for dev in $( - ${pkgs.iproute}/bin/ip a | + ${pkgs.iproute2}/bin/ip a | ${pkgs.gnused}/bin/sed -rn 's/^[0-9]+: ([^:]+):.*/\1/p' | ${pkgs.gnugrep}/bin/grep -Ev '^(lo|retiolum|wiregrill)$' # TODO wiregrill ping ni.w, retiolum ping ni.r ); do { - inet=$(${pkgs.iproute}/bin/ip addr show $dev \ + inet=$(${pkgs.iproute2}/bin/ip addr show $dev \ | ${pkgs.gnused}/bin/sed -n ' s/.*inet \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p ') diff --git a/pkgs/simple/xkiller.nix b/pkgs/simple/xkiller.nix index 8d8f016..9d83047 100644 --- a/pkgs/simple/xkiller.nix +++ b/pkgs/simple/xkiller.nix @@ -2,7 +2,7 @@ pkgs.writeDash "xkiller" '' set -efu exec >&2 - ${pkgs.iproute}/bin/ss -lp src unix:/tmp/.X11-unix/X* | + ${pkgs.iproute2}/bin/ss -lp src unix:/tmp/.X11-unix/X* | ${pkgs.gnused}/bin/sed -n ' s|.*/tmp/.X11-unix/X\([0-9]\+\)\>.*("X[^"]*",pid=\([0-9]\+\)\>.*|\1 \2|p ' | |