From 1b520e671381d4af1c68aa43f137e57c8a3addf6 Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Sat, 29 Jul 2023 00:35:25 +0200
Subject: [PATCH] fix: move wayland related default application config to
 /et/xdg

---
 recipes-support/sfwbar/files/sfwbar.config |  2 +-
 recipes-support/sfwbar/sfwbar_git.bb       |  7 ++++---
 recipes-wlroots/labwc/files/autostart      |  4 ++--
 recipes-wlroots/labwc/files/init           |  2 +-
 recipes-wlroots/labwc/files/rc.xml         |  2 +-
 recipes-wlroots/labwc/labwc_%.bbappend     | 15 ++++++++-------
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/recipes-support/sfwbar/files/sfwbar.config b/recipes-support/sfwbar/files/sfwbar.config
index c55051d..b7f7618 100644
--- a/recipes-support/sfwbar/files/sfwbar.config
+++ b/recipes-support/sfwbar/files/sfwbar.config
@@ -90,7 +90,7 @@ layout {
     style = "launcher"
     value = "/usr/share/icons/Adwaita/scalable/actions/system-run-symbolic.svg"
     tooltip = "Quick run"
-    action = Exec "bash -c \"`tofi-drun`\""
+    action = Exec "bash -c \"`drun`\""
   }
   button {
     value = "/usr/share/icons/Adwaita/scalable/devices/tv-symbolic.svg"
diff --git a/recipes-support/sfwbar/sfwbar_git.bb b/recipes-support/sfwbar/sfwbar_git.bb
index e480f9f..fbf7d72 100644
--- a/recipes-support/sfwbar/sfwbar_git.bb
+++ b/recipes-support/sfwbar/sfwbar_git.bb
@@ -19,8 +19,9 @@ inherit meson pkgconfig
 EXTRA_OEMESON += "--buildtype release"
 
 do_install:append () {
-    install -d ${D}/${sysconfdir}/sfwbar/
-    install -m 0755 ${WORKDIR}/sfwbar.config ${D}/${sysconfdir}/sfwbar/
+    install -d ${D}/${sysconfdir}/xdg/
+    install -d ${D}/${sysconfdir}/xdg/sfwbar/
+    install -m 0755 ${WORKDIR}/sfwbar.config ${D}/${sysconfdir}/xdg/sfwbar/
 }
 
-FILES:${PN} += "/usr/share/icons/*"
\ No newline at end of file
+FILES:${PN} += "/usr/share/icons/*"
diff --git a/recipes-wlroots/labwc/files/autostart b/recipes-wlroots/labwc/files/autostart
index 8c94299..d005d5d 100644
--- a/recipes-wlroots/labwc/files/autostart
+++ b/recipes-wlroots/labwc/files/autostart
@@ -1,7 +1,7 @@
 # Example autostart file
 
 # Set background color
-swaybg -i /etc/labwc/wpp.jpg >/dev/null 2>&1 &
+swaybg -i /etc/xdg/labwc/wpp.jpg >/dev/null 2>&1 &
 
 wlr-randr --output DPI-1 --transform 90
 
@@ -31,7 +31,7 @@ wlr-randr --output DPI-1 --transform 90
 # https://git.sr.ht/~leon_plickat/wlopm
 swayidle -w timeout 60 'wlopm --off DPI-1' resume 'wlopm --on DPI-1' &
 
-SFWBAR_CNF="/etc/sfwbar/sfwbar.config"
+SFWBAR_CNF="/etc/xdg/sfwbar/sfwbar.config"
 if [ -e "$HOME/.config/sfwbar/sfwbar.config" ]; then
     SFWBAR_CNF="$HOME/.config/sfwbar/sfwbar.config"
 fi
diff --git a/recipes-wlroots/labwc/files/init b/recipes-wlroots/labwc/files/init
index d30e0af..9177f97 100755
--- a/recipes-wlroots/labwc/files/init
+++ b/recipes-wlroots/labwc/files/init
@@ -8,7 +8,7 @@
 # Default-Stop:      0 1 6
 ### END INIT INFO
 LABWC_USER=diya
-LABWC_CONFDIR="/etc/labwc"
+LABWC_CONFDIR="/etc/xdg/labwc"
 if test -e "/home/$LABWC_USER/.config/labwc" ; then
     LABWC_CONFDIR="/home/$LABWC_USER/.config/labwc"
 fi
diff --git a/recipes-wlroots/labwc/files/rc.xml b/recipes-wlroots/labwc/files/rc.xml
index ca62f20..b48299e 100644
--- a/recipes-wlroots/labwc/files/rc.xml
+++ b/recipes-wlroots/labwc/files/rc.xml
@@ -41,7 +41,7 @@
     </keybind>
     <keybind key="W-Space">
       <action name="Execute">
-        <command>bash -c "bash -c \"`tofi-drun`\""</command>
+        <command>bash -c "bash -c \"`drun`\""</command>
       </action>
     </keybind>
     <!--
diff --git a/recipes-wlroots/labwc/labwc_%.bbappend b/recipes-wlroots/labwc/labwc_%.bbappend
index 65c07a3..eb415f4 100644
--- a/recipes-wlroots/labwc/labwc_%.bbappend
+++ b/recipes-wlroots/labwc/labwc_%.bbappend
@@ -9,18 +9,19 @@ SRC_URI += " file://autostart \
              file://wpp.jpg \
             "
 do_install:append () {
+    install -d ${D}/${sysconfdir}/xdg
     install -d ${D}/${sysconfdir}/init.d
-    install -d ${D}/${sysconfdir}/labwc
+    install -d ${D}/${sysconfdir}/xdg/labwc
     install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/labwc
     
-    install -m 0755 ${WORKDIR}/wpp.jpg ${D}/${sysconfdir}/labwc/
-    install -m 0755 ${WORKDIR}/autostart ${D}/${sysconfdir}/labwc/
-    install -m 0755 ${WORKDIR}/environment ${D}/${sysconfdir}/labwc/
-    install -m 0755 ${WORKDIR}/menu.xml ${D}/${sysconfdir}/labwc/
-    install -m 0755 ${WORKDIR}/rc.xml ${D}/${sysconfdir}/labwc/
+    install -m 0755 ${WORKDIR}/wpp.jpg ${D}/${sysconfdir}/xdg/labwc/
+    install -m 0755 ${WORKDIR}/autostart ${D}/${sysconfdir}/xdg/labwc/
+    install -m 0755 ${WORKDIR}/environment ${D}/${sysconfdir}/xdg/labwc/
+    install -m 0755 ${WORKDIR}/menu.xml ${D}/${sysconfdir}/xdg/labwc/
+    install -m 0755 ${WORKDIR}/rc.xml ${D}/${sysconfdir}/xdg/labwc/
     
 }
 
 inherit update-rc.d
 INITSCRIPT_NAME = "labwc"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
\ No newline at end of file
+INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."