From 9f9056c9953c99a82197318ec6a832d6643d867a Mon Sep 17 00:00:00 2001
From: eichehome <eichehome@gmx.de>
Date: Sat, 15 Apr 2023 00:56:37 +0200
Subject: [PATCH] Modified useradd to use entered username

---
 base.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/base.sh b/base.sh
index 123857e..525b1b2 100644
--- a/base.sh
+++ b/base.sh
@@ -204,7 +204,7 @@ if [[ $configuration == 1 ]]; then
   cp "$(find "${PWD}" -type f -name 20-wwan.network)" /etc/systemd/network/
 elif [[ $configuration == 2 ]]; then
   
-  pacman -S fwupd networkmanager modemmanager avahi bluez bluez-utils sshfs pipewire pipewire-audio pipewire-alsa pipewire-pulse pipewire-jack pipewire-zeroconf pipewire-v4l2 wireplumber gstreamer gst-plugin-pipewire gst-libav gst-plugins-good gst-plugins-base xdg-desktop-portal-gnome festival networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc power-profiles-daemon
+  pacman -S fwupd networkmanager modemmanager avahi bluez bluez-utils sshfs pipewire pipewire-audio pipewire-alsa pipewire-pulse pipewire-jack pipewire-zeroconf pipewire-v4l2 pipewire-docs pipewire-roc helvum wireplumber gstreamer gst-plugin-pipewire gst-libav gst-plugins-good gst-plugins-base xdg-desktop-portal-gnome espeak-ng networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc power-profiles-daemon
   
   pacman -S gnome gdm gnome-software-packagekit-plugin
 
@@ -217,7 +217,11 @@ elif [[ $configuration == 2 ]]; then
   mkdir -p /etc/systemd/resolved.conf.d
   cp "$(find "${PWD}" -type f -name disable-multicastDNS.conf)" /etc/systemd/resolved.conf.d/
   systemctl enable avahi-daemon
+  systemctl enable bluetooth
   systemctl enable gdm
+
+  #LibreOffice
+  pacman -S libreoffice-fresh-de
 fi
 
 systemctl enable systemd-resolved
@@ -348,7 +352,7 @@ cryptroot_device_uuid=$(blkid -o value -s UUID /dev/"$cryptroot_device_name"2)
 #sed -i "s/root=LABEL=arch/root=\/dev\/mapper\/$cryptroot_name rd.luks.name=$cryptroot_device_uuid=$cryptroot_name/" /boot/loader/entries/arch.conf
 find /boot -type f -name arch\*.conf -exec sed -i "s/root=LABEL=arch/root=\/dev\/mapper\/$cryptroot_name rd.luks.name=$cryptroot_device_uuid=$cryptroot_name/" {} \;
 
-useradd -mG wheel eichehome
+useradd -mG wheel "$nutzername"
 echo "$nutzername":"$nutzerpw" | chpasswd
 
 #echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers.d/wheel_group
\ No newline at end of file