libkookie: i3: update tools scripts

wip/yesman
Katharina Fey 4 years ago
parent d541499ed4
commit 29419948d7
  1. 10
      infra/libkookie/modules/workstation/ui/i3/core/tools/i3-locker.nix
  2. 1
      infra/libkookie/modules/workstation/ui/i3/core/tools/i3-move.nix
  3. 8
      infra/libkookie/modules/workstation/ui/i3/core/tools/i3-scrcap.nix

@ -11,8 +11,8 @@ let
i3lock = "${i3lock}/bin/i3lock"; i3lock = "${i3lock}/bin/i3lock";
mktemp = "${coreutils}/bin/mktemp"; mktemp = "${coreutils}/bin/mktemp";
rm = "${coreutils}/bin/rm"; rm = "${coreutils}/bin/rm";
fortune = "${fortune}/bin/fortune"; fortuneBin = "${fortune}/bin/fortune";
xrandr = "${xrandr}/bin/xrandr"; xrandrBin = "${xrandr}/bin/xrandr";
convert = "${imagemagick}/bin/convert"; convert = "${imagemagick}/bin/convert";
in in
writeShellScript "libkookie-i3locker" '' writeShellScript "libkookie-i3locker" ''
@ -20,14 +20,14 @@ writeShellScript "libkookie-i3locker" ''
# Create a temp directory to work in # Create a temp directory to work in
TMPDIR=$(${mktemp} -d) TMPDIR=$(${mktemp} -d)
BGIMAGE=$TMPDIR/lockbg.png BGIMAGE=$TMPDIR/lockbg.png
FORTUNE=$(${fortune} | sed -e 's/\t/ /g') FORTUNE=$(${fortuneBin} | sed -e 's/\t/ /g')
TMPRES=$(${xrandr} | grep \* | cut -d' ' -f4 | sed ':a;N;$!ba;s/\n/ /g') TMPRES=$(${xrandrBin} | grep \* | cut -d' ' -f4 | sed ':a;N;$!ba;s/\n/ /g')
RESOLUTION=$(`echo $TMP_RES | sed 's/ /\n/g'`) RESOLUTION=$(`echo $TMP_RES | sed 's/ /\n/g'`)
# Create a base image # Create a base image
${convert} -size 0x0 canvas:black $BGIMAGE ${convert} -size 0x0 canvas:black $BGIMAGE
for mon in "${RESOLUTION[@]}" for mon in "$(RESOLUTION[@])"
do do
echo "Running for monitor $mon" echo "Running for monitor $mon"
TMPLOCK="$TMPDIR/tmplock.png" TMPLOCK="$TMPDIR/tmplock.png"

@ -6,7 +6,6 @@
*/ */
{ pkgs, ... }: with pkgs; writeShellScript "libkookie-i3-move" '' { pkgs, ... }: with pkgs; writeShellScript "libkookie-i3-move" ''
WS=$(${i3}/bin/i3-msg -t get_workspaces | \ WS=$(${i3}/bin/i3-msg -t get_workspaces | \
${jq}/bin/jq -M '.[] | .name' | tr -d '"' \ ${jq}/bin/jq -M '.[] | .name' | tr -d '"' \
| sort -u | ${dmenu}/bin/dmenu -b -i "$@") | sort -u | ${dmenu}/bin/dmenu -b -i "$@")

@ -5,6 +5,12 @@
* used in the past, but has weird behaviour on non-gnome systems. * used in the past, but has weird behaviour on non-gnome systems.
*/ */
# TODO: this is broken and I don't know why...
{ pkgs, ... }: with pkgs; writeShellScript "libkookie-i3-move" '' { pkgs, ... }: with pkgs; writeShellScript "libkookie-i3-move" ''
${scrot}/bin/scrot -s echo "Taking screenshot at $(date)" >> /home/.local/scrcap.log
echo "${scrot}/bin/scrot" >> /home/.local/scrcap.log
${scrot}/bin/scrot -D :0 -s >> /home/.local/scrcap.log
echo "scrot exit: $?" >> /home/.local/scrcap.log
'' ''

Loading…
Cancel
Save