add river init and make some scripts work

1 files changed, 9 insertions, 14 deletions

diff --git a/bin/sway-run b/bin/sway-run
index dbc1ec3..7cebf28 100755
--- a/bin/sway-run
+++ b/bin/sway-run
@@ -3,27 +3,22 @@ set -e
 
 SWAY_BIN=${SWAY_BIN:-sway}
 SWAY_ARGS=${SWAY_ARGS:-}
-LOGFILE=/var/log/sway.log
-
-(
-	doas touch ${LOGFILE}
-	doas chown robert:robert ${LOGFILE}
-)
 
 (
 	printf -- "\n--- sway ---\n"
-	printf "DATE: $(date)\n"
-	printf "EXEC: ${SWAY_BIN} ${SWAY_ARGS}\n"
-	printf "USER: $(id -u)\n"
-	[ -n "${DBUS_SESSION_BUS_ADDRESS}" ] && printf "DBUS: ${DBUS_SESSION_BUS_ADDRESS}\n"
+	printf "Date: %s\n" "$(date)"
+	printf "User: %s\n" "$(id -u)"
+	printf "Bin:  %s\n" "${SWAY_BIN}"
+	printf "Args: %s\n" "${SWAY_ARGS}"
+	printf "Dbus: %s\n" "${DBUS_SESSION_BUS_ADDRESS}"
 	printf -- "---\n"
-) >>${LOGFILE}
+)
 
 # wlroots env vars should be set here
 # export WLR_DRM_DEVICES="/dev/dri/card1:/dev/dri/card0"
 # export WLR_DRM_DEVICES="/dev/dri/card0"
 export WLR_DRM_NO_MODIFIERS=1
 
-# exec ${SWAY_BIN} ${SWAY_ARGS} 1>&2 2>>${LOGFILE}
-# exec dbus-launch --exit-with-session ${SWAY_BIN} ${SWAY_ARGS} 1>&2 2>>${LOGFILE}
-exec dbus-run-session -- ${SWAY_BIN} ${SWAY_ARGS} 1>&2 2>>${LOGFILE}
+# exec ${SWAY_BIN} ${SWAY_ARGS}
+# exec dbus-launch --exit-with-session ${SWAY_BIN} ${SWAY_ARGS}
+exec dbus-run-session -- ${SWAY_BIN} ${SWAY_ARGS}