Make sway init part of autostart

remove cursor and set background black
ROCKNIX · Mar 27, 2024 · 900a0c6 · 900a0c6
1 parent 438c196
commit 900a0c6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/...land/compositor/sway/scripts/sway_init.sh → ...d/compositor/sway/autostart/111-sway-init b/...land/compositor/sway/scripts/sway_init.sh → ...d/compositor/sway/autostart/111-sway-init
@@ -50,6 +50,7 @@ output="output ${con}"
     else
         angle="0"
     fi
+    echo "${output} bg #000000 solid_color" >> $SWAY_HOME/config
     echo "${output} transform ${angle}" >> $SWAY_HOME/config
     echo "${output} max_render_time off" >> $SWAY_HOME/config
 fi
diff --git a/packages/wayland/compositor/sway/config/config.kiosk b/packages/wayland/compositor/sway/config/config.kiosk
@@ -1,2 +1 @@
-seat * hide_cursor 1000
 default_border none
diff --git a/packages/wayland/compositor/sway/package.mk b/packages/wayland/compositor/sway/package.mk
@@ -34,7 +34,8 @@ post_makeinstall_target() {
   mkdir -p ${INSTALL}/usr/lib/sway
     cp ${PKG_DIR}/scripts/sway.sh     ${INSTALL}/usr/bin
     cp ${PKG_DIR}/scripts/sway-config ${INSTALL}/usr/lib/sway
-    cp ${PKG_DIR}/scripts/sway_init.sh     ${INSTALL}/usr/bin
+  mkdir -p ${INSTALL}/usr/lib/autostart/common
+    cp ${PKG_DIR}/autostart/111-sway-init     ${INSTALL}/usr/lib/autostart/common
 
   # install config & wallpaper
   mkdir -p ${INSTALL}/usr/share/sway

diff --git a/packages/wayland/compositor/sway/scripts/sway-config b/packages/wayland/compositor/sway/scripts/sway-config
@@ -2,11 +2,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
-# Initialize config file, and add output line.
-# at least on the RG552 (rk3399 270 degree rotated display)
-# sway segafaults without it.
-/usr/bin/bash /usr/bin/sway_init.sh
-
 export XDG_RUNTIME_DIR=/var/run/0-runtime-dir
 export WAYLAND_DISPLAY=wayland-1
 SWAY_DAEMON_ARGS=""