From b262f63f6d367464b9b1bafb67bcfa73aebac0e1 Mon Sep 17 00:00:00 2001
From: Lightemerald <light_emerald@aostia.com>
Date: Sat, 26 Aug 2023 15:51:03 +0000
Subject: [PATCH] packages and repo fixes

---
 setup-linux.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/setup-linux.sh b/setup-linux.sh
index a69fdb0..112d2ff 100755
--- a/setup-linux.sh
+++ b/setup-linux.sh
@@ -40,7 +40,7 @@ function install_general_tools_software() {
     if [[ $DISTRO =~ (debian|ubuntu) ]]; then
         sudo apt install linux-headers-amd64 sudo nano git curl wget htop btop scrcpy vlc geary -y
     elif [[ $DISTRO == "fedora" ]]; then
-        sudo dnf in kernel-devel sudo nano git curl wget htop btop scrcpy vlc geary -y
+        sudo dnf in kernel-devel sudo nano git curl wget htop btop geary -y
     elif [[ $DISTRO == "arch" ]]; then
         sudo pacman -S --needed linux-headers dkms base-devel sudo nano git curl wget htop btop scrcpy vlc geary --noconfirm
     fi
@@ -65,8 +65,10 @@ function setup_repo() {
         if grep -q "Rawhide" /etc/fedora-release; then
             sudo dnf config-manager --add-repo 'https://download.opensuse.org/repositories/hardware:razer/Fedora_Rawhide/hardware:razer.repo'
             sudo dnf config-manager --add-repo 'https://download.opensuse.org/repositories/home:/Maroxy:/AAT-Apps/Fedora_Rawhide/home:Maroxy:AAT-Apps.repo' 
+            sudo dnf in -y 'https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-rawhide.noarch.rpm' 'https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-rawhide.noarch.rpm'
         else
             sudo dnf config-manager --add-repo "https://download.opensuse.org/repositories/hardware:razer/Fedora_$(rpm -E %fedora)/hardware:razer.repo"
+            sudo dnf in -y "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"
             sudo flatpak remote-add --if-not-exists launcher.moe https://gol.launcher.moe/gol.launcher.moe.flatpakrepo
         fi
         sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc
@@ -95,7 +97,7 @@ function install_distro_specific_packages() {
     if [[ $DISTRO =~ (debian|ubuntu) ]]; then
         sudo apt install stacer qbittorrent -y
     elif [[ $DISTRO == "fedora" ]]; then
-        sudo dnf in starship stacer qbittorrent -y
+        sudo dnf in starship scrcpy stacer qbittorrent vlc -y
         sudo flatpak install flathub com.moonlight_stream.Moonlight -y --noninteractive --system
         sudo flatpak install flathub io.github.thaunknown.miru -y --noninteractive --system
         sudo flatpak install flathub com.stremio.Stremio -y --noninteractive --system
@@ -158,13 +160,14 @@ function install_gaming() {
         if [[ $DISTRO =~ (debian|ubuntu) ]]; then
             sudo apt install steam gamescope gamemode mangohud lutris discord -y
         elif [[ $DISTRO == "fedora" ]]; then
-            if [[ $VERSION =~ ^[0-9]+$ ]]; then
-                sudo dnf in steam gamescope gamemode mangohud lutris discord protonup-qt heroic-games-launcher-bin -y
-                sudo flatpak install launcher.moe moe.launcher.an-anime-game-launcher -y
-                sudo flatpak install launcher.moe moe.launcher.honkers-launcher -y
-                sudo flatpak install launcher.moe moe.launcher.the-honkers-railway-launcher -y
+            sudo flatpak install flathub net.davidotek.pupgui2 -y --noninteractive --system
+            if grep -q "Rawhide" /etc/fedora-release; then
+                sudo dnf in steam gamescope gamemode mangohud lutris discord heroic-games-launcher-bin an-anime-game-launcher honkers-launcher the-honkers-railway-launcher -y
             else
-                sudo dnf in steam gamescope gamemode mangohud lutris discord protonup-qt heroic-games-launcher-bin an-anime-game-launcher honkers-launcher the-honkers-railway-launcher -y
+                sudo dnf in steam gamescope gamemode mangohud lutris discord heroic-games-launcher-bin -y
+                sudo flatpak install launcher.moe moe.launcher.an-anime-game-launcher -y --noninteractive --system
+                sudo flatpak install launcher.moe moe.launcher.honkers-launcher -y --noninteractive --system
+                sudo flatpak install launcher.moe moe.launcher.the-honkers-railway-launcher -y --noninteractive --system
             fi
         elif [[ $DISTRO == "arch" ]]; then
             sudo pacman -S --needed steam gamescope gamemode mangohud lutris discord protonup-qt heroic-games-launcher-bin an-anime-game-launcher-bin --noconfirm