From ebcf6fb0fc0064a062daba6f5f4d1cdbe5f01332 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:23:23 +1100 Subject: [PATCH 01/24] WM theme base --- neofetch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 5ea24241..9b745490 100755 --- a/neofetch +++ b/neofetch @@ -49,8 +49,9 @@ printinfo () { info "Packages" packages info "Shell" shell info "Resolution" resolution - info "Desktop Environment" de - info "Window Manager" wm + info "DE" de + info "WM" wm + info "WM Theme" wmtheme info "Theme" theme info "Icons" icons info "CPU" cpu @@ -806,6 +807,14 @@ getwm () { # }}} +# Window Manager Theme {{{ + +getwmtheme () { + echo "TODO" +} + +# }}} + # CPU {{{ getcpu () { From 35377d8619add22fb77b0ed2f75137657c785d7a Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:25:41 +1100 Subject: [PATCH 02/24] Modify config file --- config/config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/config b/config/config index 6748ee8f..9b6b8030 100644 --- a/config/config +++ b/config/config @@ -25,8 +25,9 @@ printinfo () { info "Packages" packages info "Shell" shell info "Resolution" resolution - info "Desktop Environment" de - info "Window Manager" wm + info "DE" de + info "WM" wm + info "WM Theme" wmtheme info "Theme" theme info "Icons" icons info "CPU" cpu From 3f3487764cddc04b219445df701e8502663c71aa Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:26:59 +1100 Subject: [PATCH 03/24] Case wm theme --- neofetch | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9b745490..60cd0e52 100755 --- a/neofetch +++ b/neofetch @@ -810,7 +810,19 @@ getwm () { # Window Manager Theme {{{ getwmtheme () { - echo "TODO" + case "$os" in + "Linux" | *"BSD") + + ;; + + "Mac OS X") + + ;; + + "Windows") + + ;; + esac } # }}} From dda8d6cb202b040a0ab4be63190826df564ec54d Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:28:56 +1100 Subject: [PATCH 04/24] Better approach --- neofetch | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 60cd0e52..22775691 100755 --- a/neofetch +++ b/neofetch @@ -810,18 +810,13 @@ getwm () { # Window Manager Theme {{{ getwmtheme () { - case "$os" in - "Linux" | *"BSD") + [ -z "$wm" ] && getwm + + case "$wm" in + '2bwm') ;; - "Mac OS X") - - ;; - - "Windows") - - ;; esac } From 3c22c86e38237737dd860d21592b547e033464a3 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:33:14 +1100 Subject: [PATCH 05/24] Add support for more WMs --- neofetch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 22775691..c95dbb18 100755 --- a/neofetch +++ b/neofetch @@ -813,11 +813,15 @@ getwmtheme () { [ -z "$wm" ] && getwm case "$wm" in - '2bwm') + 'BudgieWM') wmtheme="$(gsettings get org.gnome.desktop.wm.preferences theme)" ;; + 'Cinnamon' | 'Muffin') + de_theme="$(gsettings get org.cinnamon.theme name)" + win_theme="$(gsettings get org.cinnamon.desktop.wm.preferences theme)" + Win_theme="${de_theme} (${win_theme})" ;; - esac + wmtheme="${wmtheme//\'}" } # }}} From 64466601556d88408e1570ae74bc1eaf379e61b5 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:35:26 +1100 Subject: [PATCH 06/24] Add support for more WM themes --- neofetch | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index c95dbb18..65ea85b9 100755 --- a/neofetch +++ b/neofetch @@ -816,9 +816,18 @@ getwmtheme () { 'BudgieWM') wmtheme="$(gsettings get org.gnome.desktop.wm.preferences theme)" ;; 'Cinnamon' | 'Muffin') - de_theme="$(gsettings get org.cinnamon.theme name)" - win_theme="$(gsettings get org.cinnamon.desktop.wm.preferences theme)" - Win_theme="${de_theme} (${win_theme})" + detheme="$(gsettings get org.cinnamon.theme name)" + wmtheme="$(gsettings get org.cinnamon.desktop.wm.preferences theme)" + wmtheme="${detheme} (${wmtheme})" + ;; + + 'Compiz' | 'Mutter'* | 'GNOME Shell' | 'Gala') + if type -p gsettings >/dev/null 2>&1; then + wmtheme="$(gsettings get org.gnome.desktop.wm.preferences theme)" + + elif type -p gconftool-2 >/dev/null 2>&1; then + wmtheme="$(gconftool-2 -g /apps/metacity/general/theme)" + fi ;; esac wmtheme="${wmtheme//\'}" From 7f3c7f07e5865bbbea07d65e3c19dc90df49a6dd Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:36:19 +1100 Subject: [PATCH 07/24] Add support for Deepin --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index 65ea85b9..e11c2114 100755 --- a/neofetch +++ b/neofetch @@ -829,6 +829,11 @@ getwmtheme () { wmtheme="$(gconftool-2 -g /apps/metacity/general/theme)" fi ;; + + 'Deepin WM') + type -p gsettings >/dev/null 2>&1 && \ + wmtheme="$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme)" + ;; esac wmtheme="${wmtheme//\'}" } From a1047bd3d177c3d85735d561fc52e6983dc76174 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:39:53 +1100 Subject: [PATCH 08/24] Added support for E16 --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index e11c2114..ec7e38da 100755 --- a/neofetch +++ b/neofetch @@ -834,6 +834,8 @@ getwmtheme () { type -p gsettings >/dev/null 2>&1 && \ wmtheme="$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme)" ;; + + 'E16') wmtheme="$(awk -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")";; esac wmtheme="${wmtheme//\'}" } From 8d602f1afe28340fbaf9ef9f8c36dd709cf695b3 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 1 Apr 2016 11:41:27 +1100 Subject: [PATCH 09/24] added OS X to wmtheme --- neofetch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/neofetch b/neofetch index 22775691..1d61de77 100755 --- a/neofetch +++ b/neofetch @@ -816,6 +816,14 @@ getwmtheme () { '2bwm') ;; + 'Quartz Compositor') + wmtheme=$(/usr/libexec/PlistBuddy -c "Print AppleAquaColorVariant" ~/Library/Preferences/.GlobalPreferences.plist) + if [ -z "$wmtheme" ] || [ "$wmtheme" == "1" ]; then + wmtheme="Blue" + else + wmtheme="Graphite" + fi + ;; esac } From 95bda4827cfa0295780d954adbe9107f181dc8e6 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:41:49 +1100 Subject: [PATCH 10/24] Add E17 support for wmtheme --- neofetch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/neofetch b/neofetch index ec7e38da..8c35168e 100755 --- a/neofetch +++ b/neofetch @@ -836,6 +836,15 @@ getwmtheme () { ;; 'E16') wmtheme="$(awk -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")";; + + 'E17'|'Enlightenment') + # TODO: Reduce the size of this. + if type -p eet >/dev/null 2>&1; then + wmtheme="$(eet -d $HOME/.e/e/config/standard/e.cfg config | awk '/value \"file\" string.*.edj/ {print $4}')" + wmtheme=${wmtheme##*/} + wmtheme=${wmtheme%.*} + fi + ;; esac wmtheme="${wmtheme//\'}" } From dd5a5f02db05c668693d02433fbf1881fc996a43 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:44:20 +1100 Subject: [PATCH 11/24] Move OS X detection to the bottom --- neofetch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 3bd07d3e..bf84e6b1 100755 --- a/neofetch +++ b/neofetch @@ -820,14 +820,6 @@ getwmtheme () { wmtheme="$(gsettings get org.cinnamon.desktop.wm.preferences theme)" wmtheme="${detheme} (${wmtheme})" ;; - 'Quartz Compositor') - wmtheme=$(/usr/libexec/PlistBuddy -c "Print AppleAquaColorVariant" ~/Library/Preferences/.GlobalPreferences.plist) - if [ -z "$wmtheme" ] || [ "$wmtheme" == "1" ]; then - wmtheme="Blue" - else - wmtheme="Graphite" - fi - ;; 'Compiz' | 'Mutter'* | 'GNOME Shell' | 'Gala') if type -p gsettings >/dev/null 2>&1; then @@ -853,6 +845,15 @@ getwmtheme () { wmtheme=${wmtheme%.*} fi ;; + + 'Quartz Compositor') + wmtheme=$(/usr/libexec/PlistBuddy -c "Print AppleAquaColorVariant" ~/Library/Preferences/.GlobalPreferences.plist) + if [ -z "$wmtheme" ] || [ "$wmtheme" == "1" ]; then + wmtheme="Blue" + else + wmtheme="Graphite" + fi + ;; esac wmtheme="${wmtheme//\'}" } From d8f2dd2286b21b756196cc3a44b1dcda7ebde159 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 11:47:16 +1100 Subject: [PATCH 12/24] Add support for FluxBox --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index bf84e6b1..bf5c8106 100755 --- a/neofetch +++ b/neofetch @@ -854,6 +854,11 @@ getwmtheme () { wmtheme="Graphite" fi ;; + + 'Fluxbox') + [ -f $HOME/.fluxbox/init ] && \ + wmtheme="$(awk -F "/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init")" + ;; esac wmtheme="${wmtheme//\'}" } From 1ce7a904d1e1c258de1006e88c39fb5921056749 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 14:42:38 +1100 Subject: [PATCH 13/24] Wmtheme add support for more window managers --- neofetch | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index bf5c8106..a198b31f 100755 --- a/neofetch +++ b/neofetch @@ -814,6 +814,10 @@ getwmtheme () { case "$wm" in 'BudgieWM') wmtheme="$(gsettings get org.gnome.desktop.wm.preferences theme)" ;; + 'E16') wmtheme="$(awk -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")";; + 'Marco') wmtheme="$(gsettings get org.mate.Marco.general theme)" ;; + 'Metacity') wmtheme="$(gconftool-2 -g /apps/metacity/general/theme 2>/dev/null)" ;; + 'Sawfish') wmtheme="$(awk -F ")" '/\(quote default-frame-style/ {print $2}' "$HOME/.sawfish/custom")" ;; 'Cinnamon' | 'Muffin') detheme="$(gsettings get org.cinnamon.theme name)" @@ -835,8 +839,6 @@ getwmtheme () { wmtheme="$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme)" ;; - 'E16') wmtheme="$(awk -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")";; - 'E17'|'Enlightenment') # TODO: Reduce the size of this. if type -p eet >/dev/null 2>&1; then @@ -846,6 +848,31 @@ getwmtheme () { fi ;; + 'Fluxbox') + [ -f $HOME/.fluxbox/init ] && \ + wmtheme="$(awk -F "/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init")" + ;; + + 'IceWM') + [ -f $HOME/.icewm/theme ] && \ + wmtheme="$(awk -F "[\",/]" '!/#/ {print $2}' "$HOME/.icewm/theme")" + ;; + + 'Openbox') + [ -f "${HOME}/.config/openbox/rc.xml" ] && \ + wmtheme="$(awk -F "[<,>]" '/ Date: Fri, 1 Apr 2016 14:50:15 +1100 Subject: [PATCH 14/24] Add support for kwin --- neofetch | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index a198b31f..ff7f7500 100755 --- a/neofetch +++ b/neofetch @@ -822,7 +822,7 @@ getwmtheme () { 'Cinnamon' | 'Muffin') detheme="$(gsettings get org.cinnamon.theme name)" wmtheme="$(gsettings get org.cinnamon.desktop.wm.preferences theme)" - wmtheme="${detheme} (${wmtheme})" + wmtheme="$detheme (${wmtheme})" ;; 'Compiz' | 'Mutter'* | 'GNOME Shell' | 'Gala') @@ -873,6 +873,18 @@ getwmtheme () { wmtheme="$(xfconf-query -c xfwm4 -p /general/theme)" ;; + 'KWin'*) + kdeconfigdir + kde_config_dir=${kde_config_dir%/} + + if [ -f "$kde_config_dir/share/config/kwinrc" ]; then + wmtheme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "$kde_config_dir/share/config/kwinrc")" + + elif [ -f "$KDE_CONFIG_DIR/share/config/kdebugrc" ]; then + wmtheme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$kde_config_dir/share/config/kdebugrc")" + fi + ;; + 'Quartz Compositor') wmtheme=$(/usr/libexec/PlistBuddy -c "Print AppleAquaColorVariant" ~/Library/Preferences/.GlobalPreferences.plist) if [ -z "$wmtheme" ] || [ "$wmtheme" == "1" ]; then @@ -1390,15 +1402,7 @@ getstyle () { # Current DE case "$XDG_CURRENT_DESKTOP" in "KDE"*) - if type -p kde5-config >/dev/null 2>&1; then - kde_config_dir=$(kde5-config --localprefix) - - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir=$(kde4-config --localprefix) - - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir=$(kde-config --localprefix) - fi + kdeconfigdir if [ -f "${kde_config_dir}/share/config/kdeglobals" ]; then kde_config_file="${kde_config_dir}/share/config/kdeglobals" @@ -2552,6 +2556,23 @@ cache () { # }}} +# KDE Config directory {{{ + +kdeconfigdir () { + if type -p kde5-config >/dev/null 2>&1; then + kde_config_dir=$(kde5-config --localprefix) + + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir=$(kde4-config --localprefix) + + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir=$(kde-config --localprefix) + fi +} + +# }}} + + # }}} From 4c54da56b73aa1a83a39cb20410f70e4c463de89 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 14:53:31 +1100 Subject: [PATCH 15/24] Move windows theme to wmtheme --- neofetch | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index ff7f7500..64679fcf 100755 --- a/neofetch +++ b/neofetch @@ -894,6 +894,16 @@ getwmtheme () { fi ;; + 'Explorer') + path="/proc/registry/HKEY_CURRENT_USER/Software/Microsoft" + path+="/Windows/CurrentVersion/Themes/CurrentTheme" + + wmtheme="$(head -n1 "$path" 2>/dev/null)" + wmtheme="${wmtheme##*\\}" + wmtheme="${wmtheme%.*}" + wmtheme="${wmtheme^}" + ;; + esac wmtheme="${wmtheme//\'}" @@ -1377,8 +1387,6 @@ getstyle () { gconf="gtk_theme" xfconf="ThemeName" kde="widgetStyle" - path="/proc/registry/HKEY_CURRENT_USER/Software/Microsoft" - path+="/Windows/CurrentVersion/Themes/CurrentTheme" ;; icons) @@ -1517,17 +1525,6 @@ getstyle () { theme=${theme/ '[GTK3]'} theme=${theme/ '[GTK2/3]'} fi - else - case "$os" in - "Windows") - [ -z "$path" ] && return - theme="$(head -n1 "$path" 2>/dev/null)" - theme="${theme##*\\}" - theme="${theme%.*}" - theme="${theme^}" - ;; - - esac fi } From 68c5fdb37e1d57a471a4fe2c341bb099995b6057 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 09:40:28 +1100 Subject: [PATCH 16/24] Add wildcards to dix wm matching --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 64679fcf..21a50ea1 100755 --- a/neofetch +++ b/neofetch @@ -816,7 +816,7 @@ getwmtheme () { 'BudgieWM') wmtheme="$(gsettings get org.gnome.desktop.wm.preferences theme)" ;; 'E16') wmtheme="$(awk -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")";; 'Marco') wmtheme="$(gsettings get org.mate.Marco.general theme)" ;; - 'Metacity') wmtheme="$(gconftool-2 -g /apps/metacity/general/theme 2>/dev/null)" ;; + 'Metacity'*) wmtheme="$(gconftool-2 -g /apps/metacity/general/theme 2>/dev/null)" ;; 'Sawfish') wmtheme="$(awk -F ")" '/\(quote default-frame-style/ {print $2}' "$HOME/.sawfish/custom")" ;; 'Cinnamon' | 'Muffin') @@ -853,7 +853,7 @@ getwmtheme () { wmtheme="$(awk -F "/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init")" ;; - 'IceWM') + 'IceWM'*) [ -f $HOME/.icewm/theme ] && \ wmtheme="$(awk -F "[\",/]" '!/#/ {print $2}' "$HOME/.icewm/theme")" ;; From 50d8a44a6de0efb51827c2190e8da9e30d6b071d Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 09:47:48 +1100 Subject: [PATCH 17/24] Don't hardcode '/home/dyl/.config', use '' if available --- config/config | 3 +-- neofetch | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/config b/config/config index 9b6b8030..e79ff051 100644 --- a/config/config +++ b/config/config @@ -7,7 +7,6 @@ # Speed up script by not using unicode export LC_ALL=C export LANG=C -export LANGUAGE=C # Info Options {{{ @@ -395,7 +394,7 @@ config="on" # Path to custom config file location # --config path/to/config -config_file="$HOME/.config/neofetch/config" +config_file="${XDG_CONFIG_HOME:-${HOME}/.config}/neofetch/config" # }}} diff --git a/neofetch b/neofetch index 21a50ea1..7a61090d 100755 --- a/neofetch +++ b/neofetch @@ -22,8 +22,9 @@ # Created by Dylan Araps # https://github.com/dylanaraps/ -version=${BASH_VERSION/.*} +version="${BASH_VERSION/.*}" SYS_LOCALE="${LANG:-C}" +XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}" # Speed up script by not using unicode export LC_ALL=C @@ -420,7 +421,7 @@ config="on" # Path to custom config file location # --config path/to/config -config_file="$HOME/.config/neofetch/config" +config_file="${XDG_CONFIG_HOME:-${HOME}/.config}/neofetch/config" # }}} @@ -860,7 +861,7 @@ getwmtheme () { 'Openbox') [ -f "${HOME}/.config/openbox/rc.xml" ] && \ - wmtheme="$(awk -F "[<,>]" '/]" '//dev/null 2>&1; then gtk3theme="$(gsettings get org.gnome.desktop.interface $gsettings)" @@ -1843,7 +1844,7 @@ getwallpaper () { img="$(awk -F\' '/feh/ {printf $2}' "$HOME/.fehbg")" elif type -p nitrogen >/dev/null 2>&1; then - img="$(awk -F'=' '/file/ {printf $2;exit;}' "$HOME/.config/nitrogen/bg-saved.cfg")" + img="$(awk -F'=' '/file/ {printf $2;exit;}' "$XDG_CONFIG_HOME/nitrogen/bg-saved.cfg")" elif type -p gsettings >/dev/null 2>&1; then case "$XDG_CURRENT_DESKTOP" in @@ -2492,26 +2493,26 @@ getconfig () { source "$config_file" return fi - mkdir -p "$HOME/.config/neofetch/" + mkdir -p "$XDG_CONFIG_HOME/neofetch/" - # Check $HOME/.config/neofetch and create the + # Check $XDG_CONFIG_HOME/neofetch and create the # dir/files if they don't exist. - if [ -f "$HOME/.config/neofetch/config" ]; then - source "$HOME/.config/neofetch/config" + if [ -f "$XDG_CONFIG_HOME/neofetch/config" ]; then + source "$XDG_CONFIG_HOME/neofetch/config" elif [ -f "/usr/share/neofetch/config" ]; then - cp "/usr/share/neofetch/config" "$HOME/.config/neofetch" - source "$HOME/.config/neofetch/config" + cp "/usr/share/neofetch/config" "$XDG_CONFIG_HOME/neofetch" + source "$XDG_CONFIG_HOME/neofetch/config" elif [ -f "/usr/local/share/neofetch/config" ]; then - cp "/usr/local/share/neofetch/config" "$HOME/.config/neofetch" - source "$HOME/.config/neofetch/config" + cp "/usr/local/share/neofetch/config" "$XDG_CONFIG_HOME/neofetch" + source "$XDG_CONFIG_HOME/neofetch/config" else getscriptdir - cp "$script_dir/config/config" "$HOME/.config/neofetch" - source "$HOME/.config/neofetch/config" + cp "$script_dir/config/config" "$XDG_CONFIG_HOME/neofetch" + source "$XDG_CONFIG_HOME/neofetch/config" fi } From 4184c1750704b36277fec3691006a28c5a2b629c Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 17:38:06 +1100 Subject: [PATCH 18/24] Better implementation of envar check --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 7a61090d..f090b1ec 100755 --- a/neofetch +++ b/neofetch @@ -881,7 +881,7 @@ getwmtheme () { if [ -f "$kde_config_dir/share/config/kwinrc" ]; then wmtheme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0); print $0; exit}' "$kde_config_dir/share/config/kwinrc")" - elif [ -f "$KDE_CONFIG_DIR/share/config/kdebugrc" ]; then + elif [ -f "$kde_config_dir/share/config/kdebugrc" ]; then wmtheme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$kde_config_dir/share/config/kdebugrc")" fi ;; @@ -2557,7 +2557,10 @@ cache () { # KDE Config directory {{{ kdeconfigdir () { - if type -p kde5-config >/dev/null 2>&1; then + if [ -n "$KDE_CONFIG_DIR" ]; then + kde_config_dir="$KDE_CONFIG_DIR" + + elif type -p kde5-config >/dev/null 2>&1; then kde_config_dir=$(kde5-config --localprefix) elif type -p kde4-config >/dev/null 2>&1; then From 45e632e2bc7febbe0916727e3a67a4d75f77fd89 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 18:12:43 +1100 Subject: [PATCH 19/24] Openbox detection, Add support for LXDE --- neofetch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f090b1ec..fc635172 100755 --- a/neofetch +++ b/neofetch @@ -860,8 +860,14 @@ getwmtheme () { ;; 'Openbox') - [ -f "${HOME}/.config/openbox/rc.xml" ] && \ - wmtheme="$(awk -F "[<,>]" '/]" '/ Date: Fri, 1 Apr 2016 18:27:00 +1100 Subject: [PATCH 20/24] Cleanup --- neofetch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/neofetch b/neofetch index fc635172..2631ca2c 100755 --- a/neofetch +++ b/neofetch @@ -816,7 +816,6 @@ getwmtheme () { case "$wm" in 'BudgieWM') wmtheme="$(gsettings get org.gnome.desktop.wm.preferences theme)" ;; 'E16') wmtheme="$(awk -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")";; - 'Marco') wmtheme="$(gsettings get org.mate.Marco.general theme)" ;; 'Metacity'*) wmtheme="$(gconftool-2 -g /apps/metacity/general/theme 2>/dev/null)" ;; 'Sawfish') wmtheme="$(awk -F ")" '/\(quote default-frame-style/ {print $2}' "$HOME/.sawfish/custom")" ;; @@ -840,7 +839,7 @@ getwmtheme () { wmtheme="$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme)" ;; - 'E17'|'Enlightenment') + 'E17' | 'Enlightenment') # TODO: Reduce the size of this. if type -p eet >/dev/null 2>&1; then wmtheme="$(eet -d $HOME/.e/e/config/standard/e.cfg config | awk '/value \"file\" string.*.edj/ {print $4}')" From 82e4fce63bd2405025a4ec3a478d7feab4cad0a1 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 18:34:06 +1100 Subject: [PATCH 21/24] Fix Linux Mint detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2631ca2c..dcef123f 100755 --- a/neofetch +++ b/neofetch @@ -819,7 +819,7 @@ getwmtheme () { 'Metacity'*) wmtheme="$(gconftool-2 -g /apps/metacity/general/theme 2>/dev/null)" ;; 'Sawfish') wmtheme="$(awk -F ")" '/\(quote default-frame-style/ {print $2}' "$HOME/.sawfish/custom")" ;; - 'Cinnamon' | 'Muffin') + 'Cinnamon' | 'Muffin' | 'Mutter (Muffin)') detheme="$(gsettings get org.cinnamon.theme name)" wmtheme="$(gsettings get org.cinnamon.desktop.wm.preferences theme)" wmtheme="$detheme (${wmtheme})" From e2e3e4fd77e4510700227c30f14dae61cbb0cddc Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 18:46:37 +1100 Subject: [PATCH 22/24] Fix detection on deepin --- neofetch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index dcef123f..2dc8a4ff 100755 --- a/neofetch +++ b/neofetch @@ -816,7 +816,6 @@ getwmtheme () { case "$wm" in 'BudgieWM') wmtheme="$(gsettings get org.gnome.desktop.wm.preferences theme)" ;; 'E16') wmtheme="$(awk -F"= " '/theme.name/ {print $2}' "$HOME/.e16/e_config--0.0.cfg")";; - 'Metacity'*) wmtheme="$(gconftool-2 -g /apps/metacity/general/theme 2>/dev/null)" ;; 'Sawfish') wmtheme="$(awk -F ")" '/\(quote default-frame-style/ {print $2}' "$HOME/.sawfish/custom")" ;; 'Cinnamon' | 'Muffin' | 'Mutter (Muffin)') @@ -834,9 +833,13 @@ getwmtheme () { fi ;; - 'Deepin WM') - type -p gsettings >/dev/null 2>&1 && \ - wmtheme="$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme)" + 'Metacity'*) + if [ "$de" == "Deepin" ]; then + wmtheme="$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme 2>/dev/null)" + + else + wmtheme="$(gconftool-2 -g /apps/metacity/general/theme 2>/dev/null)" + fi ;; 'E17' | 'Enlightenment') From 9e420a9b2705c8d4cfd8a253af1e067c8b87c0ca Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 19:55:18 +1100 Subject: [PATCH 23/24] Guess we can't reduce the size of this --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 2dc8a4ff..2374b73e 100755 --- a/neofetch +++ b/neofetch @@ -843,7 +843,6 @@ getwmtheme () { ;; 'E17' | 'Enlightenment') - # TODO: Reduce the size of this. if type -p eet >/dev/null 2>&1; then wmtheme="$(eet -d $HOME/.e/e/config/standard/e.cfg config | awk '/value \"file\" string.*.edj/ {print $4}')" wmtheme=${wmtheme##*/} From cc3c59130c955aafcfac6815e2ca5ea178e4f6a5 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 1 Apr 2016 20:36:43 +1100 Subject: [PATCH 24/24] Changelog --- 1.6.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/1.6.md b/1.6.md index 28a61eb3..6ac3c2b5 100644 --- a/1.6.md +++ b/1.6.md @@ -25,6 +25,7 @@ appearing in the output. allow us to speed up the script by caching info that won't change for a
long period of time like the CPU/GPU. \[1\] - Fixed a locale issue when `LC_ALL` is unset on the user's system. +- Change all usage of `$HOME/.config` to `$XDG_CONFIG_HOME` with a fallback to `$HOME/.config`. \[1\] You can clear the cache with `--clean`. @@ -50,6 +51,9 @@ the color white, it's now based on your foreground color. - Functions now no longer print `Unknown` when they fail, they now don't appear at all. +**Window Manager Theme**
+- Added new `WM Theme` function to print window manager themes. + **OS**
- [ CRUX ] Also print the CRUX version. **[@onodera-punpun](https://github.com/onodera-punpun)**