Merge pull request #68 from JaKooLit/development

Development to Main

CHANGELOGS.md

@@ -1,5 +1,14 @@
 ## Changelogs
 
+## 04 May 2024
+- separated fonts installation script for easy debugging
+
+## 03 May 2024
+- added python3-pyquery for new weather-waybar python based on Hyprland-Dots
+
+## 02 May 2024
+- Added pyprland (hyprland plugin)
+
 ## 26 Apr 2024
 - Updated sddm.sh for Qt6 variant
 

README.md

@@ -63,6 +63,7 @@
 - By default, nvidia-dkms will be installed. and only supports GTX 900 and newer. If required to install older driver, edit the nvidia.sh in scripts-folder
 > [!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.
+- After installation, check [`THIS`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Notes_to_remember#--for-nvidia-gpu-users)
 
 #### ✨ to run
 > clone this repo (latest commit only) to reduce file size download by using git. Change directory, make executable and run the script

install-scripts/00-hypr-pkgs.sh

@@ -31,7 +31,9 @@ pipewire-alsa
 playerctl
 polkit-gnome
 python-requests
-python-pywal 
+python-pywal
+python-pyquery
+pyprland 
 qt5ct
 qt6ct
 qt6-svg
@@ -53,7 +55,7 @@ yad
 hypr_package_2=(
 brightnessctl 
 btop
-cava
+cava-git
 eog
 gnome-system-monitor
 mousepad 
@@ -66,16 +68,6 @@ vim
 yt-dlp
 )
 
-fonts=(
-adobe-source-code-pro-fonts 
-noto-fonts-emoji
-otf-font-awesome 
-ttf-droid 
-ttf-fira-code
-ttf-jetbrains-mono 
-ttf-jetbrains-mono-nerd 
-)
-
 # List of packages to uninstall as it conflicts with swaync or causing swaync to not function properly
 uninstall=(
   dunst
@@ -99,7 +91,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_hypr-pkgs.log"
 # Installation of main components
 printf "\n%s - Installing hyprland packages.... \n" "${NOTE}"
 
-for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${fonts[@]}" "${Extra[@]}"; do
+for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${Extra[@]}"; do
   install_package "$PKG1" 2>&1 | tee -a "$LOG"
   if [ $? -ne 0 ]; then
     echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"

install-scripts/fonts.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Fonts #
+
+# These fonts are minimun required for pre-configured dots to work. You can add here as required
+# WARNING! If you remove packages here, dotfiles may not work properly.
+# and also, ensure that packages are present in AUR and official Arch Repo
+
+fonts=(
+adobe-source-code-pro-fonts 
+noto-fonts-emoji
+otf-font-awesome 
+ttf-droid 
+ttf-fira-code
+ttf-jetbrains-mono 
+ttf-jetbrains-mono-nerd 
+)
+
+
+## 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)_fonts.log"
+
+
+# Installation of main components
+printf "\n%s - Installing necessary fonts.... \n" "${NOTE}"
+
+for PKG1 in "${fonts[@]}"; do
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
+  if [ $? -ne 0 ]; then
+    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
+    exit 1
+  fi
+done
+
+clear
+

install.sh

@@ -188,6 +188,9 @@ execute_script "00-hypr-pkgs.sh"
 # Install pipewire and pipewire-audio
 execute_script "pipewire.sh"
 
+# Install necessary fonts
+execute_script "fonts.sh"
+
 # Install hyprland
 execute_script "hyprland.sh"