diff --git a/scripts/0-install.sh b/scripts/0-install.sh index 7633065..88e38b6 100644 --- a/scripts/0-install.sh +++ b/scripts/0-install.sh @@ -42,6 +42,18 @@ case $yesno in ;; * ) echo "Please answer yes (Yes, y, Y) or no (No, n, N)";; esac +# Ask if this is being installed as a VM or bare metal, then install appropriate video drivers +read -p 'Is this being installed on VMWare Fusion? ' vmyesno +case $vmyesno in + [yesYesYy]* ) + gpudriver = "vmware" + ;; + [noNoNn]* ) + gpudriver = "nvidia" + ;; + * ) echo "Please answer yes (Yes, y, Y) or no (No, n, N)";; +esac +export gpu = $gpudriver # Get user credentials read -p "Please enter a username " username read -rsp "Please enter a password " password @@ -103,28 +115,24 @@ echo "$username:$password" | chpasswd passwd --lock root # Set up sudo so "wheel" group users can do root commands (password required) sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers -# Ask if this is being installed as a VM or bare metal, then install appropriate video drivers -read -p 'Is this being installed on VMWare Fusion? ' vmyesno -case $vmyesno in - [yesYesYy]* ) - echo "Installing VM drivers" - pacman -S --noconfirm --needed open-vm-tools - cat /proc/version > /etc/arch-release - systemctl enable vmware-vmblock-fuse - systemctl enable vmtoolsd - pacman -S --noconfirm --needed xf86-input-vmmouse xf86-video-vmware mesa - ;; - [noNoNn]* ) - echo "Installing NVIDIA GPU drivers" - pacman -S --noconfirm nvidia-dkms nvidia-utils lib32-nvidia-utils nvidia-settings - # Tweak systemd.conf and enable services for proper suspend/resume - echo "options nvidia NVreg_PreserveVideoMemoryAllocations=1" >> /lib/modprobe.d/systemd.conf - systemctl enable nvidia-suspend.service - systemctl enable nvidia-hibernate.service - systemctl enable nvidia-resume.service - ;; - * ) echo "Please answer yes (Yes, y, Y) or no (No, n, N)";; -esac +# Set up GPU drivers depending on device +if [[ $gpu == "vmware" ]] + echo "Installing VM drivers" + pacman -S --noconfirm --needed open-vm-tools + cat /proc/version > /etc/arch-release + systemctl enable vmware-vmblock-fuse + systemctl enable vmtoolsd + pacman -S --noconfirm --needed xf86-input-vmmouse xf86-video-vmware mesa +fi +if [[ $gpu == "nvidia" ]] + echo "Installing NVIDIA GPU drivers" + pacman -S --noconfirm nvidia-dkms nvidia-utils lib32-nvidia-utils nvidia-settings + # Tweak systemd.conf and enable services for proper suspend/resume + echo "options nvidia NVreg_PreserveVideoMemoryAllocations=1" >> /lib/modprobe.d/systemd.conf + systemctl enable nvidia-suspend.service + systemctl enable nvidia-hibernate.service + systemctl enable nvidia-resume.service +fi # Required to enable network changes (not sure if this is neccesary) #sysctl --system # Prompt the user to reboot