fix(nvidia): Do not apply flatpak overrides to hybrid systems

chore(nvidia) Apply overrides prior to flatpak installs to ensure Firefox is ready to use the moment it's installed.

Author: KyleGospo

system_files/desktop/shared/usr/bin/bazzite-flatpak-manager

@@ -38,38 +38,15 @@ FLATPAK_LIST=$(flatpak list --columns=application)
 INSTALL_LIST_FILE="/usr/share/ublue-os/bazzite/flatpak/install"
 REMOVE_LIST_FILE="/usr/share/ublue-os/bazzite/flatpak/remove"
 
-# Install flatpaks in list
-if [[ -f $INSTALL_LIST_FILE ]]; then
-  if [[ -n $FLATPAK_LIST ]]; then
-    INSTALL_LIST=$(echo $FLATPAK_LIST | grep -vf - $INSTALL_LIST_FILE)
-  else
-    INSTALL_LIST=$(cat $INSTALL_LIST_FILE)
-  fi
-  if [[ -n $INSTALL_LIST ]]; then
-    if ! flatpak install --system --noninteractive flathub ${INSTALL_LIST[@]}; then
-      # exit on error
-      exit 1
-    fi
-  fi
-fi
-
-# Remove flatpaks in list once
-if [[ ! -f $VER_FILE && -f $REMOVE_LIST_FILE ]]; then
-  REMOVE_LIST=$(echo $FLATPAK_LIST | grep -f - $REMOVE_LIST_FILE)
-  if [[ -n $REMOVE_LIST ]]; then
-    flatpak remove --system --noninteractive ${REMOVE_LIST[@]}
-  fi
-fi
-
 # Configure needed params for flatpaks
 flatpak override \
   --system \
   --env=MOZ_ENABLE_WAYLAND=1 \
   --env=MOZ_USE_XINPUT2=1 \
   org.mozilla.firefox
 
-# Params needed for HW accelerated video on Nvidia
-if [[ $IMAGE_FLAVOR =~ "nvidia" ]]; then
+# Params needed for HW accelerated video on Nvidia (Ignoring hybrid systems)
+if [[ $IMAGE_FLAVOR =~ "nvidia" ]] && [ $(grep -o "\-display" <<< $(lshw -C display) | wc -l) -le 1 ]; then
   flatpak override \
     --system \
     --filesystem=host-os \
@@ -92,6 +69,29 @@ else
     org.mozilla.firefox
 fi
 
+# Install flatpaks in list
+if [[ -f $INSTALL_LIST_FILE ]]; then
+  if [[ -n $FLATPAK_LIST ]]; then
+    INSTALL_LIST=$(echo $FLATPAK_LIST | grep -vf - $INSTALL_LIST_FILE)
+  else
+    INSTALL_LIST=$(cat $INSTALL_LIST_FILE)
+  fi
+  if [[ -n $INSTALL_LIST ]]; then
+    if ! flatpak install --system --noninteractive flathub ${INSTALL_LIST[@]}; then
+      # exit on error
+      exit 1
+    fi
+  fi
+fi
+
+# Remove flatpaks in list once
+if [[ ! -f $VER_FILE && -f $REMOVE_LIST_FILE ]]; then
+  REMOVE_LIST=$(echo $FLATPAK_LIST | grep -f - $REMOVE_LIST_FILE)
+  if [[ -n $REMOVE_LIST ]]; then
+    flatpak remove --system --noninteractive ${REMOVE_LIST[@]}
+  fi
+fi
+
 mkdir -p /etc/bazzite
 echo $VER > $VER_FILE
 echo $IMAGE_FLAVOR > $KNOWN_IMAGE_FLAVOR_FILE