Merge pull request #130 from ublue-os/wayland-autologin

feat: Add Wayland support to autologin
This commit is contained in:
Kyle Gospodnetich 2023-08-09 19:22:15 -07:00 committed by GitHub
commit e5dce78847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 6 deletions

View File

@ -165,7 +165,9 @@ RUN rm /usr/share/applications/shredder.desktop && \
rm /usr/share/applications/yad-icon-browser.desktop && \
sed -i '/^PRETTY_NAME/s/Silverblue/Bazzite GNOME/' /usr/lib/os-release \
; fi && \
if grep -qv "nvidia" <<< "${IMAGE_NAME}"; then \
if grep -q "nvidia" <<< "${IMAGE_NAME}"; then \
sed -i 's@DESKTOP_WAYLAND=true@DESKTOP_WAYLAND=false@g' /etc/default/desktop-wayland \
; else \
systemctl disable waydroid-container.service \
; fi && \
echo -e "IMAGE_NAME=${IMAGE_NAME}\nBASE_IMAGE_NAME=${BASE_IMAGE_NAME}\nIMAGE_FLAVOR=${IMAGE_FLAVOR}\nFEDORA_MAJOR_VERSION=${FEDORA_MAJOR_VERSION}" >> /etc/default/bazzite && \
@ -288,9 +290,6 @@ RUN rm /usr/share/applications/winetricks.desktop && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-obs-vkcapture.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo && \
if grep -q "nvidia" <<< "${IMAGE_NAME}"; then \
sed -i 's@DESKTOP_WAYLAND=true@DESKTOP_WAYLAND=false@g' /etc/default/desktop-wayland \
; fi && \
mv /etc/sddm.conf /etc/sddm.conf.d/steamos.conf && \
if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
systemctl enable plasma-autologin.service && \

View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash
source /etc/default/desktop-wayland
USER=$(id -nu 1000)
# SteamOS SDDM config
@ -14,5 +16,9 @@ if [ ! -f ${SDDM_CONF} ]; then
fi
# Configure autologin
sed -i 's/.*Session=.*/Session=plasmax11.desktop/g' ${SDDM_CONF}
if ${DESKTOP_WAYLAND}; then
sed -i 's/.*Session=.*/Session=plasma.desktop/g' ${SDDM_CONF}
else
sed -i 's/.*Session=.*/Session=plasmax11.desktop/g' ${SDDM_CONF}
fi
sed -i 's/.*User=.*/User='${USER}'/g' ${SDDM_CONF}

View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash
source /etc/default/desktop-wayland
USER=$(id -nu 1000)
# GDM config
@ -8,4 +10,8 @@ GDM_CONF='/etc/gdm/custom.conf'
# Configure autologin
sed -i 's/.*AutomaticLoginEnable=.*/AutomaticLoginEnable=true/g' ${GDM_CONF}
sed -i 's/.*AutomaticLogin=.*/AutomaticLogin='${USER}'/g' ${GDM_CONF}
sed -i 's/.*DefaultSession=.*/DefaultSession=gnome-xorg/g' ${GDM_CONF}
if ${DESKTOP_WAYLAND}; then
sed -i 's/.*DefaultSession=.*/DefaultSession=gnome-session/g' ${GDM_CONF}
else
sed -i 's/.*DefaultSession=.*/DefaultSession=gnome-xorg/g' ${GDM_CONF}
fi