diff --git a/Amelia.sh b/Amelia.sh index 2d63d07..1208e95 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -2,7 +2,7 @@ # Amelia Installer # https://gitlab.com/prism7/archery -# Version: 8.4.1 +# Version: 8.4.2 set -euo pipefail ################################################################################################### @@ -1750,10 +1750,10 @@ Enter a number: " # Linux Kernel if [[ "${kernelnmbr}" == "1" ]]; then nvname="nvidia-open" - vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-open nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d" + vgapkgs="libva-mesa-driver libva-nvidia-driver libvdpau-va-gl nvidia-open nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d" # Other Kernels else - vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-open-dkms nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d" + vgapkgs="libva-mesa-driver libva-nvidia-driver libvdpau-va-gl nvidia-open-dkms nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d" fi ;; 2) # Maxwell+ Family sleep 0.2 @@ -1764,14 +1764,14 @@ Enter a number: " # Linux Kernel if [[ "${kernelnmbr}" == "1" ]]; then nvname="nvidia" - vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d" + vgapkgs="libva-mesa-driver libva-nvidia-driver libvdpau-va-gl nvidia nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d" # Linux LTS Kernel elif [[ "${kernelnmbr}" == "2" ]]; then nvname="nvidia-lts" - vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-lts nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d" + vgapkgs="libva-mesa-driver libva-nvidia-driver libvdpau-va-gl nvidia-lts nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d" # Other Kernels else - vgapkgs="libva-nvidia-driver libvdpau-va-gl nvidia-dkms nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d" + vgapkgs="libva-mesa-driver libva-nvidia-driver libvdpau-va-gl nvidia-dkms nvidia-settings nvidia-utils opencl-nvidia opencl-headers vkd3d" fi local prompt="GSP Firmware Disabled" @@ -1825,7 +1825,7 @@ Enter [y/n]: " " elif [[ "${vgaconf}" == "n" ]]; then if [[ "${vendor}" == "nvidia" ]]; then - vgapkgs="vulkan-nouveau" + vgapkgs="libva-mesa-driver vulkan-nouveau" fi skip fi @@ -1871,9 +1871,9 @@ ${magenta}###${nc}--------------------------------------${magenta}[ ${bwhite}Des [11] Basic Arch Linux (No GUI) - [12] Custom Arch Linux ${red}### ${yellow}EXPERTS ONLY ${red}###${nc} + [12] Custom Arch Linux ${red}### ${yellow}EXPERTS ONLY ${red}###${nc} - [13] Cosmic ${red}(Alpha) " + [13] Cosmic ${red}# ${yellow}Alpha ${red}# " BLUE " @@ -5316,7 +5316,6 @@ Enter [Y/n]: " ################################################################################################### pacstrap_system() { - basepkgs=(base efibootmgr nano pkgstats sudo vim "${fstools}" "${kernel}" "${microcode}") local prompt="Pacstrap System" sleep 0.2 NC " @@ -5334,6 +5333,8 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs fi fi + basepkgs=(base efibootmgr nano pkgstats sudo vim "${fstools}" "${kernel}" "${microcode}") + if [[ "${vendor}" == "Virtual Machine" ]]; then basepkgs+=("${vmpkgs}") else @@ -5446,7 +5447,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs deskpkgs="${custarray[*]}" ;; 13) # Cosmic Desktop: - deskpkgs="${basepkgs[*]} cosmic networkmanager pipewire-pulse wireplumber" + deskpkgs="${basepkgs[*]} cosmic networkmanager" displaymanager="cosmic-greeter" network="NetworkManager" ;; esac