feat: replace blackbox with ptyxis

includes.container/usr/bin/reset-vso

@@ -3,17 +3,45 @@
 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
+    if [ "$answer" != "y" ]; then
+        exit
     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
+    if [ $? -ne 0 ]; then
+        exit
     fi
 fi
+
+CONTAINER_ID=$(podman ps -a --filter name=apx-vso-pico --no-trunc -q)
+if [ -n "$CONTAINER_ID" ]; then
+    PTYXIS_DEFAULT_PROFILE_UUID=$(gsettings get org.gnome.Ptyxis default-profile-uuid 2>/dev/null | tr -d "'" || echo "")
+    if [ -n "$PTYXIS_DEFAULT_PROFILE_UUID" ]; then
+        PTYXIS_DEFAULT_CONTAINER=$(gsettings get "org.gnome.Ptyxis.Profile:/org/gnome/Ptyxis/Profiles/${PTYXIS_DEFAULT_PROFILE_UUID}/" default-container 2>/dev/null | tr -d "'" || echo "")
+        if [ "$PTYXIS_DEFAULT_CONTAINER" == "$CONTAINER_ID" ]; then
+            gsettings set "org.gnome.Ptyxis.Profile:/org/gnome/Ptyxis/Profiles/${PTYXIS_DEFAULT_PROFILE_UUID}/" default-container session
+        fi
+    fi
+fi
+podman rm -f apx-vso-pico
+
+if [ "$1" == "--tty" ]; then
+    echo "VSO subsystem has been removed successfully. Do you want to re-initialize it now? [y/N]"
+    read -r answer
+    if [ "$answer" != "y" ]; then
+        exit
+    fi
+else
+    adwdialog --title "Re-initialize VSO?" \
+              --description "VSO subsystem has been removed successfully. Do you want to re-initialize it now?" \
+              --type "question" \
+              --icon "org.vanillaos.VSO"
+    if [ $? -ne 0 ]; then
+        exit
+    fi
+fi
+
+vso pico init

includes.container/usr/bin/setup-vso-terminal

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+CONTAINER_ID=$(podman ps -a --filter name=apx-vso-pico --no-trunc -q)
+if [ -z "$CONTAINER_ID" ]; then
+    vso pico init
+    exit
+fi
+
+gsettings set org.gnome.Ptyxis.Profile:/org/gnome/Ptyxis/Profiles/vso/ default-container $CONTAINER_ID
+gsettings set org.gnome.Ptyxis.Profile:/org/gnome/Ptyxis/Profiles/vso/ label "VSO Profile"
+PTYXIS_PROFILE_UUIDS=$(gsettings get org.gnome.Ptyxis profile-uuids)
+case $PTYXIS_PROFILE_UUIDS in
+    *\[\]*)
+        gsettings set org.gnome.Ptyxis profile-uuids "['vso']"
+        ;;
+    *vso*)
+        ;;
+    *)
+        gsettings set org.gnome.Ptyxis profile-uuids "${PTYXIS_PROFILE_UUIDS%]}, 'vso']"
+        ;;
+esac
+gsettings set org.gnome.Ptyxis default-profile-uuid vso

includes.container/usr/lib/systemd/user/vso-pre-run.service

@@ -5,7 +5,7 @@ After=podman.service podman-restart.service podman-auto-update.service
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/vso run -n -- echo vso container started
+ExecStart=/usr/bin/vso pico run --no-reset echo vso container started
 
 [Install]
 WantedBy=default.target

includes.container/usr/lib/systemd/user/vso-resolv.service

@@ -4,7 +4,7 @@ After=vso-pre-run.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/vso run -n -- /usr/bin/sudo bash /run/host/usr/share/vso/scripts/watch-resolv
+ExecStart=/usr/bin/vso pico run --no-reset /usr/bin/sudo bash /run/host/usr/share/vso/scripts/watch-resolv
 Restart=on-failure
 RestartSec=60s
 

includes.container/usr/libexec/vso/migrate-repo

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-/usr/share/apx/distrobox/distrobox enter --name apx-vso-pico -- ls /etc/apt/sources.list.d/debian.sources
+/usr/bin/distrobox enter --name apx-vso-pico -- ls /etc/apt/sources.list.d/debian.sources
 if [ "$?" -ne 2 ]; then
 	echo "already migrated"
 	exit 0
 fi
 
 set -e
-/usr/share/apx/distrobox/distrobox enter --name apx-vso-pico -- sudo cp /run/host/usr/libexec/vso/debian.sources /etc/apt/sources.list.d/debian.sources
-/usr/share/apx/distrobox/distrobox enter --name apx-vso-pico -- sudo rm /etc/apt/sources.list.d/vanilla-base.sources
+/usr/bin/distrobox enter --name apx-vso-pico -- sudo cp /run/host/usr/libexec/vso/debian.sources /etc/apt/sources.list.d/debian.sources
+/usr/bin/distrobox enter --name apx-vso-pico -- sudo rm /etc/apt/sources.list.d/vanilla-base.sources

includes.container/usr/share/glib-2.0/schemas/90-nautilus-terminal-rightclick.gschema.override

@@ -1,4 +1,3 @@
 [com.github.stunkymonkey.nautilus-open-any-terminal]
-terminal = "custom"
-custom-local-command = "blackbox-terminal -w %s"
+terminal = "ptyxis"
 use-generic-terminal-name = true

modules/00-vanilla-system-operator.yml

@@ -2,12 +2,12 @@ name: vso
 type: shell
 sources:
   - type: tar
-    url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v2.0.7/vso-amd64.tar.gz
-    checksum: 248a2fc5031cbb2febdcbf0069ef1924978957b411160b37870bfdb8e66b19ff
+    url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v3.0.0/vso-amd64.tar.gz
+    checksum: 1cbb94bba609915e4c9ebda0cafdd7ca2e3244ff4fc028c6532e77afe7486428
     only-arches: [amd64]
   - type: tar
-    url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v2.0.7/vso-arm64.tar.gz
-    checksum: ef92168697b6c683d2200867b92298c441b75f48b9ad3ad7fb57110d1862e26f
+    url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v3.0.0/vso-arm64.tar.gz
+    checksum: 06304270f168d06fa573200b5d7d93cd911de7d885955d533b808459b6552c34
     only-arches: [arm64]
 commands:
 - mkdir -p /usr/bin
@@ -18,17 +18,15 @@ modules:
   type: shell
   sources:
     - type: tar
-      url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v2.0.7/vso-man.tar.gz
-      checksum: 5ea2f081508e759a45271c0257123421ec11d77ec3ed3634b897fdc1bc1bd439
+      url: https://github.com/Vanilla-OS/vanilla-system-operator/releases/download/v3.0.0/vso-man.tar.gz
+      checksum: eb2b95bd4bd904286c7e37d3f7cb42ab0694ce8073993d7057c7102a9aa2d4c2
   commands:
-  - mv /sources/vso-manpage/vso-man/man/vso.1 /usr/share/man/man1/
+  - mv /sources/vso-manpage/vso-man/man/man1/vso.1 /usr/share/man/man1/
 
 - name: vso-extra-setup
   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
+  - chmod +x /usr/bin/setup-vso-terminal
   - chmod +x /usr/bin/reset-vso
 
 - name: vso-gnome-ext

modules/15-gnome-essentials.yml

@@ -23,4 +23,4 @@ sources:
     - gnome-menus
     - gnome-online-accounts
 
-    - blackbox-terminal
+    - ptyxis

modules/160-utilities.yml

@@ -3,7 +3,6 @@ type: apt
 sources:
   - packages:
     - gnome-disk-utility
-    - gnome-system-monitor
     - gnome-sushi
     - ghostscript
     - zenity

modules/997-misc-setup.yml

@@ -1,8 +1,6 @@
 name: misc-setup
 type: shell
 commands:
-  # blackbox-rescue
-  - echo "\nActions=rescue;\n[Desktop Action rescue]\nName=Rescue Mode\nExec=blackbox-terminal -c /bin/bash\nIcon=com.raggesilver.BlackBox" >> /usr/share/applications/com.raggesilver.BlackBox.desktop
   # Make init.d scripts executable
   - chmod +x /usr/share/init.d/*
   # fix-gdm-permissions-service