neofetch: clean up

This commit is contained in:
Dylan Araps 2020-10-04 15:18:28 +03:00
parent 9ca24eaa0a
commit 075eb43dd7
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 54 additions and 60 deletions

114
neofetch
View File

@ -728,8 +728,7 @@ bar_color_total="distro"
# #
# Default: 'off' # Default: 'off'
# Values: 'bar', 'infobar', 'barinfo', 'off' # Values: 'bar', 'infobar', 'barinfo', 'off'
# Flags: --cpu_display # Flags: --memory_display
# --memory_display
# --battery_display # --battery_display
# --disk_display # --disk_display
# #
@ -738,7 +737,6 @@ bar_color_total="distro"
# infobar: 'info [---=======]' # infobar: 'info [---=======]'
# barinfo: '[---=======] info' # barinfo: '[---=======] info'
# off: 'info' # off: 'info'
cpu_display="off"
memory_display="off" memory_display="off"
battery_display="off" battery_display="off"
disk_display="off" disk_display="off"
@ -985,7 +983,7 @@ get_distro() {
elif [[ -f /etc/armbian-release ]]; then elif [[ -f /etc/armbian-release ]]; then
. /etc/armbian-release . /etc/armbian-release
distro="Armbian $DISTRIBUTION_CODENAME ($VERSION)" distro="Armbian $DISTRIBUTION_CODENAME (${VERSION:-})"
elif [[ -f /etc/siduction-version ]]; then elif [[ -f /etc/siduction-version ]]; then
case $distro_shorthand in case $distro_shorthand in
@ -1500,7 +1498,7 @@ get_packages() {
has() { type -p "$1" >/dev/null && manager=$1; } has() { type -p "$1" >/dev/null && manager=$1; }
dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; }
pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; }
tot() { tot() {
IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";
((packages+=${#pkgs[@]})); ((packages+=${#pkgs[@]}));
pac "$((${#pkgs[@]}-pkgs_h))"; pac "$((${#pkgs[@]}-pkgs_h))";
@ -1634,7 +1632,7 @@ get_packages() {
has pkgman && dir /boot/system/package-links/* has pkgman && dir /boot/system/package-links/*
packages=${packages/pkgman/depot} packages=${packages/pkgman/depot}
;; ;;
IRIX) IRIX)
manager=swpkg manager=swpkg
pkgs_h=3 tot versions -b && ((packages-=3)) pkgs_h=3 tot versions -b && ((packages-=3))
@ -4314,7 +4312,7 @@ display_image() {
) )
fi fi
;; ;;
"catimg") "catimg")
catimg -w "$((width*catimg_size / font_width))" -r "$catimg_size" "$image" catimg -w "$((width*catimg_size / font_width))" -r "$catimg_size" "$image"
;; ;;
@ -4946,8 +4944,6 @@ BARS:
--bar_length num Length in spaces to make the bars. --bar_length num Length in spaces to make the bars.
--bar_colors num num Colors to make the bar. --bar_colors num num Colors to make the bar.
Set in this order: elapsed, total Set in this order: elapsed, total
--cpu_display mode Bar mode.
Possible values: bar, infobar, barinfo, off
--memory_display mode Bar mode. --memory_display mode Bar mode.
Possible values: bar, infobar, barinfo, off Possible values: bar, infobar, barinfo, off
--battery_display mode Bar mode. --battery_display mode Bar mode.
@ -5198,14 +5194,13 @@ get_args() {
bar_color_total="$3" bar_color_total="$3"
;; ;;
"--cpu_display") cpu_display="$2" ;;
"--memory_display") memory_display="$2" ;; "--memory_display") memory_display="$2" ;;
"--battery_display") battery_display="$2" ;; "--battery_display") battery_display="$2" ;;
"--disk_display") disk_display="$2" ;; "--disk_display") disk_display="$2" ;;
# Image backend # Image backend
"--backend") image_backend="$2" ;; "--backend") image_backend="$2" ;;
"--source") image_source="$2" ;; "--source") image_source="$2" ;;
"--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\
"--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" | "--ueberzug") "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" | "--ueberzug")
image_backend="${1/--}" image_backend="${1/--}"
@ -5336,7 +5331,6 @@ get_args() {
refresh_rate="on" refresh_rate="on"
shell_version="on" shell_version="on"
cpu_display="infobar"
memory_display="infobar" memory_display="infobar"
disk_display="infobar" disk_display="infobar"
cpu_temp="C" cpu_temp="C"
@ -5587,26 +5581,26 @@ EOF
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} ${c1}
'cx0XWWMMWNKOd:'. 'cx0XWWMMWNKOd:'.
.;kNMMMMMMMMMMMMMWNKd' .;kNMMMMMMMMMMMMMWNKd'
'kNMMMMMMWNNNWMMMMMMMMXo. 'kNMMMMMMWNNNWMMMMMMMMXo.
,0MMMMMW0o;'..,:dKWMMMMMWx. ,0MMMMMW0o;'..,:dKWMMMMMWx.
OMMMMMXl. .xNMMMMMNo OMMMMMXl. .xNMMMMMNo
WMMMMNl .kWWMMMMO' WMMMMNl .kWWMMMMO'
MMMMMX; oNWMMMMK, MMMMMX; oNWMMMMK,
NMMMMWo .OWMMMMMK, NMMMMWo .OWMMMMMK,
kWMMMMNd. ,kWMMMMMMK, kWMMMMNd. ,kWMMMMMMK,
'kWMMMMWXxl:;;:okNMMMMMMMMK, 'kWMMMMWXxl:;;:okNMMMMMMMMK,
.oXMMMMMMMWWWMMMMMMMMMMMMK, .oXMMMMMMMWWWMMMMMMMMMMMMK,
'oKWMMMMMMMMMMMMMMMMMMMK, 'oKWMMMMMMMMMMMMMMMMMMMK,
.;lxOKXXXXXXXXXXXXXXXO;...... .;lxOKXXXXXXXXXXXXXXXO;......
................,d0000000kd:. ................,d0000000kd:.
.kMMMMMMMMMW0; .kMMMMMMMMMW0;
.kMMMMMMMMMMMX .kMMMMMMMMMMMX
.xMMMMMMMMMMMW .xMMMMMMMMMMMW
cXMMMMMMMMMM0 cXMMMMMMMMMM0
:0WMMMMMMNx, :0WMMMMMMNx,
.o0NMWNOc. .o0NMWNOc.
EOF EOF
;; ;;
@ -5731,24 +5725,24 @@ EOF
"Archcraft"*) "Archcraft"*)
set_colors 6 6 7 1 set_colors 6 6 7 1
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} -m: ${c1} -m:
:NMM+ .+ :NMM+ .+
+MMMMMo -NMy +MMMMMo -NMy
sMMMMMMMy -MMMMh` sMMMMMMMy -MMMMh`
yMMMMMMMMMd` oMMMMd` yMMMMMMMMMd` oMMMMd`
`dMMMMMMMMMMMm. /MMMMm- `dMMMMMMMMMMMm. /MMMMm-
.mMMMMMm-dMMMMMN- :NMMMN: .mMMMMMm-dMMMMMN- :NMMMN:
-NMMMMMd` yMMMMMN: .mMMMM/ -NMMMMMd` yMMMMMN: .mMMMM/
:NMMMMMy sMMMMMM+ `dMMMMo :NMMMMMy sMMMMMM+ `dMMMMo
+MMMMMMs +MMMMMMs `hMMMMy +MMMMMMs +MMMMMMs `hMMMMy
oMMMMMMMds- :NMMMMMy sMMMMh` oMMMMMMMds- :NMMMMMy sMMMMh`
yMMMMMNoydMMmo` -NMMMMMd` +MMMMd. yMMMMMNoydMMmo` -NMMMMMd` +MMMMd.
`dMMMMMN- `:yNNs` .mMMMMMm. /MMMMm- `dMMMMMN- `:yNNs` .mMMMMMm. /MMMMm-
.mMMMMMm. :hN/ `dMMMMMN- -NMMMN: .mMMMMMm. :hN/ `dMMMMMN- -NMMMN:
-NMMMMMd` -hh` `yMMMMMN: .mMMMM/ -NMMMMMd` -hh` `yMMMMMN: .mMMMM/
:NMMMMMy `s` :h. oMMMMMM+ `----- :NMMMMMy `s` :h. oMMMMMM+ `-----
+MMMMMMo .dMm. `o. +MMMMMMo +MMMMMMo .dMm. `o. +MMMMMMo
sMMMMMM+ .mMMMN: :` :NMMMMMy sMMMMMM+ .mMMMN: :` :NMMMMMy
EOF EOF
;; ;;
@ -7806,24 +7800,24 @@ EOF
"LaxerOS"*) "LaxerOS"*)
set_colors 7 4 set_colors 7 4
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c2} ${c2}
/. /.
`://:- `://:-
`//////: `//////:
.////////:` .////////:`
-//////////:` -//////////:`
-/////////////` -/////////////`
:///////////////. :///////////////.
`://////.```-//////- `://////.```-//////-
`://///:` .//////- `://///:` .//////-
`//////: `//////: `//////: `//////:
.//////- `://///:` .//////- `://///:`
-//////- `://///:` -//////- `://///:`
-//////. ://////` -//////. ://////`
://////` -//////. ://////` -//////.
`/////:` ./////: `/////:` ./////:
.-::-` .:::-` .-::-` .:::-`
.:://////////////////////////////////::. .:://////////////////////////////////::.
//////////////////////////////////////// ////////////////////////////////////////
.:////////////////////////////////////:. .:////////////////////////////////////:.
@ -10500,7 +10494,7 @@ ${c1} -1vvnvv. `~+++` ++|+++
+Invnvnvnnnnnnnnvvnn;. +Invnvnvnnnnnnnnvvnn;.
~|Invnvnvvnvvvnnv}+` ~|Invnvnvvnvvvnnv}+`
-~|{*l}*|~ -~|{*l}*|~
EOF EOF
;; ;;