Merge pull request #57 from JaKooLit/development

Updated to install.sh to integrate hyprland installer even for nvidia

README.md

@@ -34,18 +34,15 @@ sudo nano /etc/apt/sources.list
 - If you have login Manager already like GDM (gnome login manager), I highly advice not to install SDDM. But if you decide to install SDDM, see here [`Issue 2 - SDDM`](https://github.com/JaKooLit/Debian-Hyprland/issues/2)
 
 > [!NOTE]
+> UBUNTU USERS: Will only work on Ubuntu 24.04. See above!
 > For Ubuntu 24.04 LTS, no need to edit the /etc/apt/sources.list
 
 > [!IMPORTANT]
-> UBUNTU USERS: Will only work on Ubuntu 24.04. See above!
+> If you are using Gnome already, DO NOT install the SDDM. The GDM Login Manager works well with Hyprland. For some reason, during installation, you will be asked which login manager you wanted to use. But during my test, nothing happened.
-
-> If you are using Gnome already, DO NOT install the SDDM. The GDM works file as well. For some reason, during installation, you will be asked which login manager you wanted to use. But during my test, nothing happened.
-
 
 > [!CAUTION] 
 > For Ubuntu with NVIDIA GPU's, make sure to edit the install-scripts/nvidia.sh . Delete all packages in nvidia_pkg except libva-wayland2 and nvidia-vaapi-driver and uncomment/remove # before sudo ubuntu-drivers install. You also need to delete or simply just add # in the lines 37 and 38  echo "echo "## for nvidia" | sudo tee -a... and echo "deb http://deb.debian.org/debian........
 
-
 > [!WARNING] 
 > If you have GDM already as log-in manager, DO NOT install SDDM
 > You will encounter issues. See [`Issue 2 - SDDM`](https://github.com/JaKooLit/Debian-Hyprland/issues/2)
@@ -66,7 +63,7 @@ sudo nano /etc/apt/sources.list
 ![alt text](https://github.com/JaKooLit/screenshots/blob/main/Hyprland-ScreenShots/Debian/Kali-Linux1.png)
 
 #### ❕ Installed on Ubuntu 24.04 😷
-![alt text](https://github.com/JaKooLit/screenshots/blob/main/Distro-Hyprland/Ubuntu/Ubuntu-24-04.png)
+![alt text](https://github.com/JaKooLit/screenshots/blob/main/Distro-Hyprland/Ubuntu/Ubuntu-24.04-nvidia.png)
 
 
 #### 📷 More updated Screenshots Here [`Link`](https://github.com/JaKooLit/screenshots/tree/main/Hyprland-Dots-Showcase)
@@ -214,9 +211,6 @@ log into your account
 #### 👍👍👍 Thanks and Credits!
 - [`Hyprland`](https://hyprland.org/) Of course to Hyprland and @vaxerski for this awesome Dynamic Tiling Manager.
 
-#### 💌 Some screenshots shared to me via discord
-- Discord user : thunderlake.
-![alt text](https://github.com/JaKooLit/Users-screenshots/blob/main/discord/%40thunderlake.png "Discord-user")
 
 ### 💖 Support
 - a Star on my Github repos would be nice 🌟
@@ -231,3 +225,10 @@ log into your account
 
 #### 📹 Youtube videos (Click to view and watch the playlist) 📹
 [![Youtube Playlist Thumbnail](https://raw.githubusercontent.com/JaKooLit/screenshots/main/Youtube.png)](https://youtube.com/playlist?list=PLDtGd5Fw5_GjXCznR0BzCJJDIQSZJRbxx&si=iaNjLulFdsZ6AV-t)
+
+
+                        
+## 🥰🥰 💖💖 👍👍👍
+[![Stargazers over time](https://starchart.cc/JaKooLit/Debian-Hyprland.svg?variant=adaptive)](https://starchart.cc/JaKooLit/Debian-Hyprland)
+
+                    

install-scripts/nvidia.sh

@@ -54,30 +54,6 @@ add_to_file() {
     fi
 }
 
-# Clone, build, and install Hyprland using Cmake
-printf "${NOTE} Cloning Hyprland...\n"
-
-# Check if Hyprland folder exists and remove it
-if [ -d "Hyprland" ]; then
-  printf "${NOTE} Removing existing Hyprland folder...\n"
-  rm -rf "Hyprland" 2>&1 | tee -a "$LOG"
-fi
-
-if git clone --recursive -b v0.32.3 "https://github.com/hyprwm/Hyprland"; then
-  cd "Hyprland" || exit 1
-  make all
-  if sudo make install 2>&1 | tee -a "$MLOG"; then
-    printf "${OK} Hyprland installed successfully.\n" 2>&1 | tee -a "$MLOG"
-  else
-    echo -e "${ERROR} Installation failed for Hyprland." 2>&1 | tee -a "$MLOG"
-  fi
-  mv $MLOG ../Install-Logs/ || true   
-  cd ..
-else
-  echo -e "${ERROR} Download failed for Hyprland." 2>&1 | tee -a "$LOG"
-fi
-
-
 # Install additional Nvidia packages
 printf "${YELLOW} Installing Nvidia packages...\n"
   for NVIDIA in "${nvidia_pkg[@]}"; do

install.sh

@@ -32,7 +32,7 @@ if [ "$proceed" != "y" ]; then
     exit 1
 fi
 
-read -p "$(tput setaf 6)Have you edited your /etc/apt/sources.list? (y/n): $(tput sgr0)" proceed2
+read -p "$(tput setaf 6)Have you edited your /etc/apt/sources.list? [Debian only] (y/n): $(tput sgr0)" proceed2
 
 if [ "$proceed2" != "y" ]; then
     echo "Installation aborted Kindly edit your sources.list first. Refer to readme."
@@ -167,6 +167,7 @@ execute_script "hyprlang.sh"
 execute_script "hyprlock.sh"
 execute_script "hyprcursor.sh"
 execute_script "hypridle.sh"
+execute_script "hyprland.sh"
 
 #execute_script "cliphist.sh"
 
@@ -174,10 +175,6 @@ if [ "$nvidia" == "Y" ]; then
     execute_script "nvidia.sh"
 fi
 
-if [ "$nvidia" == "N" ]; then
-    execute_script "hyprland.sh"
-fi
-
 if [ "$gtk_themes" == "Y" ]; then
     execute_script "gtk_themes.sh"
 fi