From 34287ebc7b9d9763107ad848b394c13e666aed5e Mon Sep 17 00:00:00 2001
From: beech <beechmanbopp@gmail.com>
Date: Thu, 4 Jul 2024 02:26:55 -0500
Subject: [PATCH] Added VM setup

---
 README.md      | 10 ++++++--
 preinstall2.sh |  1 +
 setup-vm.sh    | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++
 setup.sh       |  6 -----
 4 files changed, 79 insertions(+), 8 deletions(-)
 create mode 100644 setup-vm.sh

diff --git a/README.md b/README.md
index 783faa2..642bb7d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Arch Linux Install Scripts
 
-Scripts for Arch install & configuration with DE, support packages, and apps. Includes VMWare drivers.
+Scripts for Arch install & configuration with DE, support packages, and apps. Includes option to install VMWare drivers.
 
 ---
 
@@ -59,7 +59,13 @@ reboot # Remove installation media during reboot
 sudo pacman -S --noconfirm pacman-contrib curl git
 sudo git clone https://git.boppdev.net/beech/ArchScripts
 cd ArchScripts
-sh setup.sh # Comment out line 9, 65 & 66 if you're not on a VM
+
+# Normal Install
+sh setup.sh
+sh software.sh
+
+# Installing as VM guest
+sh setup-vm.sh
 sh software.sh
 ```
 
diff --git a/preinstall2.sh b/preinstall2.sh
index 239196c..cd5eebe 100644
--- a/preinstall2.sh
+++ b/preinstall2.sh
@@ -40,6 +40,7 @@ echo "options root=PARTUUID=$(blkid -s PARTUUID -o value /dev/sda3) rw" >> /boot
 # install dhcpd service
 
 sudo pacman -S dhcpcd --noconfirm --needed
+
 sudo systemctl enable dhcpcd@ADAPTER.service # EDIT "ADAPTER" WITH YOUR ADAPTER IN IP LINK
 
 # install NetworkManager
diff --git a/setup-vm.sh b/setup-vm.sh
new file mode 100644
index 0000000..ddf3c0e
--- /dev/null
+++ b/setup-vm.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+echo
+echo "Installing Base System"
+echo
+
+PKGS=(
+
+    # --- VM Packages (Uncomment if not a VM guest)
+        'open-vm-tools'
+
+    # --- XORG Display Rendering
+        'xorg'                  # Base Package
+        'xorg-drivers'          # Display Drivers 
+        'xterm'                 # Terminal for TTY
+        'xorg-server'           # XOrg server
+        'xorg-apps'             # XOrg apps group
+        'xorg-xinit'            # XOrg init
+        'xorg-xinput'           # XOrg xinput
+        'xorg-twm'              # XOrg twm
+        'xorg-xclock'           # XOrg xclock
+        'xf86-input-vmmouse'
+        'xf86-video-vmware'
+        'mesa'
+
+    # --- Setup Desktop
+        'gnome'                 # GNOME
+        'xfce4-power-manager'   # Power Manager 
+
+    # --- Login Display Manager
+        'gdm'                   # Base Login Manager
+
+    # --- Networking Setup
+        'dialog'                    # Enables shell scripts to trigger dialog boxex
+        'networkmanager'            # Network connection manager
+        'network-manager-applet'    # System tray icon/utility for network connectivity
+        'dhclient'                  # DHCP client
+        'libsecret'                 # Library for storing passwords
+        'fail2ban'                  # Ban IP's after man failed login attempts
+        'ufw'                       # Uncomplicated firewall
+    
+    # --- Audio
+        'alsa-utils'        # Advanced Linux Sound Architecture (ALSA) Components https://alsa.opensrc.org/
+        'alsa-plugins'      # ALSA plugins
+        'pulseaudio'        # Pulse Audio sound components
+        'pulseaudio-alsa'   # ALSA configuration for pulse audio
+        'pavucontrol'       # Pulse Audio volume control
+        'pnmixer'           # System tray volume control
+
+    # --- Bluetooth
+        'bluez'                 # Daemons for the bluetooth protocol stack
+        'bluez-utils'           # Bluetooth development and debugging utilities
+        'bluez-libs'            # Bluetooth libraries
+        'bluez-firmware'        # Firmware for Broadcom BCM203x and STLC2300 Bluetooth chips
+        'blueberry'             # Bluetooth configuration tool
+        'pulseaudio-bluetooth'  # Bluetooth support for PulseAudio
+)
+
+for PKG in "${PKGS[@]}"; do
+    echo "INSTALLING: ${PKG}"
+    sudo pacman -S "$PKG" --noconfirm --needed
+done
+
+sudo systemctl enable gdm.service 
+
+sudo systemctl enable vmtoolsd.service
+sudo systemctl enable vmware-vmblock-fuse.service 
+
+echo
+echo "Done! Please Reboot & Run software.sh"
+echo
diff --git a/setup.sh b/setup.sh
index dfb6e55..3715aec 100644
--- a/setup.sh
+++ b/setup.sh
@@ -5,9 +5,6 @@ echo
 
 PKGS=(
 
-    # --- VM Packages (Uncomment if not a VM guest)
-        'open-vm-tools'
-
     # --- XORG Display Rendering
         'xorg'                  # Base Package
         'xorg-drivers'          # Display Drivers 
@@ -62,9 +59,6 @@ done
 
 sudo systemctl enable gdm.service 
 
-sudo systemctl enable vmtoolsd.service # Comment out if VM guest
-sudo systemctl enable vmware-vmblock-fuse.service # Comment out if VM guest
-
 echo
 echo "Done! Please Reboot & Run software.sh"
 echo