From 941b24ed1dd509ee35b99fbaf025584e39cd5f6d Mon Sep 17 00:00:00 2001
From: JaKooLit <ejhay.games@gmail.com>
Date: Thu, 20 Feb 2025 22:37:49 +0900
Subject: [PATCH 1/6] Added nwg-displays for the upcoming Kools dots v2.3.12

---
 CHANGELOGS.md                   | 3 +++
 install-scripts/01-hypr-pkgs.sh | 1 +
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index ad40f41..321fb93 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,5 +1,8 @@
 ## Changelogs
 
+## 20 Feb 2025
+- Added nwg-displays for the upcoming Kools dots v2.3.12
+
 ## 06 Feb 2025
 - added semi-unattended function.
 - move all the initial questions at the beginning
diff --git a/install-scripts/01-hypr-pkgs.sh b/install-scripts/01-hypr-pkgs.sh
index cae2ba2..f631b48 100755
--- a/install-scripts/01-hypr-pkgs.sh
+++ b/install-scripts/01-hypr-pkgs.sh
@@ -63,6 +63,7 @@ hypr_package_2=(
   mpv-mpris 
   nvtop
   nwg-look
+  nwg-displays
   pacman-contrib
   qalculate-gtk
   vim

From 52531e7d1f99918a82885cb3d9017a02f7b5cb7c Mon Sep 17 00:00:00 2001
From: JaKooLit <ejhay.games@gmail.com>
Date: Sat, 22 Feb 2025 01:03:41 +0900
Subject: [PATCH 2/6] replaced eog with loupe

---
 CHANGELOGS.md                   | 3 +++
 install-scripts/01-hypr-pkgs.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index c823492..8e2cfa7 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,5 +1,8 @@
 ## Changelogs
 
+## 22 Feb 2025
+- replaced eog with loupe
+
 ## 20 Feb 2025
 - Added nwg-displays for the upcoming Kools dots v2.3.12
 
diff --git a/install-scripts/01-hypr-pkgs.sh b/install-scripts/01-hypr-pkgs.sh
index de6bbd6..158784e 100755
--- a/install-scripts/01-hypr-pkgs.sh
+++ b/install-scripts/01-hypr-pkgs.sh
@@ -56,7 +56,7 @@ hypr_package_2=(
   brightnessctl 
   btop
   cava
-  eog
+  loupe
   fastfetch
   gnome-system-monitor
   mousepad 

From 1970cca375ce7331cfbc541161a788d560df9cc4 Mon Sep 17 00:00:00 2001
From: JaKooLit <ejhay.games@gmail.com>
Date: Sat, 22 Feb 2025 12:04:06 +0900
Subject: [PATCH 3/6] testing so it will be more compatible for countries that
 block github raw

---
 install-scripts/zsh.sh         | 27 ++++++++++++++++++++++-----
 install-scripts/zsh_pokemon.sh | 33 ++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh
index 7c931a8..b52cc36 100755
--- a/install-scripts/zsh.sh
+++ b/install-scripts/zsh.sh
@@ -4,8 +4,12 @@
 
 zsh_pkg=(
   eza
+  mercurial
   zsh
   zsh-completions
+)
+
+zsh_pkg2=(
   fzf
 )
 
@@ -28,23 +32,30 @@ for ZSH in "${zsh_pkg[@]}"; do
   install_package "$ZSH" "$LOG"
 done 
 
+
+# Check if the zsh-completions directory exists
+if [ -d "zsh-completions" ]; then
+    rm -rf zsh-completions
+fi
+
 # Install Oh My Zsh, plugins, and set zsh as default shell
 if command -v zsh >/dev/null; then
   printf "${NOTE} Installing ${SKY_BLUE}Oh My Zsh and plugins${RESET} ...\n"
-  if [ ! -d "$HOME/.oh-my-zsh" ]; then
-      sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended || true
+  if [ ! -d "$HOME/.oh-my-zsh" ]; then  
+    sh -c "$(curl -fsSL https://install.ohmyz.sh)" "" --unattended  	       
   else
-      echo "${INFO} Directory .oh-my-zsh already exists. Skipping re-installation." 2>&1 | tee -a "$LOG"
+    echo "${INFO} 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
-      git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions || true
+      git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions 
   else
       echo "${INFO} Directory zsh-autosuggestions already exists. Cloning Skipped." 2>&1 | tee -a "$LOG"
   fi
 
   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
+      git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting 
   else
       echo "${INFO} Directory zsh-syntax-highlighting already exists. Cloning Skipped." 2>&1 | tee -a "$LOG"
   fi
@@ -78,6 +89,12 @@ if command -v zsh >/dev/null; then
   fi
 fi
 
+# Installing core zsh packages
+printf "\n%s - Installing ${SKY_BLUE}fzf${RESET} .... \n" "${NOTE}"
+for ZSH2 in "${zsh_pkg2[@]}"; do
+  install_package "$ZSH2" "$LOG"
+done
+
 # copy additional oh-my-zsh themes from assets
 if [ -d "$HOME/.oh-my-zsh/themes" ]; then
     cp -r assets/add_zsh_theme/* ~/.oh-my-zsh/themes >> "$LOG" 2>&1
diff --git a/install-scripts/zsh_pokemon.sh b/install-scripts/zsh_pokemon.sh
index 1fc925f..d8c22cd 100755
--- a/install-scripts/zsh_pokemon.sh
+++ b/install-scripts/zsh_pokemon.sh
@@ -2,10 +2,6 @@
 # 💫 https://github.com/JaKooLit 💫 #
 # pokemon-color-scripts#
 
-poke=(
-  mercurial
-)
-
 ## 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 )"
@@ -19,22 +15,25 @@ 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)_zsh_pokemon.log"
 
-# for the new oh my zsh theme
-printf "${NOTE} Installing ${SKY_BLUE}additional dependencies for oh my zsh theme${RESET}\n" 
-for pok in "${poke[@]}"; do
-  install_package "$pok" "$LOG"
-done
-printf "\n%.0s" {1..1}
+printf "${NOTE} Removing any traces of ${SKY_BLUE}Pokemon Color Scripts${RESET}\n"
 
-printf "${INFO} Installing ${SKY_BLUE}Pokemon color scripts${RESET} ..."
-
-if [ -d "pokemon-colorscripts" ]; then
-    cd pokemon-colorscripts && git pull && sudo ./install.sh && cd ..
-    else
-    git clone --depth 1 https://gitlab.com/phoneybadger/pokemon-colorscripts.git &&
-    cd pokemon-colorscripts && sudo ./install.sh && cd ..
+# Check if the pokemon directory exists
+if [ -d "/usr/local/opt/pokemon-colorscripts" ]; then
+    sudo rm -rf /usr/local/opt/pokemon-colorscripts
 fi
 
+# Check if the pokemon file exists
+if [ -f "/usr/local/bin/pokemon-colorscripts" ]; then
+    sudo rm -f /usr/local/bin/pokemon-colorscripts
+fi
+
+# Install Pokemon Color Scripts
+printf "${NOTE} Installing ${SKY_BLUE}Pokemon Color Scripts${RESET}\n"
+for pok in "pokemon-colorscripts-git"; do
+  install_package "$pok" "$LOG"
+done
+
+printf "\n%.0s" {1..1}
 # Check if ~/.zshrc exists
 if [ -f "$HOME/.zshrc" ]; then
     sed -i '/#pokemon-colorscripts --no-title -s -r | fastfetch -c $HOME\/.config\/fastfetch\/config-pokemon.jsonc --logo-type file-raw --logo-height 10 --logo-width 5 --logo -/s/^#//' "$HOME/.zshrc" >> "$LOG" 2>&1

From e4e488fc4c3dd59b1fd09ba29c1903d2eb785be2 Mon Sep 17 00:00:00 2001
From: JaKooLit <ejhay.games@gmail.com>
Date: Sat, 22 Feb 2025 13:01:24 +0900
Subject: [PATCH 4/6] changed url for installing oh-my-zsh to get wider
 coverage. Some countries are blocking github raw url's

---
 CHANGELOGS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index 8e2cfa7..2ce64bb 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -2,6 +2,7 @@
 
 ## 22 Feb 2025
 - replaced eog with loupe
+- changed url for installing oh-my-zsh to get wider coverage. Some countries are blocking github raw url's
 
 ## 20 Feb 2025
 - Added nwg-displays for the upcoming Kools dots v2.3.12

From 07f5053b2b7213705600e81e9fd93c581d0d1fc2 Mon Sep 17 00:00:00 2001
From: JaKooLit <ejhay.games@gmail.com>
Date: Sun, 23 Feb 2025 11:46:02 +0900
Subject: [PATCH 5/6] added Victor Mono Font for proper hyprlock font rendering
 for Dots v2.3.12

---
 CHANGELOGS.md                   | 5 ++++-
 install-scripts/01-hypr-pkgs.sh | 1 +
 install-scripts/fonts.sh        | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index 2ce64bb..a686428 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,4 +1,7 @@
-## Changelogs
+## CHANGELOGS
+
+## 23 Feb 2025
+- added Victor Mono Font for proper hyprlock font rendering for Dots v2.3.12
 
 ## 22 Feb 2025
 - replaced eog with loupe
diff --git a/install-scripts/01-hypr-pkgs.sh b/install-scripts/01-hypr-pkgs.sh
index 158784e..d1e0818 100755
--- a/install-scripts/01-hypr-pkgs.sh
+++ b/install-scripts/01-hypr-pkgs.sh
@@ -41,6 +41,7 @@ hypr_package=(
   swappy 
   swaync 
   swww
+  unzip # needed later
   wallust 
   waybar
   wget
diff --git a/install-scripts/fonts.sh b/install-scripts/fonts.sh
index f5d883a..736ee53 100755
--- a/install-scripts/fonts.sh
+++ b/install-scripts/fonts.sh
@@ -13,7 +13,8 @@ fonts=(
   ttf-droid 
   ttf-fira-code
   ttf-jetbrains-mono 
-  ttf-jetbrains-mono-nerd 
+  ttf-jetbrains-mono-nerd
+  ttf-victor-mono
 )
 
 

From 8d92fdd1afd7f9c6a76ed06a17bc085254b0d5bb Mon Sep 17 00:00:00 2001
From: JaKooLit <ejhay.games@gmail.com>
Date: Sun, 23 Feb 2025 12:36:23 +0900
Subject: [PATCH 6/6] added Fantasque Sans Mono Nerd for Kitty

---
 CHANGELOGS.md            | 1 +
 install-scripts/fonts.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index a686428..ac224cb 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -2,6 +2,7 @@
 
 ## 23 Feb 2025
 - added Victor Mono Font for proper hyprlock font rendering for Dots v2.3.12
+- added Fantasque Sans Mono Nerd for Kitty
 
 ## 22 Feb 2025
 - replaced eog with loupe
diff --git a/install-scripts/fonts.sh b/install-scripts/fonts.sh
index 736ee53..7322153 100755
--- a/install-scripts/fonts.sh
+++ b/install-scripts/fonts.sh
@@ -12,6 +12,7 @@ fonts=(
   otf-font-awesome 
   ttf-droid 
   ttf-fira-code
+  ttf-fantasque-nerd
   ttf-jetbrains-mono 
   ttf-jetbrains-mono-nerd
   ttf-victor-mono