general: Removed changes from other branch
This commit is contained in:
parent
70b1fe169c
commit
836ab52e6a
24
neofetch
24
neofetch
|
@ -334,16 +334,6 @@ gtk3="on"
|
||||||
public_ip_host="http://ident.me"
|
public_ip_host="http://ident.me"
|
||||||
|
|
||||||
|
|
||||||
# Window Manager
|
|
||||||
|
|
||||||
|
|
||||||
# Show Window Manager Version.
|
|
||||||
#
|
|
||||||
# Default: 'off'
|
|
||||||
# Values: 'on', off
|
|
||||||
# Flag: --wm_version
|
|
||||||
wm_version="off"
|
|
||||||
|
|
||||||
|
|
||||||
# Disk
|
# Disk
|
||||||
|
|
||||||
|
@ -1575,18 +1565,6 @@ get_wm() {
|
||||||
-e "monsterwm" \
|
-e "monsterwm" \
|
||||||
-e "tinywm")"
|
-e "tinywm")"
|
||||||
|
|
||||||
if [[ "$wm_version" == "on" && "$wm" ]]; then
|
|
||||||
wmv="$("${wm,,}" --version || "${wm,,}" -v 2>&1)"
|
|
||||||
wmv="$wm ${wmv:-$("${wm,,}_x11" -v || "${wm,,}_wayland" -v)}"
|
|
||||||
wmv="${wmv/$wm ${wm}?/$wm }"
|
|
||||||
wmv="${wmv/$wm $wm/$wm}"
|
|
||||||
wmv="${wmv/copyright*}"
|
|
||||||
wmv="${wmv/version }"
|
|
||||||
wmv="${wmv/©*}"
|
|
||||||
wmv="${wmv/(c)*}"
|
|
||||||
wmv="${wmv/ : }"
|
|
||||||
wm="$wmv"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
case "$os" in
|
case "$os" in
|
||||||
"Mac OS X")
|
"Mac OS X")
|
||||||
|
@ -5474,7 +5452,6 @@ INFO:
|
||||||
|
|
||||||
NOTE: This only supports Linux.
|
NOTE: This only supports Linux.
|
||||||
|
|
||||||
--wm_version on/off Show/Hide Window Manager version.
|
|
||||||
--gtk_shorthand on/off Shorten output of gtk theme/icons
|
--gtk_shorthand on/off Shorten output of gtk theme/icons
|
||||||
--gtk2 on/off Enable/Disable gtk2 theme/font/icons output
|
--gtk2 on/off Enable/Disable gtk2 theme/font/icons output
|
||||||
--gtk3 on/off Enable/Disable gtk3 theme/font/icons output
|
--gtk3 on/off Enable/Disable gtk3 theme/font/icons output
|
||||||
|
@ -5645,7 +5622,6 @@ get_args() {
|
||||||
"--cpu_brand") cpu_brand="$2" ;;
|
"--cpu_brand") cpu_brand="$2" ;;
|
||||||
"--gpu_brand") gpu_brand="$2" ;;
|
"--gpu_brand") gpu_brand="$2" ;;
|
||||||
"--gpu_type") gpu_type="$2" ;;
|
"--gpu_type") gpu_type="$2" ;;
|
||||||
"--wm_version") wm_version="$2" ;;
|
|
||||||
"--refresh_rate") refresh_rate="$2" ;;
|
"--refresh_rate") refresh_rate="$2" ;;
|
||||||
"--gtk_shorthand") gtk_shorthand="$2" ;;
|
"--gtk_shorthand") gtk_shorthand="$2" ;;
|
||||||
"--gtk2") gtk2="$2" ;;
|
"--gtk2") gtk2="$2" ;;
|
||||||
|
|
Reference in New Issue