From 29419948d7c668798274be78e639b4ace4ea63e5 Mon Sep 17 00:00:00 2001
From: Mx Kookie <kookie@spacekookie.de>
Date: Wed, 23 Dec 2020 13:43:54 +0100
Subject: [PATCH] libkookie: i3: update tools scripts

---
 .../modules/workstation/ui/i3/core/tools/i3-locker.nix | 10 +++++-----
 .../modules/workstation/ui/i3/core/tools/i3-move.nix   |  1 -
 .../modules/workstation/ui/i3/core/tools/i3-scrcap.nix |  8 +++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-locker.nix b/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-locker.nix
index 749d41e4eb3..29052548860 100644
--- a/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-locker.nix
+++ b/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-locker.nix
@@ -11,8 +11,8 @@ let
   i3lock = "${i3lock}/bin/i3lock";
   mktemp = "${coreutils}/bin/mktemp";
   rm = "${coreutils}/bin/rm";
-  fortune = "${fortune}/bin/fortune";
-  xrandr = "${xrandr}/bin/xrandr";
+  fortuneBin = "${fortune}/bin/fortune";
+  xrandrBin = "${xrandr}/bin/xrandr";
   convert = "${imagemagick}/bin/convert";
 in
 writeShellScript "libkookie-i3locker" ''
@@ -20,14 +20,14 @@ writeShellScript "libkookie-i3locker" ''
   # Create a temp directory to work in
   TMPDIR=$(${mktemp} -d)
   BGIMAGE=$TMPDIR/lockbg.png
-  FORTUNE=$(${fortune} | sed -e 's/\t/    /g')
-  TMPRES=$(${xrandr} | grep \* | cut -d' ' -f4 | sed ':a;N;$!ba;s/\n/ /g')
+  FORTUNE=$(${fortuneBin} | sed -e 's/\t/    /g')
+  TMPRES=$(${xrandrBin} | grep \* | cut -d' ' -f4 | sed ':a;N;$!ba;s/\n/ /g')
   RESOLUTION=$(`echo $TMP_RES | sed 's/ /\n/g'`)
 
   # Create a base image
   ${convert} -size 0x0 canvas:black $BGIMAGE
   
-  for mon in "${RESOLUTION[@]}"
+  for mon in "$(RESOLUTION[@])"
   do
     echo "Running for monitor $mon"
     TMPLOCK="$TMPDIR/tmplock.png"
diff --git a/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-move.nix b/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-move.nix
index 1ba4a45bcab..bb724d88bbe 100644
--- a/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-move.nix
+++ b/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-move.nix
@@ -6,7 +6,6 @@
  */
 
 { pkgs, ... }: with pkgs; writeShellScript "libkookie-i3-move" ''
-
   WS=$(${i3}/bin/i3-msg -t get_workspaces | \
     ${jq}/bin/jq -M '.[] | .name' | tr -d '"' \
     | sort -u | ${dmenu}/bin/dmenu -b -i "$@")
diff --git a/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-scrcap.nix b/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-scrcap.nix
index 6146dabee67..7f23ef651a9 100644
--- a/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-scrcap.nix
+++ b/infra/libkookie/modules/workstation/ui/i3/core/tools/i3-scrcap.nix
@@ -5,6 +5,12 @@
  *  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" ''
-  ${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
 ''