Merge pull request #75 from JaKooLit/development

Releasing a new installer to work with Hyprland-Dots v2.2.11

CHANGELOGS.md

@@ -1,5 +1,34 @@
 ## Changelogs
 
+## 10 May 2024
+- added wallust-git and remove python-pywal for migration to wallust on Hyprland-Dots v2.2.11
+
+## 08 May 2024
+- Adjusted sddm.sh since it does not respect preset.sh
+- install.sh have been rearranged so it quits if user choose not to proceed
+
+## 07 May 2024
+- Minor typo change on nvidia.sh
+- switch back to cava since installing cava-git keep it hanging (see known-issue on readme)
+
+## 05 May 2024
+- switched to rofi-wayland Extra Repo
+
+## 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
+
+## 23 Apr 2024
+- Dropping swayidle and swaylock in favor of hypridle and hyprlock
+
 ## 20 Apr 2024
 - Change default Oh-my-zsh theme to xiong-chiamiov-plus
 

README.md

@@ -9,6 +9,17 @@
 </div>
 
 #### Hyprland-Dots-showcase
+
+
+
+https://github.com/JaKooLit/Arch-Hyprland/assets/85185940/84e3948f-edbf-45b8-9e3f-1f6699e3830a
+
+
+### Gallery and Videos
+<details>
+<summary>
+📷 Screenshots
+</summary>
 <p align="center">
     <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Hyprland-ScreenShots/Arch-v2/Arch-Default-Layout.png" /> <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Hyprland-Dots-Showcase/dark-theme.png" />   
    <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Hyprland-Dots-Showcase/Light-theme.png" /> <img align="center" width="49%" src="https://raw.githubusercontent.com/JaKooLit/screenshots/main/Hyprland-ScreenShots/Arch-v2/Another-Screenshot.png"" /> 
@@ -29,6 +40,7 @@
 
 #### 📽️ youtube video showcase: [`Link`](https://youtu.be/W2UFwkgdwNo)
 
+</details>
     
 ### 🪧🪧🪧 ANNOUNCEMENT 🪧🪧🪧
 - This Repo does not contain Hyprland Dots or configs! Dotfiles can be checked here [`Hyprland-Dots`](https://github.com/JaKooLit/Hyprland-Dots) . During installation, if you opt to copy installation, it will be downloaded from that centralized repo.
@@ -42,30 +54,35 @@
 > [!NOTE]
 > Main reason why I have not included an uninstallation script is simple. Some packages maybe already installed on your system by default. If I create an uninstall script with packages that I have set to install, you may end up a unrecoverable system. 
 
+> [!WARNING] 
+> Download this script on a directory where you have write permissions. ie. HOME. Or any directory within your home directory. Else script will fail
+
 #### 🆕  Prerequisites
 - This install script is intended for atleast Server type / Minimal Arch Linux installed.
 
-#### 🔘 Pipewire and Pipewire audio
+> [!NOTE]
-- This script will install pipewire and will also disable or will uninstall pulseaudio. If you dont want it, you can simply just delete pipewire.sh in install-scripts folder before installing. 
+> 🔘 Pipewire and Pipewire audio
+- This script will install pipewire and will also disable or will uninstall pulseaudio. If you dont want it, edit install.sh, about line 191 and comment the line  `execute_script "pipewire.sh"` or you can simply just delete pipewire.sh in install-scripts folder before installing. 
 
 #### ✨ Costumize the packages to be installed
 - inside the install-scripts folder, you can edit 00-hypr-pkgs.sh. Care though as the Hyprland Dots may not work properly!
 - default GTK theme if agreed to be installed is Tokyo night GTK themes (dark and light) + Tokyo night SE icons
 
 #### 💫 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://github.com/JaKooLit/simple-sddm-2)
 - If you opted to install GTK Themes, Icons and Cursor offered are Tokyo Nights. [`LINK`](https://github.com/JaKooLit/GTK-themes-icons) & Bibata Cursor Modern Ice 
 
 #### 👀 NVidia GPU Owners.
 - 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
 ```bash
-git clone --depth=1 https://github.com/JaKooLit/Arch-Hyprland.git
+git clone --depth=1 https://github.com/JaKooLit/Arch-Hyprland.git ~/Arch-Hyprland
-cd Arch-Hyprland
+cd ~/Arch-Hyprland
 chmod +x install.sh
 ./install.sh
 ```
@@ -119,6 +136,10 @@ log into your account
 
 - more info from the hyprland wiki [`Hyprland Wiki Link`](https://wiki.hyprland.org/FAQ/#my-external-monitor-is-blank--doesnt-render--receives-no-signal-laptop)
 
+
+- installing of cava-git on a newly installed Arch makes the install keep hanging. Switched back to cava. After booting and logged in, if cava dont work, replace it cava-git `yay -S cava-git` or `paru -S cava-git` 
+
+
 #### 🫥 Improving performance for Older Nvidia Cards using driver 470
   - [`SEE HERE`](https://github.com/JaKooLit/Hyprland-Dots/discussions/123#discussion-6035205)
   
@@ -142,3 +163,7 @@ 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/Arch-Hyprland.svg?variant=adaptive)](https://starchart.cc/JaKooLit/Arch-Hyprland)

install-scripts/00-hypr-pkgs.sh

@@ -12,11 +12,14 @@ Extra=(
 )
 
 hypr_package=( 
+aylurs-gtk-shell
 cliphist
 curl 
 grim 
 gvfs 
 gvfs-mtp
+hypridle
+hyprlock
 imagemagick 
 jq
 kitty
@@ -29,17 +32,17 @@ pipewire-alsa
 playerctl
 polkit-gnome
 python-requests
-python-pywal 
+python-pyquery
+pyprland 
 qt5ct
 qt6ct
 qt6-svg
-rofi-lbonn-wayland-git 
+rofi-wayland
 slurp 
 swappy 
-swayidle 
-swaylock-effects-git
 swaync 
 swww
+wallust-git 
 waybar
 wget
 wl-clipboard
@@ -66,16 +69,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,10 +92,10 @@ 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 install had failed, please check the log"
+    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
     exit 1
   fi
 done
@@ -112,7 +105,7 @@ printf "\n%s - Checking if mako or dunst are installed and removing for swaync t
 for PKG in "${uninstall[@]}"; do
   uninstall_package "$PKG" 2>&1 | tee -a "$LOG"
   if [ $? -ne 0 ]; then
-    echo -e "\e[1A\e[K${ERROR} - $PKG uninstallation had failed, please check the log"
+    echo -e "\e[1A\e[K${ERROR} - $PKG uninstallation failed, please check the log"
     exit 1
   fi
 done

install-scripts/bluetooth.sh

@@ -25,7 +25,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_bluetooth.log"
 printf "${NOTE} Installing Bluetooth Packages...\n"
  for BLUE in "${blue[@]}"; do
    install_package "$BLUE" 2>&1 | tee -a "$LOG"
-   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $BLUE install had failed, please check the install.log"; exit 1; }
+   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $BLUE Package installation failed, Please check the installation logs"; exit 1; }
   done
 
 printf " Activating Bluetooth Services...\n"

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-scripts/gtk_themes.sh

@@ -26,7 +26,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_themes.log"
 for PKG1 in "${engine[@]}"; do
     install_package "$PKG1" 2>&1 | tee -a "$LOG"
     if [ $? -ne 0 ]; then
-        echo -e "\033[1A\033[K${ERROR} - $PKG1 install had failed, please check the install.log"
+        echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
         exit 1
     fi
 done

install-scripts/hyprland.sh

@@ -34,7 +34,7 @@ fi
 printf "${NOTE} Installing Hyprland .......\n"
  for HYPR in "${hypr[@]}"; do
    install_package "$HYPR" 2>&1 | tee -a "$LOG"
-   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $HYPR install had failed, please check the install.log"; exit 1; }
+   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $HYPR Package installation failed, Please check the installation logs"; exit 1; }
 done
 
 clear

install-scripts/nvidia.sh

@@ -13,11 +13,6 @@ nvidia_pkg=(
   libva-nvidia-driver-git
 )
 
-hypr=(
-  hyprland
-  hyprcursor
-)
-
 ## 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 )"
@@ -35,19 +30,12 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_nvidia.log"
 # nvidia stuff
 printf "${YELLOW} Checking for other hyprland packages and remove if any..${RESET}\n"
 if pacman -Qs hyprland > /dev/null; then
-  printf "${YELLOW} Hyprland detected. uninstalling to install Hyprland-git...${RESET}\n"
+  printf "${YELLOW} Hyprland detected. uninstalling to install Hyprland from official repo...${RESET}\n"
     for hyprnvi in hyprland-git hyprland-nvidia hyprland-nvidia-git hyprland-nvidia-hidpi-git; do
     sudo pacman -R --noconfirm "$hyprnvi" 2>/dev/null | tee -a "$LOG" || true
     done
 fi
 
-# Hyprland
-printf "${NOTE} Installing Hyprland......\n"
- for HYPR in "${hypr[@]}"; do
-   install_package "$HYPR" 2>&1 | tee -a "$LOG"
-   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $HYPR install had failed, please check the install.log"; exit 1; }
-  done
-
 # Install additional Nvidia packages
 printf "${YELLOW} Installing addition Nvidia packages...\n"
 for krnl in $(cat /usr/lib/modules/*/pkgbase); do

install-scripts/pipewire.sh

@@ -39,7 +39,7 @@ systemctl --user disable --now pulseaudio.socket pulseaudio.service 2>/dev/null
 printf "${NOTE} Installing Pipewire Packages...\n"
 for PIPEWIRE in "${pipewire[@]}"; do
     install_package "$PIPEWIRE" 2>&1 | tee -a "$LOG"
-    [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $PIPEWIRE install had failed. Please check the install.log"; exit 1; }
+    [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $PIPEWIRE Package installation failed, Please check the installation logs"; exit 1; }
 done
 
 printf "Activating Pipewire Services...\n"

install-scripts/rog.sh

@@ -21,7 +21,7 @@ printf " Installing ASUS ROG packages...\n"
 for ASUS in asusctl supergfxctl rog-control-center; do
 install_package  "$ASUS" 2>&1 | tee -a "$LOG"
   if [ $? -ne 0 ]; then
-  echo -e "\e[1A\e[K${ERROR} - $ASUS install had failed, please check the install.log"
+  echo -e "\e[1A\e[K${ERROR} - $ASUS Package installation failed, Please check the installation logs"
   exit 1
   fi
 done

install-scripts/sddm.sh

@@ -6,9 +6,9 @@ if [[ $USE_PRESET = [Yy] ]]; then
 fi
 
 sddm=(
-  qt5-graphicaleffects
+  qt6-5compat 
-  qt5-quickcontrols2
+  qt6-declarative 
-  qt5-svg
+  qt6-svg
   sddm
 )
 
@@ -31,7 +31,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_sddm.log"
 printf "${NOTE} Installing sddm and dependencies........\n"
   for package in "${sddm[@]}"; do
   install_package "$package" 2>&1 | tee -a "$LOG"
-  [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $package install has failed, please check the install.log"; exit 1; }
+  [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $package Package installation failed, Please check the installation logs"; exit 1; }
  done 
 
 # Check if other login managers installed and disabling its service before enabling sddm
@@ -63,20 +63,20 @@ while [ "$valid_input" != true ]; do
   if [[ $install_sddm_theme =~ ^[Yy]$ ]]; then
     printf "\n%s - Installing Simple SDDM Theme\n" "${NOTE}"
 
-    # Check if /usr/share/sddm/themes/simple-sddm exists and remove if it does
+    # Check if /usr/share/sddm/themes/simple-sddm-2 exists and remove if it does
-    if [ -d "/usr/share/sddm/themes/simple-sddm" ]; then
+    if [ -d "/usr/share/sddm/themes/simple-sddm-2" ]; then
-      sudo rm -rf "/usr/share/sddm/themes/simple-sddm"
+      sudo rm -rf "/usr/share/sddm/themes/simple-sddm-2"
-      echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm' directory." 2>&1 | tee -a "$LOG"
+      echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm-2' directory." 2>&1 | tee -a "$LOG"
     fi
 
-    # Check if simple-sddm directory exists in the current directory and remove if it does
+    # Check if simple-sddm-2 directory exists in the current directory and remove if it does
-    if [ -d "simple-sddm" ]; then
+    if [ -d "simple-sddm-2" ]; then
-      rm -rf "simple-sddm"
+      rm -rf "simple-sddm-2"
-      echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm' directory from the current location." 2>&1 | tee -a "$LOG"
+      echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm-2' directory from the current location." 2>&1 | tee -a "$LOG"
     fi
 
-    if git clone https://github.com/JaKooLit/simple-sddm.git; then
+    if git clone --depth 1 https://github.com/JaKooLit/simple-sddm-2.git; then
-      while [ ! -d "simple-sddm" ]; do
+      while [ ! -d "simple-sddm-2" ]; do
         sleep 1
       done
 
@@ -85,8 +85,8 @@ while [ "$valid_input" != true ]; do
         echo -e "\e[1A\e[K${OK} - Directory '/usr/share/sddm/themes' created." 2>&1 | tee -a "$LOG"
       fi
 
-      sudo mv simple-sddm /usr/share/sddm/themes/
+      sudo mv simple-sddm-2 /usr/share/sddm/themes/
-      echo -e "[Theme]\nCurrent=simple-sddm" | sudo tee "$sddm_conf_dir/10-theme.conf" &>> "$LOG"
+      echo -e "[Theme]\nCurrent=simple-sddm-2" | sudo tee "$sddm_conf_dir/10-theme.conf" &>> "$LOG"
     else
       echo -e "\e[1A\e[K${ERROR} - Failed to clone the theme repository. Please check your internet connection" | tee -a "$LOG" >&2
     fi

install-scripts/thunar.sh

@@ -28,7 +28,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_thunar.log"
 printf "${NOTE} Installing Thunar Packages...\n"  
   for THUNAR in "${thunar[@]}"; do
     install_package "$THUNAR" 2>&1 | tee -a "$LOG"
-    [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $THUNAR install had failed, please check the install.log"; exit 1; }
+    [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $THUNAR Package installation failed, Please check the installation logs"; exit 1; }
   done
 
  # Check for existing configs and copy if does not exist

install-scripts/xdph.sh

@@ -28,7 +28,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_xdph.log"
 for xdgs in "${xdg[@]}"; do
   install_package "$xdgs" 2>&1 | tee -a "$LOG"
     if [ $? -ne 0 ]; then
-    echo -e "\e[1A\e[K${ERROR} - $xdph install had failed, please check the install.log"
+    echo -e "\e[1A\e[K${ERROR} - $xdph Package installation failed, Please check the installation logs"
     exit 1
     fi
 done

install-scripts/zsh.sh

@@ -50,7 +50,7 @@ printf "${NOTE} Installing core zsh packages...${RESET}\n"
 for ZSH in "${zsh[@]}"; do
   install_package "$ZSH" 2>&1 | tee -a "$LOG"
   if [ $? -ne 0 ]; then
-     echo -e "\e[1A\e[K${ERROR} - $ZSH install had failed, please check the install.log"
+     echo -e "\e[1A\e[K${ERROR} - $ZSH Package installation failed, Please check the installation logs"
   fi
 done
 

install.sh

@@ -27,22 +27,19 @@ echo
 read -p "$(tput setaf 6)Would you like to proceed? (y/n): $(tput sgr0)" proceed
 
 printf "\n%.0s" {1..2}
-echo "$(tput bold)$(tput setaf 7)Choose Y to use preset ONLY once you reviewed, updated or updated the preset.sh $(tput sgr0)" 
-echo "$(tput bold)$(tput setaf 7)If you are not sure what to do, choose N in the "Use Preset Settings" question $(tput sgr0)"
-printf "\n%.0s" {1..1}
-read -p "$(tput setaf 6)Would you like to Use Preset Settings? (y/n): $(tput sgr0)" use_preset
-
-printf "\n%.0s" {1..3}
 
 if [ "$proceed" != "y" ]; then
     echo "Installation aborted."
+	printf "\n%.0s" {1..2}
     exit 1
 fi
 
-# Create Directory for Install Logs
+printf "\n%.0s" {1..2}
-if [ ! -d Install-Logs ]; then
+
-    mkdir Install-Logs
+echo "$(tput bold)$(tput setaf 166)ATTENTION: Choosing Y on use preset question will install also nvidia stuff! $(tput sgr0)"
-fi
+echo "$(tput bold)$(tput setaf 3)CTRL C to cancel and edit the file preset.sh $(tput sgr0)"  
+echo "$(tput bold)$(tput setaf 7)If you are not sure what to do, answer N in here $(tput sgr0)"
+read -p "$(tput setaf 6)Would you like to Use Preset Settings (See note above)? (y/n): $(tput sgr0)" use_preset
 
 # Use of Preset Settings
 if [[ $use_preset = [Yy] ]]; then
@@ -82,6 +79,11 @@ LOG="install-$(date +%d-%H%M%S).log"
 # xdph=""
 # zsh=""
 
+# Create Directory for Install Logs
+if [ ! -d Install-Logs ]; then
+    mkdir Install-Logs
+fi
+
 # Define the directory where your scripts are located
 script_directory=install-scripts
 
@@ -188,14 +190,16 @@ 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"
+
 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