Patch up fedora distro script for 41

1 files changed, 15 insertions, 12 deletions

diff --git a/distro/fedora.sh b/distro/fedora.sh
index 34cd494..ce628ce 100755
--- a/distro/fedora.sh
+++ b/distro/fedora.sh
@@ -8,10 +8,10 @@ PLYMOUTH=0
 
 yum -y update
 
-yum -y group install "Development Tools"
-yum -y group install "C Development Tools and Libraries"
 yum -y builddep dmenu slock st
 yum -y install \
+	@development-tools \
+	@c-development \
 	NetworkManager-tui \
 	ShellCheck \
 	ansible \
@@ -51,7 +51,6 @@ yum -y install \
 	maven \
 	ncdu \
 	ncmpc \
-	neofetch \
 	neovim \
 	nload \
 	npm \
@@ -118,26 +117,25 @@ yum -y install \
 #  pactl unload-module module-remap-source
 
 # https://rpmfusion.org/Configuration
-yum -y install \
+dnf -y install \
 	https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
 	https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
 
 # https://rpmfusion.org/Howto/Multimedia
-dnf config-manager --enable fedora-cisco-openh264
-
+dnf -y config-manager setopt fedora-cisco-openh264.enabled=1
 dnf -y swap ffmpeg-free ffmpeg --allowerasing
 
-dnf -y groupupdate multimedia --setop="install_weak_deps=False" --exclude=PackageKit-gstreamer-plugin
+dnf -y update @multimedia --setopt="install_weak_deps=False" --exclude=PackageKit-gstreamer-plugin
 
-dnf -y groupupdate sound-and-video
-
-yum -y install mpd
+# dnf -y groupupdate sound-and-video
 
 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 mpd
+
 yum -y install kmod-v4l2loopback
 
 sh -c 'echo "kmod-v4l2loopback" > /etc/modules-load.d/v4l.conf'
@@ -159,14 +157,16 @@ if lspci | grep -qi 'vga.*nvidia'; then
 	dnf -y install akmod-nvidia vulkan xorg-x11-drv-nvidia-cuda-libs \
 		xorg-x11-drv-nvidia-cuda nvidia-vaapi-driver libva-utils vdpauinfo
 
+	dnf -y install libva-nvidia-driver
+
 	# https://wiki.archlinux.org/title/PRIME#Wayland-specific_configuration
 	# DRI_PRIME=pci-0000_01_00_0 __VK_LAYER_NV_optimus=NVIDIA_only __GLX_VENDOR_LIBRARY_NAME=nvidia <program>
 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 config-manager addrepo --overwrite \
+	--from-repofile=https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
 dnf -y install brave-browser
 
 plymouth_changed=0
@@ -206,3 +206,6 @@ if [ $plymouth_changed -eq 1 ] ; then
 	dracut -v -f
 	grub2-mkconfig -o /boot/grub2/grub.cfg
 fi
+
+# Prevent the stupid long startup times
+# akmods --kernels "$(ls -1t /usr/lib/modules | sed 1q | sed -e's@/$@@g')"