From 2f43f76b352dc5dcda55d8dabc200d46164a83c1 Mon Sep 17 00:00:00 2001
From: Raffaele Florio <raffaeleflorio@protonmail.com>
Date: Sat, 17 Nov 2018 09:53:58 +0100
Subject: [PATCH] Reorganization and fedora-28-media

---
 docs/user-setups/raffaeleflorio/README.md | 71 ++++++++++++++++-------
 1 file changed, 50 insertions(+), 21 deletions(-)

diff --git a/docs/user-setups/raffaeleflorio/README.md b/docs/user-setups/raffaeleflorio/README.md
index be8b199..776002c 100644
--- a/docs/user-setups/raffaeleflorio/README.md
+++ b/docs/user-setups/raffaeleflorio/README.md
@@ -1,5 +1,8 @@
 # User setup / @raffaeleflorio
 
+## Dom0
+I installed in Dom0 [luks-2fa-dracut](https://github.com/raffaeleflorio/luks-2fa-dracut).
+
 ## TemplateVMs and VMs
 The following TemplateVMs are really generic. I didn't include any specialized TemplateVMs (e.g. those used for development).
 
@@ -34,15 +37,17 @@ oathtool
 vim-common
 ```
 
-Template of:
-- fedora-28-mini-dvm: template for DispVMs
-- sys-net: DispVM based on fedora-28-mini-dvm
-- sys-usb: DispVM based on fedora-28-mini-dvm
-- sys-sd: DispVM based on fedora-28-mini-dvm
-- sys-firewall: DispVM based on fedora-28-mini-dvm
-- vault: offline; password manager; totp generation
-- *VMs used as split-{gpg,ssh} backend (e.g. work-keys)*: offline; management of a minimal set of (sub)keys
-- *VMs used as data container (e.g. backup)*: offline
+TemplateBasedVMs table:
+|Name|Description|RAM Usage|Networking|
+|---|---|---|---|
+|fedora-28-mini-dvm|Template for DispVMs|default|offline|
+|sys-net|DispVM based on fedora-28-mini-dvm|300MB-500MB|online|
+|sys-usb|DispVM based on fedora-28-mini-dvm|300MB-500MB|offline|
+|sys-sd|DispVM based on fedora-28-mini-dvm|300MB-500MB|offline|
+|sys-firewall|DispVM based on fedora-28-mini-dvm|300MB-500MB|online|
+|vault|Password manager and totp generation|300MB-400MB|offline|
+|*|split-{gpg,ssh} backend (e.g. work-keys) with minimal set of (sub)keys|300MB-400MB|offline|
+|*|Data container (e.g. backup)|300MB-400MB|offline|
 
 Notes:
 - [split gpg](https://www.qubes-os.org/doc/split-gpg/)
@@ -60,10 +65,12 @@ mozilla-https-everywhere
 mozilla-privacy-badger
 ```
 
-Template of:
-- dvm-net: template for DispVMs
-- dispNet: DispVM based on dvm-net
-- *VMs that needs a minimal Firefox and/or Thunderbird (e.g. work)*: firewalled; qubes-url-redirector; custom Firefox preferences
+TemplateBasedVMs table:
+|Name|Description|RAM Usage|Networking|
+|---|---|---|---|
+|dvm-net|Template for DispVMs, generally used for browsing|400MB-1000MB|online|
+|dispNet|DispVM based on dvm-net|400MB-1000MB|online|
+|*|Custom Firefox with qubes-url-redirector and/or Thunderbird (e.g. work)|300MB-700MB|firewalled|
 
 Notes:
 - [qubes-url-redirector](https://github.com/raffaeleflorio/qubes-url-redirector)
@@ -72,7 +79,6 @@ Notes:
 ### TemplateVM fedora-28-heavy
 A clone of fedora-28-net with:
 ```
-vlc
 libreoffice
 gimp
 whois
@@ -98,18 +104,41 @@ chromium
 python2-jwt
 ```
 
-Template of:
-- dvm-heavy-offline: offline; template for DispVMs; used to handle every file in every other VMs
-- dispHeavyOffline: DispVM based on dvm-heavy-offline
-- dvm-heavy-online: template for DispVMs;
-- dispHeavyOnline: DispVM based on dvm-heavy-online
+TemplateBasedVMs table:
+|Name|Description|RAM Usage|Networking|
+|---|---|---|---|
+|dvm-heavy-offline|Template for DispVMs. Used to handle every file in every other VMs|400MB-1000MB|offline|
+|dispHeavyOffline|DispVM based on dvm-heavy-offline|400MB-1000MB|offline|
+|dvm-heavy-online|Template for DispVMs|400MB-1000MB|online|
+|dispHeavyOnline|DispVM based on dvm-heavy-online|400MB-1000MB|online|
+
+### TemplateVM fedora-28-media
+A clone of fedora-28-heavy with:
+
+```
+vlc
+ffmpeg
+fuse-exfat
+*eventually other rpmfusion packages*
+```
+TemplateBasedVMs table:
+|Name|Description|RAM Usage|Networking|
+|---|---|---|---|
+|dvm-media-offline|Template for DispVMs|400MB-1500MB|offline|
+|dvm-media-online|Template for DispVMs|400MB-1500MB|online|
 
 ### TemplateVM whonix-ws-14
-- dvm-anon
+TemplateBasedVMs table:
+|Name|Description|RAM Usage|Networking|
+|---|---|---|---|
+|dvm-anon|Template for DispVMs|400MB-1000MB|online|
 
 Notes:
 - [Whonix info 1](https://www.qubes-os.org/doc/whonix)
 - [Whonix info 2](https://www.whonix.org/wiki/Qubes)
 
 ### TemplateVM whonix-gw-14
-- sys-whonix
\ No newline at end of file
+TemplateBasedVMs table:
+|Name|Description|RAM Usage|Networking|
+|---|---|---|---|
+|sys-whonix|Whonix gateway|500MB-800MB|online|
\ No newline at end of file