From d7a51fd27fd3dff4a0eca796f254c4cfb8316245 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 19:51:30 +0900 Subject: [PATCH 1/4] updated zsh installation --- install-scripts/zsh.sh | 4 ++-- install-scripts/zsh_pokemon.sh | 13 +------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index 9427372..7a2ef10 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -4,6 +4,7 @@ zsh=( eza + mercurial zsh zplug ) @@ -92,6 +93,5 @@ fi 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} diff --git a/install-scripts/zsh_pokemon.sh b/install-scripts/zsh_pokemon.sh index 24bb5ee..4d383fc 100755 --- a/install-scripts/zsh_pokemon.sh +++ b/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} ..." @@ -44,6 +32,7 @@ if [ -f "$HOME/.zshrc" ]; then else echo "$HOME/.zshrc not found. Cant enable ${YELLOW}Pokemon color scripts${RESET}" >> "$LOG" 2>&1 fi + printf "\n%.0s" {1..2} From c487bc20fbe84e01c8c203af16c589231f165c29 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 19:59:23 +0900 Subject: [PATCH 2/4] dang forgot to update debian .zshrc --- assets/.zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/.zshrc b/assets/.zshrc index 30b41f9..4e805ff 100644 --- a/assets/.zshrc +++ b/assets/.zshrc @@ -3,7 +3,7 @@ export ZSH="$HOME/.oh-my-zsh" -ZSH_THEME="xiong-chiamiov-plus" +ZSH_THEME="agnosterzak"" plugins=( git From dadfea04ba9359e0b876d1451718c17561f9f59a Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 23 Feb 2025 20:01:35 +0900 Subject: [PATCH 3/4] added nwg-displays --- install-scripts/01-hypr-pkgs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install-scripts/01-hypr-pkgs.sh b/install-scripts/01-hypr-pkgs.sh index bf78b00..ec8ce06 100755 --- a/install-scripts/01-hypr-pkgs.sh +++ b/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 From 45a8cbf224c4d835283508750dfeef1b76bcd824 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Mon, 24 Feb 2025 00:15:57 +0900 Subject: [PATCH 4/4] applying of sddm theme fixed --- install-scripts/sddm_theme.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/install-scripts/sddm_theme.sh b/install-scripts/sddm_theme.sh index 2cdc5e8..54981c7 100755 --- a/install-scripts/sddm_theme.sh +++ b/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" - echo "Created and configured $sddm_conf_dir/theme.conf.user with theme $theme_name" | 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