From 2923f80d0986a8f9ff26bf016238da10bebec12a Mon Sep 17 00:00:00 2001
From: j1nx
Date: Tue, 15 Nov 2022 12:14:12 +0100
Subject: [PATCH] Move GUI related environment variables back into the service
file
---
.../systemd/system/user@.service.d/openvoiceos.conf | 12 ------------
.../usr/lib/systemd/user/mycroft-gui.service | 11 +++++++++++
2 files changed, 11 insertions(+), 12 deletions(-)
delete mode 100644 buildroot-external/rootfs-overlay/etc/systemd/system/user@.service.d/openvoiceos.conf
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/user@.service.d/openvoiceos.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/user@.service.d/openvoiceos.conf
deleted file mode 100644
index 95b62d85..00000000
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/user@.service.d/openvoiceos.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[Service]
-Environment=QT_QPA_PLATFORM=eglfs
-Environment=QT_QPA_EGLFS_KMS_ATOMIC=1
-Environment=QT_QPA_PLATFORMTHEME=qt5ct
-Environment=QT_PLUGIN_PATH=/usr/lib/qt/plugins:/usr/lib/plugins:/usr/lib/plugins/kf5
-Environment=QT_LOGGING_RULES='*=false'
-Environment=QT_FILE_SELECTORS=ovos
-Environment=QT_FONT_DPI=120
-Environment=QT_IM_MODULE=qtvirtualkeyboard
-Environment=QT_QUICK_CONTROLS_STYLE=OpenVoiceStyle
-Environment=XDG_CURRENT_DESKTOP=kde
-Environment=QML2_IMPORT_PATH=/usr/lib/qml
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-gui.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-gui.service
index 1c923afc..e6e353dc 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-gui.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-gui.service
@@ -2,6 +2,17 @@
Description=Mycroft GUI
[Service]
+Environment=QT_QPA_PLATFORM=eglfs
+Environment=QT_QPA_EGLFS_KMS_ATOMIC=1
+Environment=QT_QPA_PLATFORMTHEME=qt5ct
+Environment=QT_PLUGIN_PATH=/usr/lib/qt/plugins:/usr/lib/plugins:/usr/lib/plugins/kf5
+Environment=QT_LOGGING_RULES='*=false'
+Environment=QT_FILE_SELECTORS=ovos
+Environment=QT_FONT_DPI=120
+Environment=QT_IM_MODULE=qtvirtualkeyboard
+Environment=QT_QUICK_CONTROLS_STYLE=OpenVoiceStyle
+Environment=XDG_CURRENT_DESKTOP=kde
+Environment=QML2_IMPORT_PATH=/usr/lib/qml
ExecStartPre=-/usr/bin/kbuildsycoca5
ExecStart=ovos-shell --maximize
StandardOutput=null