Multimedia - use thunar in media qube

multimedia.spec

@@ -1,10 +1,11 @@
 Name:           3isec-qubes-sys-multimedia
-Version:       	2.2
+Version:       	2.3
 Release:        1%{?dist}
 Summary:        creates multimedia template and qubes
 
 License:        GPLv3+
 SOURCE0:       	multimedia
+SOURCE1:       	store
 
 %description
  This package sets up qubes to work mith multimedia files in Qubes.
@@ -32,10 +33,12 @@ Access to the multimedia file is controlled from the policy file in
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/srv/salt
 cp -rv %{SOURCE0}/  %{buildroot}/srv/salt
+cp -rv %{SOURCE1}/  %{buildroot}/srv/salt
 
 %files
 %defattr(-,root,root,-)
 /srv/salt/multimedia/*
+/srv/salt/store/*
 
 %post
 if [ $1 -eq 1 ]; then
@@ -46,9 +49,10 @@ if [ $1 -eq 1 ]; then
 fi
 
 %changelog
+* Tue Feb 13 2024 unman <unman@thirdeyesecurity.org> - 2.3
+- Use template-store with thunar for media qube
 * Mon Feb 20 2023 unman <unman@thirdeyesecurity.org> - 2.2
 - Use pillar for cacher to determine repo changes
-dd
 * Sat May 21 2022 unman <unman@thirdeyesecurity.org> - 2.1
 - Standardise package names to 3isec-
 * Sun May 15 2022 unman <unman@thirdeyesecurity.org> - 2.0

multimedia/configure.sls

@@ -17,4 +17,5 @@
 
 /rw/config/rc.local:
   file.append:
-    - text: 'cp /rw/config/DisposableOpen.desktop /usr/share/applications/'
+    - text:
+        - 'cp /rw/config/DisposableOpen.desktop /usr/share/applications/'

multimedia/create.sls

@@ -1,10 +1,7 @@
 include:
+  - store.clone
   - multimedia.clone
 
-media_precursor:
-  qvm.template_installed:
-    - name: debian-12-xfce
-
 qvm-present-id:
   qvm.present:
     - name: multimedia-dvm
@@ -28,6 +25,8 @@ qvm-features-id:
       - service.cups
       - service.cups-browsed
       - service.tinyproxy
+    - enable:
+      - service.shutdown-idle
 
 
 multimedia:
@@ -58,7 +57,7 @@ multimedia-features:
 media-present-id:
   qvm.present:
     - name: media
-    - template: debian-12-xfce
+    - template: template-store
     - label: purple
 
 media-prefs:

multimedia/install.sls.bak

@@ -1,25 +0,0 @@
-# vim: set syntax=yaml ts=2 sw=2 sts=2 et :
-#
-#
-allow-testing:
-  file.uncomment:
-    - name: /etc/apt/sources.list.d/qubes-r4.list
-    - regex: ^deb\s.*qubes-os.org.*-testing
-    - backup: false
-
-/home/user/Downloads/vlc-key:
-  file.managed:
-    - source:
-      - salt://multimedia/vlc-key
-    - user: user
-    - group: user
-
-/usr/bin/apt-key add /home/user/Downloads/vlc-key:
-  cmd.run:
-    - runas: root
-
-vlc.packages:
-  pkg.installed:
-    - pkgs:
-      - vlc
-      - pulseaudio-qubes

store.spec

@@ -23,7 +23,7 @@ cp -rv %{SOURCE0}/  %{buildroot}/srv/salt
 
 %post
 if [ $1 -eq 1 ]; then
-  qubesctl state.apply salt.clone
+  qubesctl state.apply store.clone
   qubesctl --skip-dom0 --targets=template-store state.apply store.install
 elif [ $1 -eq 2 ]; then
   qubesctl state.apply store.clone