diff --git a/neofetch b/neofetch index eaec39aa..84b4b261 100755 --- a/neofetch +++ b/neofetch @@ -778,7 +778,7 @@ get_wm_theme() { kde_config_dir if [[ -f "${kde_config_dir}/kwinrc" ]]; then - wm_theme="$(awk '/theme=kwin4/{gsub(/theme=kwin4_decoration_qml_/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" + wm_theme="$(awk '/theme=/{gsub(/theme=.*qml_|theme=.*svg__/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" [[ -z "$wm_theme" ]] && wm_theme="$(awk '/library=org.kde/{gsub(/library=org.kde./,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" [[ -z "$wm_theme" ]] && wm_theme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "${kde_config_dir}/kwinrc")" @@ -1530,7 +1530,7 @@ get_style() { if [[ -f "${kde_config_dir}/kdeglobals" ]]; then kde_config_file="${kde_config_dir}/kdeglobals" - theme="$(grep "^[^#]*${kde}" "$kde_config_file")" + theme="$(grep "^${kde}" "$kde_config_file")" theme="${theme/${kde}*=}" theme="$(uppercase "$theme")" @@ -1648,7 +1648,7 @@ get_theme() { gsettings="gtk-theme" gconf="gtk_theme" xfconf="/Net/ThemeName" - kde="widgetStyle" + kde="Name" get_style }