From e64b4d29f9240ff41bbe30164580a0dcf7dd1576 Mon Sep 17 00:00:00 2001 From: Adam Laughlin Date: Fri, 4 Jan 2019 19:18:30 -0500 Subject: [PATCH 1/2] adding cursor theme support --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 455b744c..f7b4b02a 100755 --- a/neofetch +++ b/neofetch @@ -64,6 +64,7 @@ print_info() { info "WM Theme" wm_theme info "Theme" theme info "Icons" icons + info "Cursor" cursor info "Terminal" term info "Terminal Font" term_font info "CPU" cpu @@ -2594,6 +2595,18 @@ get_style() { kde_font_size="${kde_font_size/,*}" kde_theme="${kde_theme/,*} ${kde_theme/*,} ${kde_font_size}" fi + + if [[ "$kde" == "cursorTheme" ]]; then + if [[ -f "${kde_config_dir}/kcminputrc" ]]; then + kde_config_file="${kde_config_dir}/kcminputrc" + kde_theme="$(grep "cursorTheme" "$kde_config_file")" + kde_theme="${kde_theme/*=}" + elif [[ -f "${kde_config_dir}/startupconfig" ]]; then + kde_config_file="${kde_config_dir}/startupconfig" + kde_theme="$(grep "cursortheme" "$kde_config_file")" + kde_theme="${kde_theme/*=}" + fi + fi kde_theme="$kde_theme [KDE], " else err "Theme: KDE config files not found, skipping." @@ -2733,6 +2746,17 @@ get_font() { font="$theme" } +get_cursor() { + name="gtk-cursor-theme-name" + gsettings="cursor-theme" + gconf="cursor_theme" + xfconf="/Gtk/CursorThemeName" + kde="cursorTheme" + + get_style + cursor="$theme" +} + get_term() { # If function was run, stop here. ((term_run == 1)) && return From 9281ae5ed16937a1c98c6ab84d5da1ab5723d3dc Mon Sep 17 00:00:00 2001 From: Adam Laughlin Date: Fri, 4 Jan 2019 19:46:20 -0500 Subject: [PATCH 2/2] cleaning up logic --- neofetch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index f7b4b02a..abb161bd 100755 --- a/neofetch +++ b/neofetch @@ -2599,13 +2599,12 @@ get_style() { if [[ "$kde" == "cursorTheme" ]]; then if [[ -f "${kde_config_dir}/kcminputrc" ]]; then kde_config_file="${kde_config_dir}/kcminputrc" - kde_theme="$(grep "cursorTheme" "$kde_config_file")" - kde_theme="${kde_theme/*=}" elif [[ -f "${kde_config_dir}/startupconfig" ]]; then + kde="cursortheme" kde_config_file="${kde_config_dir}/startupconfig" - kde_theme="$(grep "cursortheme" "$kde_config_file")" - kde_theme="${kde_theme/*=}" fi + kde_theme="$(grep "${kde}" "$kde_config_file")" + kde_theme="${kde_theme/*=}" fi kde_theme="$kde_theme [KDE], " else