Merge branch 'main' into castrojo-patch-1

Containerfile

@@ -78,16 +78,20 @@ RUN if grep -qv "gnome" <<< "${IMAGE_NAME}"; then \
     rpm-ostree install \
         steamdeck-kde-presets-desktop \
         wallpaper-engine-kde-plugin \
-        kdeconnectd \
+        kdeconnectd && \
+    rpm-ostree override replace \
+    --experimental \
+    --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr \
+        xorg-x11-server-Xwayland \
 ; else \
     rpm-ostree override replace \
     --experimental \
     --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr \
         mutter \
         gnome-control-center \
-        gnome-control-center-filesystem && \
+        gnome-control-center-filesystem \
+        xorg-x11-server-Xwayland && \
     rpm-ostree install \
-        sddm \
         steamdeck-backgrounds \
         gradience \
         adw-gtk3-theme \
@@ -119,6 +123,7 @@ RUN rm /usr/share/applications/shredder.desktop && \
     mkdir -p "/usr/etc/profile.d/" && \
     ln -s "/usr/share/ublue-os/firstboot/launcher/login-profile.sh" \
     "/usr/etc/profile.d/ublue-firstboot.sh" && \
+    cp "/usr/share/ublue-os/firstboot/yafti.yml" "/etc/yafti.yml" && \
     pip install --prefix=/usr yafti && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
@@ -133,11 +138,6 @@ RUN rm /usr/share/applications/shredder.desktop && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
     mkdir -p /etc/flatpak/remotes.d && \
     wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /etc/flatpak/remotes.d && \
-    cat /etc/flatpak/install | while read line; do flatpak install --system --noninteractive --no-deploy flathub $line; done && \
-    cat /etc/flatpak/deck | while read line; do flatpak install --system --noninteractive --no-deploy flathub $line; done && \
-    mkdir -p /etc/flatpak/{flathub,objects} && \
-    cp -r /var/lib/flatpak/repo/refs/remotes/flathub/* /etc/flatpak/flathub && \
-    cp -r /var/lib/flatpak/repo/objects/* /etc/flatpak/objects && \
     systemctl unmask flatpak-system-install.service && \
     systemctl enable flatpak-system-install.service && \
     systemctl disable rpm-ostreed-automatic.timer && \
@@ -145,8 +145,6 @@ RUN rm /usr/share/applications/shredder.desktop && \
     systemctl enable displaylink.service && \
     systemctl enable input-remapper.service && \
     if grep -q "gnome" <<< "${IMAGE_NAME}"; then \
-        systemctl disable gdm.service && \
-        systemctl enable sddm.service && \
         rm /usr/share/applications/yad-icon-browser.desktop \
     ; 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 && \
@@ -217,6 +215,7 @@ RUN if grep -qv "gnome" <<< "${IMAGE_NAME}"; then \
 ; else \
     rpm-ostree install \
         gnome-shell-extension-bazzite-menu \
+        sddm \
 ; fi
 
 # Install new packages & dock updater - done manually due to proprietary parts preventing it from being on Copr
@@ -261,6 +260,8 @@ RUN rm /usr/share/applications/winetricks.desktop && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo && \
     mv /etc/sddm.conf /etc/sddm.conf.d/steamos.conf && \
     if grep -q "gnome" <<< "${IMAGE_NAME}"; then \
+        systemctl disable gdm.service && \
+        systemctl enable sddm.service && \
         systemctl enable gnome-autologin.service \
     ; fi && \
     if grep -qv "gnome" <<< "${IMAGE_NAME}"; then \

system_files/deck/silverblue/usr/bin/gnome-autologin

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+USER=$(id -nu 1000)
+
+# SteamOS SDDM config
+SDDM_CONF='/etc/sddm.conf.d/steamos.conf'
+if [ ! -f ${SDDM_CONF} ]; then
+    # Fallback to sddm.conf
+    SDDM_CONF = '/etc/sddm.conf'
+fi
+
+# Configure autologin
+sed -i 's/.*Session=.*/Session=gnome-xorg.desktop/g' ${SDDM_CONF}
+sed -i 's/.*User=.*/User='${USER}'/g' ${SDDM_CONF}

system_files/desktop/shared/etc/systemd/system/flatpak-system-install.service

@@ -1,10 +1,13 @@
 [Unit]
 Description=Install System Flatpak on boot
 Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/ublue-flatpak-system-install
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target

system_files/desktop/shared/usr/bin/ublue-flatpak-system-install

@@ -2,23 +2,22 @@
 source /etc/default/bazzite
 
 if [[ -f '/etc/flatpak/install' ]]; then
-  cp -r /etc/flatpak/flathub/* /var/lib/flatpak/repo/refs/remotes/flathub
-  cp -r /etc/flatpak/objects/* /var/lib/flatpak/repo/objects
   cat /etc/flatpak/install | while read line; do
-    flatpak install --system --noninteractive --no-pull flathub $line
+    flatpak install --system --noninteractive flathub $line
   done && mv /etc/flatpak/install /etc/flatpak/installed
 fi
 
 if [[ -f '/etc/flatpak/remove' ]]; then
   cat /etc/flatpak/remove | while read line; do
-    flatpak remove --system --noninteractive $line
-  done && mv /etc/flatpak/install /etc/flatpak/removed
+    flatpak remove --system --noninteractive $line 2>/dev/null
+  done
+  mv /etc/flatpak/remove /etc/flatpak/removed
 fi
 
 if [[ -f '/etc/flatpak/deck' ]]; then
   if [[ ${IMAGE_NAME} == *'deck'* ]]; then
     cat /etc/flatpak/deck | while read line; do
-      flatpak install --system --noninteractive --no-pull flathub $line
+      flatpak install --system --noninteractive flathub $line
     done && cat /etc/flatpak/deck >> /etc/flatpak/installed
   fi
 fi

system_files/desktop/silverblue/etc/flatpak/install

@@ -2,9 +2,24 @@ net.davidotek.pupgui2
 org.freedesktop.Platform.VulkanLayer.MangoHud//22.08
 org.freedesktop.Platform.VulkanLayer.vkBasalt//22.08
 io.github.Foldex.AdwSteamGtk
-org.gnome.Loupe
 com.mattjakeman.ExtensionManager
 org.gtk.Gtk3theme.adw-gtk3
 org.gtk.Gtk3theme.adw-gtk3-dark
 org.mozilla.firefox
 com.github.tchx84.Flatseal
+org.gnome.Calculator
+org.gnome.Calendar
+org.gnome.Characters
+org.gnome.Connections
+org.gnome.Contacts
+org.gnome.Evince
+org.gnome.Extensions
+org.gnome.Logs
+org.gnome.Loupe
+org.gnome.Maps
+org.gnome.NautilusPreviewer
+org.gnome.TextEditor
+org.gnome.Weather
+org.gnome.baobab
+org.gnome.clocks
+org.gnome.font-viewer

system_files/desktop/silverblue/etc/gdm/custom.conf

@@ -0,0 +1,16 @@
+# GDM configuration storage
+
+[daemon]
+#AutomaticLoginEnable=True
+#AutomaticLogin=
+#WaylandEnable=false
+#DefaultSession=gnome-xorg
+
+[security]
+
+[xdmcp]
+
+[chooser]
+
+[debug]
+#Enable=true

system_files/desktop/silverblue/usr/bin/gnome-autologin

@@ -2,13 +2,10 @@
 
 USER=$(id -nu 1000)
 
-# SteamOS SDDM config
-SDDM_CONF='/etc/sddm.conf.d/steamos.conf'
-if [ ! -f ${SDDM_CONF} ]; then
-    # Fallback to sddm.conf
-    SDDM_CONF = '/etc/sddm.conf'
-fi
+# GDM config
+GDM_CONF='/etc/gdm/custom.conf'
 
 # Configure autologin
-sed -i 's/.*Session=.*/Session=gnome-xorg.desktop/g' ${SDDM_CONF}
-sed -i 's/.*User=.*/User='${USER}'/g' ${SDDM_CONF}
+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}