added resolv.conf to backup script

Reviewed-on: RP1/RaveOS-arch#27

3progs.sh

@@ -12,12 +12,18 @@ cd /home/$USER/.progs
 mkdir -p /home/$USER/.local/share/applications/
 cp -a rp-programscript.desktop /home/$USER/.local/share/applications/ 2>/dev/null
 echo "Exec=/home/$USER/.progs/3progs.sh" >> /home/$USER/.local/share/applications/rp-programscript.desktop 2>/dev/null
+
+
 sudo rm /usr/share/applications/qv4l2.desktop 2>/dev/null
 sudo rm /usr/share/applications/qvidcap.desktop 2>/dev/null
 sudo rm /usr/share/applications/avahi-discover.desktop 2>/dev/null
 sudo rm /usr/share/applications/bssh.desktop 2>/dev/null
 sudo rm /usr/share/applications/bvnc.desktop 2>/dev/null
-
+flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+echo "[User]
+Session=
+Icon=/usr/share/backgrounds/rave-pp.png
+SystemAccount=false" | sudo tee /var/lib/AccountsService/users/$USER 2>/dev/null
 
 # Steam GPU Grep from Lordify
    # nVidia=$(lspci -P | grep "NVIDIA" -c)
@@ -80,6 +86,7 @@ user_choice=$(zenity --list --checklist --width='1000' --height='1000' \
   FALSE "Spotube - Ingyenes Premium Spotify Zenelejátszó Linuxra" \
   FALSE "Steam Launcher" \
   FALSE "Systemd boot mod - 0sec varakozas bootolaskor" \
+  FALSE "Systemd boot mod - 3sec varakozas bootolaskor" \
   FALSE "TeamSpeak3 - TeamSpeak VOIP kliens" \
   FALSE "Telegram - Titkosított üzenetküldő" \
   FALSE "Vibrant - Szín szaturáció beállító program" \
@@ -157,6 +164,10 @@ if [[ $user_choice = *"Steam Launcher"* ]]; then
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Steam Launcher${normal}
     
+    nVidia=$(lspci -P | grep "NVIDIA" -c)
+    if [[ $nVidia -eq 0 ]]; then
+    sudo pacman -S vulkan-radeon lib32-vulkan-radeon --noconfirm
+    fi
     sudo pacman -S steam-native-runtime --noconfirm
     sudo chmod +x update-proton-ge
     ./update-proton-ge
@@ -180,6 +191,18 @@ if [[ $user_choice = *"Systemd boot mod - 0sec varakozas bootolaskor"* ]]; then
   echo
 fi
 
+if [[ $user_choice = *"Systemd boot mod - 3sec varakozas bootolaskor"* ]]; then
+  echo
+  echo ---------------------------------------------
+  echo Installing ${bold}${yellow}Systemd boot mod${normal}
+
+    sudo sed -i 's/timeout 0/timeout 3/' /boot/loader/loader.conf
+
+  echo ${bold}${yellow}Systemd boot mod ${normal}installed.
+  echo ---------------------------------------------
+  echo
+fi
+
 if [[ $user_choice = *"Heroic Launcher - Epic Games Launcher Linux verziója"* ]]; then
   echo
   echo ---------------------------------------------
@@ -309,7 +332,6 @@ if [[ $user_choice = *"CoreCTRL - AMD GPU beállító alkalmazás"* ]]; then
   echo Installing ${bold}${yellow}CoreCTRL and User Settings${normal}
 
   sudo pacman -S corectrl --noconfirm
-  #systemd missing
   cp /usr/share/applications/org.corectrl.CoreCtrl.desktop ~/.config/autostart/
   echo "polkit.addRule(function(action, subject) {
     if ((action.id == \"org.corectrl.helper.init\" ||

backup-raveos.sh

@@ -1,14 +1,17 @@
 #!/bin/bash
 
+Locale=$(locale | grep "LANG")
+Desktop=$XDG_CURRENT_DESKTOP
+
 # Text modifiers
 bold=$(tput bold)      # ${bold}
 normal=$(tput sgr0)    # ${normal}
 yellow=$(tput setaf 3) # ${yellow}
 
-zenity --info --title='Please pick a folder!' --text='Choose a folder!' --width='300' --height='100'
+zenity --info --title='Please pick a folder!' --text='Choose a folder!' --width='300' --height='100' 2>/dev/null
 
 # Folder variable
-FOLDER=$(zenity  --file-selection --title="Choose a backup directory" --directory)
+FOLDER=$(zenity  --file-selection --title="Choose a backup directory" --directory 2>/dev/null )
 if [[ $? -eq 1 ]]; then
    echo You did not pick a ${bold}${yellow}folder.${normal} Exiting!
    exit 1
@@ -22,7 +25,7 @@ user_choice=$(zenity --list --checklist --width='600' --height='400' \
   --text="Select from the options below" \
   --column="Select" --column="Name" \
   FALSE "BACKUP All of My Data and Settings" \
-  FALSE "RESTORE All of My Data and Settings")
+  FALSE "RESTORE All of My Data and Settings" 2>/dev/null )
 if [[ $? -eq 1 ]]; then
    echo You did not pick an ${bold}${yellow}option.${normal} Exiting!
    exit 1
@@ -31,39 +34,52 @@ sudo echo
 
 if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then
   cd
-  Locale=$(locale | grep "LANG" -c)
-  Desktop=$XDG_CURRENT_DESKTOP
   echo
   echo -----------------------------------------------------
   echo Copying ${bold}${yellow}$USER Settings and Files${normal} into ${bold}${yellow}$FOLDER/${normal}
   
-  rsync -ap --info=progress2 /home/$USER/Games $FOLDER
+  rsync -ap --info=progress2 /home/$USER/Games $FOLDER 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.librewolf $FOLDER 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.steam $FOLDER 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.icons $FOLDER 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.themes $FOLDER 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.mozilla $FOLDER 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.ts3client $FOLDER 2>/dev/null
   
   mkdir -p $FOLDER/.config
   rsync -ap --info=progress2 /home/$USER/.config/Bitwarden $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/heroic $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/burn-my-windows $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/btop $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/input-remapper-2 $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/Mumble $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/libvirt $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/corectrl $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/corectrl.ini $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/czkawka $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/vivaldi $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/BraveSoftware $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/FreeTube $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/libreoffice $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/dosbox-x $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/pavucontrol.ini $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/keepassxc $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/spotify $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/spotube $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/gtk-4.0 $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/qBittorrent $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/onlyoffice $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/jellyfin.org $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/nomacs $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/tutanota-desktop $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/kdeglobals $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/kdenliverc $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/kdenlive-layoutsrc $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/Signal $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/smplayer $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/discord $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/Vencord $FOLDER/.config 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.config/torbrowser $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/goverlay $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/MangoHud $FOLDER/.config 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.config/easyeffects $FOLDER/.config 2>/dev/null
@@ -80,24 +96,40 @@ if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then
   rsync -ap --info=progress2 /home/$USER/.local/share/flatpak/overrides/ $FOLDER/.local/share/flatpak 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.local/share/lutris $FOLDER/.local/share 2>/dev/null
   rsync -ap --info=progress2 /home/$USER/.local/share/TelegramDesktop $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/jellyfinmediaplayer $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/Jellyfin\ Media\ Player/ $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/Steam $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/oss.krtirtho.spotube $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/org.gnome.TextEditor $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/kdenlive $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/krusader $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/lutris $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/Mumble $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/nomacs $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/onlyoffice $FOLDER/.local/share 2>/dev/null
+  rsync -ap --info=progress2 /home/$USER/.local/share/torbrowser $FOLDER/.local/share 2>/dev/null
+  
+
   
   mkdir -p $FOLDER/.var/app/
   rsync -ap --info=progress2 /home/$USER/.var/app/ $FOLDER/.var/app 2>/dev/null
 
-  mkdir  $FOLDER/etc/
+  mkdir -p $FOLDER/etc/
-  sudo rsync -ap --info=progress2 /etc/libvirt $FOLDER 2>/dev/null
+  sudo rsync -ap --info=progress2 /etc/libvirt $FOLDER/etc 2>/dev/null
+  sudo rsync -ap --info=progress2 /etc/resolv.conf $FOLDER/etc 2>/dev/null
 
   sudo rsync -ap --info=progress2 /usr/share/jellyfin/web/config.json $FOLDER 2>/dev/null
 
   if [[ $Locale == LANG=hu_HU.UTF-8 ]]; then
     echo ${bold}${yellow}Hungarian Language detected.${normal}
     # HU lang
-    rsync -ap --info=progress2 /home/$USER/Asztal/ $FOLDER/
+    rsync -ap --info=progress2 /home/$USER/Asztal/ $FOLDER
-    rsync -ap --info=progress2 /home/$USER/Dokumentumok/ $FOLDER/
+    rsync -ap --info=progress2 /home/$USER/Dokumentumok/ $FOLDER
-    rsync -ap --info=progress2 /home/$USER/Letöltések/ $FOLDER/
+    rsync -ap --info=progress2 /home/$USER/Letöltések/ $FOLDER
-    rsync -ap --info=progress2 /home/$USER/Zenék/ $FOLDER/
+    rsync -ap --info=progress2 /home/$USER/Zenék/ $FOLDER
-    rsync -ap --info=progress2 /home/$USER/Képek/ $FOLDER/
+    rsync -ap --info=progress2 /home/$USER/Képek/ $FOLDER
-    rsync -ap --info=progress2 /home/$USER/Videók/ $FOLDER/
+    rsync -ap --info=progress2 /home/$USER/Videók/ $FOLDER
+    rsync -ap --info=progress2 /home/$USER/Calibre\ Library/ $FOLDER 2>/dev/null
   else
     echo ${bold}${yellow}English Language detected.${normal}
     # EN lang
@@ -107,6 +139,7 @@ if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then
     rsync -ap --info=progress2 /home/$USER/Music $FOLDER 
     rsync -ap --info=progress2 /home/$USER/Pictures $FOLDER 
     rsync -ap --info=progress2 /home/$USER/Videos $FOLDER
+    rsync -ap --info=progress2 /home/$USER/Calibre\ Library/ $FOLDER 2>/dev/null
   fi
   
   if [[ $Desktop == GNOME ]]; then
@@ -122,26 +155,29 @@ if [[ $user_choice = *"BACKUP All of My Data and Settings"* ]]; then
     rsync -ap --info=progress2 /home/$USER/.local/state/dolphinstaterc $FOLDER/.local/state
   fi
   
-  echo ${bold}${yellow}$USER files and settings are copied. ${normal}
+  echo ${bold}${yellow}$USER Files and Settings are backed up! ${normal}
   echo -----------------------------------------------------
   echo
+  
+  sudo chown -R $USER:$GROUP $FOLDER
+  echo ${bold}${yellow} BACKUP SCRIPT FINISHED SUCCESSFULLY! ${normal}
 fi
 
-if [[ $user_choice = *"Restore all of my data and settings"* ]]; then
+if [[ $user_choice = *"RESTORE All of My Data and Settings"* ]]; then
-  Locale=$(locale | grep "LANG")
-  Desktop=$XDG_CURRENT_DESKTOP
   echo
   echo -----------------------------------------------------
-  echo Copying ${bold}${yellow}Restoring $USER Settings and Files ${normal} into ${bold}${yellow}$FOLDER/${normal}
+  echo Copying ${bold}${yellow}Restoring - $USER - Settings and Files ${normal} into ${bold}${yellow}$FOLDER/${normal}
  
-  sudo rsync -ap --info=progress2 $FOLDER/etc/libvirt /etc/
+  sudo rsync -ap --info=progress2 $FOLDER/etc/libvirt /etc/ 2>/dev/null
-  sudo rsync -ap --info=progress2 $FOLDER/config.json /usr/share/jellyfin/web/
+  sudo rsync -ap --info=progress2 $FOLDER/config.json /usr/share/jellyfin/web/ 2>/dev/null
-  rsync -ap --info=progress2 $FOLDER /home/$USER/
+  sudo rsync -ap --info=progress2 $FOLDER /home/$USER/
 
   if [[ $Desktop == GNOME ]]; then
   # GNOME SECTION
     echo ${bold}${yellow}GNOME Detected - Loading Dconf${normal}
     dconf load / < $FOLDER/$USER-ui
+    echo
+    echo ${bold}${yellow} Dconf loaded${normal}
   else
   # KDE Section
     echo ${bold}${yellow}KDE Detected - Loading Konsave${normal}
@@ -151,7 +187,5 @@ if [[ $user_choice = *"Restore all of my data and settings"* ]]; then
   echo -----------------------------------------------------
   sudo chown -R $USER:$GROUP /home/$USER/
   echo
-  echo ${bold}${yellow}$USER settings RESTORED! ${normal}
+  echo ${bold}${yellow}SETTINGS RESTORED SUCCESSFULLY! ${normal}
 fi
-
-exit 1

post-install.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+echo "[User]
+Session=
+Icon=/usr/share/backgrounds/rave-pp.png
+SystemAccount=false" | sudo tee /var/lib/AccountsService/users/$USER
+
+# Adding ucode to boot entries - Credit Lordify
+CPU=$(lscpu | grep "AMD" -c)
+  if [[ $CPU -gt 0 ]]; then
+	  echo "initrd   /amd-ucode.img" | sudo tee -a /boot/loader/entries/linux-zen.conf
+  else
+	  echo "initrd   /intel-ucode.img" | sudo tee -a /boot/loader/entries/linux-zen.conf
+  fi
+
+flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+
+reboot

raveos-gnome.sh

@@ -78,7 +78,7 @@ fi
 
 # Installing packages
 
-    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 noto-fonts-emoji noto-fonts noto-fonts-extra 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 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 noto-fonts-emoji noto-fonts noto-fonts-extra nano qt5-wayland meson rsync zenity mesa-utils gvfs gvfs-mtp gvfs-smb android-tools wmctrl python-setuptools ufw gufw rebuild-detector --noconfirm
     sudo systemctl enable gdm.service
     sudo systemctl enable NetworkManager.service
     sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target geoclue.service