From f97aa112b518afae5ee62ddbdbcb03fdae57559c Mon Sep 17 00:00:00 2001
From: Robert Günzler <r@gnzler.io>
Date: Mon, 26 Apr 2021 13:11:56 +0200
Subject: sway: remove explicit dbus launching from config/run script

---
 .config/sway/binds.conf | 2 +-
 .config/sway/config     | 8 +++-----
 bin/sway-run            | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.config/sway/binds.conf b/.config/sway/binds.conf
index e7bab16..e5b5c42 100644
--- a/.config/sway/binds.conf
+++ b/.config/sway/binds.conf
@@ -30,7 +30,7 @@ bindsym $mod+Shift+e exec swaynag \
     -t warning \
     -m 'exit: what now?' \
     -b 'exit' 'swaymsg exit' \
-    -b 'poweroff' 'daos poweroff' \
+    -b 'poweroff' 'doas poweroff' \
     -b 'reboot' 'doas reboot'
 
 bindsym $mod+Shift+backspace exec lock
diff --git a/.config/sway/config b/.config/sway/config
index 3ad2510..15fe350 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -6,21 +6,19 @@ output * adaptive_sync on
 
 exec light -S 80
 
-exec dbus-update-activation-environment --all
+#exec dbus-update-activation-environment --all
 exec once pipewire
-exec once mako
 exec once oguri
 exec once kanshi
 exec once waybar
+exec once gammastep
+exec once foot -s
 exec once swayidle -w \
 	timeout 540 'lock' \
 	timeout 800 'swaymsg output \* dpms off' \
 	     resume 'swaymsg output \* dpms on' \
 	before-sleep 'lock' \
 	lock 'lock'
-exec once gammastep
-# spawn foot server
-exec once foot -s
 
 # for_window [app_id=Alacritty] max_render_time 2
 # for_window [app_id=firefox] max_render_time 3
diff --git a/bin/sway-run b/bin/sway-run
index cfb2e0a..9c22673 100755
--- a/bin/sway-run
+++ b/bin/sway-run
@@ -1,7 +1,6 @@
 #!/bin/sh
 set -e
 
-
 SWAY_BIN=${SWAY_BIN:-sway}
 SWAY_ARGS=${SWAY_ARGS:-}
 LOGFILE=/tmp/sway.log
@@ -15,5 +14,6 @@ LOGFILE=/tmp/sway.log
 	printf -- "---\n"
 ) >>${LOGFILE}
 
-exec dbus-run-session -- ${SWAY_BIN} ${SWAY_ARGS} 1>&2 2>>${LOGFILE}
+exec ${SWAY_BIN} ${SWAY_ARGS} 1>&2 2>>${LOGFILE}
+#exec dbus-run-session -- ${SWAY_BIN} ${SWAY_ARGS} 1>&2 2>>${LOGFILE}
 # exec dbus-launch --exit-with-session ${SWAY_BIN} ${SWAY_ARGS} 1>&2 2>>${LOGFILE}
-- 
cgit 1.4.1