1
0
mirror of https://github.com/lxsang/meta-rpi-diya.git synced 2024-11-08 06:28:23 +01:00

fix: move wayland related default application config to /et/xdg

This commit is contained in:
DanyLE 2023-07-29 00:35:25 +02:00
parent 1cb28e0e01
commit 1b520e6713
6 changed files with 17 additions and 15 deletions

View File

@ -90,7 +90,7 @@ layout {
style = "launcher" style = "launcher"
value = "/usr/share/icons/Adwaita/scalable/actions/system-run-symbolic.svg" value = "/usr/share/icons/Adwaita/scalable/actions/system-run-symbolic.svg"
tooltip = "Quick run" tooltip = "Quick run"
action = Exec "bash -c \"`tofi-drun`\"" action = Exec "bash -c \"`drun`\""
} }
button { button {
value = "/usr/share/icons/Adwaita/scalable/devices/tv-symbolic.svg" value = "/usr/share/icons/Adwaita/scalable/devices/tv-symbolic.svg"

View File

@ -19,8 +19,9 @@ inherit meson pkgconfig
EXTRA_OEMESON += "--buildtype release" EXTRA_OEMESON += "--buildtype release"
do_install:append () { do_install:append () {
install -d ${D}/${sysconfdir}/sfwbar/ install -d ${D}/${sysconfdir}/xdg/
install -m 0755 ${WORKDIR}/sfwbar.config ${D}/${sysconfdir}/sfwbar/ 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/*"

View File

@ -1,7 +1,7 @@
# Example autostart file # Example autostart file
# Set background color # 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 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 # https://git.sr.ht/~leon_plickat/wlopm
swayidle -w timeout 60 'wlopm --off DPI-1' resume 'wlopm --on DPI-1' & 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 if [ -e "$HOME/.config/sfwbar/sfwbar.config" ]; then
SFWBAR_CNF="$HOME/.config/sfwbar/sfwbar.config" SFWBAR_CNF="$HOME/.config/sfwbar/sfwbar.config"
fi fi

View File

@ -8,7 +8,7 @@
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
### END INIT INFO ### END INIT INFO
LABWC_USER=diya LABWC_USER=diya
LABWC_CONFDIR="/etc/labwc" LABWC_CONFDIR="/etc/xdg/labwc"
if test -e "/home/$LABWC_USER/.config/labwc" ; then if test -e "/home/$LABWC_USER/.config/labwc" ; then
LABWC_CONFDIR="/home/$LABWC_USER/.config/labwc" LABWC_CONFDIR="/home/$LABWC_USER/.config/labwc"
fi fi

View File

@ -41,7 +41,7 @@
</keybind> </keybind>
<keybind key="W-Space"> <keybind key="W-Space">
<action name="Execute"> <action name="Execute">
<command>bash -c "bash -c \"`tofi-drun`\""</command> <command>bash -c "bash -c \"`drun`\""</command>
</action> </action>
</keybind> </keybind>
<!-- <!--

View File

@ -9,18 +9,19 @@ SRC_URI += " file://autostart \
file://wpp.jpg \ file://wpp.jpg \
" "
do_install:append () { do_install:append () {
install -d ${D}/${sysconfdir}/xdg
install -d ${D}/${sysconfdir}/init.d 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}/init ${D}/${sysconfdir}/init.d/labwc
install -m 0755 ${WORKDIR}/wpp.jpg ${D}/${sysconfdir}/labwc/ install -m 0755 ${WORKDIR}/wpp.jpg ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${WORKDIR}/autostart ${D}/${sysconfdir}/labwc/ install -m 0755 ${WORKDIR}/autostart ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${WORKDIR}/environment ${D}/${sysconfdir}/labwc/ install -m 0755 ${WORKDIR}/environment ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${WORKDIR}/menu.xml ${D}/${sysconfdir}/labwc/ install -m 0755 ${WORKDIR}/menu.xml ${D}/${sysconfdir}/xdg/labwc/
install -m 0755 ${WORKDIR}/rc.xml ${D}/${sysconfdir}/labwc/ install -m 0755 ${WORKDIR}/rc.xml ${D}/${sysconfdir}/xdg/labwc/
} }
inherit update-rc.d inherit update-rc.d
INITSCRIPT_NAME = "labwc" 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 ."