Merge pull request #181 from JaKooLit/main

main to development

assets/.zshrc

@@ -3,7 +3,7 @@
 
 export ZSH="$HOME/.oh-my-zsh"
 
-ZSH_THEME="xiong-chiamiov-plus"
+ZSH_THEME="agnosterzak""
 
 plugins=( 
     git

install-scripts/01-hypr-pkgs.sh

@@ -20,7 +20,6 @@ hypr_package=(
   imagemagick
   kitty
   nano
-  nwg-look
   pavucontrol
   playerctl
   polkit-kde-agent-1
@@ -50,6 +49,8 @@ hypr_package_2=(
   btop
   cava
   loupe
+  nwg-look
+  nwg-displays
   fastfetch
   gnome-system-monitor
   mousepad

install-scripts/sddm_theme.sh

@@ -74,12 +74,20 @@ if git clone --depth 1 "$source_theme" "$theme_name"; then
       fi
     done
   else
-    # If the directory doesn't exist, create it and set up the new theme
     echo "$CAT - $sddm_conf_dir not found, creating..." | tee -a "$LOG"
     sudo mkdir -p "$sddm_conf_dir" 2>&1 | tee -a "$LOG"
+  fi
 
-    echo -e "[Theme]\nCurrent=$theme_name" | sudo tee "$sddm_conf_dir/theme.conf.user" 2>&1 | tee -a "$LOG"
+  if [ ! -f "$sddm_conf_dir/theme.conf.user" ]; then
+    echo -e "[Theme]\nCurrent = $theme_name" | sudo tee "$sddm_conf_dir/theme.conf.user" > /dev/null
+    
+    if [ -f "$sddm_conf_dir/theme.conf.user" ]; then
       echo "Created and configured $sddm_conf_dir/theme.conf.user with theme $theme_name" | tee -a "$LOG"
+    else
+      echo "Failed to create $sddm_conf_dir/theme.conf.user" | tee -a "$LOG"
+    fi
+  else
+    echo "$sddm_conf_dir/theme.conf.user already exists, skipping creation." | tee -a "$LOG"
   fi
 
   # Replace current background from assets

install-scripts/zsh.sh

@@ -4,6 +4,7 @@
 
 zsh=(
     eza
+    mercurial
     zsh
     zplug 
 )
@@ -93,5 +94,4 @@ if [ -d "$HOME/.oh-my-zsh/themes" ]; then
     cp -r assets/add_zsh_theme/* ~/.oh-my-zsh/themes >> "$LOG" 2>&1
 fi
 
-  
 printf "\n%.0s" {1..2}

install-scripts/zsh_pokemon.sh

@@ -2,11 +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 )"
@@ -20,13 +15,6 @@ 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 "${INFO} Installing ${SKY_BLUE}Pokemon color scripts${RESET} ..."
 
@@ -46,4 +34,5 @@ else
 fi
   
 
+
 printf "\n%.0s" {1..2}