merged

.gitignore

+*.kate-swp

appvm-ssh-vault.sls

+# -*- coding: utf-8 -*-
+# vim: set syntax=yaml ts=2 sw=2 sts=2 et :
+
+ssh-vault.present:
+    qvm.present:
+        - name: ssh-vault
+        - template: debian-10
+        - label: orange
+        - require:
+            - qvm: debian-10
+            
+ssh-vault.prefs:
+    qvm.prefs:
+        - name: ssh-vault
+        - netvm: 
+        - template: debian-10
+        - label: orange
+        - tags:
+            - vault
+            - offline
+        - require:
+            - qvm: ssh-vault.present

split-ssh.top

 # vim: set syntax=yaml ts=2 sw=2 sts=2 et :
 
 base:
+    dom0:
+        - rysieks-qubes.appvm-ssh-vault
     ssh-vault:
         - rysieks-qubes.split-ssh-vault
     'L@personal,work,comms,isnic':

sys.sls

@@ -16,6 +16,6 @@ sys-whonix:
   qvm.prefs:
     - label: gray
     
-sys-wireguard:
-  qvm.prefs:
-    - label: gray
+#sys-wireguard:
+#  qvm.prefs:
+#    - label: gray

template-networking.sls

+# vim: set syntax=yaml ts=2 sw=2 sts=2 et :
+
+# template networking, needed for certain states (like split-ssh)
+
+fedora-30:
+    qvm.prefs:
+        - netvm: sys-whonix
+
+debian-10:
+    qvm.prefs:
+        - netvm: sys-whonix
+
+debian-10-desktop:
+    qvm.prefs:
+        - netvm: sys-whonix
+
+debian-10-wg:
+    qvm.prefs:
+        - netvm: sys-whonix        
+        
+whonix-ws-15:
+    qvm.prefs:
+        - netvm: sys-whonix

templates-desktop-tools-common.sls

@@ -6,5 +6,5 @@ templates-desktop-tools-common.packages:
       - kate
       - kwrite
       - libreoffice
-      - vlc
       - xclip
+      - chromium

templates-desktop-tools-debian.sls

 # vim: set syntax=yaml ts=2 sw=2 sts=2 et :
 
 templates-desktop-tools-debian.packages:
-  pkg.installed:
-    - pkgs:
-      - konsole
-      - basket
-      - nextcloud-desktop
-      - nautilus
-      - keyringer
-      - libreoffice-l10n-pl
-      - libreoffice-l10n-ru
-      - ansible
-      - qtox
+    pkg.installed:
+        - pkgs:
+            - konsole
+            - basket
+            - nextcloud-desktop
+            - nautilus
+            - keyringer
+            - libreoffice-l10n-pl
+            - libreoffice-l10n-ru
+            - ansible
+            - vlc
+            - bats
+            - tappy
+            - qtox
 
 debian-unstable.repo:
     pkgrepo.managed:

templates-desktop-tools-fedora.sls

@@ -15,4 +15,3 @@ templates-desktop-tools-fedora.packages:
       - texlive-latex
       - texlive-collection-fontsrecommended
       - quassel-client
-      - chromium

templates-media-setup-fedora.sls

@@ -4,7 +4,7 @@ templates-media-setup-fedora.packages:
   pkg.installed:
     - pkgs:
       - clementine
-      - ffmpeg-libs
+      #- ffmpeg-libs TODO
       - gstreamer1-plugins-base
       - gstreamer1-plugins-good
       - gstreamer1-plugins-bad-free

templates-split-ssh-code.sls

@@ -4,6 +4,7 @@
 # split-ssh *code* in templates
 #
 
+# pull the repo - this needs networking in the template
 "https://github.com/rysiekpl/qubes-app-split-ssh.git":
     git.latest:
         - target: "/opt/qubes-app-split-ssh/"

templates.top

@@ -6,6 +6,9 @@
 
 base:
 
+    dom0:
+        - rysieks-qubes.template-networking
+
     # because dnf sux I guess?
     'fedora-* and I@qubes:type:template':
         - rysieks-qubes.fedora-uptodate

templates/debian-10-desktop.sls

@@ -11,6 +11,6 @@ debian-10-desktop.clone:
 debian-10-desktop.prefs:
   qvm.prefs:
     - name: debian-10-desktop
-    - netvm: sys-firewall
+    - netvm: sys-whonix
     - require:
         - qvm: debian-10-desktop.clone

templates/debian-10-wg.sls

@@ -22,7 +22,7 @@ debian-10-wg.tags:
 debian-10-wg.prefs:
     qvm.prefs:
         - name: debian-10-wg
-        - netvm: sys-firewall
+        - netvm: sys-whonix
         - kernel: ''
         - virt_mode: hvm
         - require:

templates/debian-10.sls

@@ -19,6 +19,6 @@ debian-10.installed:
 debian-10.prefs:
     qvm.prefs:
         - name: debian-10
-        - netvm: sys-firewall
+        - netvm: sys-whonix
         - require:
             - pkg: debian-10.installed