From 1ad51646fe65487e35f9c63b5b926dcbdc6e81a9 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Sun, 8 Dec 2024 07:56:22 -0500
Subject: [PATCH] hopefully fix activity-watch startup

---
 filesystem/usr/local/bin/awatch | 27 +++++++++++++++++++++++++++
 i3-sway/i3.conf                 |  2 +-
 primary-setup                   |  4 +++-
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100755 filesystem/usr/local/bin/awatch

diff --git a/filesystem/usr/local/bin/awatch b/filesystem/usr/local/bin/awatch
new file mode 100755
index 0000000..d289aed
--- /dev/null
+++ b/filesystem/usr/local/bin/awatch
@@ -0,0 +1,27 @@
+#!/bin/bash
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to change
+# to a recommended GPL license.
+
+# Copyright 2024 Ian Kelling
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if [[ $EUID != 1000 ]]; then
+  echo "$0: error: expected EUID=1000, got:$EUID"
+  exit 1
+fi
+DISPLAY=:0 /a/opt/activity-watch/aw-qt &>/home/iank/aw.log &
diff --git a/i3-sway/i3.conf b/i3-sway/i3.conf
index 498d991..52bbca6 100644
--- a/i3-sway/i3.conf
+++ b/i3-sway/i3.conf
@@ -9,6 +9,6 @@ $ex copyq
 $ex dunst
 # haven't been using it enough to justify automatically running it.]
 #$ex /usr/lib/x86_64-linux-gnu/libexec/kdeconnectd
-$ex /a/opt/activity-watch/aw-qt
+$ex awatch
 # this dies when we restart i3.
 exec_always --no-startup-id i3-event-hook
diff --git a/primary-setup b/primary-setup
index 5155722..80d3984 100755
--- a/primary-setup
+++ b/primary-setup
@@ -95,7 +95,9 @@ if dpkg -s rss2email &>/dev/null; then
 fi
 
 if [[ $HOSTNAME == "$HOST2" ]]; then
-  /a/opt/activity-watch/aw-qt &
+  if pgrep '^Xorg$'; then
+    sudo -u iank /usr/local/bin/awatch
+  fi
 else
   pkill -f '^/a/opt/activity-watch/aw-qt$'
 fi
-- 
2.30.2