From 9ce2128213fc9127c17928edd262fd9586c73825 Mon Sep 17 00:00:00 2001
From: RP1 <you@example.com>
Date: Fri, 22 Nov 2024 14:38:23 +0100
Subject: [PATCH] RP Cosmetics part added

---
 1update-gnome.sh | 70 ++++++++++++++----------------------------------
 1 file changed, 20 insertions(+), 50 deletions(-)

diff --git a/1update-gnome.sh b/1update-gnome.sh
index ee3a941..bdf7861 100644
--- a/1update-gnome.sh
+++ b/1update-gnome.sh
@@ -82,29 +82,38 @@ echo ---------------------------------------------
   echo ${bold}${yellow}Yaru theme ${normal}installed.
   echo ---------------------------------------------
 
-# Setting Yaru Dark Black Theme
+# RP Cosmetics
   echo ---------------------------------------------
   echo Installing ${bold}${yellow}Setting correct Rave Theme${normal}
   echo
+    sudo cp -a rave-pp /usr/share/pixmaps/faces/
+    sudo sed -i '7 i Icon=/usr/share/pixmaps/faces/rave-pp' /var/lib/AccountsService/users/$USER
+    sudo cp -a .themes /home/$USER/
+    sudo cp -a .icons /home/$USER/
+    sudo cp -a .mozilla /home/$USER/
     gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-purple-dark'
     gsettings set org.gnome.desktop.interface cursor-theme 'Yaru'
     gsettings set org.gnome.desktop.interface icon-theme 'Yaru-purple-dark'
     gsettings set org.gnome.desktop.sound theme-name 'Yaru'
     gsettings set org.x.apps.portal color-scheme prefer-dark
-  echo
-  echo ${bold}${yellow}Correct Rave Theme ${normal}set.
-  echo ---------------------------------------------
-
-# Gsettings changes
-  echo ---------------------------------------------
-  echo Installing ${bold}${yellow}Setting UI Preferences before DCONF${normal}
-  echo
     gsettings set org.gnome.desktop.screensaver lock-enabled false
     gsettings set org.gnome.desktop.session idle-delay 0
     gsettings set org.gnome.desktop.wm.preferences button-layout ":minimize,maximize,close"
     gsettings set org.gnome.mutter center-new-windows true
+    sudo rsync -ap --info=progress2 raveos-bg.png #/usr/share/backgrounds/
+    sudo rsync -ap --info=progress2 gnome-shell /home/$USER/.local/share/
+    sudo rsync -ap --info=progress2 burn-my-windows /home/$USER/.config/
+    sudo apt install git -y
+    git clone --depth=1 https://github.com/realmazharhussain/gdm-tools.git
+    sudo rsync -ap --info=progress2 install.sh gdm-settings/
+    cd gdm-tools
+    ./install.sh
+    cd -
+    set-gdm-theme set Yaru-purple-dark /usr/share/backgrounds/raveos-bg.png
+    dconf load / < raveui-*
+    sudo rm -rf gdm-tools  
   echo
-  echo ${bold}${yellow}UI Preferences before DCONF ${normal}set.
+  echo ${bold}${yellow}Correct Rave Theme ${normal}set.
   echo ---------------------------------------------
 
 # Disabling Geoclue
@@ -168,42 +177,8 @@ echo
   echo ${bold}${yellow}System upgraded!${normal}
   echo ---------------------------------------------
   
-
-
 fwupdmgr update
 
-# User beállítások 
-  echo
-  echo ---------------------------------------------
-  echo Installing ${bold}${yellow}User settings${normal}
-
-  sudo rsync -ap --info=progress2 raveos-bg.png /usr/share/backgrounds/
-  sudo rsync -ap --info=progress2 gnome-shell /home/$USER/.local/share/
-  sudo rsync -ap --info=progress2 burn-my-windows /home/$USER/.config/
-  sudo apt install git -y
-  git clone --depth=1 https://github.com/realmazharhussain/gdm-tools.git
-  sudo rsync -ap --info=progress2 install.sh gdm-settings/
-  cd gdm-tools
-  ./install.sh
-  cd -
-  set-gdm-theme set Yaru-purple-dark /usr/share/backgrounds/raveos-bg.png
-  dconf load / < raveui-*
-  sudo rm -rf gdm-tools  
-
-  echo ${bold}${yellow}User settings ${normal}installed.
-  echo ---------------------------------------------
-  
-  echo
-  echo ---------------------------------------------
-  echo Installing ${bold}${yellow}Gnome Extension Manager - DEB Pkg${normal}
-
-      sudo apt install gnome-shell-extensions -y
-
-  echo ${bold}${yellow}Gnome Extension Manager / All Gnome Extensions ${normal}installed.
-  echo ---------------------------------------------
-  
-  dconf load / < raveui*
-
 
 if [[ $user_choice = *"AMD GPU - Angol Nyelv"* ]]; then
 
@@ -212,12 +187,7 @@ if [[ $user_choice = *"AMD GPU - Angol Nyelv"* ]]; then
   echo ---------------------------------------------
   echo Enabling ${bold}${yellow}Wayland Window Manager${normal}
   echo
-    sudo cp -a rave-pp /usr/share/pixmaps/faces/
-    sudo sed -i '7 i Icon=/usr/share/pixmaps/faces/rave-pp' /var/lib/AccountsService/users/$USER
-    sudo sed -i 's/Session=/Session=wayland' /var/lib/AccountsService/users/$USER
-    sudo cp -a .themes /home/$USER/
-    sudo cp -a .icons /home/$USER/
-    sudo cp -a .mozilla /home/$USER/
+    
   echo
   echo ${bold}${yellow}Wayland Window Manager ${normal}enabled.
   echo ---------------------------------------------