Merge pull request #4 from Kanola-Images/dev

Bring Main up to Date

.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"

modules/00-vanilla-apx-gui.yml

@@ -12,4 +12,4 @@ modules:
     - build-essential
     - gettext
     - libadwaita-1-dev
-    - meson
+    - meson

modules/00-vanilla-backgrounds.yml

@@ -15,4 +15,4 @@ modules:
     - debhelper-compat
     - dh-sequence-gnome
     - libglib2.0-dev
-    - meson
+    - meson

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

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

modules/00-vanilla-prime-utility.yml

@@ -15,4 +15,4 @@ modules:
     - build-essential
     - gettext
     - libadwaita-1-dev
-    - meson
+    - meson

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

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

modules/00-vanilla-tour.yml

@@ -21,4 +21,4 @@ modules:
     - make
     - meson
     - python3
-    - blueprint-compiler
+    - blueprint-compiler

modules/00-vanilla-updates-utility.yml

@@ -12,4 +12,4 @@ modules:
     - build-essential
     - gettext
     - libadwaita-1-dev
-    - meson
+    - meson

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

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

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

modules/10-vanilla-abroot-rollback-notifier.yml

@@ -11,4 +11,4 @@ modules:
     packages:
     - build-essential
     - gettext
-    - meson
+    - meson

modules/100-accessibility.yml

@@ -9,4 +9,4 @@ source:
   - orca
 
   - speech-dispatcher
-  - speech-dispatcher-espeak-ng
+  - speech-dispatcher-espeak-ng

modules/110-fonts.yml

@@ -15,4 +15,4 @@ source:
   - fonts-sil-abyssinica
   - fonts-sil-padauk
   - fonts-thai-tlwg
-  - fonts-tibetan-machine
+  - fonts-tibetan-machine

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

modules/130-plymouth.yml

@@ -3,4 +3,4 @@ type: apt
 source:
   packages:
   - plymouth
-  - plymouth-themes
+  - plymouth-themes

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

modules/140-password.yml

@@ -3,5 +3,4 @@ type: apt
 source:
   packages:
   - cracklib-runtime
-  - gnome-keyring
-  - ssh-askpass-gnome
+  - 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
+  - locales-all

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/

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

modules/35-vanilla-apps.yml

@@ -4,4 +4,4 @@ source:
   packages:
   - blackbox-terminal
   - gnome-software
-  - gnome-software-plugin-flatpak
+  - gnome-software-plugin-flatpak

modules/50-laptop-goodies.yml

@@ -4,4 +4,4 @@ source:
   packages:
   - power-profiles-daemon
   - powermgmt-base
-  - switcheroo-control
+  - switcheroo-control

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

modules/80-printers.yml

@@ -5,11 +5,12 @@ source:
   # General
   - cups
   - cups-pk-helper
+  - cups-filters
 
   - printer-driver-brlaser  # Brother
   - printer-driver-escpr    # Epson
   - hplip                   # HP
 
   # Config
   - system-config-printer-common
-  - system-config-printer-udev
+  - system-config-printer-udev

modules/90-3d-utils.yml

@@ -7,4 +7,4 @@ source:
 
   - steam-devices
 
-  - vdpau-driver-all
+  - vdpau-driver-all

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

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/

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

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