fix: update default envars

recipes-core/base-files/base-files_%.bbappend

@@ -2,14 +2,14 @@ hostname = "diya"
 
 do_install:append () {
     cat << 'EOF' >> "${D}${sysconfdir}/profile"
-# QT related setting
 export GDK_BACKEND=wayland
 export XDG_RUNTIME_DIR=/home/$USER/.xdg
-export XDG_CONFIG_HOME=/etc/xdg/
-export PATH=$PATH:/home/$USER/bin
+export XDG_CONFIG_HOME=/home/$USER/.config
+export PATH=$PATH:/home/$USER/bin:/home/$USER/.local/bin
+export LD_LIBRARY_PATH=/home/$USER/lib:/home/$USER/.local/lib
 if [ ! -e "$XDG_RUNTIME_DIR" ]; then
     mkdir -p "$XDG_RUNTIME_DIR"
 fi
 export TERM=xterm-256color
 EOF
-}
+}

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"

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/*"
+FILES:${PN} += "/usr/share/icons/*"

recipes-support/tofi/files/drun

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+config="/etc/xdg/tofi/config"
+
+if [ -e "$HOME/.config/tofi/config" ]; then
+	config="$HOME/.config/tofi/config"
+fi
+
+tofi-drun -c "$config"

recipes-support/tofi/tofi_git.bb

@@ -10,7 +10,7 @@ DEPENDS = "wayland freetype wayland-native wayland-protocols-native wayland-prot
 SRCREV = "${AUTOREV}"
 
 SRC_URI = "git://github.com/philj56/tofi.git;protocol=https;branch=master"
-SRC_URI += " file://config "
+SRC_URI += " file://config file://drun "
 
 S="${WORKDIR}/git"
 
@@ -20,7 +20,8 @@ EXTRA_OEMESON += "--buildtype release"
 
 do_install:append () {
     # replace the default config
+    install -m 0755 ${WORKDIR}/drun ${D}/usr/bin/
     install -m 0755 ${WORKDIR}/config ${D}/${sysconfdir}/xdg/tofi/
 }
 
-FILES:${PN} += "/usr/share/*"
+FILES:${PN} += "/usr/share/*"

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

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

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>
     <!--

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 ."
+INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."