diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/firefox | 7 | ||||
| -rwxr-xr-x | bin/sway-run | 23 |
2 files changed, 15 insertions, 15 deletions
diff --git a/bin/firefox b/bin/firefox index 9a05b9e..d49d9af 100755 --- a/bin/firefox +++ b/bin/firefox @@ -28,6 +28,11 @@ firefox-clean) ;; workfox) - swx -M work -- "${bin}" --profile $HOME/.mozilla/firefox/d2ps1x6l.work $@ + set -- "${bin}" --profile "$HOME"/.mozilla/firefox/d2ps1x6l.work "$@" + if swaymsg -t get_version >/dev/null 2>&1; then + exec swx -M work -- "$@" + else + exec "$@" + fi ;; esac 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} |