Merge pull request #54 from JaKooLit/development

Development

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: JaKooLit
+ko_fi: jakoolit

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,46 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[Bug]: Short description of the issue"
+labels: "Something isn't working"
+---
+
+## Bug Report
+
+### Description
+
+[Provide a clear and concise description of the bug.]
+
+### Steps to Reproduce
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+### Expected Behavior
+
+[What did you expect to happen?]
+
+### Actual Behavior
+
+[What actually happened?]
+
+### Screenshots
+
+[If applicable, add screenshots to help explain your problem.]
+
+### Environment
+
+[Please add any other relevant information about the bug and remove the unnecessary lines.]
+
+e.g.,
+
+- Linux Distro: [e.g., ArchLinux, EndeavourOS, Arco, Manjaro]
+- Linux Version, output of `uname -a`:
+- Hyprland Version, output of `hyprctl version`:
+- Installation Environment: [e.g., On The Main Hardware, On A Virtual Machine]
+- Other info: [e.g., Display Resolution, Resolution, etc]
+
+### Additional Information
+
+[Add any other information about the problem here. For example, you might include the error message, any recent changes that you made to the project, or any other relevant details.]

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,38 @@
+---
+name: Custom template
+about: Use this template to submit a custom issue
+title: "[Custom]: Short description of the issue"
+labels: "custom"
+---
+
+## Custom Template
+
+### Description
+
+[Provide a clear and concise description of the issue or request.]
+
+### Steps to Reproduce (if applicable)
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+### Expected Behavior
+
+[What did you expect to happen?]
+
+### Actual Behavior
+
+[What actually happened?]
+
+### Screenshots (if applicable)
+
+[If applicable, add screenshots to help explain your problem.]
+
+### Proposed Solution (if applicable)
+
+[If you have a specific solution in mind, describe it here. If not, you can skip this section.]
+
+### Additional Information
+
+[Add any other information about the issue or request here. For example, you might include links to similar features in other projects, or screenshots or diagrams to help explain your idea.]

.github/ISSUE_TEMPLATE/documentation_update.md

@@ -0,0 +1,24 @@
+---
+name: Documentation update
+about: Propose a change to the project documentation
+title: "[Docs]: Short description of the change"
+labels: "documentation update"
+---
+
+## Documentation Update
+
+### Description
+
+[Provide a clear and concise description of the documentation update you'd like to see made.]
+
+### Current Documentation
+
+[Provide a link to the current documentation or describe where it can be found.]
+
+### Proposed Documentation
+
+[Provide a clear and concise description of the updated documentation that you'd like to see added.]
+
+### Additional Information
+
+[Add any other information about the documentation update here. For example, you might include links to similar documentation in other projects, or screenshots or diagrams to help explain your idea.]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,28 @@
+---
+name: Feature request
+about: Suggest a feature for this project
+title: "[Feature Request]: Short description of the feature"
+labels: "enhancement, needs triage, feature request"
+---
+
+## Feature Request
+
+### Description
+
+[Provide a clear and concise description of the feature you'd like to see added.]
+
+### Use Case
+
+[Describe how this feature would be useful to you or to other users of the project.]
+
+### Proposed Solution
+
+[If you have a specific solution in mind, describe it here. If not, you can skip this section.]
+
+### Alternatives
+
+[Are there any alternative solutions or workarounds that you've considered? If so, describe them here.]
+
+### Additional Information
+
+[Add any other information about the feature request here. For example, you might include links to similar features in other projects, or screenshots or diagrams to help explain your idea.]

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,43 @@
+# Pull Request
+
+## Description
+
+Please read these instructions and remove unnecessary text.
+
+- Try to include a summary of the changes and which issue is fixed.
+- Also include relevant motivation and context (if applicable).
+- List any dependencies that are required for this change. (e.g., packages or other PRs)
+- Provide a link if there is an issue related to this pull request. e.g., Fixes # (issue)
+- Please add Reviewers, Assignees, Labels, Projects, and Milestones to the PR. (if applicable)
+
+## Type of change
+
+Please put an `x` in the boxes that apply:
+
+- [ ] **Bug fix** (non-breaking change which fixes an issue)
+- [ ] **New feature** (non-breaking change which adds functionality)
+- [ ] **Breaking change** (fix or feature that would cause existing functionality to not work as expected)
+- [ ] **Documentation update** (non-breaking change; modified files are limited to the documentations)
+- [ ] **Technical debt** (a code change that does not fix a bug or add a feature but makes something clearer for devs)
+- [ ] **Other** (provide details below)
+
+## Checklist
+
+Please put an `x` in the boxes that apply:
+
+- [ ] I have read the [CONTRIBUTING](https://github.com/JaKooLit/Arch-Hyprland/blob/main/CONTRIBUTING.md) document.
+- [ ] My code follows the code style of this project.
+- [ ] My commit message follows the [commit guidelines](https://github.com/JaKooLit/Arch-Hyprland/blob/main/CONTRIBUTING.md#git-commit-messages).
+- [ ] My change requires a change to the documentation.
+- [ ] I want to add something in Arch-Hyprland wiki.
+- [ ] I have added tests to cover my changes.
+- [ ] I have tested my code locally and it works as expected.
+- [ ] All new and existing tests passed.
+
+## Screenshots
+
+(if appropriate)
+
+## Additional context
+
+Add any other context about the problem here.

CHANGELOGS.md

@@ -1,5 +1,28 @@
 ## Changelogs
 
+## 20 Apr 2024
+- Change default Oh-my-zsh theme to xiong-chiamiov-plus
+
+## 16 Mar 2024
+- added hyprcursor
+
+## 1 Mar 2024
+- replaced sddm-git with sddm
+
+## 11 Jan 2024
+- dropped wlsunset
+
+## 05 Jan 2024
+- Added a preset feature
+- Added templates for contributing, and reporting, etc
+
+## 01 Jan 2024
+- Re-coded complete and test
+- Added to spice up pacman.conf including adding of ILoveCandy on it :)
+
+## 30 Dec 2023
+- Install scripts reconstructed
+
 ## 29 December 2023
 - Remove dunst in favor of swaync. NOTE: Part of the script is to also uninstall mako and dunst (if installed) as on my experience, dunst is sometimes taking over the notification even if it is not set to start
 

COMMIT_MESSAGE_GUIDELINES.md

@@ -0,0 +1,149 @@
+# Commit Message Guidelines
+
+A good commit message should be descriptive and provide context about the changes made. This makes it easier to understand and review the changes in the future.
+
+Here are some guidelines for writing descriptive commit messages:
+
+- Start with a short summary of the changes made in the commit.
+
+- Use imperative mood for the summary, as if you're giving a command. For example, "Add feature" instead of "Added feature".
+
+- Provide additional details in the commit message body, if necessary. This could include the reason for the change, the impact of the change, or any dependencies that were introduced or removed.
+
+- Keep the message within 72 characters per line to ensure that it's easy to read in Git log output.
+
+Examples of good commit messages:
+
+- "Add authentication feature for user login"
+- "Fix bug causing application to crash on startup"
+- "Update documentation for API endpoints"
+
+Remember, writing descriptive commit messages can save time and frustration in the future, and help others understand the changes made to the codebase.
+
+## Commit Message Types
+
+Here's a more comprehensive list of commit types that you can use:
+
+`feat`: Adding a new feature to the project
+
+```markdown
+feat: Add multi-image upload support
+```
+
+`fix`: Fixing a bug or issue in the project
+
+```markdown
+fix: Fix bug causing application to crash on startup
+```
+
+`docs`: Updating documentation in the project
+
+```markdown
+docs: Update documentation for API endpoints
+```
+
+`style`: Making cosmetic or style changes to the project (such as changing colors or formatting code)
+
+```markdown
+style: Update colors and formatting
+```
+
+`refactor`: Making code changes that don't affect the behavior of the project, but improve its quality or maintainability
+
+```markdown
+refactor: Remove unused code
+```
+
+`test`: Adding or modifying tests for the project
+
+```markdown
+test: Add tests for new feature
+```
+
+`chore`: Making changes to the project that don't fit into any other category, such as updating dependencies or configuring the build system
+
+```markdown
+chore: Update dependencies
+```
+
+`perf`: Improving performance of the project
+
+```markdown
+perf: Improve performance of image processing
+```
+
+`security`: Addressing security issues in the project
+
+```markdown
+security: Update dependencies to address security issues
+```
+
+`merge`: Merging branches in the project
+
+```markdown
+merge: Merge branch 'feature/branch-name' into develop
+```
+
+`revert`: Reverting a previous commit
+
+```markdown
+revert: Revert "Add feature"
+```
+
+`build`: Making changes to the build system or dependencies of the project
+
+```markdown
+build: Update dependencies
+```
+
+`ci`: Making changes to the continuous integration (CI) system for the project
+
+```markdown
+ci: Update CI configuration
+```
+
+`config`: Making changes to configuration files for the project
+
+```markdown
+config: Update configuration files
+```
+
+`deploy`: Making changes to the deployment process for the project
+
+```markdown
+deploy: Update deployment scripts
+```
+
+`init`: Creating or initializing a new repository or project
+
+```markdown
+init: Initialize project
+```
+
+`move`: Moving files or directories within the project
+
+```markdown
+move: Move files to new directory
+```
+
+`rename`: Renaming files or directories within the project
+
+```markdown
+rename: Rename files
+```
+
+`remove`: Removing files or directories from the project
+
+```markdown
+remove: Remove files
+```
+
+`update`: Updating code, dependencies, or other components of the project
+
+```markdown
+update: Update code
+```
+
+These are just some examples, and you can create your own custom commit types as well. However, it's important to use them consistently and write clear, descriptive commit messages to make it easy for others to understand the changes you've made.
+
+**Important:** If you are planning to use a custom commit message type other than the ones listed above, make sure to add it to this list so that others can understand it as well. Create a pull request to add it to this file.

CONTRIBUTING.md

@@ -0,0 +1,70 @@
+# Contributing to Community Standards
+
+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.
+
+## Getting Started
+
+1. Fork the branch development repository to your GitHub account. This will create a copy of this repository in your account. You can make changes to this copy without affecting the original repository.
+  - For fork this repository, click the **Fork** button in the top right corner of this page or click [here](https://github.com/JaKooLit/Arch-Hyprland/fork).
+  - Make sure to uncheck the Copy the `main` branch only. This will copy the development branch and other branches (if any)
+ 
+2. Clone your forked repository to your local machine.
+
+  - Use the following command to clone your forked repository to your local machine.
+
+     ```bash
+     git clone --depth=1 -b development https://github.com/JaKooLit/Arch-Hyprland.git
+     ```
+
+3. Create a new branch for your changes.
+
+  - For example, to create a new branch named `your-branch-name`, use the following command.
+
+     ```bash
+     git checkout -b your-branch-name
+     ```
+
+4. Make your changes and commit them with a descriptive commit message.
+
+  - For example, to commit your changes, use the following command and make sure to follow the [commit message guidelines](https://github.com/JaKooLit/Arch-Hyprland/blob/main/COMMIT_MESSAGE_GUIDELINES.md).
+
+     ```bash
+     git commit -m "feat: add a new feature"
+     ```
+
+5. Push your changes to your forked repository.
+
+  - For example, to push your changes to your forked repository, use the following command.
+
+     ```bash
+     git push origin your-branch-name
+     ```
+
+6. Submit a **pull request** to the development branch repository.
+   - For example, to create a pull request, use the following steps.
+     1. Go to your forked repository.
+     2. Click the **Compare & pull request** button next to your `your-branch-name` branch.
+     3. Add a title and description for your pull request.
+     4. Click **Create pull request** and remember to add the relevant labels with using the [pull request template](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/PULL_REQUEST_TEMPLATE.md).
+
+## Guidelines
+
+- Follow the code style of the project.
+- Update the **documentation** if necessary.
+- Add tests if applicable.
+- 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.
+  - [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.
+  - [LICENSE](https://github.com/JaKooLit/Arch-Hyprland/blob/main/LICENSE.md) - Read this file to learn about the license.
+  - [README.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/README.md) - Read this file to learn about the project.
+
+## Contact
+
+If you have any questions, feel free to contact via [GitHub Discussions](https://github.com/JaKooLit/Arch-Hyprland/discussions) or [Through Discord Server](https://discord.gg/V2SJ92vbEN)

README.md

@@ -36,9 +36,12 @@
 - Since the Hyprland-Dots are evolving, some of the screenshots maybe old
 - the wallpaper offered to be downloaded towards the end is from this [`REPO`](https://github.com/JaKooLit/Wallpaper-Bank)
 
-> [❗!IMPORTANT]
+> [!IMPORTANT]
 > install a backup tool like `snapper` or `timeshift`. and Backup your system before installing hyprland using this script. This script does NOT include uninstallation of packages
 
+> [!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. 
+
 #### 🆕  Prerequisites
 - This install script is intended for atleast Server type / Minimal Arch Linux installed.
 
@@ -68,7 +71,7 @@ chmod +x install.sh
 ```
 
 <p align="center">
-    <img align="center" width="100%" src="https://raw.githubusercontent.com/JaKooLit/Arch-Hyprland/main/Arch-Installer.png" />
+    <img align="center" width="100%" src="https://raw.githubusercontent.com/JaKooLit/Arch-Hyprland/main/Installer.png" />
 
 #### ✨ for ZSH and OH-MY-ZSH installation
 > installer should auto change your default shell to zsh. However, if it does not, do this
@@ -94,6 +97,10 @@ 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
+- CD into Arch-Hyprland Folder and then ran the below command. 
+- i.e. `./install-scripts/gtk-themes` - For reinstall GTK Themes.
+
 #### 🛣️ Roadmap:
 - ~~[ ] Install zsh and oh-my-zsh without necessary steps above~~ DONE 
 - [ ] possibly adding gruvbox themes, cursors, icons
@@ -107,10 +114,14 @@ log into your account
 `ls /dev/dri/by-path` find the matching id
 `ls -l /dev/dri/by-path` to check where the symlink points to 
 )
-7. add "env = WLR_DRM_DEVICES,/dev/dri/cardX" to the ENVvariables config (.config/hypr/configs/ENVariables.conf)  ; X being where the symlink of the gpu points to
 ```
+- add "env = WLR_DRM_DEVICES,/dev/dri/cardX" to the ENVvariables config (.config/hypr/UserConfigs/ENVariables.conf)  ; X being where the symlink of the gpu points to
+
 - 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)
 
+#### 🫥 Improving performance for Older Nvidia Cards using driver 470
+  - [`SEE HERE`](https://github.com/JaKooLit/Hyprland-Dots/discussions/123#discussion-6035205)
+  
 #### 📒 Final Notes
 - join my discord channel [`Discord`](https://discord.gg/V2SJ92vbEN)
 - Feel free to copy, re-distribute, and use this script however you want. Would appreciate if you give me some loves by crediting my work :)

assets/.zshrc

@@ -3,7 +3,7 @@
 
 export ZSH="$HOME/.oh-my-zsh"
 
-ZSH_THEME="agnoster"
+ZSH_THEME="xiong-chiamiov-plus"
 
 plugins=( 
     git
@@ -20,7 +20,7 @@ source $ZSH/oh-my-zsh.sh
 
 # Display Pokemon-colorscripts
 # Project page: https://gitlab.com/phoneybadger/pokemon-colorscripts#on-other-distros-and-macos
-pokemon-colorscripts --no-title -s -r
+#pokemon-colorscripts --no-title -s -r
 
 
 ### From this line is for pywal-colors

install-scripts/00-base.sh

@@ -1,50 +1,22 @@
 #!/bin/bash
-
-# https://github.com/JaKooLit
+# 💫 https://github.com/JaKooLit 💫 #
+# base devel #
 
 base=( 
   base-devel
 )
-############## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ######################################
-
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-RESET=$(tput sgr0)
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 
 # Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_base.log"
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_base.log"
 
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if pacman -Q "$1" &>/dev/null ; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    sudo pacman -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if pacman -Q "$1" &>/dev/null ; then
-      echo -e "${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "${ERROR} $1 failed to install. Please check the $LOG. You may need to install manually."
-      exit 1
-    fi
-  fi
-}
 
 # Installation of main components
 printf "\n%s - Installing base-devel \n" "${NOTE}"
 
 for PKG1 in "${base[@]}"; do
-  install_package "$PKG1" | tee -a "$LOG"
+  install_package_pacman "$PKG1" | tee -a "$LOG"
 done
 
-
-# clear
+clear

install-scripts/00-hypr-pkgs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-
-# https://github.com/JaKooLit
+# 💫 https://github.com/JaKooLit 💫 #
+# Hyprland Packages #
 
 # edit your packages desired here. 
 # WARNING! If you remove packages here, dotfiles may not work properly.
@@ -63,7 +63,6 @@ nvtop
 nwg-look-bin
 pacman-contrib
 vim
-wlsunset
 yt-dlp
 )
 
@@ -83,63 +82,19 @@ uninstall=(
   mako
 )
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+## 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 )"
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+# 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-$(date +%d-%H%M%S)_hypr-pkgs.log"
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_hypr-pkgs.log"
 
-ISAUR=$(command -v yay || command -v paru)
-
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if $ISAUR -Q "$1" &>> /dev/null ; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if $ISAUR -Q "$1" &>> /dev/null ; then
-      echo -e "\e[1A\e[K${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
-      exit 1
-    fi
-  fi
-}
-
-# Function for uninstalling packages
-uninstall_package() {
-  # Checking if package is installed
-  if pacman -Qi "$1" &>> /dev/null ; then
-    # Package is installed
-    echo -e "${NOTE} Uninstalling $1 ..."
-    sudo pacman -Rns --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is uninstalled
-    if ! pacman -Qi "$1" &>> /dev/null ; then
-      echo -e "\e[1A\e[K${OK} $1 was uninstalled."
-    else
-      # Something went wrong, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to uninstall. Please check the log."
-      exit 1
-    fi
-  fi
-}
 
 # Installation of main components
 printf "\n%s - Installing hyprland packages.... \n" "${NOTE}"
@@ -152,8 +107,8 @@ for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${fonts[@]}" "${Extra[@
   fi
 done
 
+# Checking if mako or dunst is installed
 printf "\n%s - Checking if mako or dunst are installed and removing for swaync to work properly \n" "${NOTE}"
-
 for PKG in "${uninstall[@]}"; do
   uninstall_package "$PKG" 2>&1 | tee -a "$LOG"
   if [ $? -ne 0 ]; then

install-scripts/Global_functions.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Global Functions for Scripts #
+
+set -e
+
+# Set some colors for output messages
+OK="$(tput setaf 2)[OK]$(tput sgr0)"
+ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
+NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
+WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
+CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
+ORANGE=$(tput setaf 166)
+YELLOW=$(tput setaf 3)
+RESET=$(tput sgr0)
+
+
+# Create Directory for Install Logs
+if [ ! -d Install-Logs ]; then
+    mkdir Install-Logs
+fi
+
+# Function for installing packages
+install_package_pacman() {
+  # Checking if package is already installed
+  if pacman -Q "$1" &>/dev/null ; then
+    echo -e "${OK} $1 is already installed. Skipping..."
+  else
+    # Package not installed
+    echo -e "${NOTE} Installing $1 ..."
+    sudo pacman -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
+    # Making sure package is installed
+    if pacman -Q "$1" &>/dev/null ; then
+      echo -e "${OK} $1 was installed."
+    else
+      # Something is missing, exiting to review log
+      echo -e "${ERROR} $1 failed to install. Please check the $LOG. You may need to install manually."
+      exit 1
+    fi
+  fi
+}
+
+
+ISAUR=$(command -v yay || command -v paru)
+
+# Function for installing packages
+install_package() {
+  # Checking if package is already installed
+  if $ISAUR -Q "$1" &>> /dev/null ; then
+    echo -e "${OK} $1 is already installed. Skipping..."
+  else
+    # Package not installed
+    echo -e "${NOTE} Installing $1 ..."
+    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
+    # Making sure package is installed
+    if $ISAUR -Q "$1" &>> /dev/null ; then
+      echo -e "\e[1A\e[K${OK} $1 was installed."
+    else
+      # Something is missing, exiting to review log
+      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
+      exit 1
+    fi
+  fi
+}
+
+# Function for uninstalling packages
+uninstall_package() {
+  # Checking if package is installed
+  if pacman -Qi "$1" &>> /dev/null ; then
+    # Package is installed
+    echo -e "${NOTE} Uninstalling $1 ..."
+    sudo pacman -Rns --noconfirm "$1" 2>&1 | tee -a "$LOG"
+    # Making sure package is uninstalled
+    if ! pacman -Qi "$1" &>> /dev/null ; then
+      echo -e "\e[1A\e[K${OK} $1 was uninstalled."
+    else
+      # Something went wrong, exiting to review log
+      echo -e "\e[1A\e[K${ERROR} $1 failed to uninstall. Please check the log."
+      exit 1
+    fi
+  fi
+}

install-scripts/InputGroup.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Adding users into input group #
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+if [[ $USE_PRESET = [Yy] ]]; then
+  source ./preset.sh
+fi
+
+## 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 )"
 
@@ -8,26 +14,20 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PARENT_DIR="$SCRIPT_DIR/.."
 cd "$PARENT_DIR" || exit 1
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 
 # Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_input.log"
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_input.log"
 
 while true; do
-    echo "${WARN} This script will add or remove your user from the 'input' group."
+    echo "${WARN} This script will add your user to the 'input' group."
     echo "${NOTE} Please note that adding yourself to the 'input' group might be necessary for waybar keyboard-state functionality."
 
-    read -p "${YELLOW}Do you want to proceed? (y/n): ${RESET}" choice
+    if [[ -z $input_group_choid ]]; then
+      read -p "${YELLOW}Do you want to proceed? (y/n): ${RESET}" input_group_choid
+    fi
 
-    if [[ $choice == "y" || $choice == "Y" ]]; then
+    if [[ $input_group_choid == "y" || $input_group_choid == "Y" ]]; then
         # Check if the 'input' group exists
         if grep -q '^input:' /etc/group; then
             echo "${OK} 'input' group exists."
@@ -36,7 +36,7 @@ while true; do
             sudo groupadd input
 
             # Log the creation of the 'input' group
-            echo "$(date '+%Y-%m-%d %H:%M:%S') - 'input' group created" >> "$LOG"
+            echo "'input' group created" >> "$LOG"
         fi
 
         # Add the user to the input group
@@ -44,12 +44,14 @@ while true; do
         echo "${OK} User added to the 'input' group. Changes will take effect after you log out and log back in."
 
         # Log the addition of the user to the 'input' group
-        echo "$(date '+%Y-%m-%d %H:%M:%S') - User added to 'input' group" >> "$LOG"
+        echo "User added to 'input' group" >> "$LOG"
         break  # Break out of the loop if 'yes' is chosen
-    elif [[ $choice == "n" || $choice == "N" ]]; then
+    elif [[ $input_group_choid == "n" || $input_group_choid == "N" ]]; then
         echo "${NOTE} No changes made. Exiting the script."
         break  # Break out of the loop if 'no' is chosen
     else
         echo "${ERROR} Invalid choice. Please enter 'y' for yes or 'n' for no."
     fi
 done
+
+clear

install-scripts/bluetooth.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Bluetooth Stuff #
 
 blue=(
 bluez
@@ -6,55 +8,27 @@ bluez-utils
 blueman
 )
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+## 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 )"
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+# 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-$(date +%d-%H%M%S)_bluetooth.log"
-
-ISAUR=$(command -v yay || command -v paru)
-
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if $ISAUR -Q "$1" &>> /dev/null ; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if $ISAUR -Q "$1" &>> /dev/null ; then
-      echo -e "\e[1A\e[K${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
-      exit 1
-    fi
-  fi
-}
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_bluetooth.log"
 
 # Bluetooth
-
 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; }
   done
 
-  printf " Activating Bluetooth Services...\n"
-  sudo systemctl enable --now bluetooth.service 2>&1 | tee -a "$LOG"
+printf " Activating Bluetooth Services...\n"
+sudo systemctl enable --now bluetooth.service 2>&1 | tee -a "$LOG"
 
-  clear
+clear

install-scripts/dotfiles.sh

@@ -1,16 +1,13 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Hyprland-Dots to download from Releases #
+if [[ $USE_PRESET = [Yy] ]]; then
+  source ./preset.sh
+fi
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 
 printf "${NOTE} Downloading / Checking for existing Hyprland-Dots.tar.gz...\n"
 
@@ -34,16 +31,18 @@ if [ -f Hyprland-Dots.tar.gz ]; then
     exit 0
   else
     echo -e "${WARN} Hyprland-Dots.tar.gz is outdated (Existing version: $existing_version, Latest version: $latest_version)."
-    read -p "Do you want to upgrade to the latest version? (y/n): " upgrade_choice
+    if [[ -z $upgrade_choice ]]; then
+      read -p "Do you want to upgrade to the latest version? (y/n): " upgrade_choice
+    fi
     if [ "$upgrade_choice" = "y" ]; then
-		echo -e "${NOTE} Proceeding to download the latest release."
+		echo -e "${NOTE} Proceeding to download the latest release." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
 		
 		# Delete existing directories starting with JaKooLit-Hyprland-Dots
       find . -type d -name 'JaKooLit-Hyprland-Dots*' -exec rm -rf {} +
       rm -f Hyprland-Dots.tar.gz
       printf "${WARN} Removed existing Hyprland-Dots.tar.gz.\n"
     else
-      echo -e "${NOTE} User chose not to upgrade. Exiting..."
+      echo -e "${NOTE} User chose not to upgrade. Exiting..." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
       exit 0
     fi
   fi
@@ -56,7 +55,7 @@ latest_tag=$(curl -s https://api.github.com/repos/JaKooLit/Hyprland-Dots/release
 
 # Check if the tag is obtained successfully
 if [ -z "$latest_tag" ]; then
-  echo -e "${ERROR} Unable to fetch the latest tag information."
+  echo -e "${ERROR} Unable to fetch the latest tag information." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
   exit 1
 fi
 
@@ -65,7 +64,7 @@ latest_tarball_url=$(curl -s https://api.github.com/repos/JaKooLit/Hyprland-Dots
 
 # Check if the URL is obtained successfully
 if [ -z "$latest_tarball_url" ]; then
-  echo -e "${ERROR} Unable to fetch the tarball URL for the latest release."
+  echo -e "${ERROR} Unable to fetch the tarball URL for the latest release." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
   exit 1
 fi
 
@@ -90,10 +89,12 @@ if curl -L "$latest_tarball_url" -o "$file_name"; then
 
   # Set execute permission for copy.sh and execute it
   chmod +x copy.sh
-  ./copy.sh 2>&1 | tee -a "../install-$(date +'%d-%H%M%S')_dots.log"
+  ./copy.sh 
 
-  echo -e "${OK} Latest source code release downloaded, extracted, and processed successfully."
+  echo -e "${OK} Latest Dotfiles release downloaded, extracted, and processed successfully. Check JaKooLit-Hyprland-Dots folder for more detailed install logs" 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
 else
-  echo -e "${ERROR} Failed to download the latest source code release."
+  echo -e "${ERROR} Failed to download the latest Dotfiles release." 2>&1 | tee -a "../Install-Logs/install-$(date +'%d-%H%M%S')_dotfiles.log"
   exit 1
 fi
+
+clear

install-scripts/gtk_themes.sh

@@ -1,11 +1,13 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# GTK Themes & ICONS and  Sourcing from a different Repo #
 
 engine=(
     unzip
     gtk-engine-murrine
 )
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+## 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 )"
@@ -14,45 +16,12 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PARENT_DIR="$SCRIPT_DIR/.."
 cd "$PARENT_DIR" || exit 1
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 
 # Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_themes_main.log"
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_themes.log"
 
 
-ISAUR=$(command -v yay || command -v paru)
-
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-    # Checking if package is already installed
-    if $ISAUR -Q "$1" &>> /dev/null ; then
-        echo -e "${OK} $1 is already installed. Skipping..."
-    else
-        # Package not installed
-        echo -e "${NOTE} Installing $1 ..."
-        $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-        # Making sure package is installed
-        if $ISAUR -Q "$1" &>> /dev/null ; then
-            echo -e "\e[1A\e[K${OK} $1 was installed."
-        else
-            # Something is missing, exiting to review log
-            echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
-            exit 1
-        fi
-    fi
-}
-
 # installing engine needed for gtk themes
 for PKG1 in "${engine[@]}"; do
     install_package "$PKG1" 2>&1 | tee -a "$LOG"
@@ -69,10 +38,10 @@ if [ -d "GTK-themes-icons" ]; then
 fi
 
 echo "$NOTE Cloning Tokyo Theme GTK themes and Icons repository..." 2>&1 | tee -a "$LOG"
-if git clone https://github.com/JaKooLit/GTK-themes-icons.git 2>&1 | tee -a "$LOG"; then
+if git clone https://github.com/JaKooLit/GTK-themes-icons.git ; then
     cd GTK-themes-icons
     chmod +x auto-extract.sh
-    ./auto-extract.sh 2>&1 | tee -a "$LOG"
+    ./auto-extract.sh
     cd ..
     echo "$OK Extracted GTK Themes & Icons to ~/.icons & ~/.themes folders" 2>&1 | tee -a "$LOG"
 else

install-scripts/hyprland.sh

@@ -1,48 +1,25 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Main Hyprland Package #
 
 hypr=(
 hyprland
+hyprcursor
 )
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+# 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
 
 # Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_hyprland.log"
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland.log"
 
-ISAUR=$(command -v yay || command -v paru)
-
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if $ISAUR -Q "$1" &>> /dev/null ; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if $ISAUR -Q "$1" &>> /dev/null ; then
-      echo -e "\e[1A\e[K${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
-      exit 1
-    fi
-  fi
-}
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 
 # Removing other Hyprland to avoid conflict
 printf "${YELLOW} Checking for other hyprland packages and remove if any..${RESET}\n"
@@ -58,6 +35,6 @@ 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
+done
 
-  clear
+clear

install-scripts/nvidia.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Nvidia Stuffs #
+if [[ $USE_PRESET = [Yy] ]]; then
+  source ./preset.sh
+fi
 
 nvidia_pkg=(
   nvidia-dkms
@@ -10,47 +15,22 @@ nvidia_pkg=(
 
 hypr=(
   hyprland
+  hyprcursor
 )
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+## 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 )"
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+# 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-$(date +%d-%H%M%S)_nvidia.log"
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_nvidia.log"
 
-ISAUR=$(command -v yay || command -v paru)
-
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if $ISAUR -Q "$1" &>> /dev/null; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if $ISAUR -Q "$1" &>> /dev/null; then
-      echo -e "\e[1A\e[K${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry, I have tried :("
-      exit 1
-    fi
-  fi
-}
 
 # nvidia stuff
 printf "${YELLOW} Checking for other hyprland packages and remove if any..${RESET}\n"
@@ -108,18 +88,20 @@ if [ -f /etc/default/grub ]; then
         sudo sed -i 's/\(GRUB_CMDLINE_LINUX_DEFAULT=".*\)"/\1 nvidia-drm.modeset=1"/' /etc/default/grub
         # Regenerate GRUB configuration
         sudo grub-mkconfig -o /boot/grub/grub.cfg
-        echo "nvidia-drm.modeset=1 added to /etc/default/grub"
+        echo "nvidia-drm.modeset=1 added to /etc/default/grub" 2>&1 | tee -a "$LOG"
     else
-        echo "nvidia-drm.modeset=1 is already present in /etc/default/grub"
+        echo "nvidia-drm.modeset=1 is already present in /etc/default/grub" 2>&1 | tee -a "$LOG"
     fi
 else
     echo "/etc/default/grub does not exist"
 fi
 
 # Blacklist nouveau
-read -n1 -rep "${CAT} Would you like to blacklist nouveau? (y/n)" response
+    if [[ -z $blacklist_nouveau ]]; then
+      read -n1 -rep "${CAT} Would you like to blacklist nouveau? (y/n)" blacklist_nouveau
+    fi
 echo
-if [[ $response =~ ^[Yy]$ ]]; then
+if [[ $blacklist_nouveau =~ ^[Yy]$ ]]; then
   NOUVEAU="/etc/modprobe.d/nouveau.conf"
   if [ -f "$NOUVEAU" ]; then
     printf "${OK} Seems like nouveau is already blacklisted..moving on.\n"
@@ -137,7 +119,7 @@ if [[ $response =~ ^[Yy]$ ]]; then
     fi
   fi
 else
-  printf "${NOTE} Skipping nouveau blacklisting.\n"
+  printf "${NOTE} Skipping nouveau blacklisting.\n" 2>&1 | tee -a "$LOG"
 fi
 
 clear

install-scripts/pacman.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# pacman adding up extra-spices #
+
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
+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)_pacman.log"
+
+echo -e "${NOTE} Adding Extra Spice in pacman.conf ... ${RESET}" 2>&1 | tee -a "$LOG"
+pacman_conf="/etc/pacman.conf"
+
+# Remove comments '#' from specific lines
+lines_to_edit=(
+    "Color"
+    "CheckSpace"
+    "VerbosePkgLists"
+    "ParallelDownloads"
+)
+
+# Uncomment specified lines if they are commented out
+for line in "${lines_to_edit[@]}"; do
+    if grep -q "^#$line" "$pacman_conf"; then
+        sudo sed -i "s/^#$line/$line/" "$pacman_conf"
+        echo -e "${CAT} Uncommented: $line ${RESET}" 2>&1 | tee -a "$LOG"
+    else
+        echo -e "${CAT} $line is already uncommented. ${RESET}" 2>&1 | tee -a "$LOG"
+    fi
+done
+
+# Add "ILoveCandy" below ParallelDownloads if it doesn't exist
+if grep -q "^ParallelDownloads" "$pacman_conf" && ! grep -q "^ILoveCandy" "$pacman_conf"; then
+    sudo sed -i "/^ParallelDownloads/a ILoveCandy" "$pacman_conf"
+    echo -e "${CAT} Added ILoveCandy below ParallelDownloads. ${RESET}" 2>&1 | tee -a "$LOG"
+else
+    echo -e "${CAT} ILoveCandy already exists ${RESET}" 2>&1 | tee -a "$LOG"
+fi
+
+echo -e "${CAT} Pacman.conf spicing up completed ${RESET}" 2>&1 | tee -a "$LOG"
+
+# updating pacman.conf
+sudo pacman -Sy
+
+clear

install-scripts/paru.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Paru AUR Helper #
+# NOTE: If yay is already installed, paru will not be installed #
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
+# Set the name of the log file to include the current date and time
+LOG="install-$(date +%d-%H%M%S)_paru.log"
 
 # Set some colors for output messages
 OK="$(tput setaf 2)[OK]$(tput sgr0)"
@@ -12,20 +18,32 @@ ORANGE=$(tput setaf 166)
 YELLOW=$(tput setaf 3)
 RESET=$(tput sgr0)
 
-# Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_paru.log"
+
+# Create Directory for Install Logs
+if [ ! -d Install-Logs ]; then
+    mkdir Install-Logs
+fi
+
+# checking if paru-bin exist and removing if it is
+if [ -d paru-bin ]; then
+    rm -rf paru-bin 2>&1 | tee -a "$LOG"
+fi
 
 # Check for AUR helper and install if not found
 ISAUR=$(command -v yay || command -v paru)
 
 if [ -n "$ISAUR" ]; then
-  printf "\n%s - AUR helper was located, moving on.\n" "${OK}"
+  printf "\n%s - AUR helper already installed, moving on..\n" "${OK}"
 else
   printf "\n%s - AUR helper was NOT located\n" "$WARN"
   printf "\n%s - Installing paru from AUR\n" "${NOTE}"
   git clone https://aur.archlinux.org/paru-bin.git || { printf "%s - Failed to clone paru from AUR\n" "${ERROR}"; exit 1; }
   cd paru-bin || { printf "%s - Failed to enter paru-bin directory\n" "${ERROR}"; exit 1; }
   makepkg -si --noconfirm 2>&1 | tee -a "$LOG" || { printf "%s - Failed to install paru from AUR\n" "${ERROR}"; exit 1; }
+  
+  # moving install logs in to Install-Logs folder
+  mv install*.log ../Install-Logs/ || true  
+  cd ..
 fi
 
 # Update system before proceeding

install-scripts/pipewire.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Pipewire and Pipewire Audio Stuff #
 
 pipewire=(
     pipewire
@@ -10,43 +12,20 @@ pipewire=(
 
 ############## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##############
 # Set some colors for output messages
-OK=$(tput setaf 2)[OK]$(tput sgr0)
-ERROR=$(tput setaf 1)[ERROR]$(tput sgr0)
-NOTE=$(tput setaf 3)[NOTE]$(tput sgr0)
-WARN=$(tput setaf 166)[WARN]$(tput sgr0)
-CAT=$(tput setaf 6)[ACTION]$(tput sgr0)
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+# 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-$(date +%d-%H%M%S)_bluetooth.log"
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_pipewire.log"
 
 ISAUR=$(command -v yay || command -v paru)
 
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-    # Checking if the package is already installed
-    if $ISAUR -Q "$1" &>>/dev/null; then
-        echo -e "${OK} $1 is already installed. Skipping..."
-    else
-        # Package not installed
-        echo -e "${NOTE} Installing $1 ..."
-        $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-        # Making sure the package is installed
-        if $ISAUR -Q "$1" &>>/dev/null; then
-            echo -e "\e[1A\e[K${OK} $1 was installed."
-        else
-            # Something is missing, exiting to review the log
-            echo -e "\e[1A\e[K${ERROR} $1 failed to install. Please check the install.log. You may need to install manually! Sorry I have tried :("
-            exit 1
-        fi
-    fi
-}
-
 # Removal of pulseaudio
 printf "${YELLOW}Removing pulseaudio stuff...${RESET}\n"
 for pulseaudio in pulseaudio pulseaudio-alsa pulseaudio-bluetooth; do
@@ -54,7 +33,7 @@ for pulseaudio in pulseaudio pulseaudio-alsa pulseaudio-bluetooth; do
 done
 
 # Disabling pulseaudio to avoid conflicts
-systemctl --user disable --now pulseaudio.socket pulseaudio.service 2>&1 | tee -a "$LOG"
+systemctl --user disable --now pulseaudio.socket pulseaudio.service 2>/dev/null && tee -a "$LOG"
 
 # Pipewire
 printf "${NOTE} Installing Pipewire Packages...\n"
@@ -67,4 +46,5 @@ printf "Activating Pipewire Services...\n"
 systemctl --user enable --now pipewire.socket pipewire-pulse.socket wireplumber.service 2>&1 | tee -a "$LOG"
 systemctl --user enable --now pipewire.service 2>&1 | tee -a "$LOG"
 
+
 clear

install-scripts/rog.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Asus ROG Laptops #
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
-
-
+## 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 )"
 
@@ -10,55 +10,24 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PARENT_DIR="$SCRIPT_DIR/.."
 cd "$PARENT_DIR" || exit 1
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 
 # Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_rog.log"
-
-ISAUR=$(command -v yay || command -v paru)
-
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if $ISAUR -Q "$1" &>> /dev/null ; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if $ISAUR -Q "$1" &>> /dev/null ; then
-      echo -e "\e[1A\e[K${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
-      exit 1
-    fi
-  fi
-}
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_rog.log"
 
 ### Install software for Asus ROG laptops ###
 
-    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"
-      exit 1
-      fi
-    done
-    printf " Activating ROG services...\n"
-    sudo systemctl enable --now supergfxd 2>&1 | tee -a "$LOG"
+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"
+  exit 1
+  fi
+done
+
+printf " Activating ROG services...\n"
+sudo systemctl enable --now supergfxd 2>&1 | tee -a "$LOG"
 
 clear
+

install-scripts/sddm.sh

@@ -1,13 +1,18 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# SDDM Log-in Manager #
+if [[ $USE_PRESET = [Yy] ]]; then
+  source ./preset.sh
+fi
 
 sddm=(
   qt5-graphicaleffects
   qt5-quickcontrols2
   qt5-svg
-  sddm-git
+  sddm
 )
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+## 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 )"
@@ -16,58 +21,14 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PARENT_DIR="$SCRIPT_DIR/.."
 cd "$PARENT_DIR" || exit 1
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 
 # Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_sddm.log"
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_sddm.log"
 
-ISAUR=$(command -v yay || command -v paru)
-
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if $ISAUR -Q "$1" &>> /dev/null ; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if $ISAUR -Q "$1" &>> /dev/null ; then
-      echo -e "\e[1A\e[K${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
-      exit 1
-    fi
-  fi
-}
-
-# SDDM
-
-# Check if SDDM is already installed
-if pacman -Qs sddm > /dev/null; then
-  # Prompt user to manually install sddm-git to remove SDDM
-  read -n1 -rep "SDDM is already installed. Would you like to manually install sddm-git to remove it? This requires manual intervention. (y/n)" manual_install_sddm
-  echo
-  if [[ $manual_install_sddm =~ ^[Yy]$ ]]; then
-    $ISAUR -S sddm-git 2>&1 | tee -a "$LOG"
-  fi
-fi
 
 # Install SDDM and SDDM theme
-printf "${NOTE} Installing SDDM-git and dependencies........\n"
+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; }
@@ -96,7 +57,9 @@ sudo cp assets/hyprland.desktop "$wayland_sessions_dir/" 2>&1 | tee -a "$LOG"
 # SDDM-themes
 valid_input=false
 while [ "$valid_input" != true ]; do
-  read -n 1 -r -p "${CAT} OPTIONAL - Would you like to install SDDM themes? (y/n)" install_sddm_theme
+    if [[ -z $install_sddm_theme ]]; then
+      read -n 1 -r -p "${CAT} OPTIONAL - Would you like to install SDDM themes? (y/n)" install_sddm_theme
+    fi
   if [[ $install_sddm_theme =~ ^[Yy]$ ]]; then
     printf "\n%s - Installing Simple SDDM Theme\n" "${NOTE}"
 
@@ -112,7 +75,7 @@ while [ "$valid_input" != true ]; do
       echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm' directory from the current location." 2>&1 | tee -a "$LOG"
     fi
 
-    if git clone https://github.com/JaKooLit/simple-sddm.git 2>&1 | tee -a "$LOG"; then
+    if git clone https://github.com/JaKooLit/simple-sddm.git; then
       while [ ! -d "simple-sddm" ]; do
         sleep 1
       done
@@ -125,7 +88,7 @@ while [ "$valid_input" != true ]; do
       sudo mv simple-sddm /usr/share/sddm/themes/
       echo -e "[Theme]\nCurrent=simple-sddm" | 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 or repository availability." | tee -a "$LOG" >&2
+      echo -e "\e[1A\e[K${ERROR} - Failed to clone the theme repository. Please check your internet connection" | tee -a "$LOG" >&2
     fi
     valid_input=true
   elif [[ $install_sddm_theme =~ ^[Nn]$ ]]; then
@@ -133,9 +96,8 @@ while [ "$valid_input" != true ]; do
     valid_input=true
   else
     printf "\n%s - Invalid input. Please enter 'y' for Yes or 'n' for No.\n" "${ERROR}" 2>&1 | tee -a "$LOG"
+    install_sddm_theme=""
   fi
 done
 
-
-
 clear

install-scripts/thunar.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Thunar #
 
 thunar=(
 thunar 
@@ -8,7 +10,7 @@ ffmpegthumbnailer
 thunar-archive-plugin
 )
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+## 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 )"
@@ -17,65 +19,29 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PARENT_DIR="$SCRIPT_DIR/.."
 cd "$PARENT_DIR" || exit 1
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 
 # Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_thunar.log"
-
-
-ISAUR=$(command -v yay || command -v paru)
-
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if $ISAUR -Q "$1" &>> /dev/null ; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if $ISAUR -Q "$1" &>> /dev/null ; then
-      echo -e "\e[1A\e[K${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
-      exit 1
-    fi
-  fi
-}
-
-# Bluetooth
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_thunar.log"
 
+# Thunar
 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; }
   done
 
-  # Check for existing config folders and backup
-  for DIR1 in Thunar xfce4; do
-    DIRPATH=~/.config/$DIR1
-    if [ -d "$DIRPATH" ]; then
-      echo -e "${NOTE} Config for $DIR1 found, backing up."
-      mv $DIRPATH $DIRPATH-back-up 2>&1 | tee -a "$LOG"
-      echo -e "${NOTE} Backed up $DIR1 to $DIRPATH-back-up."
-    fi
-  done
-
-# copying from assets
-cp -r assets/xfce4 ~/.config/ && echo "Copy xfce4 completed!" || echo "Error: Failed to copy xfce4 config files." 2>&1 | tee -a "$LOG"
-cp -r assets/Thunar ~/.config/ && echo "Copy Thunar completed!" || echo "Error: Failed to copy Thunar config files." 2>&1 | tee -a "$LOG"
+ # Check for existing configs and copy if does not exist
+for DIR1 in Thunar xfce4; do
+  DIRPATH=~/.config/$DIR1
+  if [ -d "$DIRPATH" ]; then
+    echo -e "${NOTE} Config for $DIR1 found, no need to copy." 2>&1 | tee -a "$LOG"
+  else
+    echo -e "${NOTE} Config for $DIR1 not found, copying from assets." 2>&1 | tee -a "$LOG"
+    cp -r assets/$DIR1 ~/.config/ && echo "Copy $DIR1 completed!" || echo "Error: Failed to copy $DIR1 config files." 2>&1 | tee -a "$LOG"
+  fi
+done
 
 clear
+
+

install-scripts/xdph.sh

@@ -1,84 +1,74 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# XDG-Desktop-Portals #
+if [[ $USE_PRESET = [Yy] ]]; then
+  source ./preset.sh
+fi
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
+xdg=(
+xdg-desktop-portal-hyprland
+xdg-desktop-portal-gtk
+)
 
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+# 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-$(date +%d-%H%M%S)_xdph.log"
-
-ISAUR=$(command -v yay || command -v paru)
-
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if $ISAUR -Q "$1" &>> /dev/null ; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if $ISAUR -Q "$1" &>> /dev/null ; then
-      echo -e "\e[1A\e[K${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
-      exit 1
-    fi
-  fi
-}
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_xdph.log"
 
 # XDG-DESKTOP-PORTAL-HYPRLAND
-
-for xdph in xdg-desktop-portal-hyprland; do
-  install_package "$xdph" 2>&1 | tee -a "$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"
     exit 1
     fi
 done
 
+printf "\n"
+    
 printf "${NOTE} Checking for other XDG-Desktop-Portal-Implementations....\n"
 sleep 1
 printf "\n"
-printf "${NOTE} XDG-desktop-portal-KDE (if installed) should be manually disabled or removed! I can't remove it... sorry...\n"
-read -rp "${CAT} Would you like to try to remove other XDG-Desktop-Portal-Implementations? (y/n) " XDPH1
-echo
-sleep 1
+printf "${NOTE} XDG-desktop-portal-KDE & GNOME (if installed) should be manually disabled or removed! I can't remove it... sorry...\n"
+while true; do
+    if [[ -z $XDPH1 ]]; then
+      read -rp "${CAT} Would you like to try to remove other XDG-Desktop-Portal-Implementations? (y/n) " XDPH1
+    fi
+    echo
+    sleep 1
 
-if [[ $XDPH1 =~ ^[Yy]$ ]]; then
-    # Clean out other portals
-    printf "${NOTE} Clearing any other xdg-desktop-portal implementations...\n"
-    # Check if packages are installed and uninstall if present
-    if pacman -Qs xdg-desktop-portal-gnome > /dev/null ; then
-        echo "Removing xdg-desktop-portal-gnome..."
-        sudo pacman -R --noconfirm xdg-desktop-portal-gnome 2>&1 | tee -a $LOG
-    fi
-    if pacman -Qs xdg-desktop-portal-gtk > /dev/null ; then
-        echo "Removing xdg-desktop-portal-gtk..."
-        sudo pacman -R --noconfirm xdg-desktop-portal-gtk 2>&1 | tee -a $LOG
-    fi
-    if pacman -Qs xdg-desktop-portal-wlr > /dev/null ; then
-        echo "Removing xdg-desktop-portal-wlr..."
-        sudo pacman -R --noconfirm xdg-desktop-portal-wlr 2>&1 | tee -a $LOG
-    fi
-    if pacman -Qs xdg-desktop-portal-lxqt > /dev/null ; then
-        echo "Removing xdg-desktop-portal-lxqt..."
-        sudo pacman -R --noconfirm xdg-desktop-portal-lxqt 2>&1 | tee -a $LOG
-    fi
-fi
+    case $XDPH1 in
+        [Yy])
+            # Clean out other portals
+            printf "${NOTE} Clearing any other xdg-desktop-portal implementations...\n"
+            # Check if packages are installed and uninstall if present
+            if pacman -Qs xdg-desktop-portal-wlr > /dev/null ; then
+                echo "Removing xdg-desktop-portal-wlr..."
+                sudo pacman -R --noconfirm xdg-desktop-portal-wlr 2>&1 | tee -a "$LOG"
+            fi
+            if pacman -Qs xdg-desktop-portal-lxqt > /dev/null ; then
+                echo "Removing xdg-desktop-portal-lxqt..."
+                sudo pacman -R --noconfirm xdg-desktop-portal-lxqt 2>&1 | tee -a "$LOG"
+            fi
+            break
+            ;;
+        [Nn])
+            echo "no other XDG-implementations will be removed." >> "$LOG"
+            break
+            ;;
+        *)
+            echo "Invalid input. Please enter 'y' for yes or 'n' for no."
+            ;;
+    esac
+done
 
 clear

install-scripts/yay.sh

@@ -1,7 +1,12 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Yay AUR Helper #
+# NOTE: If paru is already installed, yay will not be installed #
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
 
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
+# Set the name of the log file to include the current date and time
+LOG="install-$(date +%d-%H%M%S)_yay.log"
 
 # Set some colors for output messages
 OK="$(tput setaf 2)[OK]$(tput sgr0)"
@@ -13,20 +18,30 @@ ORANGE=$(tput setaf 166)
 YELLOW=$(tput setaf 3)
 RESET=$(tput sgr0)
 
-# Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_yay.log"
+# Create Directory for Install Logs
+if [ ! -d Install-Logs ]; then
+    mkdir Install-Logs
+fi
+
+# Check Existing yay-bin
+if [ -d yay-bin ]; then
+    rm -rf yay-bin 2>&1 | tee -a "$LOG"
+fi
 
 # Check for AUR helper and install if not found
 ISAUR=$(command -v yay || command -v paru)
-
 if [ -n "$ISAUR" ]; then
-  printf "\n%s - AUR helper yay was located, moving on.\n" "${OK}"
+  printf "\n%s - AUR helper already installed, moving on.\n" "${OK}"
 else
   printf "\n%s - AUR helper was NOT located\n" "$WARN"
   printf "\n%s - Installing yay from AUR\n" "${NOTE}"
   git clone https://aur.archlinux.org/yay-bin.git || { printf "%s - Failed to clone yay from AUR\n" "${ERROR}"; exit 1; }
   cd yay-bin || { printf "%s - Failed to enter yay-bin directory\n" "${ERROR}"; exit 1; }
   makepkg -si --noconfirm 2>&1 | tee -a "$LOG" || { printf "%s - Failed to install yay from AUR\n" "${ERROR}"; exit 1; }
+
+  # moving install logs in to Install-Logs folder
+  mv install*.log ../Install-Logs/ || true   
+  cd ..
 fi
 
 # Update system before proceeding

install-scripts/zsh.sh

@@ -1,23 +1,17 @@
 #!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# zsh and oh my zsh including pokemon-color-scripts#
+if [[ $USE_PRESET = [Yy] ]]; then
+  source ./preset.sh
+fi
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
-
-# Set some colors for output messages
-OK="$(tput setaf 2)[OK]$(tput sgr0)"
-ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
-NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
-WARN="$(tput setaf 166)[WARN]$(tput sgr0)"
-CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-ORANGE=$(tput setaf 166)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
-
-# Set the name of the log file to include the current date and time
-LOG="install-$(date +%d-%H%M%S)_zsh.log"
+zsh=(
+zsh
+zsh-completions
+)
 
 
-############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ######################################
-
+## 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 )"
 
@@ -25,47 +19,35 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PARENT_DIR="$SCRIPT_DIR/.."
 cd "$PARENT_DIR" || exit 1
 
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 
-ISAUR=$(command -v yay || command -v paru)
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_zsh.log"
 
-# Set the script to exit on error
-set -e
-
-# Function for installing packages
-install_package() {
-  # Checking if package is already installed
-  if $ISAUR -Q "$1" &>> /dev/null ; then
-    echo -e "${OK} $1 is already installed. Skipping..."
-  else
-    # Package not installed
-    echo -e "${NOTE} Installing $1 ..."
-    $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG"
-    # Making sure package is installed
-    if $ISAUR -Q "$1" &>> /dev/null ; then
-      echo -e "\e[1A\e[K${OK} $1 was installed."
-    else
-      # Something is missing, exiting to review log
-      echo -e "\e[1A\e[K${ERROR} $1 failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :("
-      exit 1
+## Optional Pokemon color scripts
+while true; do
+    if [[ -z $pokemon_choice ]]; then
+       read -p "${CAT} OPTIONAL - Do you want to add Pokemon color scripts? (y/n): " pokemon_choice
     fi
-  fi
-}
-
-
-# Check if the oh-my-zsh directory exists
-if [ -d "$HOME/.oh-my-zsh" ]; then
-    printf "${NOTE} Oh My Zsh found. Creating a backup before uninstalling...${RESET}\n"
-    # Perform backup using cp -r and create a backup directory with -backup suffix
-    cp -r "$HOME/.oh-my-zsh" "$HOME/.oh-my-zsh-backup" || true
-    mv "$HOME/.zshrc" "$HOME/.zshrc-backup" || true
-
-    printf "${NOTE} Backup created....${RESET}\n"
-fi
-
+    case "$pokemon_choice" in
+        [Yy]*)
+            zsh+=('pokemon-colorscripts-git')
+            sed -i '/#pokemon-colorscripts --no-title -s -r/s/^#//' assets/.zshrc
+            break
+            ;;
+        [Nn]*)
+            echo "${NOTE}Skipping Pokemon color scripts installation.${RESET}" 2>&1 | tee -a "$LOG"
+            break
+            ;;
+        *)
+            echo "${WARN}Please enter 'y' for yes or 'n' for no.${RESET}"
+            ;;
+    esac
+done
 
 # Installing zsh packages
 printf "${NOTE} Installing core zsh packages...${RESET}\n"
-for ZSH in zsh zsh-completions pokemon-colorscripts-git; do
+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"
@@ -79,34 +61,42 @@ if command -v zsh >/dev/null; then
 	if [ ! -d "$HOME/.oh-my-zsh" ]; then
   		sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended || true
 	else
-		echo "Directory .oh-my-zsh already exists. Skipping re-installation."
+		echo "Directory .oh-my-zsh already exists. Skipping re-installation." 2>&1 | tee -a "$LOG"
 	fi
 	# Check if the directories exist before cloning the repositories
-	if [ ! -d "$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions" ]; then
+	if [ ! -d "$HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions" ]; then
     	git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions || true
 	else
-    	echo "Directory zsh-autosuggestions already exists. Skipping cloning."
+    	echo "Directory zsh-autosuggestions already exists. Skipping cloning." 2>&1 | tee -a "$LOG"
 	fi
 
-	if [ ! -d "$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting" ]; then
+	if [ ! -d "$HOME/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" ]; then
     	git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting || true
 	else
-    	echo "Directory zsh-syntax-highlighting already exists. Skipping cloning."
+    	echo "Directory zsh-syntax-highlighting already exists. Skipping cloning." 2>&1 | tee -a "$LOG"
 	fi
 	
+	# Check if ~/.zshrc and .zprofile exists, create a backup, and copy the new configuration
+	if [ -f "$HOME/.zshrc" ]; then
+    	cp -b "$HOME/.zshrc" "$HOME/.zshrc-backup" || true
+	fi
+
+	if [ -f "$HOME/.zprofile" ]; then
+    	cp -b "$HOME/.zprofile" "$HOME/.zprofile-backup" || true
+	fi
+	
+	# Copying the preconfigured zsh themes and profile
     cp -r 'assets/.zshrc' ~/
     cp -r 'assets/.zprofile' ~/
 
     printf "${NOTE} Changing default shell to zsh...\n"
 
 	while ! chsh -s $(which zsh); do
-    	echo "${ERROR} Authentication failed. Please enter the correct password."
+    	echo "${ERROR} Authentication failed. Please enter the correct password." 2>&1 | tee -a "$LOG"
     	sleep 1
 	done
 	printf "${NOTE} Shell changed successfully to zsh.\n" 2>&1 | tee -a "$LOG"
 
 fi
-  printf "\n\n\n\n"
-  
 
 clear

install.sh

@@ -26,12 +26,28 @@ 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."
     exit 1
 fi
 
+# Create Directory for Install Logs
+if [ ! -d Install-Logs ]; then
+    mkdir Install-Logs
+fi
 
+# Use of Preset Settings
+if [[ $use_preset = [Yy] ]]; then
+  source ./preset.sh
+fi
 
 # Set some colors for output messages
 OK="$(tput setaf 2)[OK]$(tput sgr0)"
@@ -43,6 +59,7 @@ ORANGE=$(tput setaf 166)
 YELLOW=$(tput setaf 3)
 RESET=$(tput sgr0)
 
+
 # Function to colorize prompts
 colorize_prompt() {
     local color="$1"
@@ -54,22 +71,32 @@ colorize_prompt() {
 LOG="install-$(date +%d-%H%M%S).log"
 
 # Initialize variables to store user responses
-aur_helper=""
-bluetooth=""
-dots=""
-gtk_themes=""
-nvidia=""
-rog=""
-sddm=""
-thunar=""
-xdph=""
-zsh=""
+# aur_helper=""
+# bluetooth=""
+# dots=""
+# gtk_themes=""
+# nvidia=""
+# rog=""
+# sddm=""
+# thunar=""
+# xdph=""
+# zsh=""
 
 # Define the directory where your scripts are located
 script_directory=install-scripts
 
 # Function to ask a yes/no question and set the response in a variable
 ask_yes_no() {
+  if [[ ! -z "${!2}" ]]; then
+    echo "$(colorize_prompt "$CAT"  "$1 (Preset): ${!2}")" 
+    if [[ "${!2}" = [Yy] ]]; then
+      return 0
+    else
+      return 1
+    fi
+  else
+    eval "$2=''" 
+  fi
     while true; do
         read -p "$(colorize_prompt "$CAT"  "$1 (y/n): ")" choice
         case "$choice" in
@@ -86,6 +113,12 @@ ask_custom_option() {
     local valid_options="$2"
     local response_var="$3"
 
+    if [[ ! -z "${!3}" ]]; then
+      return 0
+    else
+     eval "$3=''" 
+    fi
+
     while true; do
         read -p "$(colorize_prompt "$CAT"  "$prompt ($valid_options): ")" choice
         if [[ " $valid_options " == *" $choice "* ]]; then
@@ -103,7 +136,7 @@ execute_script() {
     if [ -f "$script_path" ]; then
         chmod +x "$script_path"
         if [ -x "$script_path" ]; then
-            "$script_path"
+            env USE_PRESET=$use_preset  "$script_path"
         else
             echo "Failed to make script '$script' executable."
         fi
@@ -116,7 +149,7 @@ execute_script() {
 printf "\n"
 ask_custom_option "-Type AUR helper" "paru or yay" aur_helper
 printf "\n"
-ask_yes_no "-Do you have nvidia gpu?" nvidia
+ask_yes_no "-Do you have any nvidia gpu in your system?" nvidia
 printf "\n"
 ask_yes_no "-Install GTK themes (required for Dark/Light function)?" gtk_themes
 printf "\n"
@@ -124,22 +157,25 @@ ask_yes_no "-Do you want to configure Bluetooth?" bluetooth
 printf "\n"
 ask_yes_no "-Do you want to install Thunar file manager?" thunar
 printf "\n"
-ask_yes_no "-Installing in Asus ROG Laptops?" rog
-printf "\n"
-ask_yes_no "-Install and configure SDDM log-in Manager?" sddm
+ask_yes_no "-Install & configure SDDM log-in Manager plus (OPTIONAL) SDDM Theme?" sddm
 printf "\n"
 ask_yes_no "-Install XDG-DESKTOP-PORTAL-HYPRLAND? (For proper Screen Share ie OBS)" xdph
 printf "\n"
-ask_yes_no "-Install zsh, oh-my-zsh & pokemon-colorscripts?" zsh
+ask_yes_no "-Install zsh, oh-my-zsh & (Optional) pokemon-colorscripts?" zsh
 printf "\n"
-ask_yes_no "-Do you want to copy Hyprland dotfiles?" dots
+ask_yes_no "-Installing in a Asus ROG Laptops?" rog
 printf "\n"
+ask_yes_no "-Do you want to download pre-configured Hyprland dotfiles?" dots
+printf "\n"
+
 # Ensuring all in the scripts folder are made executable
 chmod +x install-scripts/*
-
-# Execute AUR helper script based on user choice
+sleep 0.5
+# Ensuring base-devel is installed
 execute_script "00-base.sh"
-
+sleep 0.5
+execute_script "pacman.sh"
+# Execute AUR helper script based on user choice
 if [ "$aur_helper" == "paru" ]; then
     execute_script "paru.sh"
 elif [ "$aur_helper" == "yay" ]; then
@@ -172,10 +208,6 @@ if [ "$thunar" == "Y" ]; then
     execute_script "thunar.sh"
 fi
 
-if [ "$rog" == "Y" ]; then
-    execute_script "rog.sh"
-fi
-
 if [ "$sddm" == "Y" ]; then
     execute_script "sddm.sh"
 fi
@@ -190,12 +222,15 @@ fi
 
 execute_script "InputGroup.sh"
 
+if [ "$rog" == "Y" ]; then
+    execute_script "rog.sh"
+fi
+
 if [ "$dots" == "Y" ]; then
     execute_script "dotfiles.sh"
 
 fi
 
-clear
 
 printf "\n${OK} Yey! Installation Completed.\n"
 printf "\n"

preset.sh

@@ -0,0 +1,48 @@
+# 💫 https://github.com/JaKooLit 💫 #
+#
+# CREDIT to: https://github.com/PostCyberPunk for this Preset function
+
+## -- Make sure you use the right answer or install script will fail ###
+# Make sure proper AUR Helper is use NO Upperscript. Either paru or yay only is accepted
+# The rest Change to Y for Yes and N for No. 
+
+### -Type AUR helper
+### yay or paru 
+aur_helper="yay"
+############ use : "Y" or "N"
+###-Do you have any nvidia gpu in your system?
+nvidia="Y"
+###-Install GTK themes (required for Dark/Light function)?
+gtk_themes="Y"
+###-Do you want to configure Bluetooth?
+bluetooth="Y"
+###-Do you want to install Thunar file manager?
+thunar="Y"
+###-Install & configure SDDM log-in Manager plus (OPTIONAL) SDDM Theme?
+sddm="Y"
+###-Install XDG-DESKTOP-PORTAL-HYPRLAND? (For proper Screen Share ie OBS)
+xdph="Y"
+###-Install zsh, oh-my-zsh & (Optional) pokemon-colorscripts?
+zsh="Y"
+###-Installing in a Asus ROG Laptops?
+rog="N"
+###-Do you want to download pre-configured Hyprland dotfiles?
+dots="Y"
+
+### These are the sub-questions of the above choices
+### Would you like to blacklist nouveau? (y/n)
+blacklist_nouveau="Y"
+### XDG-desktop-portal-KDE & GNOME (if installed) should be manually disabled or removed! Script cant remove nor disable it.
+### Would you like to try to remove other XDG-Desktop-Portal-Implementations? (y/n) 
+XDPH1="Y"
+### SDDM is already installed. Would you like to manually install sddm-git to remove it? This requires manual intervention. (y/n)
+manual_install_sddm="N"
+### OPTIONAL - Would you like to install SDDM themes? (y/n)
+install_sddm_theme="Y"
+### " This script will add your user to the 'input' group."
+### " Please note that adding yourself to the 'input' group might be necessary for waybar keyboard-state functionality."
+input_group_choid="Y"
+### OPTIONAL - Do you want to add Pokemon color scripts? (y/n): 
+pokemon_choice="Y"
+### Do you want to upgrade to the latest version? (y/n) - This is for the dotfiles
+upgrade_choice="Y"