From 5bea680c5aad6ada74b0be2e55f511c445b0f0aa Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Sat, 19 Jun 2021 22:56:16 +0200
Subject: [PATCH] minor

---
 pkg/de-p1st-installer/PKGBUILD         |  2 +-
 pkg/de-p1st-installer/example-vbox.cfg | 49 ++++++++++++++------------
 pkg/de-p1st-xfce4/PKGBUILD             |  2 +-
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/pkg/de-p1st-installer/PKGBUILD b/pkg/de-p1st-installer/PKGBUILD
index ed6e423..636c4c6 100644
--- a/pkg/de-p1st-installer/PKGBUILD
+++ b/pkg/de-p1st-installer/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=installer
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.1.14
+pkgver=0.1.15
 pkgrel=1
 pkgdesc="Bash script to install Arch Linux"
 arch=('any')
diff --git a/pkg/de-p1st-installer/example-vbox.cfg b/pkg/de-p1st-installer/example-vbox.cfg
index 1748738..fb6a39f 100644
--- a/pkg/de-p1st-installer/example-vbox.cfg
+++ b/pkg/de-p1st-installer/example-vbox.cfg
@@ -31,30 +31,35 @@ LEAVE_MOUNTED=1
 
 PACSTRAP_INTERACTIVE=1
 
-# Additional pacman packages
-# E.g. to specify the preferred providers and avoid questions during pacstrap
-# -> Choose providers for initramfs, de-p1st-kernel, de-p1st-ucode
-#
-# Even though de-p1st-mkinitcpio depends on mkinitcpio,
-# pacstrap will still ask for an provider for initramfs
-# except if we explicitly add mkinitcpio here
+############## ADDITIONAL_PKGS from here on ##############
 ADDITIONAL_PKGS=()
-ADDITIONAL_PKGS+=('mkinitcpio' 'de-p1st-kernel-lts' 'de-p1st-ucode-placeholder' 'virtualbox-guest-utils')
-#
+
+# Specify the preferred providers for initramfs, de-p1st-kernel, de-p1st-ucode
+ADDITIONAL_PKGS+=('mkinitcpio' 'de-p1st-kernel-lts' 'de-p1st-ucode-placeholder')
+# VBox guest additions
+ADDITIONAL_PKGS+=('virtualbox-guest-utils')
 # XFCE4 desktop with HiDPI
 ADDITIONAL_PKGS+=('de-p1st-gpu-generic' 'de-p1st-xfce4-hidpi' 'de-p1st-sddm-tablet')
-#
-# smartcard
-ADDITIONAL_PKGS+=('de-p1st-smartcard')
-# other programs
-ADDITIONAL_PKGS+=('signal-desktop' 'nextcloud-client' 'keepassxc' 'xournalpp' 'evince')
-ADDITIONAL_PKGS+=('intellij-idea-ultimate-edition' 'intellij-idea-ultimate-edition-jre')
-# gallery / image viewer
-ADDITIONAL_PKGS+=('nomacs' 'qt5-imageformats')
-#
-# pulseaudio - base
+
+# Audio
+## pulseaudio - base
 ADDITIONAL_PKGS+=('pulseaudio' 'pulseaudio-alsa' 'pavucontrol')
-# pulseaudio - xfce4
+## pulseaudio - xfce4
 ADDITIONAL_PKGS+=('xfce4-pulseaudio-plugin')
-# sound theme
-ADDITIONAL_PKGS+=('libcanberra' 'libcanberra-pulse')
\ No newline at end of file
+## sound theme
+ADDITIONAL_PKGS+=('libcanberra' 'libcanberra-pulse')
+
+# If your network is unsafe, e.g. if you live in Germany, then include a VPN client
+ADDITIONAL_PKGS+=('riseup-vpn')
+# Smartcard (e.g. Nitrokey or Yubikey)
+ADDITIONAL_PKGS+=('de-p1st-smartcard')
+
+
+# Other programs
+ADDITIONAL_PKGS+=('signal-desktop' 'nextcloud-client' 'keepassxc' 'xournalpp')
+# Development
+ADDITIONAL_PKGS+=('intellij-idea-ultimate-edition' 'intellij-idea-ultimate-edition-jre')
+# Document viewer
+ADDITIONAL_PKGS+=('evince')
+# Gallery / image viewer
+ADDITIONAL_PKGS+=('nomacs' 'qt5-imageformats')
diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD
index fcf7c15..c2bb9d8 100644
--- a/pkg/de-p1st-xfce4/PKGBUILD
+++ b/pkg/de-p1st-xfce4/PKGBUILD
@@ -54,7 +54,7 @@ depends+=(de-p1st-sddm-theme)
 
 # ============== network, theme, keyboard ==============
 #
-# NetworkManager applet
+# NetworkManager and NetworkManager applet
 depends+=(network-manager-applet)  # depends on networkmanager
 #
 # gtk and qt theme