3 files changed, 15 insertions, 24 deletions
diff --git a/bin/autostart b/bin/autostart
index ac4bc3a..6fb5da2 100755
--- a/bin/autostart
+++ b/bin/autostart
@@ -1,11 +1,23 @@
 #!/usr/bin/env bash
 
 [ -f /usr/bin/fcitx5 ] && fcitx5 -d
-[ -f ~/.fehbg ] && ~/.fehbg &
 
 [ -f /usr/bin/dunst ] && dunst &
-[ -f /usr/bin/udiskie ] && udiskie -a -n -s &
+[ -f /usr/bin/udiskie ] && udiskie -a -n -s --appindicator &
 
 [ -f /usr/bin/clipmenud ] && clipmenud &
 
+if [ "$XDG_SESSION_TYPE" = x11 ]; then
+    [ -f ~/.fehbg ] && ~/.fehbg &
+fi
+
+if [ "$XDG_SESSION_TYPE" = wayland ]; then
+    command -v gammastep > /dev/null && \
+        command -v awk > /dev/null && \
+        command -v tr > /dev/null && \
+        gammastep \
+            -l $(curl -s "https://location.services.mozilla.com/v1/geolocate?key=geoclue" | awk 'OFS=":" {print $3,$5}' | tr -d ',}') \
+            -m wayland
+fi
+
 [ -x "$HOME/.local/autostart" ] && "$HOME/.local/autostart"
diff --git a/bin/autostart-wayland b/bin/autostart-wayland
deleted file mode 100755
index d74ecb0..0000000
--- a/bin/autostart-wayland
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-[ -f /usr/bin/fcitx5 ] && fcitx5 -d
-
-[ -f /usr/bin/dunst ] && dunst &
-[ -f /usr/bin/udiskie ] && udiskie -a -n -s --appindicator &
-
-[ -f /usr/bin/clipmenud ] && clipmenud &
-
-command -v gammastep > /dev/null && \
-    command -v awk > /dev/null && \
-    command -v tr > /dev/null && \
-    gammastep \
-        -l $(curl -s "https://location.services.mozilla.com/v1/geolocate?key=geoclue" | awk 'OFS=":" {print $3,$5}' | tr -d ',}') \
-        -m wayland
-
-[ -x "$HOME/.local/autostart" ] && "$HOME/.local/autostart"
diff --git a/bin/startsway b/bin/startsway
index 812788b..b593354 100755
--- a/bin/startsway
+++ b/bin/startsway
@@ -5,8 +5,4 @@ export XDG_SESSION_DESKTOP=sway
 export WLR_RENDER=vulkan
 export MOZ_ENABLE_WAYLAND=1
 
-sway
-
-swaymsg -- exec --no-startup-id autostart-wayland
-
-exit 0
+exec sway