1 files changed, 40 insertions, 64 deletions
diff --git a/web/qvm-app.sls b/web/qvm-app.sls
index 6d49a07..d05fd2e 100644
--- a/web/qvm-app.sls
+++ b/web/qvm-app.sls
@@ -1,4 +1,6 @@
-web--create-web-qube:
+# General-use Firefox qubes
+
+split-web--create-web-qube:
   qvm.vm:
     - name: web-dvm
     - present:
@@ -12,23 +14,20 @@ web--create-web-qube:
     - require:
       - qvm: web--create-template
 
-web-features_dvm:
+split-web-features_dvm:
   qvm.features:
     - name: web-dvm
     - disable:
       - service.cups
       - service.cups-browsed
       - service.tinyproxy
-    - set:
-      - menu-items: xfce4-terminal.desktop
-      - appmenus-dispvm: True
 
 split-web--create-qube:
   qvm.vm:
     - name: split-web
     - present:
       - template: tmpl-split-web
-      - label: gray
+      - label: black
     - prefs:
       - default-dispvm: web-dvm
       - netvm: none
@@ -38,64 +37,41 @@ split-web--create-qube:
     - require:
         - web--create-split-template
 
-# web--create-vps-admin-qube:
-#   qvm.vm:
-#     - name: web-vps-admin
-#     - present:
-#       - template: tmpl-web
-#       - label: blue
-#     - features:
-#       - set:
-#         - menu-items: librewolf.desktop
-#     - require:
-#       - qvm: web--create-template
-
-# web--create-home-admin-qube:
-#   qvm.vm:
-#     - name: web-home-admin
-#     - present:
-#       - template: tmpl-web
-#       - label: blue
-#     - features:
-#       - set:
-#         - menu-items: librewolf.desktop
-#     - require:
-#       - qvm: web--create-template
+# Split Whonix browsing qubes
 
-# web--create-banking-qube:
-#   qvm.vm:
-#     - name: web-banking
-#     - present:
-#       - template: tmpl-web
-#       - label: blue
-#     - features:
-#       - set:
-#         - menu-items: librewolf.desktop
-#     - require:
-#       - qvm: web--create-template
+split-tor--create-browsing-qube:
+  qvm.vm:
+    - name: split-tor-dvm
+    - present:
+      - template: tmpl-whonix-ws
+      - label: purple
+    - prefs:
+      - template_for_dispvms: True
+    - features:
+      - set:
+        - menu-items: xfce4-terminal
+    - require:
+      - qvm: split-tor--create-template
 
-# web--create-work-qube:
-#   qvm.vm:
-#     - name: web-work
-#     - present:
-#       - template: tmpl-web
-#       - label: blue
-#       - mem: 6000
-#       - vcpus: 4
-#     - features:
-#       - set:
-#         - menu-items: librewolf.desktop
-#     - require:
-#       - qvm: web--create-template
+split-tor-features_dvm:
+  qvm.features:
+    - name: split-tor-dvm
+    - disable:
+      - service.cups
+      - service.cups-browsed
+      - service.tinyproxy
 
-# web--create-shopping-qube:
-#   qvm.vm:
-#     - name: web-shopping
-#     - present:
-#       - template: tmpl-web
-#       - label: blue
-#     - features:
-#       - set:
-#         - menu-items: librewolf.desktop
-#     - require:
-#       - qvm: web--create-template
+split-tor--create-qube:
+  qvm.vm:
+    - name: split-tor
+    - present:
+      - template: tmpl-split-web
+      - label: black
+    - prefs:
+      - default-dispvm: split-tor-dvm
+      - netvm: none
+    - features:
+      - set:
+        - menu-items: split-browser.desktop split-browser-safest.desktop xterm.desktop
+    - require:
+        - web--create-split-template