diff --git a/config/config b/config/config index 305c8cb6..36425fc6 100644 --- a/config/config +++ b/config/config @@ -701,29 +701,3 @@ scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" # NOTE: If you'd like another image host to be added to Neofetch. # Open an issue on github. image_host="teknik" - - -# Config Options - -# Enable/Disable config file -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --config -# --config off, none -# -# Note: This option is only used when neofetch sources this config -# as a default config and NOT as a user config. Changing this in -# your user config won't actually do anything. -config="on" - -# Path to custom config file location -# -# Default: '${XDG_CONFIG_HOME:-${HOME}/.config}/neofetch/config' -# Values: '/path/to/config' -# Flag: --config_file -# -# Note: This option is only used when neofetch sources this config -# as a default config and NOT as a user config. Changing this in -# your user config won't actually do anything. -config_file="${XDG_CONFIG_HOME:-${HOME}/.config}/neofetch/config" diff --git a/neofetch b/neofetch index ec2ecf60..e8cb0cb5 100755 --- a/neofetch +++ b/neofetch @@ -1658,8 +1658,8 @@ get_term_font() { ;; "termite") - [[ -f "${XDG_CONFIG_HOME}/termite/config" ]] && config_file="${XDG_CONFIG_HOME}/termite/config" - term_font="$(awk -F '= ' '/\[options\]/ {opt=1} /^font/ {if(opt==1) a=$2; opt=0} END{print a}' "/etc/xdg/termite/config" "$config_file")" + [[ -f "${XDG_CONFIG_HOME}/termite/config" ]] && termite_config="${XDG_CONFIG_HOME}/termite/config" + term_font="$(awk -F '= ' '/\[options\]/ {opt=1} /^font/ {if(opt==1) a=$2; opt=0} END{print a}' "/etc/xdg/termite/config" "$termite_config")" ;; "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm") @@ -3979,8 +3979,8 @@ get_args() { # Other "--config") case "$2" in - "none" | "off" | "") config="off" ;; - *) config_file="$2"; config="on"; get_user_config 2>/dev/null ;; + "none" | "off" | "") ;; + *) config_file="$2"; get_user_config 2>/dev/null ;; esac ;; "-v") verbose="on" ;;