From 09d49993cc385366e34a3221d4e912d015231f7d Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 10 May 2024 15:40:31 +0900 Subject: [PATCH 1/3] added ags.sh, wallust and removal of pywal --- CHANGELOGS.md | 10 +++++ install-scripts/ags.sh | 77 +++++++++++++++++++++++++++++++++++++ install-scripts/hypr-eco.sh | 9 ++--- install-scripts/pywal.sh | 32 --------------- install-scripts/wallust.sh | 64 ++++++++++++++++++++++++++++++ install.sh | 3 +- 6 files changed, 157 insertions(+), 38 deletions(-) create mode 100755 install-scripts/ags.sh delete mode 100755 install-scripts/pywal.sh create mode 100755 install-scripts/wallust.sh diff --git a/CHANGELOGS.md b/CHANGELOGS.md index b8e7864..9fba3be 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,15 @@ ## Changelogs +## 10 May 2024 +- added wallust-git and remove python-pywal for migration to wallust on Hyprland-Dots v2.2.11 + +## 07 May 2024 +- added ags.sh for upcoming ags overview for next Hyprland-Dots release. Will be installed form source + +## 03 May 2024 +- Bump swww to v0.9.5 +- added python3-pyquery for new weather-waybar python based on Hyprland-Dots + ## 03 May 2024 - Bump swww to v0.9.5 - added python3-pyquery for new weather-waybar python based on Hyprland-Dots diff --git a/install-scripts/ags.sh b/install-scripts/ags.sh new file mode 100755 index 0000000..b0239fa --- /dev/null +++ b/install-scripts/ags.sh @@ -0,0 +1,77 @@ +#!/bin/bash +# 💫 https://github.com/JaKooLit 💫 # +# Aylur's GTK Shell # + +ags=( +node-typescript +npm +meson +libgjs-dev +gjs +libgtk-layer-shell-dev +libgtk-3-dev +libpulse-dev +libdbusmenu-gtk3-dev +libsoup-3.0-dev +) + +# specific tags to download +ags_tag="v1.8.2" + +## 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)_ags.log" +MLOG="install-$(date +%d-%H%M%S)_ags.log" + +# Installing ags Dependencies +for PKG1 in "${ags[@]}"; do + 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 + +#install typescript by npm +sudo npm install --global typescript 2>&1 | tee -a "$LOG" + +# ags + +printf "${NOTE} Install and Compiling Aylurs GTK shell\n" + +# Check if folder exists and remove it +if [ -d "ags" ]; then + printf "${NOTE} Removing existing ags folder...\n" + rm -rf "ags" +fi + +# 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 + # Build and install ags + npm install + meson setup build + if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then + printf "${OK} ags 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 "${ERROR} Failed to download ags Please check your connection" 2>&1 | tee -a "$LOG" + mv "$MLOG" ../Install-Logs/ || true + exit 1 +fi + diff --git a/install-scripts/hypr-eco.sh b/install-scripts/hypr-eco.sh index 87b0ba3..a975115 100755 --- a/install-scripts/hypr-eco.sh +++ b/install-scripts/hypr-eco.sh @@ -4,7 +4,8 @@ # Hyprland plugins: pyprland pypr_depend=( - python-is-python3 +python3-aiofiles +python-is-python3 ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## @@ -40,8 +41,6 @@ printf "${NOTE} Installing pyprland\n" curl https://raw.githubusercontent.com/hyprland-community/pyprland/main/scripts/get-pypr | sh 2>&1 | tee -a "$LOG" -pip install pyprland --break-system-packages 2>&1 | tee -a "$LOG" - - - +pip install pyprland 2>&1 | tee -a "$LOG" +clear diff --git a/install-scripts/pywal.sh b/install-scripts/pywal.sh deleted file mode 100755 index 0fa5516..0000000 --- a/install-scripts/pywal.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# 💫 https://github.com/JaKooLit 💫 # -# Pywal Colors) # - -pywal=( - imagemagick - python3-pip -) - -## 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')_pywal.log" - -# Installing Pywal dependencies -for package in "${pywal[@]}"; do - install_package "$package" || exit 1 -done - -## Installing pywal colors -printf "\n%s - Installing Pywal.... \n" "${NOTE}" -sudo pip3 install pywal --break-system-packages 2>&1 | tee -a "$LOG" - -clear diff --git a/install-scripts/wallust.sh b/install-scripts/wallust.sh new file mode 100755 index 0000000..e90c71e --- /dev/null +++ b/install-scripts/wallust.sh @@ -0,0 +1,64 @@ +#!/bin/bash +# 💫 https://github.com/JaKooLit 💫 # +# wallust - pywal colors replacment # + +depend=( +librust-jpeg-decoder-dev +imagemagick +rustup +) + +#specific branch or release +wal_tag="dev" + +## 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)_wallust.log" +MLOG="install-$(date +%d-%H%M%S)_wallust.log" + +# Installing depencies +for PKG1 in "${depend[@]}"; do + 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 "${NOTE} Installing wallust from dev branch...\n" + +# Check if folder exists and remove it +if [ -d "wallust" ]; then + printf "${NOTE} Removing existing wallust folder...\n" + rm -rf "wallust" +fi + +# Clone and build wallust +printf "${NOTE} Installing wallust...\n" +if git clone --depth 1 -b $wal_tag https://codeberg.org/explosion-mental/wallust.git; then + cd wallust || exit 1 + make + if sudo make install 2>&1 | tee -a "$MLOG" ; then + printf "${OK} wallust installed successfully.\n" 2>&1 | tee -a "$MLOG" + else + echo -e "${ERROR} Installation failed for wallust." 2>&1 | tee -a "$MLOG" + fi + #moving the addional logs to Install-Logs directory + mv $MLOG ../Install-Logs/ || true + cd .. +else + echo -e "${ERROR} Download failed for wallust." 2>&1 | tee -a "$LOG" +fi + +clear + diff --git a/install.sh b/install.sh index e37f599..35e3450 100755 --- a/install.sh +++ b/install.sh @@ -154,8 +154,9 @@ execute_script "fonts.sh" execute_script "swappy.sh" execute_script "swww.sh" execute_script "rofi-wayland.sh" -execute_script "pywal.sh" +execute_script "wallust.sh" execute_script "force-install.sh" +execute_script "ags.sh" execute_script "hyprlang.sh" execute_script "hyprlock.sh" execute_script "hyprcursor.sh" From 85af50ac7c4dff15adbf4ab90762405c2e15d354 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" Date: Fri, 10 May 2024 15:52:32 +0900 Subject: [PATCH 2/3] Update ags.sh --- install-scripts/ags.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-scripts/ags.sh b/install-scripts/ags.sh index b0239fa..1ed54d9 100755 --- a/install-scripts/ags.sh +++ b/install-scripts/ags.sh @@ -1,4 +1,4 @@ -#!/bin/bash +7#!/bin/bash # 💫 https://github.com/JaKooLit 💫 # # Aylur's GTK Shell # @@ -61,7 +61,7 @@ if git clone --recursive -b "$ags_tag" --depth 1 https://github.com/Aylur/ags.gi npm install meson setup build if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then - printf "${OK} ags successfully.\n" 2>&1 | tee -a "$MLOG" + 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 From 84ab9b775e6886a28d1aff3d05bf0a1fc8783f68 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 13 May 2024 10:57:34 +0900 Subject: [PATCH 3/3] Updated dotfiles to be installed for Ubuntu --- install-scripts/dotfiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index cc80625..c389d59 100755 --- a/install-scripts/dotfiles.sh +++ b/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.2.10-1" +specific_version="v2.2.11" ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##