Merge remote-tracking branch 'origin/master'

1 files changed, 35 insertions, 23 deletions

diff --git a/distro/el9 b/distro/el9
index 6eadd1b..51036d7 100755
--- a/distro/el9
+++ b/distro/el9
@@ -1,14 +1,29 @@
 #!/bin/sh
-if [ "$(id -u)" -ne 0 ] ; then
-	echo "Run with sudo"
+ROCM_ENALBE=NO
+NVIDIA_ENABLE=NO
+if [ "$(id -u)" -eq 0 ] ; then
+	echo "Run as a normal user"
 	exit 1
 fi
 set -ex
 
-yum -y update
+sudo yum -y group install "Development Tools"
+sudo yum -y install cargo clang cmake
 
-yum -y group install "Development Tools"
-yum -y install \
+if ! [ -x "$(command -v tree-sitter)" ] ; then
+	cargo install tree-sitter-cli
+fi
+./compile/nvim.sh
+./compile/dpw.sh
+./compile/pm.sh
+
+sudo dnf config-manager --set-enabled crb
+sudo yum -y install epel-release
+
+sudo yum -y update
+
+sudo yum -y install \
+	age \
 	ansible \
 	bear \
 	bind-utils \
@@ -66,6 +81,7 @@ yum -y install \
 	xkill \
 	xsetroot \
 	zstd \
+	pcsc-lite-devel \
 
 
 # https://rpmfusion.org/Configuration
@@ -76,36 +92,32 @@ sudo dnf install --nogpgcheck \
 	https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm
 
 # https://rpmfusion.org/Howto/Multimedia
-dnf -y swap ffmpeg-free ffmpeg --allowerasing
+sudo dnf -y swap ffmpeg-free ffmpeg --allowerasing
 
-dnf -y groupupdate multimedia --setop="install_weak_deps=False" --exclude=PackageKit-gstreamer-plugin
+sudo dnf -y groupupdate multimedia --setop="install_weak_deps=False" --exclude=PackageKit-gstreamer-plugin
 
-dnf -y groupupdate sound-and-video
+sudo dnf -y groupupdate sound-and-video
 
-dnf -y install intel-media-driver
+sudo dnf -y install intel-media-driver
 
 # dnf -y swap mesa-va-drivers mesa-va-drivers-freeworld
 # dnf -y swap mesa-vdpau-drivers mesa-vdpau-drivers-freeworld
 
-yum -y install kmod-v4l2loopback
+sudo yum -y install akmod-v4l2loopback
 
-sh -c 'echo "kmod-v4l2loopback" > /etc/modules-load.d/v4l.conf'
+# sudo sh -c 'echo "kmod-v4l2loopback" > /etc/modules-load.d/v4l.conf'
 
-sh -c 'echo "options v4l2loopback devices=3 video_nr=10,11,12 card_label=\"OBS Cam,Loopback 1,Loopback 2\""  > /etc/modprobe.d/99-v4l.conf '
+sudo sh -c 'echo "options v4l2loopback devices=3 video_nr=10,11,12 card_label=\"OBS Cam,Loopback 1,Loopback 2\""  > /etc/modprobe.d/99-v4l.conf '
 
 flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 flatpak install -y flathub com.obsproject.Studio
 
-if lspci | grep -qi 'vga.*amd.*navi' ; then
+if lspci | grep -qi 'vga.*amd.*navi' && [ $ROCM_ENALBE = YES ] ; then
 	# https://rocm.docs.amd.com/projects/install-on-linux/en/latest/tutorial/quick-start.html
 	sudo crb enable
 	sudo yum -y install kernel-headers kernel-devel
 	# See prerequisites. Adding current user to Video and Render groups
-	if [ -z "$SUDO_USER" ] ; then
-		echo "Re-run under sudo so we can alter user groups appropriately"
-		exit 1
-	fi
-	sudo usermod -a -G render,video "$SUDO_USER"
+	sudo usermod -a -G render,video "$(id -un)"
 	sudo yum -y install \
 		https://repo.radeon.com/amdgpu-install/6.0.2/rhel/9.3/amdgpu-install-6.0.60002-1.el9.noarch.rpm
 	sudo yum -y clean all
@@ -113,7 +125,7 @@ if lspci | grep -qi 'vga.*amd.*navi' ; then
 	sudo yum -y install rocm-hip-libraries
 fi
 
-if lspci | grep -qi 'vga.*nvidia'; then
+if lspci | grep -qi 'vga.*nvidia' && [ $NVIDIA_ENABLE = YES ]; then
 	# Nvidia https://rpmfusion.org/Howto/NVIDIA
 	dnf -y install akmod-nvidia vulkan xorg-x11-drv-nvidia-cuda-libs \
 		nvidia-vaapi-driver libva-utils vdpauinfo
@@ -123,8 +135,8 @@ if lspci | grep -qi 'vga.*nvidia'; then
 fi
 
 # Brave https://brave.com/linux/
-dnf -y install dnf-plugins-core
-dnf -y config-manager --add-repo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
-rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
-dnf -y install brave-browser
+sudo dnf -y install dnf-plugins-core
+sudo dnf -y config-manager --add-repo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
+sudo rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
+sudo dnf -y install brave-browser