From: Samir Benmendil <me@rmz.io>
Date: Wed, 23 Dec 2020 20:39:28 +0000 (+0000)
Subject: mkosi/kodi: switch to wayland
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/ea4fba86679ac5f40772944051003df5c5ff1117

mkosi/kodi: switch to wayland
---

diff --git a/mkosi/kodi/mkosi.default b/mkosi/kodi/mkosi.default
index 4ab30f4..d30e0d4 100644
--- a/mkosi/kodi/mkosi.default
+++ b/mkosi/kodi/mkosi.default
@@ -8,7 +8,12 @@ Format=subvolume
 
 [Packages]
 Packages=
+    # wayland
+    cage
+    xorg-xwayland
+    # kodi
     kodi
+    kodi-wayland
     kodi-addon-audioencoder-flac
     kodi-addon-audioencoder-lame
     kodi-addon-audioencoder-vorbis
@@ -27,11 +32,7 @@ Packages=
     kodi-addon-game-libretro-snes9x
     kodi-addon-game-libretro-yabause
     kodi-addon-peripheral-joystick
-    kodi-x11
     libva-intel-driver
     lirc
     pulseaudio
     rxvt-unicode-terminfo
-    xorg-server
-    xorg-xinit
-    xorg-xset
diff --git a/mkosi/kodi/mkosi.extra/etc/systemd/system/kodi-x11.service b/mkosi/kodi/mkosi.extra/etc/systemd/system/kodi-wayland.service
similarity index 66%
rename from mkosi/kodi/mkosi.extra/etc/systemd/system/kodi-x11.service
rename to mkosi/kodi/mkosi.extra/etc/systemd/system/kodi-wayland.service
index 80bc1ac..c94f3fc 100644
--- a/mkosi/kodi/mkosi.extra/etc/systemd/system/kodi-x11.service
+++ b/mkosi/kodi/mkosi.extra/etc/systemd/system/kodi-wayland.service
@@ -1,16 +1,17 @@
 [Unit]
-Description=Kodi standalone (X11)
+Description=Kodi standalone (Wayland)
 After=remote-fs.target network-online.target nss-lookup.target sound.target bluetooth.target polkit.service upower.service mysqld.service
-Wants=network-online.target polkit.service upower.service lircd.service
+Wants=network-online.target polkit.service upower.service
 Conflicts=getty@tty1.service
 
 [Service]
 User=kodi
 Group=kodi
+Environment=XDG_RUNTIME_DIR=/tmp
 EnvironmentFile=-/etc/conf.d/kodi-standalone
 TTYPath=/dev/tty1
-Environment=WINDOWING=x11
-ExecStart=/usr/bin/xinit /usr/bin/kodi-standalone -- :0 -quiet -nolisten tcp vt1
+Environment=WINDOWING=wayland
+ExecStart=/usr/bin/cage -- /usr/bin/kodi-standalone
 ExecStop=/usr/bin/killall --user kodi --exact --wait kodi-x11
 Restart=on-abort
 StandardInput=tty
diff --git a/mkosi/kodi/mkosi.extra/etc/sysusers.d/kodi.conf b/mkosi/kodi/mkosi.extra/etc/sysusers.d/kodi.conf
index 583c5b5..cc73e21 100644
--- a/mkosi/kodi/mkosi.extra/etc/sysusers.d/kodi.conf
+++ b/mkosi/kodi/mkosi.extra/etc/sysusers.d/kodi.conf
@@ -7,3 +7,4 @@ u kodi 973 "Kodi User" /var/lib/kodi
 # supplemental groups
 m kodi audio
 m kodi video
+m kodi input
diff --git a/mkosi/kodi/mkosi.postinst b/mkosi/kodi/mkosi.postinst
index b65d166..5e82d58 100755
--- a/mkosi/kodi/mkosi.postinst
+++ b/mkosi/kodi/mkosi.postinst
@@ -1,3 +1,3 @@
 passwd -d root
-systemctl enable kodi-x11
+systemctl enable kodi-wayland
 systemctl enable lircd