Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display global KDE Plasma theme and fix bug with DE listing on windows #163

Merged
merged 3 commits into from
Aug 10, 2023
Merged

Display global KDE Plasma theme and fix bug with DE listing on windows #163

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce2a49e
Display global KDE Plasma theme
mcneb10 Aug 9, 2023
98feca0
Don't try to display XDG_SESSION_TYPE on Windows
mcneb10 Aug 9, 2023
b5e9edf
[F] Fix shellcheck warnings
hykilpikonna Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions neofetch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2438,7 +2438,7 @@ get_de() {
# TODO:
# - New config option + flag: --de_display_server on/off ?
# - Add display of X11, Arcan and anything else relevant.
[[ $de ]] &&
[[ $de ]] && [[ $os != "Windows" ]] &&
de+=" (${XDG_SESSION_TYPE})"

de_run=1
Expand Down Expand Up @@ -3943,8 +3943,13 @@ get_style() {
qt_theme="$(grep "^${kde}" "$kde_config_file")"
qt_theme="${qt_theme/*=}"

kde_theme="$(grep "^${kde}" "$kde_config_file")"
kde_theme="${kde_theme/*=}"
if [[ "$kde" == "widgetStyle" ]] && grep -q "\[Theme\]" "$HOME/.config/plasmarc"; then
kde_theme="$(awk '/name=/ {gsub(/name=/,"",$0);print $0;exit}' "$HOME/.config/plasmarc")"
else
kde_theme="$(grep "^${kde}" "$kde_config_file")"
kde_theme="${kde_theme/*=}"
fi

if [[ "$kde" == "font" ]]; then
kde_font_size="${kde_theme#*,}"
kde_font_size="${kde_font_size/,*}"
Expand All @@ -3961,7 +3966,7 @@ get_style() {
kde_theme="$(grep "${kde}" "$kde_config_file")"
kde_theme="${kde_theme/*=}"
fi
kde_theme="$kde_theme [KDE], "
#kde_theme="$kde_theme [KDE], "
else
err "Theme: KDE config files not found, skipping."
fi
Expand Down Expand Up @@ -4132,11 +4137,13 @@ get_style() {
gtk2_theme="$(trim "$gtk2_theme")"
gtk3_theme="$(trim "$gtk3_theme")"
qt_theme="$(trim "$qt_theme")"
kde_theme="$(trim "$kde_theme")"

# Remove quotes.
gtk2_theme="$(trim_quotes "$gtk2_theme")"
gtk3_theme="$(trim_quotes "$gtk3_theme")"
qt_theme="$(trim_quotes "$qt_theme")"
kde_theme="$(trim_quotes "$kde_theme")"

# Handle Qt theme engines that load external themes
case "$qt_theme" in
Expand All @@ -4155,6 +4162,7 @@ get_style() {
[[ "$gtk2" == "off" ]] && unset gtk2_theme
[[ "$gtk3" == "off" ]] && unset gtk3_theme
[[ "$qt" == "off" ]] && unset qt_theme
# TODO: kde theme visibility

# Format the string based on which themes exist.
# append_theme theme toolkit
Expand All @@ -4170,6 +4178,7 @@ get_style() {
}
theme=''
local cur_theme=''
append_theme "$kde_theme" 'KDE'
append_theme "$fly_theme" 'Fly'
append_theme "$qt_theme" 'Qt'
append_theme "$gtk2_theme" 'GTK2'
Expand Down