Merge pull request #127 from JaKooLit/main

synchronize Main to Development

README.md

@@ -142,14 +142,14 @@ sudo nano /etc/apt/sources.list
 - nwg-look is a utility to costumize your GTK theme. It's a LXAppearance like. Its a good tool though but this package is entirely optional
 
 #### ✨ Costumize the packages to be installed
-- inside the install-scripts folder, you can edit 00-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!
+- inside the install-scripts directory, you can edit 00-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 GTK Themes, Icons here's the [`LINK`](https://github.com/JaKooLit/GTK-themes-icons) & Bibata Cursor Modern Ice (assets directory)
 
 #### 🔔 NOTICE TO NVIDIA OWNERS ### 
-- by default it is installing the latest and newest nvidia drivers. If you have an older nvidia-gpu (GTX 800 series and older), check out nvidia-debian website [`LINK`](https://wiki.debian.org/NvidiaGraphicsDrivers) and edit nvidia.sh in install-scripts folder to install proper gpu driver
+- by default it is installing the latest and newest nvidia drivers. If you have an older nvidia-gpu (GTX 800 series and older), check out nvidia-debian website [`LINK`](https://wiki.debian.org/NvidiaGraphicsDrivers) and edit nvidia.sh in install-scripts directory to install proper gpu driver
 > [!IMPORTANT]
 > If you want to use nouveau driver, choose N when asked if you have nvidia gpu. This is because the nvidia installer part, it will blacklist nouveau. Hyprland will still be installed but it will skip blacklisting nouveau.
 
@@ -236,9 +236,12 @@ source ~/.zshrc
 - for the install part, kindly open issue on this repo
 - for the Pre-configured Hyprland dots / configuration, submit issue [`here`](https://github.com/JaKooLit/Hyprland-Dots/issues)
 
-#### 🔧 Proper way to re-installing a particular script from install-scripts folder
+#### 🔧 Proper way to re-installing a particular script from install-scripts directory
 - CD into Debian-Hyprland Folder and then ran the below command. 
-- i.e. `./install-scripts/gtk-themes` - For reinstall GTK Themes. 
+- i.e. `./install-scripts/gtk-themes.sh` - For reinstall GTK Themes or
+- `./install-scripts/sddm.sh` - For reinstall sddm
+> [!IMPORTANT]
+> DO NOT cd into install-scripts directory as script will most likely to fail
 
 #### 🛣️ Roadmap:
 - [ ] possibly adding gruvbox themes, cursors, icons

install-scripts/00-hypr-pkgs.sh

@@ -30,6 +30,7 @@ hypr_package=(
   qt6ct
   slurp
   sway-notification-center
+  swappy
   waybar
   wget
   wl-clipboard

install-scripts/dotfiles.sh

@@ -3,7 +3,7 @@
 # Hyprland-Dots to download a specific release #
 
 # Define the specific release version to download
-specific_version="v2.3"
+specific_version="v2.3.1-1"
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 

install-scripts/swappy.sh

@@ -1,45 +0,0 @@
-#!/bin/bash
-# 💫 https://github.com/JaKooLit 💫 #
-# swappy - for screenshot) #
-
-## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
-# Determine the directory where the script is located
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Change the working directory to the parent directory of the script
-PARENT_DIR="$SCRIPT_DIR/.."
-cd "$PARENT_DIR" || exit 1
-
-source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
-
-# Set the name of the log file to include the current date and time
-LOG="Install-Logs/install-$(date +%d-%H%M%S)_swappy2.log"
-MLOG="install-$(date +%d-%H%M%S)_swappy.log"
-
-printf "${NOTE} Installing swappy..\n"
-
-# Check if swappy folder exists
-if [ -d "swappy" ]; then
-  printf "${NOTE} swappy folder exists. Pulling latest changes...\n"
-  cd swappy || exit 1
-  git pull origin master 2>&1 | tee -a "$MLOG"
-else
-  printf "${NOTE} Cloning swappy repository...\n"
-  if git clone https://github.com/jtheoof/swappy.git; then
-    cd swappy || exit 1
-  else
-    echo -e "${ERROR} Download failed for swappy" 2>&1 | tee -a "$LOG"
-    exit 1
-  fi
-fi
-
-# Proceed with the installation steps
-meson build
-ninja -C build
-sudo ninja -C build install 2>&1 | tee -a "$MLOG"
-
-# Moving logs into main Install-Logs
-mv "$MLOG" ../Install-Logs/ || true 
-cd - || exit 1
-
-clear

install-scripts/xdph.sh

@@ -38,7 +38,7 @@ fi
 
 # Clone and build xdg-desktop-portal-hyprland
 printf "${NOTE} Installing xdg-desktop-portal-hyprland...\n"
-if git clone -b $xdph_tag --recursive https://github.com/hyprwm/xdg-desktop-portal-hyprland; then
+if git clone --recursive https://github.com/hyprwm/xdg-desktop-portal-hyprland; then
     cd xdg-desktop-portal-hyprland || exit 1
 	cmake -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib -DCMAKE_INSTALL_PREFIX=/usr -B build
 	cmake --build build

install.sh

@@ -159,17 +159,16 @@ execute_script "00-dependencies.sh"
 execute_script "00-hypr-pkgs.sh"
 execute_script "fonts.sh"
 execute_script "imagemagick.sh"
-execute_script "swappy.sh"
 execute_script "swww.sh"
 execute_script "rofi-wayland.sh"
 execute_script "wallust.sh"
 execute_script "ags.sh"
+execute_script "hyprutils.sh"
 execute_script "hyprlang.sh"
 execute_script "hyprlock.sh"
 execute_script "hyprcursor.sh"
 execute_script "hypridle.sh"
 execute_script "hyprwayland-scanner.sh"
-execute_script "hyprutils.sh"
 execute_script "hyprland.sh"
 execute_script "hypr-eco.sh"
 # execute_script "waybar-git.sh" only if waybar on repo is old