diff --git a/includes.container/etc/environment.d/90local-cursor.conf b/includes.container/etc/environment.d/90local-cursor.conf
new file mode 100644
index 0000000..1f1c65a
--- /dev/null
+++ b/includes.container/etc/environment.d/90local-cursor.conf
@@ -0,0 +1 @@
+XCURSOR_PATH="/usr/share/icons:/usr/local/share/icons:~/.local/share/icons"
diff --git a/includes.container/etc/skel/.config/autostart/abroot-rollback-notifier.desktop b/includes.container/etc/skel/.config/autostart/abroot-rollback-notifier.desktop
deleted file mode 100644
index 4cbc05c..0000000
--- a/includes.container/etc/skel/.config/autostart/abroot-rollback-notifier.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=ABRoot Rollback Notifier
-Exec=/usr/bin/abroot-rollback-notifier
-Type=Application
-X-GNOME-Autostart-enabled=true
-Hidden=true
-NoDisplay=true
\ No newline at end of file
diff --git a/includes.container/etc/skel/.config/autostart/vanillaos-vso-tasks-rotator.desktop b/includes.container/etc/skel/.config/autostart/vanillaos-vso-tasks-rotator.desktop
deleted file mode 100644
index c158f26..0000000
--- a/includes.container/etc/skel/.config/autostart/vanillaos-vso-tasks-rotator.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=VSO Tasks Rotator
-Exec=/usr/bin/vso tasks rotate
-Type=Application
-X-GNOME-Autostart-enabled=true
-Hidden=true
-NoDisplay=true
\ No newline at end of file
diff --git a/includes.container/etc/sysctl.d/core-pattern.conf b/includes.container/etc/sysctl.d/core-pattern.conf
new file mode 100644
index 0000000..4decb36
--- /dev/null
+++ b/includes.container/etc/sysctl.d/core-pattern.conf
@@ -0,0 +1 @@
+kernel.core_pattern = /var/tmp/core.%e.%p.%h.%t
diff --git a/includes.container/etc/systemd/user/apx-vso-pico.service b/includes.container/etc/systemd/user/apx-vso-pico.service
new file mode 100644
index 0000000..be8dd9a
--- /dev/null
+++ b/includes.container/etc/systemd/user/apx-vso-pico.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Podman container-apx-vso-pico.service
+Documentation=man:podman-generate-systemd(1)
+PartOf=graphical-session.target
+Requires=podman.service
+Wants=graphical-session.target
+After=graphical-session.target
+
+[Service]
+TimeoutStopSec=10
+RemainAfterExit=yes
+ExecStop=/.system/usr/bin/podman stop -t 3 apx-vso-pico
+ExecStopPost=/.system/usr/bin/podman stop -t 3 apx-vso-pico
+
+[Install]
+WantedBy=graphical-session.target
diff --git a/includes.container/etc/udev/rules.d/99-waydroid.rules b/includes.container/etc/udev/rules.d/99-waydroid.rules
index 8d3cc77..081f26e 100644
--- a/includes.container/etc/udev/rules.d/99-waydroid.rules
+++ b/includes.container/etc/udev/rules.d/99-waydroid.rules
@@ -1,2 +1,2 @@
-KERNEL=="binder", NAME="%k", MODE="0666"
-KERNEL=="ashmem", NAMe="%k", MODE="0666"
+KERNEL=="binder", MODE="0666"
+KERNEL=="ashmem", MODE="0666"
diff --git a/includes.container/etc/xdg/autostart/clipboard-sync.desktop b/includes.container/etc/xdg/autostart/clipboard-sync.desktop
new file mode 100644
index 0000000..dba1582
--- /dev/null
+++ b/includes.container/etc/xdg/autostart/clipboard-sync.desktop
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Wayland/X Clipboard Sync
+Exec=systemctl --user start clipboard-sync
+Type=Application
diff --git a/includes.container/usr/bin/reset-vso b/includes.container/usr/bin/reset-vso
new file mode 100644
index 0000000..eec25c9
--- /dev/null
+++ b/includes.container/usr/bin/reset-vso
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ "$1" == "--tty" ]; then
+ echo "Are you sure you want to reset the VSO? This will remove all your installed software in the subsystem. [y/N]"
+ read -r answer
+ if [ "$answer" == "y" ]; then
+ podman rm -f apx-vso-pico
+ blackbox-terminal
+ fi
+else
+ adwdialog --title "Reset VSO?" \
+ --description "Are you sure you want to reset the VSO? This will remove all your installed software in the subsystem." \
+ --type "question" \
+ --icon "org.vanillaos.VSO"
+ if [ $? -eq 0 ]; then
+ podman rm -f apx-vso-pico
+ blackbox-terminal
+ fi
+fi
diff --git a/includes.container/usr/bin/wait-for-connection b/includes.container/usr/bin/wait-for-connection
new file mode 100644
index 0000000..e3e10d1
--- /dev/null
+++ b/includes.container/usr/bin/wait-for-connection
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+is_network_online() {
+ nmcli -t g | grep -q "connected"
+ return $?
+}
+
+retry_count=0
+max_retries=30
+
+until is_network_online; do
+ if [ $retry_count -ge $max_retries ]; then
+ echo "Network not available after 1 minute. Exiting."
+ exit 1
+ fi
+ echo "Waiting for network..."
+ sleep 2
+ ((retry_count++))
+done
+
+echo "Network is online."
diff --git a/includes.container/usr/bin/waydroid b/includes.container/usr/bin/waydroid
new file mode 100644
index 0000000..e6ebb32
--- /dev/null
+++ b/includes.container/usr/bin/waydroid
@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+
+if [[ -f /run/.containerenv ]]; then
+ /usr/bin/waydroid "$@"
+ exit
+fi
+
+if [[ "$1" == "app" ]]; then
+ /usr/bin/vso android launch "$3"
+fi
+
diff --git a/includes.container/usr/lib/systemd/system/clear-first-setup-steps.service b/includes.container/usr/lib/systemd/system/clear-first-setup-steps.service
new file mode 100644
index 0000000..eac317a
--- /dev/null
+++ b/includes.container/usr/lib/systemd/system/clear-first-setup-steps.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Cleans up First Setup steps
+After=local-fs.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/sh -c '/usr/bin/echo "" > /etc/org.vanillaos.FirstSetup.commands'
diff --git a/includes.container/usr/lib/systemd/system/user@.service b/includes.container/usr/lib/systemd/system/user@.service
deleted file mode 100644
index cf43fc7..0000000
--- a/includes.container/usr/lib/systemd/system/user@.service
+++ /dev/null
@@ -1,31 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=User Manager for UID %i
-Documentation=man:user@.service(5)
-After=user-runtime-dir@%i.service dbus.service systemd-oomd.service
-Requires=user-runtime-dir@%i.service
-IgnoreOnIsolate=yes
-
-[Service]
-User=%i
-PAMName=systemd-user
-Type=notify-reload
-ExecStart=/usr/lib/systemd/systemd --user
-Slice=user-%i.slice
-KillMode=mixed
-Delegate=pids memory cpu
-DelegateSubgroup=init.scope
-TasksMax=infinity
-TimeoutStopSec=60s
-KeyringMode=inherit
-OOMScoreAdjust=100
-MemoryPressureWatch=skip
-
diff --git a/includes.container/usr/lib/systemd/system/vanilla-updates.service b/includes.container/usr/lib/systemd/system/vanilla-updates.service
index c65bcf3..7aaa7e1 100644
--- a/includes.container/usr/lib/systemd/system/vanilla-updates.service
+++ b/includes.container/usr/lib/systemd/system/vanilla-updates.service
@@ -4,7 +4,7 @@ Description=Vanilla OS Updater
[Service]
User=root
WorkingDirectory=/root
-ExecStart=vso sys-upgrade
+ExecStart=vso sys-upgrade upgrade
[Install]
WantedBy=multi-user.target
\ No newline at end of file
diff --git a/includes.container/usr/lib/systemd/user/vso-pre-run.service b/includes.container/usr/lib/systemd/user/vso-pre-run.service
new file mode 100644
index 0000000..dd9d099
--- /dev/null
+++ b/includes.container/usr/lib/systemd/user/vso-pre-run.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=VSO Shell Pre-Run
+
+[Service]
+ExecStartPre=/usr/bin/wait-for-connection
+ExecStart=/usr/bin/vso run -n -- ls
+Restart=always
+
+[Install]
+WantedBy=default.target
diff --git a/includes.container/usr/lib/systemd/user/vso-tasks-rotation.service b/includes.container/usr/lib/systemd/user/vso-tasks-rotation.service
new file mode 100644
index 0000000..9428e72
--- /dev/null
+++ b/includes.container/usr/lib/systemd/user/vso-tasks-rotation.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=VSO Tasks Rotation
+
+[Service]
+ExecStart=/usr/bin/vso tasks rotate
+
+[Install]
+WantedBy=multi-user.target
diff --git a/includes.container/usr/share/abroot/abroot.json b/includes.container/usr/share/abroot/abroot.json
index 255c050..a1c3155 100644
--- a/includes.container/usr/share/abroot/abroot.json
+++ b/includes.container/usr/share/abroot/abroot.json
@@ -1,22 +1,27 @@
{
- "autoRepair": true,
- "maxParallelDownloads": 2,
- "registry": "ghcr.io",
- "registryService": "registry.ghcr.io",
- "registryAPIVersion": "v2",
- "name": "Kanola-Images/base",
- "tag": "main",
- "iPkgMngPre": "lpkg --unlock",
- "iPkgMngPost": "lpkg --lock",
- "iPkgMngAdd": "apt-get install -y",
- "iPkgMngRm": "apt-get remove -y --autoremove",
- "iPkgMngApi": "https://packages.vanillaos.org/api/pkg/{packageName}",
- "iPkgMngStatus": 2,
- "differURL": "",
- "partLabelVar": "vos-var",
- "partLabelA": "vos-a",
- "partLabelB": "vos-b",
- "partLabelBoot": "vos-boot",
- "partLabelEfi": "vos-efi",
- "libPathStates": "/var/lib/abroot/states"
+ "autoRepair": true,
+ "maxParallelDownloads": 2,
+
+ "registry": "ghcr.io",
+ "registryService": "registry.ghcr.io",
+ "registryAPIVersion": "v2",
+ "name": "vanilla-os/desktop",
+ "tag": "main",
+
+ "iPkgMngPre": "lpkg --unlock",
+ "iPkgMngPost": "lpkg --lock",
+ "iPkgMngAdd": "apt-get install -y",
+ "iPkgMngRm": "apt-get remove -y --autoremove",
+ "iPkgMngApi": "https://packages.vanillaos.org/api/pkg/{packageName}",
+ "iPkgMngStatus": 2,
+
+ "differURL": "https://differ.vanillaos.org",
+
+ "partLabelVar": "vos-var",
+ "partLabelA": "vos-a",
+ "partLabelB": "vos-b",
+ "partLabelBoot": "vos-boot",
+ "partLabelEfi": "vos-efi",
+
+ "libPathStates": "/var/lib/abroot/states"
}
diff --git a/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override b/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override
index a4699d3..ca06dad 100644
--- a/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override
+++ b/includes.container/usr/share/glib-2.0/schemas/90-vanilla-gnome-console-vso.gschema.override
@@ -1,3 +1,3 @@
[com.raggesilver.BlackBox]
use-custom-command = true
-custom-shell-command = "/usr/bin/vso-os-shell"
\ No newline at end of file
+custom-shell-command = "/usr/bin/vso-os-shell"
diff --git a/includes.container/usr/share/polkit-1/actions/org.vanillaos.abroot-rollback-notifier.policy b/includes.container/usr/share/polkit-1/actions/org.vanillaos.abroot-rollback-notifier.policy
index bdcee12..479be86 100644
--- a/includes.container/usr/share/polkit-1/actions/org.vanillaos.abroot-rollback-notifier.policy
+++ b/includes.container/usr/share/polkit-1/actions/org.vanillaos.abroot-rollback-notifier.policy
@@ -18,4 +18,4 @@
/usr/bin/abroot
rollback
-
+
\ No newline at end of file
diff --git a/includes.container/usr/share/polkit-1/actions/org.vanillaos.vso.policy b/includes.container/usr/share/polkit-1/actions/org.vanillaos.vso.policy
index d98aac8..c99b774 100644
--- a/includes.container/usr/share/polkit-1/actions/org.vanillaos.vso.policy
+++ b/includes.container/usr/share/polkit-1/actions/org.vanillaos.vso.policy
@@ -6,6 +6,18 @@
Vanilla OS
https://www.vanillaos.org/
package-x-generic
+
+ Check for system package updates
+ Authentication is required to check for updates
+ package-x-generic
+
+ auth_admin
+ auth_admin
+ auth_admin_keep
+
+ /usr/bin/vso
+ sys
+
Check for system package updates
Authentication is required to check for updates
diff --git a/includes.container/usr/share/polkit-1/rules.d/org.vanillaos.vso.rules b/includes.container/usr/share/polkit-1/rules.d/org.vanillaos.vso.rules
index 259dc74..7b00845 100644
--- a/includes.container/usr/share/polkit-1/rules.d/org.vanillaos.vso.rules
+++ b/includes.container/usr/share/polkit-1/rules.d/org.vanillaos.vso.rules
@@ -1,6 +1,7 @@
polkit.addRule(function (action, subject) {
if (
(
+ action.id == "org.vanillaos.vso.sys" ||
action.id == "org.vanillaos.vso.sys-upgrade" ||
action.id == "org.vanillaos.vso.distrobox" ||
action.id == "org.vanillaos.vso.podman"
diff --git a/modules/00-vanilla-apx-gui.yml b/modules/00-vanilla-apx-gui.yml
index ad52d6f..09881db 100644
--- a/modules/00-vanilla-apx-gui.yml
+++ b/modules/00-vanilla-apx-gui.yml
@@ -3,8 +3,7 @@ type: meson
source:
type: git
url: https://github.com/Vanilla-OS/apx-gui
- branch: main
- commit: latest
+ tag: v1.0.3
modules:
- name: apx-gui-deps-install
type: apt
diff --git a/modules/00-vanilla-backgrounds.yml b/modules/00-vanilla-backgrounds.yml
index 63df863..9b9b9e4 100644
--- a/modules/00-vanilla-backgrounds.yml
+++ b/modules/00-vanilla-backgrounds.yml
@@ -3,8 +3,7 @@ type: dpkg-buildpackage
source:
type: git
url: https://github.com/Vanilla-OS/vanilla-backgrounds.git
- branch: main
- commit: latest
+ tag: v1.0.4
paths:
- vanilla-backgrounds
modules:
@@ -16,4 +15,4 @@ modules:
- debhelper-compat
- dh-sequence-gnome
- libglib2.0-dev
- - meson
\ No newline at end of file
+ - meson
diff --git a/modules/00-vanilla-desktop-base.yml b/modules/00-vanilla-desktop-base.yml
index c5fde83..454c970 100644
--- a/modules/00-vanilla-desktop-base.yml
+++ b/modules/00-vanilla-desktop-base.yml
@@ -3,8 +3,7 @@ type: dpkg-buildpackage
source:
type: git
url: https://github.com/Vanilla-OS/desktop-base.git
- branch: main
- commit: latest
+ tag: v1.0.0
paths:
- desktop-base
modules:
diff --git a/modules/00-vanilla-first-setup.yml b/modules/00-vanilla-first-setup.yml
index f748941..7ffc954 100644
--- a/modules/00-vanilla-first-setup.yml
+++ b/modules/00-vanilla-first-setup.yml
@@ -3,8 +3,7 @@ type: dpkg-buildpackage
source:
type: git
url: https://github.com/Vanilla-OS/first-setup.git
- branch: main
- commit: latest
+ tag: v2.2.1
paths:
- vanilla-first-setup
modules:
@@ -12,13 +11,13 @@ modules:
type: apt
source:
packages:
- - accountsservice
- build-essential
- debhelper
- desktop-file-utils
- dpkg-dev
- gettext
- gir1.2-nma4-1.0
+ - gir1.2-vte-3.91
- libadwaita-1-dev
- libjpeg-dev
- libnm0
@@ -29,4 +28,4 @@ modules:
- make
- meson
- python3
- - python3-tz
\ No newline at end of file
+ - python3-tz
diff --git a/modules/00-vanilla-gnome-default-settings.yml b/modules/00-vanilla-gnome-default-settings.yml
new file mode 100644
index 0000000..f0f39e8
--- /dev/null
+++ b/modules/00-vanilla-gnome-default-settings.yml
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000..ba79623
--- /dev/null
+++ b/modules/00-vanilla-prime-utility.yml
@@ -0,0 +1,18 @@
+
+name: vanilla-prime-utility
+type: dpkg-buildpackage
+source:
+ type: git
+ url: https://github.com/Vanilla-OS/vanilla-prime-utility
+ tag: v1.0.3
+ paths:
+ - vanilla-prime-utility
+modules:
+- name: vanilla-prime-utility-deps-install
+ type: apt
+ source:
+ packages:
+ - build-essential
+ - gettext
+ - libadwaita-1-dev
+ - meson
diff --git a/modules/00-vanilla-sideload.yml b/modules/00-vanilla-sideload.yml
index bddfd0b..6d663fe 100644
--- a/modules/00-vanilla-sideload.yml
+++ b/modules/00-vanilla-sideload.yml
@@ -3,10 +3,9 @@ type: dpkg-buildpackage
source:
type: git
url: https://github.com/Vanilla-OS/sideload-utility
- branch: main
- commit: latest
+ tag: v1.0.0
paths:
- - vanilla-sideload
+ - vanilla-sideload
modules:
- name: sideload-utility-deps-install
type: apt
@@ -33,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
\ No newline at end of file
+ - printf 'application/vnd.debian.binary-package=org.vanillaos.Sideload.desktop\n' >> /etc/skel/.config/mimeapps.list
diff --git a/modules/00-vanilla-system-operator.yml b/modules/00-vanilla-system-operator.yml
index 110579e..cf47ed3 100644
--- a/modules/00-vanilla-system-operator.yml
+++ b/modules/00-vanilla-system-operator.yml
@@ -2,8 +2,8 @@ name: vso
type: shell
source:
type: tar
- # switch to production build once in production
- url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/continuous/vso.tar.gz
+ url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v2.0.3/vso.tar.gz
+ checksum: 63673c9f76e41b17623c2b5676dc80c8125512d381ac0ef9a45b9b5aa0bc4b69
commands:
- mkdir -p /usr/bin
- cp /sources/vso/vso /usr/bin/vso
@@ -13,15 +13,28 @@ modules:
type: shell
source:
type: tar
- url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/continuous/vso-man.tar.gz
+ url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v2.0.3/vso-man.tar.gz
+ checksum: d38b5930ccae7880e9d195c709cf9480690a42900b3d2e7c603b1efb3cf3beea
commands:
- mv /sources/vso-manpage/man/vso.1 /usr/share/man/man1/
+
- name: vso-os-shell
type: shell
commands:
- chmod +x /usr/bin/vso-os-shell
- echo "/usr/bin/vso-os-shell" >> /etc/shells
- sed -i 's/^\(SHELL=\).*/\1\/usr\/bin\/vso-os-shell/' /etc/default/useradd
+
+- name: reset-vso
+ type: shell
+ commands:
+ - chmod +x /usr/bin/reset-vso
+
+- name: wait-for-connection
+ type: shell
+ commands:
+ - chmod +x /usr/bin/wait-for-connection
+
- name: vso-gnome-ext
type: shell
source:
@@ -30,26 +43,22 @@ modules:
commands:
- mkdir -p /usr/share/gnome-shell/extensions/
- mv /sources/vso-gnome-ext/vso-gnome-ext-1.2/vso\@vanillaos.org /usr/share/gnome-shell/extensions/vso\@vanillaos.org
+
- name: vso-deps-install
type: apt
source:
packages:
- dpkg-dev
- ifstat
-- name: vso-tasks-rotation-autostart
- type: shell
- commands:
- - mkdir /usr/lib/systemd/user/default.target.wants
- - ln -s /usr/lib/systemd/user/vso-tasks-rotation.service /usr/lib/systemd/user/default.target.wants/vso-tasks-rotation.service
+
- name: adwdialog
type: dpkg-buildpackage
source:
type: git
url: https://github.com/Vanilla-OS/AdwDialog.git
- branch: main
- commit: latest
+ tag: v0.2.0
paths:
- - adwdialog
+ - adwdialog
modules:
- name: adwdialog-deps-install
type: apt
@@ -65,8 +74,12 @@ modules:
- make
- meson
- python3
+
- name: enable-systemd-unit
type: shell
commands:
- ln -s /usr/lib/systemd/system/vanilla-updates.service /etc/systemd/system/multi-user.target.wants/vanilla-updates.service
- - ln -s /usr/lib/systemd/system/vanilla-updates.timer /etc/systemd/system/timers.target.wants/vanilla-updates.timer
\ No newline at end of file
+ - 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
diff --git a/modules/00-vanilla-tour.yml b/modules/00-vanilla-tour.yml
index c0a0b33..ed15c03 100644
--- a/modules/00-vanilla-tour.yml
+++ b/modules/00-vanilla-tour.yml
@@ -3,10 +3,9 @@ type: dpkg-buildpackage
source:
type: git
url: https://github.com/Vanilla-OS/vanilla-tour
- branch: main
- commit: latest
+ tag: v0.0.1
paths:
- - vanilla-tour
+ - vanilla-tour
modules:
- name: vanilla-tour-deps-install
type: apt
@@ -22,4 +21,4 @@ modules:
- make
- meson
- python3
- - blueprint-compiler
\ No newline at end of file
+ - blueprint-compiler
diff --git a/modules/00-vanilla-updates-utility.yml b/modules/00-vanilla-updates-utility.yml
index e228353..6c6e6cd 100644
--- a/modules/00-vanilla-updates-utility.yml
+++ b/modules/00-vanilla-updates-utility.yml
@@ -3,8 +3,7 @@ type: meson
source:
type: git
url: https://github.com/Vanilla-OS/vanilla-updates-utility
- branch: main
- commit: latest
+ tag: v1.0.1
modules:
- name: vanilla-updates-utility-deps-install
type: apt
@@ -13,4 +12,4 @@ modules:
- build-essential
- gettext
- libadwaita-1-dev
- - meson
\ No newline at end of file
+ - meson
diff --git a/modules/01-workarounds-packages.yml b/modules/01-workarounds-packages.yml
new file mode 100644
index 0000000..cbb5056
--- /dev/null
+++ b/modules/01-workarounds-packages.yml
@@ -0,0 +1,4 @@
+name: install workaround packages
+type: apt
+commands:
+- accountsservice
diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml
index 6b2d39b..041a095 100644
--- a/modules/02-waydroid-modules.yml
+++ b/modules/02-waydroid-modules.yml
@@ -7,9 +7,8 @@ commands:
- dkms install waydroid-ashmem/1 -k $(ls /usr/src | grep -Po '[0-9].[0-9].[0-9].*$' | head -1)
source:
type: git
- url: https://github.com/choff/anbox-modules.git
- branch: master
- commit: latest
+ url: https://github.com/Vanilla-OS/anbox-modules
+ tag: v1.0.0
modules:
- name: waydroid-deps-install
type: apt
diff --git a/modules/03-fswarn.yml b/modules/03-fswarn.yml
index e20a8e8..1ce4008 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
\ No newline at end of file
+ checksum: 52f66710132138c21b81b56cb2d6edc7e59ad6eef4a4065b81af0f852d827dab
diff --git a/modules/04-clipboard-sync-repo.yml b/modules/04-clipboard-sync-repo.yml
new file mode 100644
index 0000000..467aa7c
--- /dev/null
+++ b/modules/04-clipboard-sync-repo.yml
@@ -0,0 +1,5 @@
+name: waydroid-modules
+type: shell
+commands:
+ - wget -P /etc/apt/sources.list.d/ https://raw.githubusercontent.com/dnut/deb/master/dnut.list
+ - sudo apt update && sudo apt upgrade -y
\ No newline at end of file
diff --git a/modules/05-clipboards.yml b/modules/05-clipboards.yml
new file mode 100644
index 0000000..fa524ec
--- /dev/null
+++ b/modules/05-clipboards.yml
@@ -0,0 +1,7 @@
+name: clipboard
+type: apt
+source:
+ packages:
+ - xclip
+ - wl-clipboard
+ - clipboard-sync
\ 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 ebbc1cc..8041a28 100644
--- a/modules/10-vanilla-abroot-rollback-notifier.yml
+++ b/modules/10-vanilla-abroot-rollback-notifier.yml
@@ -3,8 +3,7 @@ type: meson
source:
type: git
url: https://github.com/Vanilla-OS/abroot-rollback-notifier
- branch: main
- commit: latest
+ tag: v1.0.0
modules:
- name: abroot-rollback-notifier-deps-install
type: apt
diff --git a/modules/110-fonts.yml b/modules/110-fonts.yml
index 19c1cb0..d9dfdb1 100644
--- a/modules/110-fonts.yml
+++ b/modules/110-fonts.yml
@@ -2,6 +2,7 @@ name: fonts
type: apt
source:
packages:
+ - fonts-cantarell
- fonts-dejavu-core
- fonts-freefont-ttf
- fonts-indic
@@ -15,4 +16,3 @@ source:
- fonts-sil-padauk
- fonts-thai-tlwg
- fonts-tibetan-machine
- - fonts-hack
diff --git a/modules/120-network.yml b/modules/120-network.yml
new file mode 100644
index 0000000..dde066e
--- /dev/null
+++ b/modules/120-network.yml
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000..ea170ae
--- /dev/null
+++ b/modules/121-disable-ssh-daemon.yml
@@ -0,0 +1,4 @@
+name: disable-ssh-daemon
+type: shell
+commands:
+ - unlink /etc/systemd/system/multi-user.target.wants/ssh.service
diff --git a/modules/131-plymouth-theme-vanilla.yml b/modules/131-plymouth-theme-vanilla.yml
index c5816c9..4c33a02 100644
--- a/modules/131-plymouth-theme-vanilla.yml
+++ b/modules/131-plymouth-theme-vanilla.yml
@@ -3,8 +3,7 @@ type: dpkg-buildpackage
source:
type: git
url: https://github.com/Vanilla-OS/plymouth-theme-vanilla
- branch: main
- commit: latest
+ tag: v1.0.1
paths:
- plymouth-theme-vanilla
- plymouth-theme-vanilla-bgrt
diff --git a/modules/140-password.yml b/modules/140-password.yml
index 8039386..a854d6d 100644
--- a/modules/140-password.yml
+++ b/modules/140-password.yml
@@ -3,3 +3,5 @@ type: apt
source:
packages:
- cracklib-runtime
+ - gnome-keyring
+ - ssh-askpass-gnome
diff --git a/modules/160-utilities.yml b/modules/160-utilities.yml
index ee96f35..627f70f 100644
--- a/modules/160-utilities.yml
+++ b/modules/160-utilities.yml
@@ -2,6 +2,12 @@ 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
index d582449..1764dbb 100644
--- a/modules/170-gnome-software-vso-plugin.yml
+++ b/modules/170-gnome-software-vso-plugin.yml
@@ -1,5 +1,5 @@
name: gs-vso-plugin
type: shell
commands:
-- curl -L -O https://github.com/Vanilla-OS/gs-plugin-vso/releases/download/continuous/libgs_plugin_vso.so
+- 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 e4147d6..78a0e15 100644
--- a/modules/210-libs-extra.yml
+++ b/modules/210-libs-extra.yml
@@ -1,4 +1,4 @@
-name: libs-extra
+name: gnome-common
type: apt
source:
packages:
@@ -11,7 +11,10 @@ source:
- ibus-gtk4
- libgdk-pixbuf2.0-bin
+ - 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/80-printers.yml b/modules/80-printers.yml
index 7c2eaf4..eeace0b 100644
--- a/modules/80-printers.yml
+++ b/modules/80-printers.yml
@@ -2,8 +2,14 @@ name: printers
type: apt
source:
packages:
+ # General
- cups
- cups-pk-helper
+ - printer-driver-brlaser # Brother
+ - printer-driver-escpr # Epson
+ - hplip # HP
+
+ # Config
- system-config-printer-common
- system-config-printer-udev
diff --git a/modules/999-clear-first-setup-steps-unit.yml b/modules/999-clear-first-setup-steps-unit.yml
new file mode 100644
index 0000000..83fc4dc
--- /dev/null
+++ b/modules/999-clear-first-setup-steps-unit.yml
@@ -0,0 +1,5 @@
+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/
diff --git a/modules/999-pkg-cleanup.yml b/modules/999-pkg-cleanup.yml
index e75fe33..45924d6 100644
--- a/modules/999-pkg-cleanup.yml
+++ b/modules/999-pkg-cleanup.yml
@@ -2,5 +2,5 @@ name: pkg-cleanup
type: shell
commands:
- apt remove -y zutty gnome-shell-extension-prefs
-# - SUDO_FORCE_REMOVE=yes apt purge -y sudo
+- SUDO_FORCE_REMOVE=yes apt purge -y sudo
- echo 'NoDisplay=true' >> /usr/share/applications/software-properties-gtk.desktop
diff --git a/recipe.yml b/recipe.yml
index c0460ae..c687735 100644
--- a/recipe.yml
+++ b/recipe.yml
@@ -22,15 +22,15 @@ stages:
- apt update
- apt upgrade -y
- apt clean
- - apt-mark hold snapd
+ - apt-mark hold snapd gnome-software-plugin-snap
- apt -y install squashfs-tools minisign
- name: vanilla-tools
type: shell
source:
type: tar
- # switch to production build once in production
- url: https://github.com/Vanilla-OS/vanilla-tools/releases/download/continuous/vanilla-tools.tar.gz
+ url: https://github.com/Vanilla-OS/vanilla-tools/releases/download/v1.0.0/vanilla-tools.tar.gz
+ checksum: 0e1d92d9c9154f9a115e97b40ff692afa52ddd0d9f770a8ec67440bf1a48aa72
commands:
- mkdir -p /usr/bin
- cp /sources/vanilla-tools/vanilla-tools/lpkg /usr/bin/lpkg
@@ -44,14 +44,19 @@ 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
- modules/00-vanilla-sideload.yml
- modules/00-vanilla-updates-utility.yml
+ - modules/00-vanilla-prime-utility.yml
+ - modules/01-workarounds-packages.yml
- modules/01-workarounds.yml
- modules/02-waydroid-modules.yml
- modules/03-fswarn.yml
+ - 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
@@ -60,6 +65,8 @@ stages:
- 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
@@ -68,6 +75,7 @@ stages:
- modules/210-libs-extra.yml
- modules/998-vanilla-cleanup.yml
- modules/999-pkg-cleanup.yml
+ - modules/999-clear-first-setup-steps-unit.yml
- name: firstsetup-default-session
type: shell
@@ -75,6 +83,17 @@ stages:
- sed 's/Session=/Session=firstsetup/g' -i /usr/share/accountsservice/user-templates/administrator
- sed 's/Session=/Session=firstsetup/g' -i /usr/share/accountsservice/user-templates/standard
+ - name: apx-vso-pico-shutdown-service
+ type: shell
+ commands:
+ - 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: