Add only gdm code not gnome shell

hooks/002.1-add-gdm.chroot

@@ -28,36 +28,8 @@ apt-get install --no-install-recommends -y \
     gir1.2-gsound-1.0 \
     libcanberra-pulse \
     libsnapd-glib-2-1 \
-    ibus
-
-# Install a basic Ubuntu session
-apt-get install --no-install-recommends -y \
-    ubuntu-session \
-    gkbd-capplet \
-    gnome-menus \
-    gnome-terminal \
-    gnome-settings-daemon \
-    gnome-shell-extension-appindicator \
-    gnome-shell-extension-desktop-icons-ng \
-    gnome-shell-extension-ubuntu-dock \
-    gnome-shell-extension-ubuntu-tiling-assistant \
-    gnome-control-center \
-    gnome-keyring \
-    fprintd \
-    libpam-fprintd \
-    opensc \
-    bolt \
-    libpam-gnome-keyring \
-    spice-vdagent \
-    xdg-desktop-portal \
-    xdg-desktop-portal-gnome \
-    xdg-desktop-portal-gtk \
-    xdg-user-dirs-gtk \
-    inotify-tools \
-    alsa-ucm-conf
-
-# Remove setuid from some executables we're not using
-chmod u-s,g-s /usr/bin/pkexec
+    ibus \
+    xdg-desktop-portal
 
 # Remove Ubuntu X11 session
 rm /usr/share/xsessions/ubuntu.desktop
@@ -70,11 +42,11 @@ sed -i '/^Description=/ a # delay until snapd finishes seeding\nAfter=snapd.seed
 
 # Remove D-Bus service activation files provided by
 # ubuntu-desktop-session snap.
-rm /usr/share/dbus-1/services/org.gnome.Nautilus.service
-rm /usr/share/dbus-1/services/org.gnome.Terminal.service
-rm /usr/share/dbus-1/services/org.freedesktop.impl.portal.desktop.gnome.service
-rm /usr/share/dbus-1/services/org.freedesktop.impl.portal.desktop.gtk.service
-rm /usr/share/dbus-1/services/org.gnome.Shell.Screencast.service
+rm -f /usr/share/dbus-1/services/org.gnome.Nautilus.service
+rm -f /usr/share/dbus-1/services/org.gnome.Terminal.service
+rm -f /usr/share/dbus-1/services/org.freedesktop.impl.portal.desktop.gnome.service
+rm -f /usr/share/dbus-1/services/org.freedesktop.impl.portal.desktop.gtk.service
+rm -f /usr/share/dbus-1/services/org.gnome.Shell.Screencast.service
 rm -f /usr/share/dbus-1/services/org.freedesktop.IBus.service
 rm -f /usr/share/dbus-1/services/org.freedesktop.portal.IBus.service
 rm -f /usr/share/dbus-1/services/org.freedesktop.ColorHelper.service
@@ -120,7 +92,7 @@ sed -i "/^ReadWritePaths=/ a \\  /var/lib/extrausers/ \\\\" \
     /usr/lib/systemd/system/accounts-daemon.service
 
 # Hide gnome-terminal by default
-sed -i 's/OnlyShowIn=/NoDisplay=true\nOnlyShowIn=/g' /usr/share/applications/org.gnome.Terminal.desktop
+#sed -i 's/OnlyShowIn=/NoDisplay=true\nOnlyShowIn=/g' /usr/share/applications/org.gnome.Terminal.desktop
 
 # change default wallpapers
 cp /usr/share/gnome-background-properties/ubuntu-wallpapers.xml /usr/share/gnome-background-properties/ubuntu-core-desktop-wallpapers.xml

hooks/599-cleanup-packages.chroot

@@ -1,13 +1,22 @@
 #!/bin/sh
 
 set -e
-echo Removing pipewire
 # remove packages that were installed due to dependencies but that we
 # must remove.
-dpkg -r --force-all pipewire wireplumber pipewire-pulse
+echo Removing pipewire
+dpkg -r --force-all pipewire wireplumber pipewire-pulse pipewire-alsa
 
 # For pipewire-bin remove all the binaries but retain all the config from /usr/share which will
 # be used by clients and modules
 for i in $(dpkg -L pipewire-bin | grep -v "^/\.$" | grep -v "usr/share" | sed -E -e 's,^/,,' | tac) ; do
     rm -df "$i" || /bin/true
 done
+echo Removing xdg-desktop-portal-XXX
+# Save the portal file
+cp /usr/share/xdg-desktop-portal/portals/gnome.portal /usr/share/xdg-desktop-portal/portals/gnome.portal.preserve
+dpkg -r --force-all xdg-desktop-portal-gtk xdg-desktop-portal-gnome
+# Now, restore the portal file
+mv /usr/share/xdg-desktop-portal/portals/gnome.portal.preserve /usr/share/xdg-desktop-portal/portals/gnome.portal
+
+# Remove all the gnome services to ensure that they don't interfere with the ones in the session snap
+rm -f /usr/share/dbus-1/services/org.gnome.*

static/etc/system-image/writable-paths

@@ -73,7 +73,6 @@
 /etc/polkit-1/rules.d                   auto                    persistent  none        none
 /var/lib/AccountsService                auto                    persistent  transition  none
 /var/lib/gdm3                           auto                    persistent  transition  none
-/usr/share/wayland-sessions             auto                    persistent  transition  none
 /usr/share/polkit-1                     auto                    persistent  transition  none
 /var/lib/colord                         auto                    persistent  transition  none
 /var/lib/fprint                         auto                    persistent  transition  none

static/usr/share/xdg-desktop-portal/portals/gnome-keyring.portal

@@ -0,0 +1,4 @@
+[portal]
+DBusName=org.freedesktop.secrets
+Interfaces=org.freedesktop.impl.portal.Secret
+UseIn=gnome

static/usr/share/xdg-desktop-portal/portals/kwallet.portal

@@ -0,0 +1,4 @@
+[portal]
+DBusName=org.freedesktop.impl.portal.desktop.kwallet
+Interfaces=org.freedesktop.impl.portal.Secret;
+UseIn=kde