diff --git a/README.md b/README.md index 04352c52..b24fddeb 100644 --- a/README.md +++ b/README.md @@ -443,7 +443,6 @@ alias neofetch2="neofetch \ --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --refresh_rate on/off Whether to display the refresh rate of each monitor Unsupported on Windows - --gpu_shorthand on/off Shorten the output of GPU (tiny, on, off) --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/icons output diff --git a/config/config b/config/config index eeecf851..c02fb537 100644 --- a/config/config +++ b/config/config @@ -128,10 +128,6 @@ cpu_temp="off" # GPU -# Shorten output of the getgpu funcion -# --gpu_shorthand on, off, tiny -gpu_shorthand="on" - # Enable/Disable GPU Brand # --gpu_brand on, off gpu_brand="on" diff --git a/neofetch b/neofetch index 7675029d..baa1279e 100755 --- a/neofetch +++ b/neofetch @@ -1001,6 +1001,7 @@ getgpu() { gpu="${gpu/'[AMD]' }" gpu="${gpu/*\[}" gpu="${gpu/\]*}" + gpu="${gpu/\/*}" gpu="AMD $gpu" ;; @@ -1104,24 +1105,6 @@ getgpu() { ;; esac - case "$gpu_shorthand" in - "on" | "tiny") - gpu="${gpu// Rev\. ?}" - gpu="${gpu// OEM}" - gpu="${gpu// Series}" - gpu="${gpu// Controller}" - gpu="${gpu/\/*}" - - case "$gpu_shorthand" in - "tiny") - gpu="${gpu/Graphics }" - gpu="${gpu/GeForce }" - gpu="${gpu/Radeon }" - ;; - esac - ;; - esac - if [ "$gpu_brand" == "off" ]; then gpu="${gpu/AMD}" gpu="${gpu/NVIDIA}" @@ -3001,7 +2984,6 @@ usage() { cat << EOF --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --refresh_rate on/off Whether to display the refresh rate of each monitor Unsupported on Windows - --gpu_shorthand on/off Shorten the output of GPU (tiny, on, off) --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/icons output @@ -3129,7 +3111,6 @@ getargs() { --kernel_shorthand) kernel_shorthand="$2" ;; --uptime_shorthand) uptime_shorthand="$2" ;; --cpu_shorthand) cpu_shorthand="$2" ;; - --gpu_shorthand) gpu_shorthand="$2" ;; --gpu_brand) gpu_brand="$2" ;; --refresh_rate) refresh_rate="$2" ;; --gtk_shorthand) gtk_shorthand="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index 5fa7c980..d69fbe20 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -64,9 +64,6 @@ Whether to display the refresh rate of each monitor .br Note: Unsupported on Windows .TP -.B \--gpu_shorthand 'on/off' -Shorten the output of GPU (tiny, on, off) -.TP .B \--gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) .TP