diff --git a/modules/00-vanilla-first-setup.yml b/modules/00-vanilla-first-setup.yml index 7ffc954..19b472e 100644 --- a/modules/00-vanilla-first-setup.yml +++ b/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 diff --git a/modules/00-vanilla-gnome-default-settings.yml b/modules/00-vanilla-gnome-default-settings.yml deleted file mode 100644 index f0f39e8..0000000 --- a/modules/00-vanilla-gnome-default-settings.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: vanilla-gnome-default-settings -type: dpkg-buildpackage -source: - type: git - url: https://github.com/Vanilla-OS/vanilla-gnome-default-settings.git - tag: v0.1 - paths: - - vanilla-gnome-default-settings -modules: -- name: vanilla-gnome-default-settings-deps-install - type: apt - source: - packages: - - dpkg-dev - - libglib2.0-bin diff --git a/modules/120-network.yml b/modules/120-network.yml deleted file mode 100644 index dde066e..0000000 --- a/modules/120-network.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: network -type: apt -source: - packages: - - network-manager-gnome - - network-manager-fortisslvpn-gnome - - network-manager-l2tp-gnome - - network-manager-openconnect-gnome - - network-manager-openvpn-gnome - - network-manager-ssh-gnome - - network-manager-vpnc-gnome - - - gnome-remote-desktop - - gnome-user-share diff --git a/modules/140-password.yml b/modules/140-password.yml index a854d6d..1ad0ad4 100644 --- a/modules/140-password.yml +++ b/modules/140-password.yml @@ -3,5 +3,4 @@ type: apt source: packages: - cracklib-runtime - - gnome-keyring - ssh-askpass-gnome diff --git a/modules/160-utilities.yml b/modules/160-utilities.yml index 627f70f..ece089d 100644 --- a/modules/160-utilities.yml +++ b/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 diff --git a/modules/170-gnome-software-vso-plugin.yml b/modules/170-gnome-software-vso-plugin.yml deleted file mode 100644 index 1764dbb..0000000 --- a/modules/170-gnome-software-vso-plugin.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: gs-vso-plugin -type: shell -commands: -- curl -L -O https://github.com/Vanilla-OS/gs-plugin-vso/releases/download/v1.0.0/libgs_plugin_vso.so -- mv libgs_plugin_vso.so /usr/lib/x86_64-linux-gnu/gnome-software/plugins-20/ diff --git a/modules/210-libs-extra.yml b/modules/210-libs-extra.yml index 78a0e15..95c711e 100644 --- a/modules/210-libs-extra.yml +++ b/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 diff --git a/modules/35-vanilla-apps.yml b/modules/35-vanilla-apps.yml deleted file mode 100644 index 5c8ec45..0000000 --- a/modules/35-vanilla-apps.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: blackbox -type: apt -source: - packages: - - blackbox-terminal - - gnome-software - - gnome-software-plugin-flatpak diff --git a/recipe.yml b/recipe.yml index c687735..a9b831b 100644 --- a/recipe.yml +++ b/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: