diff --git a/.github/workflows/vib-build.yml b/.github/workflows/vib-build.yml index b73ec01..de961e0 100644 --- a/.github/workflows/vib-build.yml +++ b/.github/workflows/vib-build.yml @@ -35,7 +35,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: vanilla-os/vib-gh-action@v0.7.4 + - uses: vanilla-os/vib-gh-action@v0.8.1 with: recipe: "recipe.yml" plugins: "Vanilla-OS/vib-fsguard:v1.5.3" diff --git a/modules/00-vanilla-apx-gui.yml b/modules/00-vanilla-apx-gui.yml index 09881db..4638b96 100644 --- a/modules/00-vanilla-apx-gui.yml +++ b/modules/00-vanilla-apx-gui.yml @@ -12,4 +12,4 @@ modules: - build-essential - gettext - libadwaita-1-dev - - meson + - meson \ No newline at end of file diff --git a/modules/00-vanilla-backgrounds.yml b/modules/00-vanilla-backgrounds.yml index 9b9b9e4..6450b9f 100644 --- a/modules/00-vanilla-backgrounds.yml +++ b/modules/00-vanilla-backgrounds.yml @@ -15,4 +15,4 @@ modules: - debhelper-compat - dh-sequence-gnome - libglib2.0-dev - - meson + - meson \ No newline at end of file diff --git a/modules/00-vanilla-desktop-base.yml b/modules/00-vanilla-desktop-base.yml index 454c970..85beac0 100644 --- a/modules/00-vanilla-desktop-base.yml +++ b/modules/00-vanilla-desktop-base.yml @@ -3,7 +3,7 @@ type: dpkg-buildpackage source: type: git url: https://github.com/Vanilla-OS/desktop-base.git - tag: v1.0.0 + tag: v1.0.1 paths: - desktop-base modules: @@ -15,4 +15,4 @@ modules: - dpkg-dev - dh-make - librsvg2-bin - - optipng + - optipng \ No newline at end of file diff --git a/modules/00-vanilla-first-setup.yml b/modules/00-vanilla-first-setup.yml index 7ffc954..9517ce2 100644 --- a/modules/00-vanilla-first-setup.yml +++ b/modules/00-vanilla-first-setup.yml @@ -3,7 +3,7 @@ type: dpkg-buildpackage source: type: git url: https://github.com/Vanilla-OS/first-setup.git - tag: v2.2.1 + tag: v2.2.3 paths: - vanilla-first-setup modules: @@ -28,4 +28,4 @@ modules: - make - meson - python3 - - python3-tz + - python3-tz \ No newline at end of file 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/00-vanilla-prime-utility.yml b/modules/00-vanilla-prime-utility.yml index ba79623..241b586 100644 --- a/modules/00-vanilla-prime-utility.yml +++ b/modules/00-vanilla-prime-utility.yml @@ -15,4 +15,4 @@ modules: - build-essential - gettext - libadwaita-1-dev - - meson + - meson \ No newline at end of file diff --git a/modules/00-vanilla-sideload.yml b/modules/00-vanilla-sideload.yml index 6d663fe..7b04fbc 100644 --- a/modules/00-vanilla-sideload.yml +++ b/modules/00-vanilla-sideload.yml @@ -32,4 +32,4 @@ modules: commands: - mkdir -p /etc/skel/.config - printf '[Default Applications]\n' > /etc/skel/.config/mimeapps.list - - printf 'application/vnd.debian.binary-package=org.vanillaos.Sideload.desktop\n' >> /etc/skel/.config/mimeapps.list + - printf 'application/vnd.debian.binary-package=org.vanillaos.Sideload.desktop\n' >> /etc/skel/.config/mimeapps.list \ No newline at end of file diff --git a/modules/00-vanilla-system-operator.yml b/modules/00-vanilla-system-operator.yml index cf47ed3..e5110b3 100644 --- a/modules/00-vanilla-system-operator.yml +++ b/modules/00-vanilla-system-operator.yml @@ -82,4 +82,4 @@ modules: - ln -s /usr/lib/systemd/system/vanilla-updates.timer /etc/systemd/system/timers.target.wants/vanilla-updates.timer - mkdir -p /usr/lib/systemd/user/default.target.wants - ln -s /usr/lib/systemd/user/vso-pre-run.service /usr/lib/systemd/user/default.target.wants/vso-pre-run.service - - ln -s /usr/lib/systemd/user/vso-tasks-rotation.service /usr/lib/systemd/user/default.target.wants/vso-tasks-rotation.service + - ln -s /usr/lib/systemd/user/vso-tasks-rotation.service /usr/lib/systemd/user/default.target.wants/vso-tasks-rotation.service \ No newline at end of file diff --git a/modules/00-vanilla-tour.yml b/modules/00-vanilla-tour.yml index ed15c03..6ef7d77 100644 --- a/modules/00-vanilla-tour.yml +++ b/modules/00-vanilla-tour.yml @@ -21,4 +21,4 @@ modules: - make - meson - python3 - - blueprint-compiler + - blueprint-compiler \ No newline at end of file diff --git a/modules/00-vanilla-updates-utility.yml b/modules/00-vanilla-updates-utility.yml index 6c6e6cd..13c4542 100644 --- a/modules/00-vanilla-updates-utility.yml +++ b/modules/00-vanilla-updates-utility.yml @@ -12,4 +12,4 @@ modules: - build-essential - gettext - libadwaita-1-dev - - meson + - meson \ No newline at end of file diff --git a/modules/01-workarounds.yml b/modules/01-workarounds.yml index be941e5..767fd39 100644 --- a/modules/01-workarounds.yml +++ b/modules/01-workarounds.yml @@ -2,4 +2,4 @@ name: install workaround packages type: shell commands: - apt install -y /etc/workarounds/blackbox-is-x-terminal-emulator/blackbox-is-x-terminal-emulator_1.0_all.deb -- rm -rf /etc/workarounds +- rm -rf /etc/workarounds \ No newline at end of file diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml index 041a095..740fb08 100644 --- a/modules/02-waydroid-modules.yml +++ b/modules/02-waydroid-modules.yml @@ -3,8 +3,8 @@ type: shell commands: - cp -rT /sources/waydroid-modules/binder /usr/src/waydroid-binder-1 - cp -rT /sources/waydroid-modules/ashmem /usr/src/waydroid-ashmem-1 -- dkms install waydroid-binder/1 -k $(ls /usr/src | grep -Po '[0-9].[0-9].[0-9].*$' | head -1) -- dkms install waydroid-ashmem/1 -k $(ls /usr/src | grep -Po '[0-9].[0-9].[0-9].*$' | head -1) +- dkms install waydroid-binder/1 -k 6.10.9-amd64 +- dkms install waydroid-ashmem/1 -k 6.10.9-amd64 source: type: git url: https://github.com/Vanilla-OS/anbox-modules @@ -19,4 +19,4 @@ modules: - name: dkms-linux-headers type: shell commands: - - apt install -y linux-headers-amd64 + - apt install -y linux-headers-amd64 \ No newline at end of file diff --git a/modules/03-fswarn.yml b/modules/03-fswarn.yml index 1ce4008..e20a8e8 100644 --- a/modules/03-fswarn.yml +++ b/modules/03-fswarn.yml @@ -6,4 +6,4 @@ commands: source: type: tar url: https://github.com/Vanilla-OS/fswarn/releases/download/v1.0-1/fswarn.tar.xz - checksum: 52f66710132138c21b81b56cb2d6edc7e59ad6eef4a4065b81af0f852d827dab + checksum: 52f66710132138c21b81b56cb2d6edc7e59ad6eef4a4065b81af0f852d827dab \ No newline at end of file diff --git a/modules/10-vanilla-abroot-rollback-notifier.yml b/modules/10-vanilla-abroot-rollback-notifier.yml index 8041a28..d01e537 100644 --- a/modules/10-vanilla-abroot-rollback-notifier.yml +++ b/modules/10-vanilla-abroot-rollback-notifier.yml @@ -11,4 +11,4 @@ modules: packages: - build-essential - gettext - - meson + - meson \ No newline at end of file diff --git a/modules/100-accessibility.yml b/modules/100-accessibility.yml index 9212d3c..421f58d 100644 --- a/modules/100-accessibility.yml +++ b/modules/100-accessibility.yml @@ -9,4 +9,4 @@ source: - orca - speech-dispatcher - - speech-dispatcher-espeak-ng + - speech-dispatcher-espeak-ng \ No newline at end of file diff --git a/modules/110-fonts.yml b/modules/110-fonts.yml index d9dfdb1..ff5363e 100644 --- a/modules/110-fonts.yml +++ b/modules/110-fonts.yml @@ -15,4 +15,4 @@ source: - fonts-sil-abyssinica - fonts-sil-padauk - fonts-thai-tlwg - - fonts-tibetan-machine + - fonts-tibetan-machine \ No newline at end of file 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/121-disable-ssh-daemon.yml b/modules/121-disable-ssh-daemon.yml index ea170ae..71ce082 100644 --- a/modules/121-disable-ssh-daemon.yml +++ b/modules/121-disable-ssh-daemon.yml @@ -1,4 +1,4 @@ name: disable-ssh-daemon type: shell commands: - - unlink /etc/systemd/system/multi-user.target.wants/ssh.service + - unlink /etc/systemd/system/multi-user.target.wants/ssh.service \ No newline at end of file diff --git a/modules/130-plymouth.yml b/modules/130-plymouth.yml index 56a2026..ac60210 100644 --- a/modules/130-plymouth.yml +++ b/modules/130-plymouth.yml @@ -3,4 +3,4 @@ type: apt source: packages: - plymouth - - plymouth-themes + - plymouth-themes \ No newline at end of file diff --git a/modules/131-plymouth-theme-vanilla.yml b/modules/131-plymouth-theme-vanilla.yml index 4c33a02..e929ee1 100644 --- a/modules/131-plymouth-theme-vanilla.yml +++ b/modules/131-plymouth-theme-vanilla.yml @@ -8,4 +8,4 @@ source: - plymouth-theme-vanilla - plymouth-theme-vanilla-bgrt - plymouth-theme-vanilla-logo - - plymouth-theme-vanilla-text + - plymouth-theme-vanilla-text \ No newline at end of file diff --git a/modules/140-password.yml b/modules/140-password.yml index a854d6d..466f75b 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 + - ssh-askpass-gnome \ No newline at end of file diff --git a/modules/160-utilities.yml b/modules/160-utilities.yml index 627f70f..40e5598 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 + - locales-all \ No newline at end of file diff --git a/modules/170-gnome-software-vso-plugin.yml b/modules/170-gnome-software-vso-plugin.yml index 1764dbb..a5a38e1 100644 --- a/modules/170-gnome-software-vso-plugin.yml +++ b/modules/170-gnome-software-vso-plugin.yml @@ -2,4 +2,5 @@ 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/ +- mkdir -p /usr/lib/x86_64-linux-gnu/gnome-software/plugins-20/ +- mv libgs_plugin_vso.so /usr/lib/x86_64-linux-gnu/gnome-software/plugins-20/ \ No newline at end of file diff --git a/modules/210-libs-extra.yml b/modules/210-libs-extra.yml index 78a0e15..2e44fab 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 + - libwmf0.2-7-gtk \ No newline at end of file diff --git a/modules/35-vanilla-apps.yml b/modules/35-vanilla-apps.yml index 5c8ec45..8cc3221 100644 --- a/modules/35-vanilla-apps.yml +++ b/modules/35-vanilla-apps.yml @@ -4,4 +4,4 @@ source: packages: - blackbox-terminal - gnome-software - - gnome-software-plugin-flatpak + - gnome-software-plugin-flatpak \ No newline at end of file diff --git a/modules/50-laptop-goodies.yml b/modules/50-laptop-goodies.yml index 75c82b3..14f9b81 100644 --- a/modules/50-laptop-goodies.yml +++ b/modules/50-laptop-goodies.yml @@ -4,4 +4,4 @@ source: packages: - power-profiles-daemon - powermgmt-base - - switcheroo-control + - switcheroo-control \ No newline at end of file diff --git a/modules/60-media.yml b/modules/60-media.yml index f58e2c3..8401f01 100644 --- a/modules/60-media.yml +++ b/modules/60-media.yml @@ -10,4 +10,4 @@ source: - gstreamer1.0-plugins-ugly - gstreamer1.0-plugins-base-apps - gstreamer1.0-pulseaudio - - libavcodec-extra + - libavcodec-extra \ No newline at end of file diff --git a/modules/80-printers.yml b/modules/80-printers.yml index eeace0b..9f0b71d 100644 --- a/modules/80-printers.yml +++ b/modules/80-printers.yml @@ -5,6 +5,7 @@ source: # General - cups - cups-pk-helper + - cups-filters - printer-driver-brlaser # Brother - printer-driver-escpr # Epson @@ -12,4 +13,4 @@ source: # Config - system-config-printer-common - - system-config-printer-udev + - system-config-printer-udev \ No newline at end of file diff --git a/modules/90-3d-utils.yml b/modules/90-3d-utils.yml index 376286e..3121d6a 100644 --- a/modules/90-3d-utils.yml +++ b/modules/90-3d-utils.yml @@ -7,4 +7,4 @@ source: - steam-devices - - vdpau-driver-all + - vdpau-driver-all \ No newline at end of file diff --git a/modules/998-vanilla-cleanup.yml b/modules/998-vanilla-cleanup.yml index 38be6ef..d7ccbfc 100644 --- a/modules/998-vanilla-cleanup.yml +++ b/modules/998-vanilla-cleanup.yml @@ -3,4 +3,4 @@ type: shell commands: - apt remove -y dpkg-dev debhelper-compat dh-sequence-gnome libglib2.0-dev meson build-essential debhelper libadwaita-1-dev gettext make libjpeg-dev libnm-dev libnma-gtk4-dev - apt autoremove -y -- apt clean +- apt clean \ No newline at end of file diff --git a/modules/999-clear-first-setup-steps-unit.yml b/modules/999-clear-first-setup-steps-unit.yml index 83fc4dc..76500f0 100644 --- a/modules/999-clear-first-setup-steps-unit.yml +++ b/modules/999-clear-first-setup-steps-unit.yml @@ -2,4 +2,4 @@ name: clear-first-setup-steps-unit type: shell commands: - mkdir -p /etc/systemd/system/local-fs.target.wants/ -- ln -s /usr/lib/systemd/system/clear-first-setup-steps.service /etc/systemd/system/local-fs.target.wants/ +- ln -s /usr/lib/systemd/system/clear-first-setup-steps.service /etc/systemd/system/local-fs.target.wants/ \ No newline at end of file diff --git a/modules/999-pkg-cleanup.yml b/modules/999-pkg-cleanup.yml index 45924d6..fc2a0e0 100644 --- a/modules/999-pkg-cleanup.yml +++ b/modules/999-pkg-cleanup.yml @@ -3,4 +3,4 @@ type: shell commands: - apt remove -y zutty gnome-shell-extension-prefs - SUDO_FORCE_REMOVE=yes apt purge -y sudo -- echo 'NoDisplay=true' >> /usr/share/applications/software-properties-gtk.desktop +- echo 'NoDisplay=true' >> /usr/share/applications/software-properties-gtk.desktop \ No newline at end of file diff --git a/recipe.yml b/recipe.yml index c687735..5d317fe 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,14 +57,12 @@ 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 @@ -92,7 +89,7 @@ stages: - name: gnome-software-setup type: shell commands: - - rm /usr/lib/*/gnome-software/plugins-20/libgs_plugin_packagekit.so + - rm -f /usr/lib/*/gnome-software/plugins-20/libgs_plugin_packagekit.so - name: cleanup type: shell @@ -125,4 +122,4 @@ stages: commands: - rm -rf /tmp/* - rm -rf /var/tmp/* - - rm -rf /sources + - rm -rf /sources \ No newline at end of file