From aab92dac45abf85e73050833378ba68c22003208 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 20 Mar 2025 15:24:16 +0900 Subject: [PATCH 1/8] added findutils as dependencies --- CHANGELOGS.md | 1 + install-scripts/00-base.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index fa96359..8afa7ac 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -2,6 +2,7 @@ ## 20 March 2025 - adjusted hyprland installation script. This is great for those who are using -git packages +- added findutils as dependencies ## 11 March 2025 - Added uninstall script diff --git a/install-scripts/00-base.sh b/install-scripts/00-base.sh index 911ed7d..c70b0c4 100755 --- a/install-scripts/00-base.sh +++ b/install-scripts/00-base.sh @@ -5,6 +5,7 @@ base=( base-devel archlinux-keyring + findutils ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## From 409c6120497f04d4ec125cc0710dd3bed395d5a0 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 21 Mar 2025 22:06:17 +0900 Subject: [PATCH 2/8] updated contributing.md --- CONTRIBUTING.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5dba8eb..7e07f24 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,10 +55,9 @@ Thank you for your interest in contributing to Community Standards! We welcome a - Make sure all tests pass or fully tested before submitting your changes. - Keep your pull request focused and avoid including unrelated changes. - Remember to follow the following files before submitting your changes. - - [bug_report.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/bug_report.md) - Use this template to create a report to help us improve. - - [feature_request.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/feature_request.md) - Use this template to suggest a feature for this project. - - [documentation_update.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/documentation_update.md) - Use this template to propose a change to the documentation. - - [custom.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/custom.md) - Use this template to submit a custom issue. + - [bug.yml](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/bug.yml) - Use this template to create a report to help us improve. + - [feature.yml](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/feature.yml) - Use this template to suggest a feature for this project. + - [documentation-update.yml](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/documentation-update.yml) - Use this template to propose a change to the documentation. - [PULL_REQUEST_TEMPLATE.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/PULL_REQUEST_TEMPLATE.md) - Use this template to submit a pull request. - [COMMIT_MESSAGE_GUIDELINES.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/COMMIT_MESSAGE_GUIDELINES.md) - Read this file to learn about the commit message guidelines. - [CONTRIBUTING.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/CONTRIBUTING.md) - Read this file to learn about the contributing guidelines. From 78310220d40b23e5412b26d9596bbe761a2dfc58 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Fri, 21 Mar 2025 22:25:26 +0900 Subject: [PATCH 3/8] Updated README re-contributing --- CONTRIBUTING.md | 4 ++-- README.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7e07f24..6681cd4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ -# Contributing to Community Standards +# Contributing to KooL Hyprland Projects -Thank you for your interest in contributing to Community Standards! We welcome any contributions, including bug fixes, feature enhancements, documentation improvements, and other general improvements. +Thank you for your interest in contributing to KooL Hyprland Projects! We welcome any contributions, including bug fixes, feature enhancements, documentation improvements, and other general improvements. ## Getting Started diff --git a/README.md b/README.md index 0b9bee9..6dc4285 100644 --- a/README.md +++ b/README.md @@ -218,11 +218,11 @@ env = WLR_RENDERER_ALLOW_SOFTWARE,1 -#### ⏩ Contributing +#### ✍️ Contributing - As stated above, these script does not contain actual config files. These are only the installer of packages -- The development branch of this script is pulling the latest "stable" releases of the Hyprland-Dotfiles. -- If you want to contribute and/or test the Hyprland-Dotfiles (development branch), [`Hyprland-Dots-Development`](https://github.com/JaKooLit/Hyprland-Dots/tree/development) - +- If you want to contribute and/or test the Hyprland-Dotfiles (development branch), [`Hyprland-Dots-Development`](https://github.com/JaKooLit/Hyprland-Dots/tree/development) +- Want to contribute on KooL-Hyprland-Dots Click [`HERE`](https://github.com/JaKooLit/Hyprland-Dots/blob/main/CONTRIBUTING.md) for a guide how to contribute +- Want to contribute on This Installer? Click [`HERE`](https://github.com/JaKooLit/Arch-Hyprland/blob/main/CONTRIBUTING.md) for a guide how to contribute #### 👍👍👍 Thanks and Credits! - [`Hyprland`](https://hyprland.org/) Of course to Hyprland and @vaxerski for this awesome Dynamic Tiling Manager. From 672a7006957a922d68a184ad70a67465adddb9a1 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 24 Mar 2025 16:59:28 +0900 Subject: [PATCH 4/8] adjusted to work with fishy shell --- install-scripts/zsh.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index 948ca75..ff94cee 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -80,18 +80,20 @@ if command -v zsh >/dev/null; then cp -r 'assets/.zprofile' ~/ # Check if the current shell is zsh - if [[ "$SHELL" != *"zsh"* ]]; then + current_shell=$(basename "$SHELL") + if [ "$current_shell" != "zsh" ]; then printf "${NOTE} Changing default shell to ${MAGENTA}zsh${RESET}..." printf "\n%.0s" {1..2} - while ! chsh -s $(which zsh); do + # Loop to ensure the chsh command succeeds + while ! chsh -s "$(command -v zsh)"; do echo "${ERROR} Authentication failed. Please enter the correct password." 2>&1 | tee -a "$LOG" sleep 1 done printf "${INFO} Shell changed successfully to ${MAGENTA}zsh${RESET}" 2>&1 | tee -a "$LOG" else - echo "${NOTE}Your shell is already set to ${MAGENTA}zsh${RESET}." + echo "${NOTE} Your shell is already set to ${MAGENTA}zsh${RESET}." fi fi From 5011f153beea187c7a2ac2b615364bb3f325cb9a Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 24 Mar 2025 22:08:56 +0900 Subject: [PATCH 5/8] minor zsh.sh update --- install-scripts/zsh.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index ff94cee..dd941f8 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -95,6 +95,7 @@ if command -v zsh >/dev/null; then else echo "${NOTE} Your shell is already set to ${MAGENTA}zsh${RESET}." fi + fi # Installing core zsh packages From 3fcfdc0badd3674469e2bc2cd864efaa40ad85bb Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 25 Mar 2025 00:35:40 +0900 Subject: [PATCH 6/8] cachy-hyprland-settings set to remove first before mako --- install-scripts/01-hypr-pkgs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-scripts/01-hypr-pkgs.sh b/install-scripts/01-hypr-pkgs.sh index 6977682..a2f651e 100755 --- a/install-scripts/01-hypr-pkgs.sh +++ b/install-scripts/01-hypr-pkgs.sh @@ -75,8 +75,8 @@ hypr_package_2=( uninstall=( aylurs-gtk-shell dunst - mako cachyos-hyprland-settings + mako rofi wallust-git rofi-lbonn-wayland From 10d45b5d995d169afa7278cc04238878c9a3439d Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 25 Mar 2025 00:59:47 +0900 Subject: [PATCH 7/8] install.sh updated to NOT exit if user choose N on the last part. Removed auto-clone instruction for Fish as it creates a big issue --- README.md | 8 +++----- install.sh | 36 ++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 6dc4285..1fce12a 100644 --- a/README.md +++ b/README.md @@ -101,16 +101,14 @@ https://github.com/user-attachments/assets/49bc12b2-abaf-45de-a21c-67aacd9bb872 - After installation, check [`THIS`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Notes_to_remember#--for-nvidia-gpu-users) ## ✨ Auto clone and install +> [!CAUTION] +> If you are using FISH SHELL, DO NOT use this function. Clone and ran install.sh instead + - you can use this command to automatically clone the installer and ran the script for you - NOTE: `curl` package is required before running this command ```bash sh <(curl -L https://raw.githubusercontent.com/JaKooLit/Arch-Hyprland/main/auto-install.sh) ``` -- if you are using like fish or a non-POSIX compliant terminal -```bash -curl -sL https://raw.githubusercontent.com/JaKooLit/Arch-Hyprland/main/auto-install.sh | bash -``` - ## ✨ to use this script - clone this repo (latest commit only) to reduce file size download by using git. Change directory, make executable and run the script diff --git a/install.sh b/install.sh index df4824e..6bd97b6 100755 --- a/install.sh +++ b/install.sh @@ -473,25 +473,28 @@ if pacman -Q hyprland &> /dev/null || pacman -Q hyprland-git &> /dev/null; then printf "\n${NOTE} You can start Hyprland by typing ${SKY_BLUE}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" - read -rp "${CAT} Would you like to reboot now? (y/n): " HYP + while true; do + echo -n "${CAT} Would you like to reboot now? (y/n): " + read HYP + HYP=$(echo "$HYP" | tr '[:upper:]' '[:lower:]') - HYP=$(echo "$HYP" | tr '[:upper:]' '[:lower:]') - - if [[ "$HYP" == "y" || "$HYP" == "yes" ]]; then - echo "${INFO} Rebooting now..." - systemctl reboot - elif [[ "$HYP" == "n" || "$HYP" == "no" ]]; then - echo "👌 ${OK} You choose NOT to reboot" - printf "\n%.0s" {1..1} - # Check if NVIDIA GPU is present - if lspci | grep -i "nvidia" &> /dev/null; then - echo "${INFO} HOWEVER ${YELLOW}NVIDIA GPU${RESET} detected. Reminder that you must REBOOT your SYSTEM..." + if [[ "$HYP" == "y" || "$HYP" == "yes" ]]; then + echo "${INFO} Rebooting now..." + systemctl reboot + break + elif [[ "$HYP" == "n" || "$HYP" == "no" ]]; then + echo "👌 ${OK} You chose NOT to reboot" printf "\n%.0s" {1..1} + # Check if NVIDIA GPU is present + if lspci | grep -i "nvidia" &> /dev/null; then + echo "${INFO} HOWEVER ${YELLOW}NVIDIA GPU${RESET} detected. Reminder that you must REBOOT your SYSTEM..." + printf "\n%.0s" {1..1} + fi + break + else + echo "${WARN} Invalid response. Please answer with 'y' or 'n'." fi - else - echo "${WARN} Invalid response. Please answer with 'y' or 'n'. Exiting." - exit 1 - fi + done else # Print error message if neither package is installed printf "\n${WARN} Hyprland is NOT installed. Please check 00_CHECK-time_installed.log and other files in the Install-Logs/ directory..." @@ -499,4 +502,5 @@ else exit 1 fi + printf "\n%.0s" {1..2} \ No newline at end of file From 0803fb9c0fb17506561e85cd82c07e74fefc0342 Mon Sep 17 00:00:00 2001 From: "Ja.KooLit" <85185940+JaKooLit@users.noreply.github.com> Date: Sat, 12 Apr 2025 19:54:05 -0400 Subject: [PATCH 8/8] 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 48afaba..8c741dc 100755 --- a/install-scripts/ags.sh +++ b/install-scripts/ags.sh @@ -68,9 +68,9 @@ printf "\n%.0s" {1..1} printf "${NOTE} Install and Compiling ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET}..\n" # Check if directory exists and remove it -if [ -d "ags" ]; then +if [ -d "ags_v1.9.0" ]; then printf "${NOTE} Removing existing ags directory...\n" - rm -rf "ags" + rm -rf "ags_v1.9.0" fi printf "\n%.0s" {1..1}