resolving git merge conflict

3progs.sh

@@ -43,6 +43,7 @@ user_choice=$(zenity --list --checklist --width='1000' --height='1000' \
   FALSE "GTKStressTesting - CPU Monitorozas es Stress Test Program" \
   FALSE "Heroic Launcher - Epic Games Launcher Linux verziója" \
   FALSE "Input-Remapper 2.0 - egér/bill. gomb konfiguráló, macro író progi" \
+  FALSE "Jellyfin - Jellyfin Media Player" \
   FALSE "Kdenlive - Linuxos videószerkesztő program" \
   FALSE "KeepassXC - Jelszókezelő, az adatbázist titkosítva tárolja a PC-n" \
   FALSE "KVM QEMU - virtualizáció, virtuális gépek futtatása" \
@@ -56,7 +57,7 @@ user_choice=$(zenity --list --checklist --width='1000' --height='1000' \
   FALSE "OnlyOffice - Legujabb MS Office Linuxos megfeleloje - LIBREOFFICE-t TOROLNI FOGJA!" \
   FALSE "OBS - Nyílt forrású felvételkészítő és streamelő program" \
   FALSE "Parabolic - Videóletöltő, működik minden platformon" \
-  FALSE "PeaZip - tömörítő program" \
+  FALSE "P7Zip - tömörítő program" \
   FALSE "Pavucontrol - Apponkénti hangerőszabályzás/konfigurálás" \
   FALSE "PhotoGIMP - Adobe Photoshop-szerű képszerkesztő Linuxra" \
   FALSE "QBittorrent - torrent kliens" \
@@ -69,6 +70,7 @@ user_choice=$(zenity --list --checklist --width='1000' --height='1000' \
   FALSE "Vivaldi - webböngésző" \
   FALSE "VLC - médialejátszó" \
   FALSE "Windows 11 Telepítő - Csak Profiknak!" \
+  FALSE "XPadNeo - XBox Controller Support" \
   FALSE "Zenpower3 - AMD CPU Feszultseg, Aramerosseg es Fogyasztas Monitorozas" )
 if [[ $? -eq 1 ]]; then
    echo ${bold}${yellow}Cancelled by User. Exiting!${normal}
@@ -367,7 +369,7 @@ if [[ $user_choice = *"OnlyOffice - Legujabb MS Office Linuxos megfeleloje - LIB
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}OnlyOffice${normal}
 
-  sudo pacman -S onlyoffice-bin --noconfirm
+  yay -S onlyoffice-bin --noconfirm
 
   echo ${bold}${yellow}OnlyOffice ${normal}installed.
   echo ---------------------------------------------
@@ -588,7 +590,7 @@ if [[ $user_choice = *"Vibrant - Szín szaturáció beállító program"* ]]; th
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Vibrant${normal}
 
-  flatpak install flathub io.github.libvibrant.vibrantLinux --user -y
+  yay -S vibrantlinux --noconfirm
 
   echo ${bold}${yellow}Vibrant ${normal}installed.
   echo ---------------------------------------------
@@ -696,6 +698,30 @@ if [[ $user_choice = *"Monophony - Youtube videokbol kiszedi a hangot. Jo cucc p
   echo
 fi
 
+if [[ $user_choice = *"Jellyfin - Jellyfin Media Player"* ]]; then
+  echo
+  echo ---------------------------------------------
+  echo Installing ${bold}${yellow}Jellyfin${normal}
+
+  yay -S jellyfin-media-player --noconfirm
+
+  echo ${bold}${yellow}Jellyfin Media Player ${normal}installed.
+  echo ---------------------------------------------
+  echo
+fi
+
+if [[ $user_choice = *"XpadNeo - XBox Controller Support"* ]]; then
+  echo
+  echo ---------------------------------------------
+  echo Installing ${bold}${yellow}Jellyfin${normal}
+
+  yay -S xpadneo --noconfirm
+
+  echo ${bold}${yellow}XPadNeo ${normal}installed.
+  echo ---------------------------------------------
+  echo
+fi
+
 if [[ $user_choice = *"Windows 11 Telepítő - Csak Profiknak"* ]]; then
   zenity --warning --text='!! MAJOM VAGY !!' --width='300' --height='100'
 fi

detect_windows.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# systemd-boot utility script to add Michaelsoft boot entry into systemd-boot
+# AlexC (c) 2025
+
+# Check if the systemd-boot is installed
+if ! command -v bootctl &> /dev/null; then
+    echo "systemd-boot not found. Please install systemd-boot."
+    exit 1
+fi
+
+# Function to detect the EFI partition
+detect_efi_partition() {
+    # Search for the FAT32 filesystem, which is used for EFI partitions
+    efi_partition=$(blkid | grep -i 'vfat' | awk -F: '{print $1}')
+    
+    if [ -z "$efi_partition" ]; then
+        echo "No EFI partition detected."
+        return 1
+    fi
+
+    echo "$efi_partition"
+    return 0
+}
+
+# Function to check if Windows boot files exist in the EFI partition
+check_windows_boot_files() {
+    local efi_partition=$1
+    local efi_dir_mount_point="/mnt/efi"
+
+    # Mount the EFI partition temporarily to check for Windows boot files
+    mount "$efi_partition" "$efi_dir_mount_point" &> /dev/null
+    if [ $? -ne 0 ]; then
+        echo "Failed to mount EFI partition."
+        return 1
+    fi
+
+    # Check if Windows boot files exist in /EFI/Microsoft/Boot/
+    if [ ! -f "$efi_dir_mount_point/EFI/Microsoft/Boot/bootmgfw.efi" ]; then
+        echo "Windows boot files not found in the EFI partition."
+        umount "$efi_dir_mount_point"
+        return 1
+    fi
+
+    # Clean up by unmounting the EFI partition
+    umount "$efi_dir_mount_point"
+    return 0
+}
+
+# Function to add Windows entry to systemd-boot
+add_windows_entry() {
+    local efi_partition=$1
+    local boot_loader_dir="/boot/loader/entries"
+    local windows_entry="$boot_loader_dir/windows.conf"
+
+    # Create the entry directory if it doesn't exist
+    mkdir -p "$boot_loader_dir"
+
+    # Add the Windows entry to systemd-boot
+    echo "Creating systemd-boot entry for Windows..."
+    cat <<EOF > "$windows_entry"
+title   Windows
+efi     /EFI/Microsoft/Boot/bootmgfw.efi
+options root=$efi_partition ro
+EOF
+
+    echo "Windows boot entry added successfully."
+}
+
+# Detect EFI partition and check for Windows boot files
+efi_partition=$(detect_efi_partition)
+if [ $? -eq 0 ]; then
+    check_windows_boot_files "$efi_partition"
+    if [ $? -eq 0 ]; then
+        add_windows_entry "$efi_partition"
+    else
+        echo "Windows boot files are not present. Please ensure Windows is installed properly."
+        exit 1
+    fi
+else
+    echo "Could not detect EFI partition."
+    exit 1
+fi
+
+# Reload systemd-boot to recognize the new entry
+bootctl update
+
+echo "systemd-boot entry for Windows has been added and systemd-boot has been updated."
+exit 0

raveos-gnome.sh

@@ -78,7 +78,11 @@ fi
 
 # Installing packages
 
+<<<<<<< HEAD
     sudo pacman -S gnome-console gnome-session gdm gnome-disk-utility gnome-system-monitor eog network-manager-applet networkmanager flatpak base-devel bash-completion gedit gnome-calculator baobab ffmpeg git gnome-control-center gparted gnome-tweaks gnome-browser-connector xdg-desktop-portal xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-desktop-portal-wlr ttf-ubuntu-font-family gnome-settings-daemon unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools ufw gufw rebuild-detector --noconfirm
+=======
+    sudo pacman -S gnome-console gnome-session gdm gnome-disk-utility gnome-system-monitor fuse2 eog network-manager-applet networkmanager flatpak base-devel bash-completion gedit gnome-calculator baobab ffmpeg git gnome-control-center gparted gnome-tweaks gnome-browser-connector xdg-desktop-portal xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-desktop-portal-wlr ttf-ubuntu-font-family gnome-settings-daemon unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools ufw gufw rebuild-detector --noconfirm
+>>>>>>> AlexC-main
     sudo systemctl enable gdm.service
     sudo systemctl enable NetworkManager.service
     sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target geoclue.service

raveos-hypr.sh

@@ -80,7 +80,11 @@ fi
 
 # Installing packages
 
+<<<<<<< HEAD
     sudo pacman -S tilix gnome-session gdm gnome-disk-utility gnome-system-monitor eog network-manager-applet networkmanager flatpak base-devel bash-completion gedit gnome-calculator baobab ffmpeg git gnome-control-center gparted gnome-tweaks gnome-browser-connector xdg-desktop-portal xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-desktop-portal-wlr ttf-ubuntu-font-family gnome-settings-daemon unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools ufw gufw rebuild-detector --noconfirm
+=======
+    sudo pacman -S tilix gnome-session gdm gnome-disk-utility gnome-system-monitor fuse2 eog network-manager-applet networkmanager flatpak base-devel bash-completion gedit gnome-calculator baobab ffmpeg git gnome-control-center gparted gnome-tweaks gnome-browser-connector xdg-desktop-portal xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-desktop-portal-wlr ttf-ubuntu-font-family gnome-settings-daemon unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools ufw gufw rebuild-detector --noconfirm
+>>>>>>> AlexC-main
     sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target geoclue.service
     flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
     sudo systemctl enable gdm.service

raveos-kde.sh

@@ -78,7 +78,11 @@ fi
 
 # Installing packages
 
+<<<<<<< HEAD
     sudo pacman -S sddm plasma-desktop plasma-wayland-protocols plasma-systemmonitor dolphin konsole gnome-disk-utility ark kscreen plasma-pa inkscape ksystemstats network-manager-applet networkmanager flatpak base-devel bash-completion kate kcalc baobab ffmpeg git  gparted xdg-desktop-portal xdg-desktop-portal-gtk plasma-browser-integration xdg-desktop-portal-wlr ttf-ubuntu-font-family unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools qt5-graphicaleffects qt5-quickcontrols2 ufw gufw spectacle rebuild-detector --noconfirm
+=======
+    sudo pacman -S sddm plasma-desktop plasma-wayland-protocols plasma-systemmonitor networkmanager-qt discover dolphin konsole fuse2 gnome-disk-utility ark kscreen plasma-pa inkscape ksystemstats networkmanager flatpak base-devel bash-completion kate kcalc baobab ffmpeg git gparted xdg-desktop-portal xdg-desktop-portal-gtk plasma-browser-integration xdg-desktop-portal-wlr ttf-ubuntu-font-family unzip wget glib2 glib2-devel hblock nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools qt5-graphicaleffects qt5-quickcontrols2 ufw gufw spectacle rebuild-detector gwenview --noconfirm
+>>>>>>> AlexC-main
     sudo systemctl enable NetworkManager.service
     sudo systemctl enable sddm.service
     sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target
@@ -138,6 +142,12 @@ if [[ $nVidia -gt 0 ]]; then
 	sudo mkinitcpio -P
 fi
 
+# Dark theme for GTK apps
+    yay -S adwaita-qt5-git adwaita-qt6-git --noconfirm
+    gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita'
+    echo "Dark theme has been set to GTP applications"
+    sleep 2
+
 # RaveOS Cosmetics
 
     #cp -a /home/$USER/cosmetics/burn-my-windows /home/$USER/.config/