cry/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dylanaraps:master' into master

Browse source
This commit is contained in:
Cappy Ishihara 2021-10-23 01:15:24 +07:00 • committed by GitHub
commit 2a81916124
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

121
neofetch
View file

@ -780,13 +780,13 @@ image_source="auto"
# Default: 'auto' # Default: 'auto'
# Values: 'auto', 'distro_name' # Values: 'auto', 'distro_name'
# Flag: --ascii_distro # Flag: --ascii_distro
# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, AmogOS, Anarchy, Android, instantOS, # NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS,
# Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft, # Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft,
# ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, # ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch,
# Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight,
# Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS,
# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres,
# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, # Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin,
# DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary,
# EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD,
# FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo,
@ -1541,7 +1541,7 @@ get_packages() {
has kiss && tot kiss l has kiss && tot kiss l
has cpt-list && tot cpt-list has cpt-list && tot cpt-list
has pacman-key && tot pacman -Qq --color never has pacman-key && tot pacman -Qq --color never
has dpkg && pac "$(dpkg --list | grep -c ^ii)" has dpkg && tot dpkg-query -f '.\n' -W
has xbps-query && tot xbps-query -l has xbps-query && tot xbps-query -l
has apk && tot apk info has apk && tot apk info
has opkg && tot opkg list-installed has opkg && tot opkg list-installed
@ -1549,6 +1549,7 @@ get_packages() {
has lvu && tot lvu installed has lvu && tot lvu installed
has tce-status && tot tce-status -i has tce-status && tot tce-status -i
has pkg_info && tot pkg_info has pkg_info && tot pkg_info
has pkgin && tot pkgin list
has tazpkg && pkgs_h=6 tot tazpkg list && ((packages-=6)) has tazpkg && pkgs_h=6 tot tazpkg list && ((packages-=6))
has sorcery && tot gaze installed has sorcery && tot gaze installed
has alps && tot alps showinstalled has alps && tot alps showinstalled
@ -2490,7 +2491,7 @@ get_gpu() {
gpu_cmd="$(lspci -mm | gpu_cmd="$(lspci -mm |
awk -F '\"|\" \"|\\(' \ awk -F '\"|\" \"|\\(' \
'/"Display|"3D|"VGA/ { '/"Display|"3D|"VGA/ {
a[$0] = $1 " " $3 " " ($7 ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $7) a[$0] = $1 " " $3 " " ($(NF-1) ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $(NF-1))
} }
END { for (i in a) { END { for (i in a) {
if (!seen[a[i]]++) { if (!seen[a[i]]++) {
@ -5130,7 +5131,7 @@ ASCII:
BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs,
Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom,
Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux,
CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan,
DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless,
EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware,
Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU,
@ -5680,31 +5681,6 @@ dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd
.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. .:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:.
`.:+shNMMMMMh yMMMMMNhs+:`` `.:+shNMMMMMh yMMMMMNhs+:``
`-+shy shs+:` `-+shy shs+:`
EOF
;;
"AmogOS"*)
set_colors 6 6 7 1
read -rd '' ascii_data <<'EOF'
${c1} '
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⣤⣤⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⠟⠉⠉⠉⠉⠉⠉⠉⠙⠻⢶⣄⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣷⡀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡟⠀⣠⣶⠛⠛⠛⠛⠛⠛⠳⣦⡀⠀⠘⣿⡄⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⠁⠀⢹⣿⣦⣀⣀⣀⣀⣀⣠⣼⡇⠀⠀⠸⣷⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠀⠀⠀⠉⠛⠿⠿⠿⠿⠛⠋⠁⠀⠀⠀⠀⣿⡄
⠀⠀ ⠀⠀⢠⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⡇⠀
⠀⠀⣸⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡇⠀
⠀⠀⠀⠀⠀⠀⠀⠀⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣧⠀
⠀⠀⠀⠀⠀⠀⠀⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣿⠀
⠀⠀⠀⠀⠀⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀
⠀⠀⠀⠀⠀⠀⠀⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀
⠀⠀⠀⠀⠀⠀⢰⣿⠀⠀⠀⠀⣠⡶⠶⠿⠿⠿⠿⢷⣦⠀⠀⠀⠀⠀⠀⠀⣿⠀
⠀⠀⣀⣀⣀⠀⣸⡇⠀⠀⠀⠀⣿⡀⠀⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⣿⠀
⣠⡿⠛⠛⠛⠛⠻⠀⠀⠀⠀⠀⢸⣇⠀⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⠀⠀⠀⣿⠀
⢻⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⡟⠀⠀⢀⣤⣤⣴⣿⠀⠀⠀⠀⠀⠀⠀⣿⠀
⠈⠙⢷⣶⣦⣤⣤⣤⣴⣶⣾⠿⠛⠁⢀⣶⡟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡟⠀
⠀⠀⠀⠀⠈⣿⣆⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⡾⠃⠀
⠀ ⠀⠀⠀⠀⠀⠀⠈⠛⠻⢿⣿⣾⣿⡿⠿⠟⠋⠁⠀⠀⠀
EOF EOF
;; ;;
"Anarchy"*) "Anarchy"*)
@ -6911,7 +6887,7 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo
EOF EOF
;; ;;
*"CrystalUX"*) *"Crystal Linux"*)
set_colors 13 5 set_colors 13 5
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} mysssym ${c1} mysssym
@ -7690,25 +7666,25 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
EOF EOF
;; ;;
"glaucus"*) "glaucus"*)
set_colors 5 set_colors 5
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} ,, ,d88P ${c1} ,, ,d88P
,d8P ,ad8888* ,d8P ,ad8888*
,888P d88888* ,,ad8888P* ,888P d88888* ,,ad8888P*
d d888P a88888P* ,ad8888888* d d888P a88888P* ,ad8888888*
.d8 d8888: d888888* ,d888888P* .d8 d8888: d888888* ,d888888P*
.888; 88888b d8888888b8888888P .888; 88888b d8888888b8888888P
d8888J888888a88888888888888P* ,d d8888J888888a88888888888888P* ,d
88888888888888888888888888P ,,d8* 88888888888888888888888888P ,,d8*
888888888888888888888888888888888* 888888888888888888888888888888888*
*8888888888888888888888888888888* *8888888888888888888888888888888*
Y888888888P* `*``*888888888888* Y888888888P* `*``*888888888888*
*^888^* *Y888P** *^888^* *Y888P**
EOF EOF
;; ;;
"gNewSense"*) "gNewSense"*)
set_colors 4 5 7 6 set_colors 4 5 7 6
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
@ -7858,25 +7834,22 @@ EOF
;; ;;
"Haiku"*) "Haiku"*)
set_colors 2 8 set_colors 1 3 7 2
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c2} :dc' ${c3}
'l:;'${c1},${c2}'ck. .;dc:.
co ${c1}..${c2}k. .;; ':o. MMMM MMMM
co ${c1}..${c2}k. ol ${c1}.${c2}0. MMMM MMMM
co ${c1}..${c2}k. oc ${c1}..${c2}0. MMMM MMMM
co ${c1}..${c2}k. oc ${c1}..${c2}0. MMMM MMMM
.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. MMMM${c4} .ciO| /YMMMMM*"
';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; ${c3} MMMM${c4} .cOMMMMM|/MMMMM/`
..${c1}oOolllllccccccc:::::${c2}od; , ,iMM|/MMMMMMMMMMMMMMM*
cx:ooc${c1}:::::::;${c2}cooolcX. `*.__,-cMMMMMMMMMMMMMMMMM/`${c3}.MMM
cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. MM${c4}MMMMMMM/`:MMM/ ${c3}MMMM
cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. MMMM MMMM
.::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. MMMM MMMM
'::c'${c1}...${c2}do${c1}..... .${c2}K, """" """"
cd,.${c1}....:${c2}O,${c1}
':clod:'${c1}
${c1}
EOF EOF
;; ;;
@ -8420,11 +8393,11 @@ EOF
"mac"* | "Darwin") "mac"* | "Darwin")
set_colors 2 3 1 1 5 4 set_colors 2 3 1 1 5 4
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} 'c. ${c1} c.'
,xNMM. ,xNMM.
.OMMMMo .OMMMMo
OMMM0, lMM"
.;loddo:' loolloddol;. .;loddo:. .olloddol;.
cKMMMMMMMMMMNWMMMMMMMMMM0: cKMMMMMMMMMMNWMMMMMMMMMM0:
${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. ${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd.
XMMMMMMMMMMMMMMMMMMMMMMMX. XMMMMMMMMMMMMMMMMMMMMMMMX.
@ -8432,11 +8405,11 @@ ${c3};MMMMMMMMMMMMMMMMMMMMMMMM:
:MMMMMMMMMMMMMMMMMMMMMMMM: :MMMMMMMMMMMMMMMMMMMMMMMM:
${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. ${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX.
kMMMMMMMMMMMMMMMMMMMMMMMMWd. kMMMMMMMMMMMMMMMMMMMMMMMMWd.
${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk ${c5}'XMMMMMMMMMMMMMMMMMMMMMMMMMMk
.XMMMMMMMMMMMMMMMMMMMMMMMMK. 'XMMMMMMMMMMMMMMMMMMMMMMMMK.
${c6}kMMMMMMMMMMMMMMMMMMMMMMd ${c6}kMMMMMMMMMMMMMMMMMMMMMMd
;KMMMMMMMWXXWMMMMMMMk. ;KMMMMMMMWXXWMMMMMMMk.
.cooc,. .,coo:. "cooc*" "*coo'"
EOF EOF
;; ;;
@ -11200,7 +11173,7 @@ ${c1}
################ ################ ################ ################
################ ################ ################ ################
################ ################ ################ ################
################ ################ ################ ################
################ ################ ################ ################
################ ################ ################ ################
@ -11361,11 +11334,11 @@ EOF
"Darwin") "Darwin")
set_colors 2 3 1 1 5 4 set_colors 2 3 1 1 5 4
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} 'c. ${c1} c.'
,xNMM. ,xNMM.
.OMMMMo .OMMMMo
OMMM0, lMMM"
.;loddo:' loolloddol;. .;loddo:. .olloddol;.
cKMMMMMMMMMMNWMMMMMMMMMM0: cKMMMMMMMMMMNWMMMMMMMMMM0:
${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. ${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd.
XMMMMMMMMMMMMMMMMMMMMMMMX. XMMMMMMMMMMMMMMMMMMMMMMMX.
@ -11373,11 +11346,11 @@ ${c3};MMMMMMMMMMMMMMMMMMMMMMMM:
:MMMMMMMMMMMMMMMMMMMMMMMM: :MMMMMMMMMMMMMMMMMMMMMMMM:
${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. ${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX.
kMMMMMMMMMMMMMMMMMMMMMMMMWd. kMMMMMMMMMMMMMMMMMMMMMMMMWd.
${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk ${c5}'XMMMMMMMMMMMMMMMMMMMMMMMMMMk
.XMMMMMMMMMMMMMMMMMMMMMMMMK. 'XMMMMMMMMMMMMMMMMMMMMMMMMK.
${c6}kMMMMMMMMMMMMMMMMMMMMMMd ${c6}kMMMMMMMMMMMMMMMMMMMMMMd
;KMMMMMMMWXXWMMMMMMMk. ;KMMMMMMMWXXWMMMMMMMk.
.cooc,. .,coo:. "cooc*" "*coo'"
EOF EOF
;; ;;