Merge pull request #1 from Kanola-Images/dev

Update to upstream Orchid Stable

includes.container/etc/environment.d/90local-cursor.conf

@@ -0,0 +1 @@
+XCURSOR_PATH="/usr/share/icons:/usr/local/share/icons:~/.local/share/icons"

includes.container/etc/sysctl.d/core-pattern.conf

@@ -0,0 +1 @@
+kernel.core_pattern = /var/tmp/core.%e.%p.%h.%t

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

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"

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

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

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

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
+

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'

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

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

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

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

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"
+custom-shell-command = "/usr/bin/vso-os-shell"

includes.container/usr/share/polkit-1/actions/org.vanillaos.abroot-rollback-notifier.policy

@@ -18,4 +18,4 @@
         <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/abroot</annotate>
         <annotate key="org.freedesktop.policykit.exec.argv1">rollback</annotate>
     </action>
-</policyconfig>
+</policyconfig>

includes.container/usr/share/polkit-1/actions/org.vanillaos.vso.policy

@@ -6,6 +6,18 @@
   <vendor>Vanilla OS</vendor>
   <vendor_url>https://www.vanillaos.org/</vendor_url>
   <icon_name>package-x-generic</icon_name>
+  <action id="org.vanillaos.vso.sys">
+    <description>Check for system package updates</description>
+    <message>Authentication is required to check for updates</message>
+    <icon_name>package-x-generic</icon_name>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin_keep</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/vso</annotate>
+    <annotate key="org.freedesktop.policykit.exec.argv1">sys</annotate>
+  </action>
   <action id="org.vanillaos.vso.sys-upgrade">
     <description>Check for system package updates</description>
     <message>Authentication is required to check for updates</message>

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"

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

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
+    - meson

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:

modules/00-vanilla-first-setup.yml

@@ -3,22 +3,21 @@ 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:
 - name: vanilla-first-setup-deps-install
   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
+    - python3-tz

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

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

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
+  - printf 'application/vnd.debian.binary-package=org.vanillaos.Sideload.desktop\n' >> /etc/skel/.config/mimeapps.list