From db6dc4e7e3f7e6d59446b7dafc5575096642b3f1 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Fri, 14 May 2021 15:12:23 +0200
Subject: [PATCH] fix xfce4 custom settings

---
 pkg/de-p1st-installer/PKGBUILD      |  4 ++--
 pkg/de-p1st-installer/installer.cfg |  2 +-
 pkg/de-p1st-xfce4/PKGBUILD          | 13 ++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkg/de-p1st-installer/PKGBUILD b/pkg/de-p1st-installer/PKGBUILD
index 80191fb..79d2ed4 100644
--- a/pkg/de-p1st-installer/PKGBUILD
+++ b/pkg/de-p1st-installer/PKGBUILD
@@ -2,8 +2,8 @@
 _pkgname=installer
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.1.3
-pkgrel=2
+pkgver=0.1.4
+pkgrel=1
 pkgdesc="Bash script to install Arch Linux"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
diff --git a/pkg/de-p1st-installer/installer.cfg b/pkg/de-p1st-installer/installer.cfg
index b608152..9fca5ce 100644
--- a/pkg/de-p1st-installer/installer.cfg
+++ b/pkg/de-p1st-installer/installer.cfg
@@ -37,7 +37,7 @@ PACSTRAP_INTERACTIVE=1
 # 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=('mkinitcpio' 'de-p1st-kernel-lts' 'de-p1st-ucode-placeholder')
+ADDITIONAL_PKGS=('mkinitcpio' 'de-p1st-kernel-lts' 'de-p1st-ucode-placeholder' 'virtualbox-guest-utils')
 
 # XFCE4 desktop with HiDPI
 ADDITIONAL_PKGS+=('de-p1st-gpu-generic' 'de-p1st-xfce4-hidpi')
diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD
index 13e3884..02de9f9 100644
--- a/pkg/de-p1st-xfce4/PKGBUILD
+++ b/pkg/de-p1st-xfce4/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=xfce4
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.0.7
+pkgver=0.0.8
 pkgrel=1
 pkgdesc="XFCE4 with configuration"
 arch=('any')
@@ -66,13 +66,12 @@ depends+=(de-p1st-keyboard-x11)
 package() {
   cd "${_reponame}/pkg/${pkgname}"
 
-  install -Dm0644 img/face.jpg "$pkgdir"/etc/skel/.face
+  install -Dm0644 img/face.jpg      "$pkgdir"/etc/skel/.face
 
-  # TODO
-  #   xfconf-query --create -c xfce4-desktop -p /desktop-icons/primary -t 'bool' -s 'true' || exit $?
-  #   -> holo
-  # TODO: test the below
-  install -Dm0644 -o0 xfce4-desktop.xml "$pkgdir"/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+  # Adding the xml to /etc/xdg/xfce4/xfconf/xfce-perchannel-xml does not work
+  # (it will not be copied to ~/.config/xfce4/xfconf/xfce-perchannel-xml/)
+  # Thus we place it in the skeleton for new users
+  install -Dm0644 xfce4-desktop.xml "$pkgdir"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
 
   # === display manager ===
   install -Dm0644 systemd.preset        "$pkgdir"/usr/lib/systemd/system-preset/20-"$pkgname".preset