From 7aea47738c6903aeae2d349886bffbd8aa63bd7a Mon Sep 17 00:00:00 2001
From: DustVoice <info@dustvoice.de>
Date: Wed, 6 Nov 2019 02:49:43 +0100
Subject: [PATCH] Fully functional DustArch; TODO: Add documentation for
 DustArch archiso creation process

---
 Documentation.adoc                         |  2 +-
 livecd/airootfs/etc/skel                   |  2 +-
 livecd/airootfs/root/customize_airootfs.sh | 28 ++++++++++++++++------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/Documentation.adoc b/Documentation.adoc
index 9bdc2b7..a381baa 100644
--- a/Documentation.adoc
+++ b/Documentation.adoc
@@ -524,7 +524,7 @@ After that we are going to create a new user, set the password for this user, ma
 
 [source, console]
 ----
-[root@archiso /]# useradd -mg users -G wheel,storage,power dustvoice
+[root@archiso /]# useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /usr/bin/fish dustvoice
 [root@archiso /]# passwd dustvoice
 [root@archiso /]# pacman -S sudo
 ----
diff --git a/livecd/airootfs/etc/skel b/livecd/airootfs/etc/skel
index 617c820..579286d 160000
--- a/livecd/airootfs/etc/skel
+++ b/livecd/airootfs/etc/skel
@@ -1 +1 @@
-Subproject commit 617c820d8a898213d697a7a2d71e2e9d8cc31836
+Subproject commit 579286d2a8fcf22344a99ded2760e2c79dc7aca9
diff --git a/livecd/airootfs/root/customize_airootfs.sh b/livecd/airootfs/root/customize_airootfs.sh
index 5ecc7f4..1ed26e8 100755
--- a/livecd/airootfs/root/customize_airootfs.sh
+++ b/livecd/airootfs/root/customize_airootfs.sh
@@ -27,14 +27,22 @@ sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf
 sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf
 sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf
 
+pip3 install neovim
 pip3 install pygments
-gem install asciidoctor --pre
-gem install asciidoctor-pdf --pre
-gem install asciidoctor-epub3 --pre
-gem install pygments.rb --pre
 
-nvim --headless +PlugInstall +qa
-python3 ~/.config/nvim/plugged/YouCompleteMe/install.py --clang-completer
+! id dustvoice && useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /usr/bin/fish dustvoice
+echo 'dustvoice ALL=(ALL) ALL' >> /etc/sudoers
+chown -R dustvoice:users /home/dustvoice
+
+sudo -u dustvoice gem install asciidoctor --pre
+sudo -u dustvoice gem install asciidoctor-pdf --pre
+sudo -u dustvoice gem install asciidoctor-epub3 --pre
+sudo -u dustvoice gem install pygments.rb --pre
+
+sudo -u dustvoice nvim --headless +PlugInstall +qa
+sudo -u dustvoice python3 /home/dustvoice/.config/nvim/plugged/YouCompleteMe/install.py --clang-completer
+
+sudo -u dustvoice gpg-connect-agent updatestartuptty /bye
 
 systemctl enable pacman-init.service choose-mirror.service
 systemctl set-default multi-user.target
@@ -45,4 +53,10 @@ systemctl start dhcpcd.service
 systemctl enable pcscd
 systemctl start pcscd
 
-gpg-connect-agent updatestartuptty /bye
+echo ""
+echo "Please set a password for the [root] user:"
+until passwd; do echo "Try again, or Ctrl-c within 5 seconds!"; sleep 5; done
+
+echo ""
+echo "Please set a password for the [dustvoice] user:"
+until passwd dustvoice; do echo "Try again, or Ctrl-c within 5 seconds!"; sleep 5; done