From f4c46cb994f7e619f7dd5e66f2c82b796e263baf Mon Sep 17 00:00:00 2001 From: rishav12s Date: Mon, 30 Sep 2024 14:20:41 +0530 Subject: [PATCH 1/3] replace pokemon-colorscripts with pokeget --- Configs/.zshrc | 2 +- Scripts/custom_hypr.lst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configs/.zshrc b/Configs/.zshrc index 2a5926930a..94040774dd 100644 --- a/Configs/.zshrc +++ b/Configs/.zshrc @@ -86,4 +86,4 @@ alias mkdir='mkdir -p' [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh # Display Pokemon -pokemon-colorscripts --no-title -r 1,3,6 +pokeget random --hide-name diff --git a/Scripts/custom_hypr.lst b/Scripts/custom_hypr.lst index 869682caf9..1fe221721e 100644 --- a/Scripts/custom_hypr.lst +++ b/Scripts/custom_hypr.lst @@ -73,7 +73,7 @@ zsh-theme-powerlevel10k-git|zsh oh-my-zsh-git # theme for zsh eza|fish # file lister for fish starship|fish # customizable shell prompt fastfetch # system information fetch tool -pokemon-colorscripts-git|zsh # display pokemon sprites +pokeget|zsh # display pokemon sprites # --------------------------------------------------- // HyDE hyde-cli-git # cli tool to manage hyde From f2f4dead05c296de8212639ae2e9814be6e2ac30 Mon Sep 17 00:00:00 2001 From: rishav <157917453+rishav12s@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:33:50 +0530 Subject: [PATCH 2/3] fix comment spacing --- Scripts/custom_hypr.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/custom_hypr.lst b/Scripts/custom_hypr.lst index 1fe221721e..b76d472678 100644 --- a/Scripts/custom_hypr.lst +++ b/Scripts/custom_hypr.lst @@ -73,7 +73,7 @@ zsh-theme-powerlevel10k-git|zsh oh-my-zsh-git # theme for zsh eza|fish # file lister for fish starship|fish # customizable shell prompt fastfetch # system information fetch tool -pokeget|zsh # display pokemon sprites +pokeget|zsh # display pokemon sprites # --------------------------------------------------- // HyDE hyde-cli-git # cli tool to manage hyde From 674274befe77222abac96f86efeecba95a530c8a Mon Sep 17 00:00:00 2001 From: rishav <157917453+rishav12s@users.noreply.github.com> Date: Sun, 6 Oct 2024 12:52:33 +0530 Subject: [PATCH 3/3] wlogout variable btn_col following theme.dcol and hypr.theme --- Configs/.local/share/bin/logoutlaunch.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Configs/.local/share/bin/logoutlaunch.sh b/Configs/.local/share/bin/logoutlaunch.sh index 50911a6043..c1f749563e 100755 --- a/Configs/.local/share/bin/logoutlaunch.sh +++ b/Configs/.local/share/bin/logoutlaunch.sh @@ -55,6 +55,16 @@ export fntSize=$(( y_mon * 2 / 100 )) #// detect wallpaper brightness [ -f "${cacheDir}/wall.dcol" ] && source "${cacheDir}/wall.dcol" +# Theme mode: detects the color-scheme set in hypr.theme and falls back if nothing is parsed. +if [ "${enableWallDcol}" -eq 0 ]; then + colorScheme="$({ grep -q "^[[:space:]]*\$COLOR[-_]SCHEME\s*=" "${hydeThemeDir}/hypr.theme" && grep "^[[:space:]]*\$COLOR[-_]SCHEME\s*=" "${hydeThemeDir}/hypr.theme" | cut -d '=' -f2 | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' ;} || + grep 'gsettings set org.gnome.desktop.interface color-scheme' "${hydeThemeDir}/hypr.theme" | awk -F "'" '{print $((NF - 1))}')" + colorScheme=${colorScheme:-$(gsettings get org.gnome.desktop.interface color-scheme)} + # should be declared explicitly so we can easily debug + grep -q "dark" <<< "${colorScheme}" && dcol_mode="dark" + grep -q "light" <<< "${colorScheme}" && dcol_mode="light" +[ -f "${hydeThemeDir}/theme.dcol" ] && source "${hydeThemeDir}/theme.dcol" +fi [ "${dcol_mode}" == "dark" ] && export BtnCol="white" || export BtnCol="black"