diff --git a/README.md b/README.md index abba16e..bb4de2b 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@

-  
 Hyprland-Dots Debian repo 
    +  
 Hyprland-Dots Debian repo 
     
 Youtube 
     
 Wiki 
     
 Keybinds 
    @@ -149,7 +149,7 @@ sudo nano /etc/apt/sources.list - inside the install-scripts directory, you can edit 01-hypr-pkgs.sh. Do not edit 00-dependencies.sh unless you know what you are doing. Care though as the Hyprland Dots may not work properly! #### 💫 SDDM and GTK Themes offered -- If you opted to install SDDM theme, here's the [`LINK`](https://github.com/JaKooLit/simple-sddm) +- If you opted to install SDDM theme, here's the [`LINK`](https://codeberg.org/JaKooLit/sddm-sequoia) which is a fork of [`LINK`](https://codeberg.org/minMelody/sddm-sequoia) - If you opted to install GTK Themes, Icons, here's the [`LINK`](https://github.com/JaKooLit/GTK-themes-icons). This also includes Bibata Modern Ice cursor. #### 🔔 NOTICE TO NVIDIA OWNERS ### diff --git a/install-scripts/Global_functions.sh b/install-scripts/Global_functions.sh index e37542f..241469c 100755 --- a/install-scripts/Global_functions.sh +++ b/install-scripts/Global_functions.sh @@ -2,11 +2,6 @@ # 💫 https://github.com/JaKooLit 💫 # # Global Functions for Scripts # -# Create Directory for Install Logs -if [ ! -d Install-Logs ]; then - mkdir Install-Logs -fi - set -e # Set some colors for output messages @@ -25,36 +20,63 @@ BLUE="$(tput setaf 4)" SKY_BLUE="$(tput setaf 6)" RESET="$(tput sgr0)" +# Create Directory for Install Logs +if [ ! -d Install-Logs ]; then + mkdir Install-Logs +fi -# Function for installing packages -install_package() { - # Checking if package is already installed - if sudo dpkg -l | grep -q -w "$1" ; then - echo -e "${OK} $1 is already installed. Skipping..." - else - # Package not installed - echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" - # Making sure the package is installed - if sudo dpkg -l | grep -q -w "$1" ; then - echo -e "\e[1A\e[K${OK} Package ${YELLOW}$1${RESET} has been successfully installed!" +# Function that would show a progress +show_progress() { + local pid=$1 + local package_name=$2 + local spin_chars=("●○○○○○" "○●○○○○" "○○●○○○" "○○○●○○" "○○○○●○" "○○○○○●" \ + "○○○○●○" "○○○●○○" "○○●○○○" "○●○○○○") # Growing & Shrinking Dots + local i=0 + + tput civis # Hide cursor + printf "\r${NOTE} Installing ${YELLOW}%s${RESET} ..." "$package_name" + + while ps -p $pid &> /dev/null; do + printf "\r${NOTE} Installing ${YELLOW}%s${RESET} %s" "$package_name" "${spin_chars[i]}" + i=$(( (i + 1) % 10 )) + sleep 0.3 + done + + printf "\r${NOTE} Installing ${YELLOW}%s${RESET} ... Done!%-20s\n" "$package_name" "" + tput cnorm +} + + +# Function for re-installing packages with a progress bar +re_install_package() { + echo -e "${NOTE} Force installing ${YELLOW}$1${RESET} ..." + + # Run the reinstall command in the background + ( + stdbuf -oL sudo apt-get install --reinstall -y "$1" 2>&1 + ) >> "$LOG" 2>&1 & + PID=$! + show_progress $PID "$1" + + # Double check if the package was re-installed successfully + if dpkg -l | grep -q -w "$1"; then + echo -e "\e[1A\e[K${OK} Package ${YELLOW}$1${RESET} has been successfully re-installed!" else - # Something is missing, exiting to review the log - echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry, I have tried :(" - exit 1 + # Package was not found, installation failed + echo -e "${ERROR} $1 failed to re-install. Please check the install.log. You may need to install it manually. Sorry, I have tried :(" + exit 1 fi - fi } # Function for re-installing packages re_install_package() { - echo -e "${NOTE} Force installing $1 ..." + echo -e "${NOTE} Force installing ${YELLOW}$1${RESET} ..." # Try to reinstall the package if sudo apt-get install --reinstall -y "$1" 2>&1 | tee -a "$LOG"; then # Check if the package was installed successfully if dpkg -l | grep -q -w "$1"; then - echo -e "\e[1A\e[K${OK} Package ${YELLOW}$1${RESET} has been successfully installed!" + echo -e "\e[1A\e[K${OK} Package ${YELLOW}$1${RESET} has been successfully re-installed!" else # Package was not found, installation failed echo -e "${ERROR} $1 failed to install. Please check the install.log. You may need to install it manually. Sorry, I have tried :(" @@ -71,14 +93,14 @@ uninstall_package() { # Check if package is installed if sudo dpkg -l | grep -q -w "^ii $1" ; then # Package is installed, attempt to uninstall - echo -e "${NOTE} Uninstalling $1 ..." + echo -e "${NOTE} Uninstalling ${YELLOW}$1${RESET} ..." # Attempt to uninstall the package and its configuration files sudo apt-get autoremove -y "$1" >> "$LOG" 2>&1 # Check if the package is still installed after removal attempt if ! dpkg -l | grep -q -w "^ii $1" ; then - echo -e "\e[1A\e[K${OK} $1 was uninstalled." + echo -e "\e[1A\e[K${OK} ${MAGENTA}$1${RESET} was uninstalled." else echo -e "\e[1A\e[K${ERROR} $1 failed to uninstall. Please check the uninstall.log." exit 1 diff --git a/install-scripts/ags.sh b/install-scripts/ags.sh index 6518a3d..2d2906f 100755 --- a/install-scripts/ags.sh +++ b/install-scripts/ags.sh @@ -1,16 +1,6 @@ #!/bin/bash # 💫 https://github.com/JaKooLit 💫 # -# Aylur's GTK Shell v 1.9.0 # -# for desktop overview - -# Check if AGS is installed -if command -v ags &>/dev/null; then - AGS_VERSION=$(ags -v | awk '{print $NF}') - if [[ "$AGS_VERSION" == "1.9.0" ]]; then - echo -e "${OK} ${MAGENTA}Aylur's GTK Shell v1.9.0${RESET} is already installed. Skipping installation." - exit 0 - fi -fi +# Aylur's GTK Shell # ags=( node-typescript @@ -43,24 +33,21 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh" LOG="Install-Logs/install-$(date +%d-%H%M%S)_ags.log" MLOG="install-$(date +%d-%H%M%S)_ags2.log" -printf "\n%.0s" {1..1} - -# Installation of main components -printf "\n%s - Installing ${BLUE}Aylur's GTK shell $ags_tag${RESET} Dependencies \n" "${NOTE}" - # Installing ags Dependencies for PKG1 in "${ags[@]}"; do - install_package "$PKG1" "$LOG" - if [ $? -ne 0 ]; then - echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs" - exit 1 - fi + install_package "$PKG1" 2>&1 | tee -a "$LOG" + if [ $? -ne 0 ]; then + echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs" + exit 1 + fi done -printf "\n%.0s" {1..1} +#install typescript by npm +sudo npm install --global typescript 2>&1 | tee -a "$LOG" -# ags v1 -printf "${NOTE} Install and Compiling ${BLUE}Aylur's GTK shell $ags_tag${RESET}..\n" +# ags + +printf "${NOTE} Install and Compiling Aylurs GTK shell $ags_tag.. \n" # Check if folder exists and remove it if [ -d "ags" ]; then @@ -68,26 +55,24 @@ if [ -d "ags" ]; then rm -rf "ags" fi -printf "\n%.0s" {1..1} -printf "${INFO} Kindly Standby...cloning and compiling ${BLUE}Aylur's GTK shell $ags_tag${RESET}...\n" -printf "\n%.0s" {1..1} -# Clone repository with the specified tag and capture git output into MLOG +# Clone nwg-look repository with the specified tag if git clone --recursive -b "$ags_tag" --depth 1 https://github.com/Aylur/ags.git; then cd ags || exit 1 - npm install - meson setup build - if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then - printf "\n${OK} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG" - else - echo -e "\n${ERROR} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Installation failed\n " 2>&1 | tee -a "$MLOG" - fi + # Build and install ags + npm install + meson setup build + if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then + printf "${OK} ags installed successfully.\n" 2>&1 | tee -a "$MLOG" + else + echo -e "${ERROR} Installation failed for ags" 2>&1 | tee -a "$MLOG" + fi + # Move logs to Install-Logs directory mv "$MLOG" ../Install-Logs/ || true cd .. else - echo -e "\n${ERROR} Failed to download ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Please check your connection\n" 2>&1 | tee -a "$LOG" + echo -e "${ERROR} Failed to download ags Please check your connection" 2>&1 | tee -a "$LOG" mv "$MLOG" ../Install-Logs/ || true exit 1 fi -printf "\n%.0s" {1..2} \ No newline at end of file diff --git a/install-scripts/dotfiles-branch.sh b/install-scripts/dotfiles-branch.sh index 3d21eab..27ea029 100644 --- a/install-scripts/dotfiles-branch.sh +++ b/install-scripts/dotfiles-branch.sh @@ -3,7 +3,7 @@ # Hyprland-Dots to download from main # #specific branch or release -dots_tag="Deb-Untu-old-v-Hyprland" +dots_tag="Deb-Untu-Dots" ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## diff --git a/install.sh b/install.sh index 1c40bb6..cbeb3ff 100755 --- a/install.sh +++ b/install.sh @@ -1,10 +1,26 @@ #!/bin/bash - # https://github.com/JaKooLit +# Set some colors for output messages +OK="$(tput setaf 2)[OK]$(tput sgr0)" +ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" +NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)" +INFO="$(tput setaf 4)[INFO]$(tput sgr0)" +WARN="$(tput setaf 1)[WARN]$(tput sgr0)" +CAT="$(tput setaf 6)[ACTION]$(tput sgr0)" +MAGENTA="$(tput setaf 5)" +ORANGE="$(tput setaf 214)" +WARNING="$(tput setaf 1)" +YELLOW="$(tput setaf 3)" +GREEN="$(tput setaf 2)" +BLUE="$(tput setaf 4)" +SKY_BLUE="$(tput setaf 6)" +RESET="$(tput sgr0)" + + # Check if running as root. If root, script will exit if [[ $EUID -eq 0 ]]; then - echo "This script should not be executed as root! Exiting......." + echo "This script should ${WARNING}NOT${RESET} be executed as root! Exiting......." exit 1 fi @@ -21,41 +37,42 @@ is_ubuntu() { # Check if the system is Ubuntu if is_ubuntu; then - echo "This script is NOT intended for Ubuntu / Ubuntu Based. Refer to README for the correct link for Ubuntu-Hyprland project." + echo "${WARN}This script is ${WARNING}NOT intended for Ubuntu / Ubuntu Based${RESET}. Refer to ${YELLOW}README for the correct link for Ubuntu-Hyprland project${RESET} " exit 1 fi clear -# ASCII art -printf "\n%.0s" {1..3} -echo " | _. |/ _ _ | o _|_ " -echo " \_| (_| o |\ (_) (_) |_ | |_ " +printf "\n%.0s" {1..3} +echo -e "\e[32m | _. |/ _ _ | o _|_ \e[39m" +echo -e "\e[32m \_| (_| o |\ (_) (_) |_ | |_ 2025\e[39m" printf "\n%.0s" {1..2} # Welcome message -echo "$(tput setaf 6)Welcome to JaKooLit's Debian Trixie/SID Hyprland Install Script!$(tput sgr0)" +echo "${SKY_BLUE}Welcome to JaKooLit's Debian Trixie/SID Hyprland (2025) Install Script!${RESET}" echo -echo "$(tput setaf 166)ATTENTION: Run a full system update and reboot first!! (Highly Recommended)$(tput sgr0)" +echo "${WARNING}ATTENTION: Run a full system update and Reboot first!! (Highly Recommended) ${RESET}" echo -echo "$(tput setaf 3)NOTE: You will be required to answer some questions during the installation!$(tput sgr0)" +echo "${YELLOW}NOTE: You will be required to answer some questions during the installation! ${RESET}" echo -echo "$(tput setaf 3)NOTE: If you are installing on a VM, ensure to enable 3D acceleration; otherwise, Hyprland won't start!$(tput sgr0)" +echo "${YELLOW}NOTE: If you are installing on a VM, ensure to enable 3D acceleration else Hyprland wont start! ${RESET}" echo # Prompt user to proceed read -p "$(tput setaf 6)Would you like to proceed? (y/n): $(tput sgr0)" proceed -if [[ "$proceed" != "y" ]]; then - echo "Installation aborted." +if [ "$proceed" != "y" ]; then + printf "\n%.0s" {1..2} + echo "${INFO} Installation aborted. No changes in your system! ${MAGENTA}Goodbye!!!${RESET} " + printf "\n%.0s" {1..2} exit 1 fi -read -p "$(tput setaf 6)Have you edited your /etc/apt/sources.list? [Very Important] (y/n): $(tput sgr0)" proceed2 +read -p "${CAT} Have you edited your /etc/apt/sources.list? ${YELLOW}[Very Important else script will fail]${RESET} (y/n): ${RESET}" proceed2 if [ "$proceed2" != "y" ]; then - echo "Installation aborted Kindly edit your sources.list first. Refer to readme." + echo "Installation aborted! Kindly edit your ${YELLOW}sources.list${RESET} first. Refer to readme." exit 1 fi @@ -64,16 +81,21 @@ if [ ! -d Install-Logs ]; then mkdir Install-Logs fi -# Set some colors for output messages -OK="$(tput setaf 2)[OK]$(tput sgr0)" -ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" -NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)" -WARN="$(tput setaf 1)[WARN]$(tput sgr0)" -CAT="$(tput setaf 6)[ACTION]$(tput sgr0)" -MAGENTA=$(tput setaf 5) -WARNING=$(tput setaf 1) -YELLOW=$(tput setaf 3) -RESET=$(tput sgr0) +# Function to colorize prompts +colorize_prompt() { + local color="$1" + local message="$2" + echo -n "${color}${message}$(tput sgr0)" +} + +printf "\n%.0s" {1..1} + +# install pciutils if detected not installed. Necessary for detecting GPU +if ! dpkg -l | grep -w pciutils > /dev/null; then + echo "pciutils is not installed. Installing..." + sudo apt-get install -y pciutils +fi +printf "\n%.0s" {1..2} # Function to colorize prompts colorize_prompt() { @@ -85,21 +107,6 @@ colorize_prompt() { # Set the name of the log file to include the current date and time LOG="install-$(date +%d-%H%M%S).log" -# Initialize variables to store user responses -bluetooth="" -dots="" -gtk_themes="" -nvidia="" -nwg="" -rog="" -sddm="" -thunar="" -xdph="" -zsh="" - -# Export PKG_CONFIG_PATH for libinput -export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig - # Define the directory where your scripts are located script_directory=install-scripts @@ -149,30 +156,28 @@ execute_script() { # Collect user responses to all questions printf "\n" -ask_yes_no "-Do you have any nvidia gpu in your system?" nvidia +# Check if nvidia is present +if lspci | grep -i "nvidia" &> /dev/null; then + ask_yes_no "-${YELLOW}NVIDIA${RESET} GPU is detected. Do you want script to configure it?" nvidia +fi printf "\n" -ask_yes_no "-Install GTK themes (required for Dark/Light function)?" gtk_themes +ask_yes_no "-Install ${YELLOW}GTK themes${RESET} (required for Dark/Light function)?" gtk_themes printf "\n" -ask_yes_no "-Do you want to configure Bluetooth?" bluetooth +ask_yes_no "-Do you want to configure ${YELLOW}Bluetooth${RESET}?" bluetooth printf "\n" -ask_yes_no "-Do you want to install Thunar file manager?" thunar +ask_yes_no "-Do you want to install ${YELLOW}Thunar file manager${RESET}?" thunar printf "\n" -ask_yes_no "-Install AGS (aylur's gtk shell) v1 for Desktop Like Overview?" ags +ask_yes_no "-Install ${YELLOW}AGS (aylur's GTK shell) v1${RESET} for Desktop-Like Overview?" ags printf "\n" -ask_yes_no "-Install & configure SDDM log-in Manager plus (OPTIONAL) SDDM Theme?" sddm +ask_yes_no "-Install & configure ${YELLOW}SDDM${RESET} login manager, plus (OPTIONAL) SDDM theme?" sddm printf "\n" -ask_yes_no "-Install XDG-DESKTOP-PORTAL-HYPRLAND? (For proper Screen Share ie OBS)" xdph +ask_yes_no "-Install ${YELLOW}XDG-DESKTOP-PORTAL-HYPRLAND${RESET}? (For proper Screen Share, e.g., OBS)" xdph printf "\n" -ask_yes_no "-Install zsh & oh-my-zsh plus (OPTIONAL) pokemon-colorscripts for tty?" zsh +ask_yes_no "-Install ${YELLOW}zsh${RESET}, ${YELLOW}oh-my-zsh${RESET} & (Optional) ${YELLOW}pokemon-colorscripts${RESET}?" zsh printf "\n" - -# 14 Sep 2024, now in Debian repo -#ask_yes_no "-Install nwg-look? (a GTK Theming app - lxappearance-like) WARN! This Package Takes long time to build!" nwg -#printf "\n" - -ask_yes_no "-Installing on Asus ROG Laptops?" rog +ask_yes_no "-Installing on ${YELLOW}Asus ROG laptops${RESET}?" rog printf "\n" -ask_yes_no "-Do you want to download and install pre-configured Hyprland-dotfiles?" dots +ask_yes_no "-Do you want to download pre-configured ${YELLOW}KooL Hyprland dotfiles${RESET}?" dots printf "\n" # Ensuring all in the scripts folder are made executable @@ -180,17 +185,16 @@ chmod +x install-scripts/* printf "\n%.0s" {1..3} # check if any known login managers are active when users choose to install sddm -if [ "$sddm" == "Y" ]; then +if [ "$sddm" == "y" ] || [ "$sddm" == "Y" ]; then # List of services to check services=("gdm.service" "gdm3.service" "lightdm.service" "xdm.service" "lxdm.service") # Loop through each service for svc in "${services[@]}"; do if systemctl is-active --quiet "$svc"; then - echo "${ERROR} $svc is active. Please stop or disable it first or do not choose SDDM to install." + echo "${ERROR} ${MAGENTA}$svc${RESET} is active. stop or disable it first or ${YELLOW}DO NOT choose SDDM${RESET} to install." echo "${NOTE} If you have GDM, no need to install SDDM. GDM will work fine as Login Manager for Hyprland." - printf "\n%.0s" {1..3} - + printf "\n%.0s" {1..2} exit 1 fi done @@ -290,25 +294,40 @@ printf "\n%.0s" {1..1} # Check if either hyprland or hyprland-git is installed if dpkg -l | grep -qw hyprland; then - printf "\n${OK} Hyprland is installed. However, some essential packages may not be installed Please see above!" - printf "\n${CAT} Ignore this message if it states 'All essential packages are installed.'\n" + printf "\n${OK} Hyprland is installed. However, some essential packages may not be installed. Please see above!" + printf "\n${CAT} Ignore this message if it states ${YELLOW}All essential packages${RESET} are installed as per above\n" sleep 2 - printf "\n${NOTE} You can start Hyprland by typing 'Hyprland' (IF SDDM is not installed) (note the capital H!).\n" - printf "\n${NOTE} However, it is highly recommended to reboot your system.\n\n" + printf "\n${NOTE} You can start Hyprland by typing ${MAGENTA}Hyprland${RESET} (IF SDDM is not installed) (note the capital H!).\n" + printf "\n${NOTE} However, it is ${YELLOW}highly recommended to reboot${RESET} your system.\n\n" # Prompt user to reboot read -rp "${CAT} Would you like to reboot now? (y/n): " HYP - # Check if the user answered 'y' or 'Y' - if [[ "$HYP" =~ ^[Yy]$ ]]; then - if [[ "$nvidia" == "Y" ]]; then - echo "${NOTE} NVIDIA GPU detected. Rebooting the system..." - fi - systemctl reboot + # Normalize user input to lowercase + HYP=$(echo "$HYP" | tr '[:upper:]' '[:lower:]') + + if [[ "$HYP" == "y" || "$HYP" == "yes" ]]; then + echo "${INFO} Rebooting now..." + reboot # Optionally reboot if the user agrees + elif [[ "$HYP" == "n" || "$HYP" == "no" ]]; then + echo "${INFO} You can reboot later at any time." + else + echo "${WARN} Invalid response. Please answer with 'y' or 'n'. Exiting." + exit 1 + fi + + # Check if NVIDIA GPU is present + if lspci | grep -i "nvidia" &> /dev/null; then + echo "${INFO} ${YELLOW}NVIDIA GPU${RESET} detected. Reminder that you must REBOOT your SYSTEM..." + else + echo -e "\n${CAT} Thanks for using ${MAGENTA}KooL's Hyprland Dots${RESET}. Enjoy and Have a good day!" + printf "\n%.0s" {1..3} + exit 0 fi else # Print error message if neither package is installed - printf "\n${WARN} Hyprland failed to install. Please check 00_CHECK-time_installed.log and other files Install-Logs/ directory...\n\n" + printf "\n${WARN} Hyprland failed to install. Please check 00_CHECK-time_installed.log and other files in the Install-Logs/ directory...\n\n" + printf "\n%.0s" {1..2} exit 1 fi