Pull in mirko's changes

modules/00-vanilla-first-setup.yml

@@ -18,6 +18,8 @@ modules:
     - gettext
     - gir1.2-nma4-1.0
     - gir1.2-vte-3.91
+    - gir1.2-gnomedesktop-4.0
+    - gir1.2-gweather-4.0
     - libadwaita-1-dev
     - libjpeg-dev
     - libnm0
@@ -29,3 +31,4 @@ modules:
     - meson
     - python3
     - python3-tz
+    - python3-requests

modules/140-password.yml

@@ -3,5 +3,4 @@ type: apt
 source:
   packages:
   - cracklib-runtime
-  - gnome-keyring
   - ssh-askpass-gnome

modules/160-utilities.yml

@@ -2,12 +2,7 @@ name: utilities
 type: apt
 source:
   packages:
-  - gnome-disk-utility
-  - gnome-system-monitor
-  - gnome-sushi
-  - gnome-software
   - ghostscript
   - zenity
   - flatpak
-  - gnome-software-plugin-flatpak
   - locales-all

modules/210-libs-extra.yml

@@ -1,4 +1,4 @@
-name: gnome-common
+name: desktop-common
 type: apt
 source:
   packages:
@@ -14,7 +14,5 @@ source:
   - libjxl-gdk-pixbuf
   - libglib2.0-bin
   - libblockdev-crypto3
-  - libpam-gnome-keyring
   - libproxy1-plugin-gsettings
   - libwmf0.2-7-gtk
-  - gnome-epub-thumbnailer

recipe.yml

@@ -44,7 +44,6 @@ stages:
       - modules/00-vanilla-desktop-base.yml
       - modules/00-vanilla-backgrounds.yml
       - modules/00-vanilla-first-setup.yml
-      - modules/00-vanilla-gnome-default-settings.yml
       - modules/00-vanilla-system-operator.yml
       - modules/00-vanilla-apx-gui.yml
       - modules/00-vanilla-tour.yml
@@ -58,20 +57,17 @@ stages:
       - modules/04-clipboard-sync-repo.yml
       - modules/05-clipboards.yml
       - modules/10-vanilla-abroot-rollback-notifier.yml
-      - modules/35-vanilla-apps.yml
       - modules/50-laptop-goodies.yml
       - modules/60-media.yml
       - modules/80-printers.yml
       - modules/90-3d-utils.yml
       - modules/100-accessibility.yml
       - modules/110-fonts.yml
-      - modules/120-network.yml
       - modules/121-disable-ssh-daemon.yml
       - modules/130-plymouth.yml
       - modules/131-plymouth-theme-vanilla.yml
       - modules/140-password.yml
       - modules/160-utilities.yml
-      - modules/170-gnome-software-vso-plugin.yml
       - modules/210-libs-extra.yml
       - modules/998-vanilla-cleanup.yml
       - modules/999-pkg-cleanup.yml
@@ -89,11 +85,6 @@ stages:
     - mkdir -p /etc/systemd/user/graphical-session.target.wants/
     - ln -s /etc/systemd/user/apx-vso-pico.service /etc/systemd/user/graphical-session.target.wants/
 
-  - name: gnome-software-setup
-    type: shell
-    commands:
-    - rm /usr/lib/*/gnome-software/plugins-20/libgs_plugin_packagekit.so
-
   - name: cleanup
     type: shell
     commands: