From b0a654f162f6dcaf67871c2ca6785b97bca49c05 Mon Sep 17 00:00:00 2001 From: minhtricute69 <42957778+minhtricute69@users.noreply.github.com> Date: Fri, 11 Jun 2021 11:48:39 +0700 Subject: [PATCH 01/55] Add HydroOS distro support (#1766) Add HydroOS distro support --- neofetch | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 62b82ea4..59ccbb56 100755 --- a/neofetch +++ b/neofetch @@ -790,7 +790,7 @@ image_source="auto" # Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, -# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, # KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, # Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, @@ -7591,6 +7591,20 @@ ${c2} ` `` EOF ;; + "HydroOS"*) + set_colors 1 2 3 4 5 + read -rd '' ascii_data <<'EOF' +${c1} + _ _ _ ____ _____ + | | | | | | / __ \ / ____| + | |__| |_ _ __| |_ __ ___ | | | | (___ + | __ | | | |/ _` | '__/ _ \| | | |\___ \ + | | | | |_| | (_| | | | (_) | |__| |____) | + |_| |_|\__, |\__,_|_| \___/ \____/|_____/ + __/ | + |___/ +EOF + ;; "hyperbola_small"*) set_colors 8 From 19fefa65618241846f567815739fa2f7b4078e36 Mon Sep 17 00:00:00 2001 From: minhtricute69 <42957778+minhtricute69@users.noreply.github.com> Date: Fri, 11 Jun 2021 11:48:46 +0700 Subject: [PATCH 02/55] Add HydroOS distro support (#1767) Add HydroOS distro support --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index c05e3038..aa4c7c11 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -306,7 +306,7 @@ Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, -gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, From 4d7ec21ad5c4ae24e634c92763eaa26ea2655b0f Mon Sep 17 00:00:00 2001 From: Philipp Wallisch Date: Fri, 11 Jun 2021 06:51:48 +0200 Subject: [PATCH 03/55] Rework macOS memory calculation to work on Apple Silicon (#1752) --- neofetch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 59ccbb56..c8489506 100755 --- a/neofetch +++ b/neofetch @@ -2601,12 +2601,13 @@ get_memory() { ;; "Mac OS X" | "macOS" | "iPhone OS") + hw_pagesize="$(sysctl -n hw.pagesize)" mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))" - mem_wired="$(vm_stat | awk '/ wired/ { print $4 }')" - mem_active="$(vm_stat | awk '/ active/ { printf $3 }')" - mem_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" - mem_compressed="${mem_compressed:-0}" - mem_used="$(((${mem_wired//.} + ${mem_active//.} + ${mem_compressed//.}) * 4 / 1024))" + pages_app="$(($(sysctl -n vm.page_pageable_internal_count) - $(sysctl -n vm.page_purgeable_count)))" + pages_wired="$(vm_stat | awk '/ wired/ { print $4 }')" + pages_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" + pages_compressed="${pages_compressed:-0}" + mem_used="$(((${pages_app} + ${pages_wired//.} + ${pages_compressed//.}) * hw_pagesize / 1024 / 1024))" ;; "BSD" | "MINIX") From 22b97f99c33e5e141dea9489e0393ff5723a197a Mon Sep 17 00:00:00 2001 From: jnats Date: Fri, 11 Jun 2021 05:52:52 +0100 Subject: [PATCH 04/55] Update neofetch (#1749) Co-authored-by: jnats --- neofetch | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index c8489506..b8c72bb3 100755 --- a/neofetch +++ b/neofetch @@ -786,8 +786,8 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -# Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, -# Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, +# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, +# DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS @@ -5049,8 +5049,8 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, - CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, - DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, + CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, + DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, @@ -6692,6 +6692,32 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; + *"CrystalUX"*) + set_colors 13 5 + read -rd '' ascii_data <<'EOF' +${c1} mysssym +${c1} mysssym +${c1} mysssym +${c1} mysssym +${c1} mysssyd +${c1} mysssyd N +${c1} mysssyd mysym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysym dysssym +${c1} N dysssym +${c1} dysssym +${c1} dysssym +${c1} dysssym +${c1} dysssym +${c1} dysssym +EOF + ;; + *"Cucumber"*) set_colors 2 3 read -rd '' ascii_data <<'EOF' From 87753c5057632d6b7cffd5c6097d72f61b13a123 Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Fri, 11 Jun 2021 00:53:33 -0400 Subject: [PATCH 05/55] fix neofetch not recognizing brew package count on M1 macs (#1747) * fix neofetch not recognizing brew package count on M1 macs * fix apt package count issue --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index b8c72bb3..8aee9f8d 100755 --- a/neofetch +++ b/neofetch @@ -1522,7 +1522,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has apt && tot apt list + has apt && tot apt list --installed && ((packages-=1)) has rpm && tot rpm -qa has xbps-query && tot xbps-query -l has apk && tot apk info @@ -1610,7 +1610,7 @@ get_packages() { "Mac OS X"|"macOS"|MINIX) has port && pkgs_h=1 tot port installed && ((packages-=1)) - has brew && dir /usr/local/Cellar/* + has brew && dir "$(brew --cellar)"/* has pkgin && tot pkgin list has nix-store && { From b7abdba2fdd6321cf6ac0acbbde54f857cc519d6 Mon Sep 17 00:00:00 2001 From: Luca Robbiano Date: Fri, 11 Jun 2021 06:54:26 +0200 Subject: [PATCH 06/55] Add Rocky Linux (#1743) * Add Rocky Linux * Add Rocky Linux ASCII Art * Add Rocky Linux into the ASCII logo list * Fix Co-authored-by: Kaleb <51819073+klebdotio@users.noreply.github.com> --- neofetch | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 8aee9f8d..0cf87a42 100755 --- a/neofetch +++ b/neofetch @@ -800,8 +800,8 @@ image_source="auto" # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, # Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, -# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, -# sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rocky, +# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, @@ -9705,6 +9705,49 @@ ${c1} EOF ;; + "rocky_small"*) + set_colors 2 + read -rd '' ascii_data <<'EOF' +${c1} `-/+++++++++/-.` + `-+++++++++++++++++-` +.+++++++++++++++++++++. +-+++++++++++++++++++++++. ++++++++++++++++/-/+++++++ ++++++++++++++/. ./+++++ ++++++++++++:. ./+++ ++++++++++:` `:/:` .:/ +-++++++:` .:+++++:` + .+++-` ./+++++++++:` + `-` ./+++++++++++- + -+++++++++:-.` +EOF + ;; + + "rocky"*) + set_colors 35 + read -rd '' ascii_data <<'EOF' +${c1} __wgliliiligw_, + _williiiiiiliilililw, + _%iiiiiilililiiiiiiiiiii_ + .Qliiiililiiiiiiililililiilm. + _iiiiiliiiiiililiiiiiiiiiiliil, + .lililiiilililiiiilililililiiiii, +_liiiiiiliiiiiiiliiiiiF{iiiiiilili, +jliililiiilililiiili@` ~ililiiiiiL +iiiliiiiliiiiiiili>` ~liililii +liliiiliiilililii` -9liiiil +iiiiiliiliiiiii~ "4lili +4ililiiiiilil~| -w, )4lf +-liiiiililiF' _liig, )' + )iiiliii@` _QIililig, + )iiii>` .Qliliiiililw + )<>~ .mliiiiiliiiiiil, + _gllilililiililii~ + giliiiiiiiiiiiiT` + -^~$ililili@~~' +EOF + ;; + "Rosa"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From cd6c4334db046b813e0002ff98919a30a472e52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Efe=20=C3=87etin?= <45270788+efectn@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:55:06 +0300 Subject: [PATCH 07/55] Add TeArch Linux. (#1741) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add TeArch Linux. * Update neofetch Co-authored-by: Efe Çetin --- neofetch | 31 +++++++++++++++++++++++++++++-- neofetch.1 | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 0cf87a42..7393fbf9 100755 --- a/neofetch +++ b/neofetch @@ -793,7 +793,7 @@ image_source="auto" # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, # KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, -# Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, +# Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, # Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, # Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, @@ -5056,7 +5056,7 @@ ASCII: GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, - Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, + Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, @@ -8231,6 +8231,33 @@ ${c1}██████████████████ ██████ EOF ;; + "TeArch"*) + set_colors 39 7 1 + read -rd '' ascii_data <<'EOF' +${c1} @@@@@@@@@@@@@@ + @@@@@@@@@ @@@@@@ + @@@@@ @@@@@ + @@ @@ + @% @@ + @ @ + @@@@@@@@@@@@@@@@@@@@@@@@ @@ + .@@@@@@@@@@@@/@@@@@@@@@@@@ + @@@@@@@@@@@@///@@@@@@@@@@@@ + @@@@@@@@@@@@@((((@@@@@@@@@@@@ + @@@@@@@@@@@#(((((((#@@@@@@@@@@@ + @@@@@@@@@@@#//////////@@@@@@@@@@& + @@@@@@@@@@////@@@@@////@@@@@@@@@@ + @@@@@@@@//////@@@@@/////@@@@@@@@@ + @@@@@@@//@@@@@@@@@@@@@@@//@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +@@ .@@@@@@@@@@@@@@@@@@@@@@@@@ @ + @@@@@@ @@@. @@@@@@@ + @@@@@@@&@@@@@@@# #@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@ +EOF + ;; + "Maui"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index aa4c7c11..8eed9bc3 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -309,7 +309,7 @@ FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, -Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, +Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, From d8b58a10b9c08deb236bd85bea0f4f0cdc6e3c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=B3czai=20Oliv=C3=A9r?= Date: Fri, 11 Jun 2021 06:55:35 +0200 Subject: [PATCH 08/55] Only use DNS if public_ip_host option is empty (#1737) In config: public_ip_host="" -> uses DNS for getting public IP public_ip_host="http://example.com/ip" -> uses wget/curl for getting public IP --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 7393fbf9..093fc030 100755 --- a/neofetch +++ b/neofetch @@ -3807,12 +3807,12 @@ get_local_ip() { } get_public_ip() { - if type -p dig >/dev/null; then + if [[ ! -n "$public_ip_host" ]] && type -p dig >/dev/null; then public_ip="$(dig +time=1 +tries=1 +short myip.opendns.com @resolver1.opendns.com)" [[ "$public_ip" =~ ^\; ]] && unset public_ip fi - if [[ -z "$public_ip" ]] && type -p drill >/dev/null; then + if [[ ! -n "$public_ip_host" ]] && [[ -z "$public_ip" ]] && type -p drill >/dev/null; then public_ip="$(drill myip.opendns.com @resolver1.opendns.com | \ awk '/^myip\./ && $3 == "IN" {print $5}')" fi From 21c9c5f22b32faed93f5110b40537694bdf670a4 Mon Sep 17 00:00:00 2001 From: Kevin Lapointe <80723850+klpnt@users.noreply.github.com> Date: Fri, 11 Jun 2021 00:55:56 -0400 Subject: [PATCH 09/55] New ASCII logo for Fedora (#1736) * Added new ASCII logo for Fedora * Added new ASCII art for Fedora * Added new ASCII for Fedora --- neofetch | 31 ++++++++++++++++++++++++++++--- neofetch.1 | 2 +- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 093fc030..0044858b 100755 --- a/neofetch +++ b/neofetch @@ -808,7 +808,7 @@ image_source="auto" # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, # Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, # windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. -# NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. +# NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. # Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, @@ -5072,7 +5072,7 @@ ASCII: Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. - NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. + NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. NOTE: Use '{distro name}_old' to use the old logos. @@ -7161,7 +7161,7 @@ ${c1}\\ \\${c2}__/ | EOF ;; - "Fedora"* | "RFRemix"*) + "Fedora_old"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} /:-------------:\\ @@ -7183,6 +7183,31 @@ ${c1} /:-------------:\\ :---------------------:// EOF ;; + + "Fedora"*) + set_colors 12 7 + read -rd '' ascii_data <<'EOF' +${c1} .',;::::;,'. + .';:cccccccccccc:;,. + .;cccccccccccccccccccccc;. + .:cccccccccccccccccccccccccc:. + .;ccccccccccccc;${c2}.:dddl:.${c1};ccccccc;. + .:ccccccccccccc;${c2}OWMKOOXMWd${c1};ccccccc:. +.:ccccccccccccc;${c2}KMMc${c1};cc;${c2}xMMc${c1};ccccccc:. +,cccccccccccccc;${c2}MMM.${c1};cc;${c2};WW:${c1};cccccccc, +:cccccccccccccc;${c2}MMM.${c1};cccccccccccccccc: +:ccccccc;${c2}oxOOOo${c1};${c2}MMM0OOk.${c1};cccccccccccc: +cccccc;${c2}0MMKxdd:${c1};${c2}MMMkddc.${c1};cccccccccccc; +ccccc;${c2}XM0'${c1};cccc;${c2}MMM.${c1};cccccccccccccccc' +ccccc;${c2}MMo${c1};ccccc;${c2}MMW.${c1};ccccccccccccccc; +ccccc;${c2}0MNc.${c1}ccc${c2}.xMMd${c1};ccccccccccccccc; +cccccc;${c2}dNMWXXXWM0:${c1};cccccccccccccc:, +cccccccc;${c2}.:odl:.${c1};cccccccccccccc:,. +:cccccccccccccccccccccccccccc:'. +.:cccccccccccccccccccccc:;,.. + '::cccccccccccccc::;,. +EOF + ;; "Feren"*) set_colors 4 7 1 diff --git a/neofetch.1 b/neofetch.1 index 8eed9bc3..39676dfb 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -325,7 +325,7 @@ Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP -NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. +NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. .IP NOTE: Use '{distro name}_old' to use the old logos. .IP From 41f75b7b484cca653e0db19b194d99a993dbf5f8 Mon Sep 17 00:00:00 2001 From: Adam Salt <75907419+whyadamsalt@users.noreply.github.com> Date: Fri, 11 Jun 2021 05:56:10 +0100 Subject: [PATCH 10/55] Update neofetch (#1732) --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 0044858b..f634e3bd 100755 --- a/neofetch +++ b/neofetch @@ -6359,6 +6359,28 @@ ${c2} .......... ...',;;;;;;,,... ..... EOF + + + "CelOS"*) + set_colors 3 2 4 5 7 + read -rd '' ascii_data <<'EOF' + +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +@@@# @@@ +@@ ,#%%%%%(. (@ +@# %%%%%%%%%%%%%%# @ +@# %%%%%%%%# %%%/ @ +@# #%%%%%%%%. #%%%* @ +@# %%%%%%%%%%%* (%%%%%# @ +@# #%%%% %%%%%%%%%%%, @ +@# #%%%%%%%%%%%%%%%%%, @ +@# #%%%%%%%%%%%%%* @ +@@ *##%#(, @@ +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + + +EOF + ;; ;; "centos_small"*) From 50a8bd285d965c2c94e863f7e5e4e547c1c101db Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:02:17 +0000 Subject: [PATCH 11/55] packages: Use dnf cache if available. Closes #1730 --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f634e3bd..e0298e69 100755 --- a/neofetch +++ b/neofetch @@ -1523,7 +1523,6 @@ get_packages() { has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never has apt && tot apt list --installed && ((packages-=1)) - has rpm && tot rpm -qa has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed @@ -1537,6 +1536,13 @@ get_packages() { has butch && tot butch list has swupd && tot swupd bundle-list --quiet + # Using the dnf package cache is much faster than rpm. + if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then + pac "$(sqlite3 /var/cache/dnf/packages.db "SELECT count(pkg) FROM installed")" + else + has rpm && tot rpm -qa + fi + # 'mine' conflicts with minesweeper games. [[ -f /etc/SDE-VERSION ]] && has mine && tot mine -q From 34d55b874787629fdf3936e2ad8560a44f8ac4bd Mon Sep 17 00:00:00 2001 From: MeztliRA <78863518+MeztliRA@users.noreply.github.com> Date: Fri, 11 Jun 2021 12:04:16 +0700 Subject: [PATCH 12/55] Fixes #1636 (#1727) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e0298e69..206dab8c 100755 --- a/neofetch +++ b/neofetch @@ -1769,7 +1769,7 @@ get_de() { ((wm_run != 1)) && get_wm # Temporary support for Regolith Linux - if [[ $DESKTOP_SESSION == regolith ]]; then + if [[ $DESKTOP_SESSION == *regolith ]]; then de=Regolith elif [[ $XDG_CURRENT_DESKTOP ]]; then From 96d9d3c4f6504226ae0674ffb31061bf29387b25 Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Fri, 11 Jun 2021 05:05:46 +0000 Subject: [PATCH 13/55] just removes any quotes from around the Alacritty font name, if any (#1708) --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 206dab8c..00578871 100755 --- a/neofetch +++ b/neofetch @@ -3274,6 +3274,7 @@ get_term_font() { term_font="${term_font/*family:}" term_font="${term_font/$'\n'*}" term_font="${term_font/\#*}" + term_font="${term_font//\"}" ;; "Apple_Terminal") From 0dd28db34e519962517efbf1b38bc16250c7d143 Mon Sep 17 00:00:00 2001 From: Rolex <62307498+DaOfficialRolex@users.noreply.github.com> Date: Fri, 11 Jun 2021 05:07:44 +0000 Subject: [PATCH 14/55] Added APT/Debian Packager to package managers for MacOS and combined PR #1702 (#1762) * Added new iOS and iPadOS device information * Updated neofetch to show dpkg and correct amount of packages. * Fixed indentation. --- neofetch | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 00578871..fc511402 100755 --- a/neofetch +++ b/neofetch @@ -1263,9 +1263,11 @@ get_model() { iPad6,1[12]): "iPad 5" ;; iPad7,[5-6]): "iPad 6" ;; iPad7,1[12]): "iPad 7" ;; + iPad11,[67]): "iPad 8" ;; iPad4,[1-3]): "iPad Air" ;; iPad5,[3-4]): "iPad Air 2" ;; iPad11,[3-4]): "iPad Air 3" ;; + iPad13,[1-2]): "iPad Air 4";; iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; @@ -1305,6 +1307,10 @@ get_model() { iPhone12,3): "iPhone 11 Pro" ;; iPhone12,5): "iPhone 11 Pro Max" ;; iPhone12,8): "iPhone SE 2020" ;; + iPhone13,1): "iPhone 12 Mini" ;; + iPhone13,2): "iPhone 12" ;; + iPhone13,3): "iPhone 12 Pro" ;; + iPhone13,4): "iPhone 12 Pro Max" ;; iPod1,1): "iPod touch" ;; ipod2,1): "iPod touch 2G" ;; @@ -1312,6 +1318,7 @@ get_model() { ipod4,1): "iPod touch 4G" ;; ipod5,1): "iPod touch 5G" ;; ipod7,1): "iPod touch 6G" ;; + iPod9,1): "iPod touch 7G" ;; esac model=$_ @@ -1618,6 +1625,7 @@ get_packages() { has port && pkgs_h=1 tot port installed && ((packages-=1)) has brew && dir "$(brew --cellar)"/* has pkgin && tot pkgin list + has dpkg && tot dpkg-query -f '.\n' -W has nix-store && { nix-user-pkgs() { @@ -2231,8 +2239,9 @@ get_cpu() { "Apple A10 Fusion (4) @ 2.34GHz" ;; "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; - "iPhone11,"[2468] | "iPad11,"[1-4]): "Apple A12 Bionic (6) @ 2.49GHz" ;; + "iPhone11,"[2468] | "iPad11,"[1-4] | "iPad11,"[6-7]): "Apple A12 Bionic (6) @ 2.49GHz" ;; "iPhone12,"[1358]): "Apple A13 Bionic (6) @ 2.65GHz" ;; + "iPhone13,"[1-4] | "iPad13,"[1-2]): "Apple A14 Bionic (6) @ 3.00Ghz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; @@ -2520,8 +2529,9 @@ get_gpu() { "iPhone8,"[1-4] | "iPad6,1"[12]): "PowerVR GT7600" ;; "iPhone9,"[1-4] | "iPad7,"[5-6]): "PowerVR GT7600 Plus" ;; "iPhone10,"[1-6]): "Apple Designed GPU (A11)" ;; - "iPhone11,"[2468]): "Apple Designed GPU (A12)" ;; + "iPhone11,"[2468] | "iPad11,"[67]): "Apple Designed GPU (A12)" ;; "iPhone12,"[1358]): "Apple Designed GPU (A13)" ;; + "iPhone13,"[1234] | "iPad13,"[12]): "Apple Designed GPU (A14)" ;; "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; From c0ceffb55455f00478753728135a0d447a6e5450 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:11:00 +0000 Subject: [PATCH 15/55] general: fix indentation --- neofetch | 61 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index fc511402..f1f97078 100755 --- a/neofetch +++ b/neofetch @@ -1263,11 +1263,11 @@ get_model() { iPad6,1[12]): "iPad 5" ;; iPad7,[5-6]): "iPad 6" ;; iPad7,1[12]): "iPad 7" ;; - iPad11,[67]): "iPad 8" ;; + iPad11,[67]): "iPad 8" ;; iPad4,[1-3]): "iPad Air" ;; iPad5,[3-4]): "iPad Air 2" ;; iPad11,[3-4]): "iPad Air 3" ;; - iPad13,[1-2]): "iPad Air 4";; + iPad13,[1-2]): "iPad Air 4";; iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; @@ -1307,10 +1307,10 @@ get_model() { iPhone12,3): "iPhone 11 Pro" ;; iPhone12,5): "iPhone 11 Pro Max" ;; iPhone12,8): "iPhone SE 2020" ;; - iPhone13,1): "iPhone 12 Mini" ;; - iPhone13,2): "iPhone 12" ;; - iPhone13,3): "iPhone 12 Pro" ;; - iPhone13,4): "iPhone 12 Pro Max" ;; + iPhone13,1): "iPhone 12 Mini" ;; + iPhone13,2): "iPhone 12" ;; + iPhone13,3): "iPhone 12 Pro" ;; + iPhone13,4): "iPhone 12 Pro Max" ;; iPod1,1): "iPod touch" ;; ipod2,1): "iPod touch 2G" ;; @@ -1318,7 +1318,7 @@ get_model() { ipod4,1): "iPod touch 4G" ;; ipod5,1): "iPod touch 5G" ;; ipod7,1): "iPod touch 6G" ;; - iPod9,1): "iPod touch 7G" ;; + iPod9,1): "iPod touch 7G" ;; esac model=$_ @@ -1508,9 +1508,9 @@ get_packages() { dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { - IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; - ((packages+=${#pkgs[@]})); - pac "$((${#pkgs[@]}-pkgs_h))"; + IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; + ((packages+=${#pkgs[@]})); + pac "$((${#pkgs[@]}-pkgs_h))"; } # Redefine tot() for Bedrock Linux. @@ -1518,7 +1518,7 @@ get_packages() { tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) - pac "$((${#pkgs[@]}-pkgs_h))"; + pac "$((${#pkgs[@]}-pkgs_h))"; } br_prefix="/bedrock/strata/*" } @@ -1614,7 +1614,7 @@ get_packages() { # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. has snap && ps -e | grep -qFm 1 snapd >/dev/null && \ - pkgs_h=1 tot snap list && ((packages-=1)) + pkgs_h=1 tot snap list && ((packages-=1)) # This is the only standard location for appimages. # See: https://github.com/AppImage/AppImageKit/wiki @@ -1625,7 +1625,7 @@ get_packages() { has port && pkgs_h=1 tot port installed && ((packages-=1)) has brew && dir "$(brew --cellar)"/* has pkgin && tot pkgin list - has dpkg && tot dpkg-query -f '.\n' -W + has dpkg && tot dpkg-query -f '.\n' -W has nix-store && { nix-user-pkgs() { @@ -1651,7 +1651,7 @@ get_packages() { # Scoop environment throws errors if `tot scoop list` is used has scoop && pkgs_h=1 dir ~/scoop/apps/* && ((packages-=1)) - # Count chocolatey packages. + # Count chocolatey packages. [[ -d /cygdrive/c/ProgramData/chocolatey/lib ]] && \ dir /cygdrive/c/ProgramData/chocolatey/lib/* ;; @@ -1659,7 +1659,7 @@ get_packages() { Haiku) has pkgman && dir /boot/system/package-links/* packages=${packages/pkgman/depot} - ;; + ;; IRIX) manager=swpkg @@ -2241,7 +2241,7 @@ get_cpu() { "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; "iPhone11,"[2468] | "iPad11,"[1-4] | "iPad11,"[6-7]): "Apple A12 Bionic (6) @ 2.49GHz" ;; "iPhone12,"[1358]): "Apple A13 Bionic (6) @ 2.65GHz" ;; - "iPhone13,"[1-4] | "iPad13,"[1-2]): "Apple A14 Bionic (6) @ 3.00Ghz" ;; + "iPhone13,"[1-4] | "iPad13,"[1-2]): "Apple A14 Bionic (6) @ 3.00Ghz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; @@ -2531,7 +2531,7 @@ get_gpu() { "iPhone10,"[1-6]): "Apple Designed GPU (A11)" ;; "iPhone11,"[2468] | "iPad11,"[67]): "Apple Designed GPU (A12)" ;; "iPhone12,"[1358]): "Apple Designed GPU (A13)" ;; - "iPhone13,"[1234] | "iPad13,"[12]): "Apple Designed GPU (A14)" ;; + "iPhone13,"[1234] | "iPad13,"[12]): "Apple Designed GPU (A14)" ;; "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; @@ -5067,7 +5067,7 @@ ASCII: Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CrystalUX, 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, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, @@ -6381,7 +6381,7 @@ EOF "CelOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' - + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@@# @@@ @@ ,#%%%%%(. (@ @@ -6731,9 +6731,9 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - *"CrystalUX"*) - set_colors 13 5 - read -rd '' ascii_data <<'EOF' + *"CrystalUX"*) + set_colors 13 5 + read -rd '' ascii_data <<'EOF' ${c1} mysssym ${c1} mysssym ${c1} mysssym @@ -6755,7 +6755,7 @@ ${c1} dysssym ${c1} dysssym ${c1} dysssym EOF - ;; + ;; *"Cucumber"*) set_colors 2 3 @@ -7682,7 +7682,8 @@ ${c2} ` `` EOF ;; - "HydroOS"*) + + "HydroOS"*) set_colors 1 2 3 4 5 read -rd '' ascii_data <<'EOF' ${c1} @@ -7695,7 +7696,7 @@ ${c1} __/ | |___/ EOF - ;; + ;; "hyperbola_small"*) set_colors 8 @@ -9796,9 +9797,9 @@ ${c1} EOF ;; - "rocky_small"*) - set_colors 2 - read -rd '' ascii_data <<'EOF' + "rocky_small"*) + set_colors 2 + read -rd '' ascii_data <<'EOF' ${c1} `-/+++++++++/-.` `-+++++++++++++++++-` .+++++++++++++++++++++. @@ -9812,7 +9813,7 @@ ${c1} `-/+++++++++/-.` `-` ./+++++++++++- -+++++++++:-.` EOF - ;; + ;; "rocky"*) set_colors 35 @@ -10751,7 +10752,7 @@ EOF ;; - "semc"*) + "semc"*) set_colors 2 8 1 read -rd '' ascii_data <<'EOF' ${c1} /\ From 75198506b857e408eb6e9398f59842dd3dfcf6fe Mon Sep 17 00:00:00 2001 From: Daniel Thau Date: Fri, 11 Jun 2021 01:12:37 -0400 Subject: [PATCH 16/55] Bedrock Linux fixes (#1675) Neofetch is Bedrock-aware by default, but ignores Bedrock and restricts itself to the local layer of the Bedrock system when run in Bedrock's "restricted" mode. Previously, neofetch checked for restricted mode by looking at the $PATH, which can fail in some workflows. Instead, check for $BEDROCK_RESTRICT, which is more robust. Neofetch previously counted Bedrock stratum aliases when counting packages for some package managers. This resulted in over-counting packages. This commit restricts neofetch to only counting actual strata, not aliases. --- neofetch | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index fc511402..42e35e90 100755 --- a/neofetch +++ b/neofetch @@ -971,7 +971,7 @@ get_distro() { case $os in Linux|BSD|MINIX) - if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then + if [[ -f /bedrock/etc/bedrock-release && -z $BEDROCK_RESTRICT ]]; then case $distro_shorthand in on|tiny) distro="Bedrock Linux" ;; *) distro=$(< /bedrock/etc/bedrock-release) @@ -1505,7 +1505,9 @@ get_packages() { # pac: If packages > 0, log package manager name. # tot: Count lines in command output. has() { type -p "$1" >/dev/null && manager=$1; } - dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } + # globbing is intentional here + # shellcheck disable=SC2206 + dir() { pkgs=($@); ((packages+=${#pkgs[@]})); pac "$((${#pkgs[@]}-pkgs_h))"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; @@ -1513,14 +1515,22 @@ get_packages() { pac "$((${#pkgs[@]}-pkgs_h))"; } - # Redefine tot() for Bedrock Linux. + # Redefine tot() and dir() for Bedrock Linux. [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { + br_strata=$(brl list) tot() { - IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" + IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in ${br_strata}; do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) - pac "$((${#pkgs[@]}-pkgs_h))"; + pac "$((${#pkgs[@]}-pkgs_h))"; + } + dir() { + local pkgs=() + # globbing is intentional here + # shellcheck disable=SC2206 + for s in ${br_strata}; do pkgs+=(/bedrock/strata/$s/$@); done + ((packages+=${#pkgs[@]})) + pac "$((${#pkgs[@]}-pkgs_h))" } - br_prefix="/bedrock/strata/*" } case $os in @@ -1560,16 +1570,16 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob - has brew && dir "$(brew --cellar)"/* - has emerge && dir ${br_prefix}/var/db/pkg/*/*/ - has Compile && dir ${br_prefix}/Programs/*/ - has eopkg && dir ${br_prefix}/var/lib/eopkg/package/* - has crew && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist - has pkgtool && dir ${br_prefix}/var/log/packages/* - has scratch && dir ${br_prefix}/var/lib/scratchpkg/index/*/.pkginfo - has kagami && dir ${br_prefix}/var/lib/kagami/pkgs/* - has cave && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ - ${br_prefix}/var/db/paludis/repositories/installed/data/*/ + has brew && dir "$(brew --cellar)/*" + has emerge && dir "/var/db/pkg/*/*" + has Compile && dir "/Programs/*/" + has eopkg && dir "/var/lib/eopkg/package/*" + has crew && dir "/usr/local/etc/crew/meta/*.filelist" + has pkgtool && dir "/var/log/packages/*" + has scratch && dir "/var/lib/scratchpkg/index/*/.pkginfo" + has kagami && dir "/var/lib/kagami/pkgs/*" + has cave && dir "/var/db/paludis/repositories/cross-installed/*/data/*/ \ + /var/db/paludis/repositories/installed/data/*/" shopt -u nullglob } From 528010e0456fd6fe5c23cb68e5333d7f72360def Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 11 Jun 2021 07:13:36 +0200 Subject: [PATCH 17/55] Add AlmaLinux logo (#1715) * Add AlmaLinux logo * Update AlmaLinux logo --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 42e35e90..8f176daf 100755 --- a/neofetch +++ b/neofetch @@ -5504,6 +5504,32 @@ ${c1} EOF ;; + "AlmaLinux"*) + set_colors 1 3 4 2 6 + read -rd '' ascii_data <<'EOF' +${c1} 'c:. +${c1} lkkkx, .. ${c2}.. ,cc, +${c1} okkkk:ckkx' ${c2}.lxkkx.okkkkd +${c1} .:llcokkx' ${c2}:kkkxkko:xkkd, +${c1} .xkkkkdood: ${c2};kx, .lkxlll; +${c1} xkkx. ${c2}xk' xkkkkk: +${c1} 'xkx. ${c2}xd .....,. +${c3} .. ${c1}:xkl' ${c2}:c ..''.. +${c3} .dkx' ${c1}.:ldl:'. ${c2}' ${c4}':lollldkkxo; +${c3} .''lkkko' ${c4}ckkkx. +${c3}'xkkkd:kkd. .. ${c5};' ${c4}:kkxo. +${c3},xkkkd;kk' ,d; ${c5}ld. ${c4}':dkd::cc, +${c3} .,,.;xkko'.';lxo. ${c5}dx, ${c4}:kkk'xkkkkc +${c3} 'dkkkkkxo:. ${c5};kx ${c4}.kkk:;xkkd. +${c3} ..... ${c5}.;dk:. ${c5}lkk. ${c4}:;, + ${c5}:kkkkkkkdoxkkx + ,c,,;;;:xkkd. + ;kkkkl... + ;kkkkl + ,od; +EOF + ;; + "alpine_small") set_colors 4 7 read -rd '' ascii_data <<'EOF' From d16e6e36cac65415af54dd98be20bfbace4e2656 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:15:37 +0000 Subject: [PATCH 18/55] packages: use crew prefix. Closes #1697 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 83ff7168..14cd4739 100755 --- a/neofetch +++ b/neofetch @@ -1574,7 +1574,7 @@ get_packages() { has emerge && dir "/var/db/pkg/*/*" has Compile && dir "/Programs/*/" has eopkg && dir "/var/lib/eopkg/package/*" - has crew && dir "/usr/local/etc/crew/meta/*.filelist" + has crew && dir "${CREW_PREFIX:-/usr/local}/etc/crew/meta/*.filelist" has pkgtool && dir "/var/log/packages/*" has scratch && dir "/var/lib/scratchpkg/index/*/.pkginfo" has kagami && dir "/var/lib/kagami/pkgs/*" From df453e4f1bbb5d82b11db8910a19e49437eedef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCleyman=20Fatih=20=C5=9Eim=C5=9Fek?= <75628379+suleymanfatih@users.noreply.github.com> Date: Fri, 11 Jun 2021 08:17:02 +0300 Subject: [PATCH 19/55] added PNM Linux ascii art (#1695) --- neofetch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/neofetch b/neofetch index 14cd4739..39911309 100755 --- a/neofetch +++ b/neofetch @@ -9335,6 +9335,33 @@ ${c1} PPPPPPPPPPPPPP EOF ;; + "PNM Linux"* | "WHPNM Linux"*) + set_colors 33 9 15 202 + read -rd '' ascii_data <<'EOF' + +${c1} + ``.---..` `--` + ``.---........-:.${c2}-::`${c1} + ${c2}./::-${c1}........${c2}--::.````${c1} + ${c2}.:://:::${c1}----${c2}::::-..${c1} + ..${c2}--:::::--::::++-${c1}.` + ${c2}`-:-`${c1} .-ohy+::${c2}-:::${c1}/sdmdd:.${c2} `-:- + .-:::${c1}...${c3}sNNmds$y${c1}o/+${c3}sy+NN$m${c1}d+.`${c2}-:::-. + `.-:-${c1}./${c3}dN${c1}()${c3}yyooosd${c1}()${c3}$m${c1}dy${c2}-.::-.`${c1} + ${c2}`.${c1}-...-${c3}+hNdyyyyyydmy${c1}:......${c2}`${c1} + ``..--.....-${c3}yNNm${c4}hssssh${c3}mmdo${c1}.........``` +`-:://:.....${c3}hNNNNN${c4}mddm${c3}NNNmds${c1}.....//::--` + ```.:-...${c3}oNNNNNNNNNNNNNNmd/${c1}...:-.``` + .....${c3}hNNNNNNNNNNNNNNmds${c1}....` + --...${c3}hNNNNNNNNNNNNNNmdo${c1}..... + .:...${c3}/NNNNNNNNNNNNNNdd${c1}:....` + `-...${c3}+mNNNNNNNNNNNmh${c1}:...-. + ${c4}.:+o+/:-${c1}:+oo+///++o+/:-${c4}:/+ooo/:. + ${c4}+oo/:o- +oooooso.` + ${c4}.` ` `/ .-//- +EOF + ;; + "popos_small"* | "pop_os_small"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' From 611117f4af527de3b81bc92c74ae976e130d39e6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:16:43 +0000 Subject: [PATCH 20/55] general: Fix indentation --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 39911309..c5509a44 100755 --- a/neofetch +++ b/neofetch @@ -9336,8 +9336,8 @@ EOF ;; "PNM Linux"* | "WHPNM Linux"*) - set_colors 33 9 15 202 - read -rd '' ascii_data <<'EOF' + set_colors 33 9 15 202 + read -rd '' ascii_data <<'EOF' ${c1} ``.---..` `--` From 55beea7b6f5f0811ac66a9273161a134ceb83435 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:19:46 +0000 Subject: [PATCH 21/55] os: Add CyberOS. Closes #1690 --- neofetch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/neofetch b/neofetch index c5509a44..2c39e783 100755 --- a/neofetch +++ b/neofetch @@ -6819,6 +6819,27 @@ o/${c2}--...::-:/::/:-......-::::::-/-...-${c1}:/o EOF ;; + "CyberOS"*) + set_colors 50 32 57 + read -rd '' ascii_data <<'EOF' +${c3} !M$EEEEEEEEEEEP + .MMMMM000000Nr. + ${c3}&MMMMMM${c2}MMMMMMMMMMMMM9 + ${c3}~MMM${c1}MMMM${c2}MMMMMMMMMMMMC + ${c1}" ${c3}M${c1}MMMMMMM${c2}MMMMMMMMMMs + ${c1}iM${c2}MMM&&${c1}MMMMMMMM${c2}MMMMMMMM\\ + ${c1}BMMM${c2}MMMMM${c1}MMMMMMM${c2}MMMMMM${c3}" +${c1}9MMMMM${c2}MMMMMMM${c1}MMMM${c2}MMMM${c3}MMMf- + ${c2}sMMMMMMMM${c1}MM${c2}M${c3}MMMMMMMMM3_ + ${c2}+ffffffff${c1}P${c3}MMMMMMMMMMMM0 + ${c2}CMMMMMMMMMMM + }MMMMMMMMM + ~MMMMMMM + "RMMMM + .PMB +EOF + ;; + "dahlia"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From f572fb37a01417c571f89ce7481b51e03cc614e3 Mon Sep 17 00:00:00 2001 From: Suleyman Poyraz <22801690+Zaryob@users.noreply.github.com> Date: Fri, 11 Jun 2021 08:24:32 +0300 Subject: [PATCH 22/55] Added PuffOS successfuly instead of #1659 (#1678) Co-authored-by: dylan --- neofetch | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 2c39e783..942dfe69 100755 --- a/neofetch +++ b/neofetch @@ -799,9 +799,9 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, -# Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, -# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rocky, -# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, +# Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, @@ -5089,7 +5089,7 @@ ASCII: openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, - Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, + Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, @@ -9491,6 +9491,25 @@ ${c1} /\\ EOF ;; + "PuffOS"*) + set_colors 3 + read -rd '' ascii_data <<'EOF' +${c1} + _,..._,m, + ,/' '""; + / ". + ,'mmmMMMMmm. \ + _/-"^^^^^"""%#%mm, ; + ,m,_,' "###) ;, +(###% \#/ ;##mm. + ^#/ __ ___ ; (######) + ; //.\\ //.\\ ; \####/ + _; (#\"// \\"/#) ; ,/ +@##\ \##/ = `"=" ,;mm/ +`\##>.____,...,____,<####@ +EOF + ;; + "Proxmox"*) set_colors 7 202 read -rd '' ascii_data <<'EOF' From 6b755b7ac69af5d7df648575e3d55fffbcd8101e Mon Sep 17 00:00:00 2001 From: Jonas Frei <8ec426b4-7173-428a-a6dc-3c520b45b0e2@wwsxrfc8.anonaddy.com> Date: Fri, 11 Jun 2021 07:24:51 +0200 Subject: [PATCH 23/55] Added 'hikari' to supported WMs (#1669) Co-authored-by: Jonas Frei --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 942dfe69..a5f4314f 100755 --- a/neofetch +++ b/neofetch @@ -1894,6 +1894,7 @@ get_wm() { -e gnome-shell \ -e greenfield \ -e grefsen \ + -e hikari \ -e kwin \ -e lipstick \ -e maynard \ From 3514e02d61a7ee880b325436e8454e5d56eb07df Mon Sep 17 00:00:00 2001 From: jrt Date: Fri, 11 Jun 2021 07:25:40 +0200 Subject: [PATCH 24/55] add AsteroidOS (#1676) --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index a5f4314f..dfbe1404 100755 --- a/neofetch +++ b/neofetch @@ -6149,6 +6149,29 @@ ${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy EOF ;; + "AsteroidOS"*) + set_colors 160 208 202 214 + read -rd '' ascii_data <<'EOF' +${c1} *** +${c1} ***** +${c1} ********** +${c1} *************** +${c1} *///****////****////. +${c2} (/////// /////// ///////( +${c2} /(((((//* //, //((((((. +${c2} ((((((((((( ((( (((((((( +${c2} *((((((((((((((((((((((( (((((((( +${c3} (((((#(((((((#((((( ((#((((( +${c3} (#(#(#####(#(#, ####(#(# +${c3} ######### ######## +${c3} /######## ######## +${c4} #######%####### +${c4} (#%%%%%%%# +${c4} %%%%% +${c4} %%% +EOF + ;; + "Bedrock"*) set_colors 8 7 read -rd '' ascii_data <<'EOF' From 9b708d6e5fd4e0651fb218b7f63f9cbf14c6deda Mon Sep 17 00:00:00 2001 From: Tiny Date: Fri, 11 Jun 2021 05:25:57 +0000 Subject: [PATCH 25/55] fix:The main version file of GNU/Deepin Linux has been moved from /etc/deepin-version to /etc/os-version (#1667) Description: Log: --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index dfbe1404..f3367be7 100755 --- a/neofetch +++ b/neofetch @@ -1840,7 +1840,7 @@ get_de() { Xfce*) de_ver=$(xfce4-session --version) ;; GNOME*) de_ver=$(gnome-shell --version) ;; Cinnamon*) de_ver=$(cinnamon --version) ;; - Deepin*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; + Deepin*) de_ver=$(awk -F'=' '/MajorVersion/ {print $2}' /etc/os-version) ;; Budgie*) de_ver=$(budgie-desktop --version) ;; LXQt*) de_ver=$(lxqt-session --version) ;; Lumina*) de_ver=$(lumina-desktop --version 2>&1) ;; From 13cda3f7e40a79e3f4e7d64d6f13e134c1f75c4a Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Thu, 10 Jun 2021 22:30:28 -0700 Subject: [PATCH 26/55] neofetch: Fix Terminal Font for mintty (#1641) * neofetch: Fix Terminal Font for mintty * Quiet shellcheck error --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f3367be7..5cf2f5b1 100755 --- a/neofetch +++ b/neofetch @@ -3452,7 +3452,7 @@ END ;; "mintty") - term_font="$(awk -F '=' '!/^($|#)/ && /Font/ {printf $2; exit}' "${HOME}/.minttyrc")" + term_font="$(awk -F '=' '!/^($|#)/ && /^\\s*Font\\s*=/ {printf $2; exit}' "${HOME}/.minttyrc")" ;; "pantheon"*) From ec1fb325b0ea6324923d6b277a125efb86ebc17c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:39:31 +0000 Subject: [PATCH 27/55] misc: fix typo. Closes #1623 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 2c39e783..48271100 100755 --- a/neofetch +++ b/neofetch @@ -815,7 +815,7 @@ image_source="auto" # Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. # NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, # CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, -# Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, +# Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, # Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, # Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, # postmarketOS, and Void have a smaller logo variant. @@ -5110,7 +5110,7 @@ ASCII: NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, - Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, + Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, postmarketOS, and Void have a smaller logo variant. From 2491af5e58924cc2d6d9a11183de62c45bc165d9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:41:19 +0000 Subject: [PATCH 28/55] os: Add support for Mandrake. Closes #1625 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a51ca9c5..c04ee1e3 100755 --- a/neofetch +++ b/neofetch @@ -8323,7 +8323,7 @@ o00. k0O${c2}dddddd${c1}occ EOF ;; - "Mandriva"*) + "Mandriva"* | "Mandrake"*) set_colors 4 3 read -rd '' ascii_data <<'EOF' ${c2} `` From 64dd7b68eff2cac409e10f92ea7f6b5bc83ae8e6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:47:20 +0000 Subject: [PATCH 29/55] term: Add newgrp to blacklist. Closes #1635 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c04ee1e3..fccdef9b 100755 --- a/neofetch +++ b/neofetch @@ -3245,7 +3245,7 @@ get_term() { name="$(get_process_name "$parent")" case ${name// } in - "${SHELL/*\/}"|*"sh"|"screen"|"su"*) ;; + "${SHELL/*\/}"|*"sh"|"screen"|"su"*|"newgrp") ;; "login"*|*"Login"*|"init"|"(init)") term="$(tty)" From 7de6bb8d2c4d817d67ce5e7c2f3f60897e37233d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:56:42 +0000 Subject: [PATCH 30/55] resolution: Fix truncation of drm modes. Closes #1639 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fccdef9b..b2938644 100755 --- a/neofetch +++ b/neofetch @@ -3047,7 +3047,8 @@ get_resolution() { ;; esac - resolution="${resolution%,*}" + resolution="${resolution%%,}" + resolution="${resolution%%, }" [[ -z "${resolution/x}" ]] && resolution= } From ab839cb9b01ca466212fc04b5285251bc2033575 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 06:14:10 +0000 Subject: [PATCH 31/55] os: Fix Chrome OS issue. Closes #1653 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index b2938644..e676aa1a 100755 --- a/neofetch +++ b/neofetch @@ -1115,6 +1115,7 @@ get_distro() { tiny) distro="Chrome OS" ;; *) distro+=" on Chrome OS" ;; esac + distro=${distro## on } fi distro=$(trim_quotes "$distro") From 27277eac1dd18738bb51978fed3e750cf29b6c14 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 10 Jun 2021 23:18:31 -0700 Subject: [PATCH 32/55] os: fix syntax error introduced by celos logo (#1772) Signed-off-by: Christian Stewart --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e676aa1a..8f8d4159 100755 --- a/neofetch +++ b/neofetch @@ -6438,6 +6438,7 @@ ${c2} .......... ...',;;;;;;,,... ..... EOF + ;; "CelOS"*) @@ -6460,7 +6461,6 @@ EOF EOF ;; - ;; "centos_small"*) set_colors 3 2 4 5 7 From 1c954ec55652dc14a4d17408cd6170319290be54 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 10 Jun 2021 23:19:21 -0700 Subject: [PATCH 33/55] Added support for SkiffOS (#1664) * os: fix syntax error introduced by celos logo Signed-off-by: Christian Stewart * Added support for SkiffOS https://github.com/skiffos/skiffos Fixes #1657 Signed-off-by: Christian Stewart --- neofetch | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8f8d4159..b525c857 100755 --- a/neofetch +++ b/neofetch @@ -802,7 +802,7 @@ image_source="auto" # Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -# SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +# SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, @@ -10292,6 +10292,22 @@ yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy EOF ;; + "SkiffOS"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c2} + ,@@@@@@@@@@@w,_ + ${c2}====~~~,,.${c2}A@@@@@@@@@@@@@@@@@W,_ + ${c1}`||||||||||||||L{${c2}"@$@@@@@@@@B" + ${c1}`|||||||||||||||||||||L{${c2}"$D + ${c2}@@@@@@@@@@@@@@@@@@@@@${c1}_||||}==, + ${c2}*@@@@@@@@@@@@@@@@@@@@@@@@@p${c1}||||==, + ${c1}`'||LLL{{""${c2}@$B@@@@@@@@@@@@@@@p${c1}|| + ${c1}`~=|||||||||||L"${c2}$@@@@@@@@@@@ + ${c1}````'"""""""${c2}'"""""""" +EOF + ;; + "Solus"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 06b1c77bb8311a91d09fbb2c11f9827a3570a97a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:03:16 +0000 Subject: [PATCH 34/55] gpu: Fix windows issue. See: #1759 --- neofetch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index b525c857..b735d512 100755 --- a/neofetch +++ b/neofetch @@ -2561,12 +2561,14 @@ get_gpu() { while read -r line; do line=$(trim "$line") - [[ -z $win_gpu ]] || [[ -z "$line" ]] && { - win_gpu=1 - continue - } + case $line in + *Caption*|'') + continue - prin "${subtitle:+${subtitle}${gpu_name}}" "$line" + *) + prin "${subtitle:+${subtitle}${gpu_name}}" "$line" + ;; + esac done < <(wmic path Win32_VideoController get caption) ;; From bcc8d98df5ced8a773ef890747b10a176ba986df Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:05:57 +0000 Subject: [PATCH 35/55] os: Fix ubuntu studio. Closes #1733 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b735d512..39f376fc 100755 --- a/neofetch +++ b/neofetch @@ -1124,12 +1124,12 @@ get_distro() { # Get Ubuntu flavor. if [[ $distro == "Ubuntu"* ]]; then case $XDG_CONFIG_DIRS in + *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; *"plasma"*) distro=${distro/Ubuntu/Kubuntu} ;; *"mate"*) distro=${distro/Ubuntu/Ubuntu MATE} ;; *"xubuntu"*) distro=${distro/Ubuntu/Xubuntu} ;; *"Lubuntu"*) distro=${distro/Ubuntu/Lubuntu} ;; *"budgie"*) distro=${distro/Ubuntu/Ubuntu Budgie} ;; - *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; *"cinnamon"*) distro=${distro/Ubuntu/Ubuntu Cinnamon} ;; esac fi From 4fbf8df1c80c49fdbef577e3723cc0d942c7eb31 Mon Sep 17 00:00:00 2001 From: Lorenzo Cauli Date: Fri, 11 Jun 2021 09:34:26 +0200 Subject: [PATCH 36/55] Edited PCLinuxOS logo for proper alignment. (#1685) Co-authored-by: Lorenzo Cauli --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 39f376fc..34ee2503 100755 --- a/neofetch +++ b/neofetch @@ -9314,7 +9314,7 @@ EOF "PCLinuxOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - ${c1}mhhhyyyyhhhdN +${c1} mhhhyyyyhhhdN dyssyhhhhhhhhhhhssyhN Nysyhhyo/:-.....-/oyhhhssd Nsshhy+. `/shhysm From 4b93d6824aaee58477569a88900505edc42acad3 Mon Sep 17 00:00:00 2001 From: Jaehee Hong Date: Fri, 11 Jun 2021 16:36:31 +0900 Subject: [PATCH 37/55] Fix Homebrew's Cellar path for brew package counts (#1656) From 0bbd6bff86da9c1fd016a86fd1557666b31bf5fb Mon Sep 17 00:00:00 2001 From: freddii Date: Fri, 11 Jun 2021 09:37:20 +0200 Subject: [PATCH 38/55] fixes spelling mistake (#1654) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 34ee2503..85473d29 100755 --- a/neofetch +++ b/neofetch @@ -158,7 +158,7 @@ uptime_shorthand="on" # Memory -# Show memory pecentage in output. +# Show memory percentage in output. # # Default: 'off' # Values: 'on', 'off' From 9b1108133caf38bcd8a19d4b96ebaa720caf0500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Fri, 11 Jun 2021 09:37:57 +0200 Subject: [PATCH 39/55] OpenBSD: change cpu count (#1650) Instead of using hw.ncpu, use hw.ncpuonline and hw.ncpufound, and check SMT status --- neofetch | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 85473d29..28900c8f 100755 --- a/neofetch +++ b/neofetch @@ -2286,7 +2286,17 @@ get_cpu() { [[ -z "$speed" ]] && speed="$(sysctl -n hw.clockrate)" # Get CPU cores. - cores="$(sysctl -n hw.ncpu)" + case $kernel_name in + "OpenBSD"*) + [[ "$(sysctl -n hw.smt)" == "1" ]] && smt="on" || smt="off" + ncpufound="$(sysctl -n hw.ncpufound)" + ncpuonline="$(sysctl -n hw.ncpuonline)" + cores="${ncpuonline}/${ncpufound},\\xc2\\xa0SMT\\xc2\\xa0${smt}" + ;; + *) + cores="$(sysctl -n hw.ncpu)" + ;; + esac # Get CPU temp. case $kernel_name in From 219714c86ef298102ce7eb7bce1124ac9df9df68 Mon Sep 17 00:00:00 2001 From: Guanzhong Chen Date: Fri, 11 Jun 2021 03:39:07 -0400 Subject: [PATCH 40/55] Show GPU subsystem name if possible. Fixes #1490 (#1648) After this change, if a subsystem name exists for a GPU, we display that name instead of the device name. This should fix the issue mentioned in #1490. For example, a card that would be shown as: GPU: AMD ATI Radeon RX 470/480/570/570X/580/580X/590 before will now be shown as: GPU: AMD ATI Radeon RX 480 4GB This fallback logic is implemented in the `awk` command. Additionally, the PCI address is now stripped from the awk output because it never is desirable to print it. It is, however, still kept internally in `awk` to distinguish multiple cards of the same model. --- neofetch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 28900c8f..f93e1fea 100755 --- a/neofetch +++ b/neofetch @@ -2449,9 +2449,17 @@ get_gpu() { case $os in "Linux") # Read GPUs into array. - gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ - '/"Display|"3D|"VGA/ {a[$0] = $1 " " $3 " " $4} - END {for(i in a) {if(!seen[a[i]]++) print a[i]}}')" + gpu_cmd="$(lspci -mm | + awk -F '\"|\" \"|\\(' \ + '/"Display|"3D|"VGA/ { + a[$0] = $1 " " $3 " " ($7 ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $7) + } + END { for (i in a) { + if (!seen[a[i]]++) { + sub("^[^ ]+ ", "", a[i]); + print a[i] + } + }}')" IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd" # Remove duplicate Intel Graphics outputs. From 07ae57453a5514e73a1c7c50b896b73f02532e9c Mon Sep 17 00:00:00 2001 From: kanashimia Date: Fri, 11 Jun 2021 10:41:32 +0300 Subject: [PATCH 41/55] Fix nix mistkae on darwin (#1628) See https://github.com/dylanaraps/neofetch/pull/1617#issuecomment-740655977 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f93e1fea..e681598f 100755 --- a/neofetch +++ b/neofetch @@ -1644,7 +1644,7 @@ get_packages() { nix-store -qR /etc/profiles/per-user/"$USER" } manager=nix-system && tot nix-store -qR /run/current-system/sw - manager=nix-user && tot nix-store -qR nix-user-pkgs + manager=nix-user && tot nix-user-pkgs } ;; From 70ad34e919b301f007fd18e5daf81120b45ce6db Mon Sep 17 00:00:00 2001 From: Koakuma Date: Fri, 11 Jun 2021 14:42:46 +0700 Subject: [PATCH 42/55] Fix CPU core/frequency reading on Linux/SPARC systems (#1643) --- neofetch | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index e681598f..2f0bb9e6 100755 --- a/neofetch +++ b/neofetch @@ -2213,17 +2213,50 @@ get_cpu() { speed="$((speed / 1000))" else - speed="$(awk -F ': |\\.' '/cpu MHz|^clock/ {printf $2; exit}' "$cpu_file")" - speed="${speed/MHz}" + case $kernel_machine in + "sparc"*) + # SPARC systems use a different file to expose clock speed information. + speed_file="/sys/devices/system/cpu/cpu0/clock_tick" + speed="$(($(< "$speed_file") / 1000000))" + ;; + + *) + speed="$(awk -F ': |\\.' '/cpu MHz|^clock/ {printf $2; exit}' "$cpu_file")" + speed="${speed/MHz}" + ;; + esac fi # Get CPU temp. [[ -f "$temp_dir" ]] && deg="$(($(< "$temp_dir") * 100 / 10000))" # Get CPU cores. - case $cpu_cores in - "logical" | "on") cores="$(grep -c "^processor" "$cpu_file")" ;; - "physical") cores="$(awk '/^core id/&&!a[$0]++{++i} END {print i}' "$cpu_file")" ;; + case $kernel_machine in + "sparc"*) + case $cpu_cores in + # SPARC systems doesn't expose detailed topology information in + # /proc/cpuinfo so I have to use lscpu here. + "logical" | "on") + cores="$(lscpu | awk -F ': *' '/^CPU\(s\)/ {print $2}')" + ;; + "physical") + cores="$(lscpu | awk -F ': *' '/^Core\(s\) per socket/ {print $2}')" + sockets="$(lscpu | awk -F ': *' '/^Socket\(s\)/ {print $2}')" + cores="$((sockets * cores))" + ;; + esac + ;; + + *) + case $cpu_cores in + "logical" | "on") + cores="$(grep -c "^processor" "$cpu_file")" + ;; + "physical") + cores="$(awk '/^core id/&&!a[$0]++{++i} END {print i}' "$cpu_file")" + ;; + esac + ;; esac ;; From 77f0efea26115639110a42abc1803623a0b91b40 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:45:19 +0000 Subject: [PATCH 43/55] packages: Fix apt. Closes #1620 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 39f376fc..4cd5b9bf 100755 --- a/neofetch +++ b/neofetch @@ -1540,7 +1540,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has apt && tot apt list --installed && ((packages-=1)) + has apt && pkgs_h=1 tot apt list --installed && ((packages-=1)) has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed From 010e3760581ea594a6871579f202c2bbb94f7ae5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:48:16 +0000 Subject: [PATCH 44/55] packages: use dpkg --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6cc30621..3c0a272c 100755 --- a/neofetch +++ b/neofetch @@ -1540,7 +1540,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has apt && pkgs_h=1 tot apt list --installed && ((packages-=1)) + has dpkg && pac "$(dpkg --list | grep -c ^ii)" has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed From 77cac59c84db2254c460c48a9c1a69c3b21b217a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 09:23:37 +0000 Subject: [PATCH 45/55] neofetch: Fix syntax error --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 3c0a272c..d675de47 100755 --- a/neofetch +++ b/neofetch @@ -2615,6 +2615,7 @@ get_gpu() { case $line in *Caption*|'') continue + ;; *) prin "${subtitle:+${subtitle}${gpu_name}}" "$line" From 370a50c3e36b091dc2dc2f6cd9161477f3638b31 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 09:25:11 +0000 Subject: [PATCH 46/55] term: ignore bwrap --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d675de47..d3aeb96c 100755 --- a/neofetch +++ b/neofetch @@ -3307,7 +3307,8 @@ get_term() { term="$(tty)" ;; - "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|"USER"*"PID"*|"kdeinit"*|"launchd"*) + "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*| + "USER"*"PID"*|"kdeinit"*|"launchd"*|"bwrap") break ;; From bb974c77fc04a66f8d2f78335990fdb1066385bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Fri, 11 Jun 2021 12:28:24 +0200 Subject: [PATCH 47/55] Fix a wrong multiple line spanning (#1774) ./neofetch: line 3310: syntax error near unexpected token `newline' ./neofetch: line 3310: `"ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|' --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d3aeb96c..11c80ff5 100755 --- a/neofetch +++ b/neofetch @@ -3307,7 +3307,7 @@ get_term() { term="$(tty)" ;; - "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*| + "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|\ "USER"*"PID"*|"kdeinit"*|"launchd"*|"bwrap") break ;; From 5e54a5e48b22fa316d1f35fe7b8470b9c01ba106 Mon Sep 17 00:00:00 2001 From: Gyro7 <65873913+Gyro7@users.noreply.github.com> Date: Fri, 11 Jun 2021 13:11:43 +0200 Subject: [PATCH 48/55] Add distribution AmogOS (#1773) * Add distribution AmogOS * Fixed indentation and removed unrelated changes * Added AmogOS to ascii art distros --- neofetch | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 11c80ff5..b0159927 100755 --- a/neofetch +++ b/neofetch @@ -780,7 +780,7 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS, +# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, AmogOS, Anarchy, Android, instantOS, # Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft, # ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, @@ -5676,7 +5676,31 @@ dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd `-+shy shs+:` EOF ;; - + "AmogOS"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ' +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⣤⣤⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⠟⠉⠉⠉⠉⠉⠉⠉⠙⠻⢶⣄⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣷⡀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡟⠀⣠⣶⠛⠛⠛⠛⠛⠛⠳⣦⡀⠀⠘⣿⡄⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⠁⠀⢹⣿⣦⣀⣀⣀⣀⣀⣠⣼⡇⠀⠀⠸⣷⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠀⠀⠀⠉⠛⠿⠿⠿⠿⠛⠋⠁⠀⠀⠀⠀⣿⡄ +⠀⠀ ⠀⠀⢠⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⡇⠀ + ⠀⠀⣸⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡇⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣧⠀ +⠀⠀⠀⠀⠀⠀⠀⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣿⠀ +⠀⠀⠀⠀⠀⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠀⠀⠀⠀⠀⠀⠀⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠀⠀⠀⠀⠀⠀⢰⣿⠀⠀⠀⠀⣠⡶⠶⠿⠿⠿⠿⢷⣦⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠀⠀⣀⣀⣀⠀⣸⡇⠀⠀⠀⠀⣿⡀⠀⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⣿⠀ +⣠⡿⠛⠛⠛⠛⠻⠀⠀⠀⠀⠀⢸⣇⠀⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⠀⠀⠀⣿⠀ +⢻⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⡟⠀⠀⢀⣤⣤⣴⣿⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠈⠙⢷⣶⣦⣤⣤⣤⣴⣶⣾⠿⠛⠁⢀⣶⡟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡟⠀ + ⠀⠀⠀⠀⠈⣿⣆⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⡾⠃⠀ +⠀ ⠀⠀⠀⠀⠀⠀⠈⠛⠻⢿⣿⣾⣿⡿⠿⠟⠋⠁⠀⠀⠀ +EOF + ;; "Anarchy"*) set_colors 7 4 read -rd '' ascii_data <<'EOF' From 25127b7793dc899fe03f06e564d64716de894556 Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Sat, 12 Jun 2021 03:47:27 -0400 Subject: [PATCH 49/55] fix package count not including brew casks (#1777) --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index b0159927..f4509273 100755 --- a/neofetch +++ b/neofetch @@ -1571,7 +1571,7 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob - has brew && dir "$(brew --cellar)/*" + has brew && dir "$(brew --cellar)/* $(brew --caskroom)/*" has emerge && dir "/var/db/pkg/*/*" has Compile && dir "/Programs/*/" has eopkg && dir "/var/lib/eopkg/package/*" @@ -1634,7 +1634,7 @@ get_packages() { "Mac OS X"|"macOS"|MINIX) has port && pkgs_h=1 tot port installed && ((packages-=1)) - has brew && dir "$(brew --cellar)"/* + has brew && dir "$(brew --cellar)/* $(brew --caskroom)/*" has pkgin && tot pkgin list has dpkg && tot dpkg-query -f '.\n' -W From 73ad76aa4be76fa78a2048075fb15d65e3aadbbd Mon Sep 17 00:00:00 2001 From: MrVeink <59528135+MrVeink@users.noreply.github.com> Date: Sat, 12 Jun 2021 10:48:38 +0300 Subject: [PATCH 50/55] Added iglunix to ascii art distros (#1775) --- neofetch | 138 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 60 deletions(-) diff --git a/neofetch b/neofetch index f4509273..d9e86e42 100755 --- a/neofetch +++ b/neofetch @@ -786,12 +786,12 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, +# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS -# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, +# Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, # KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, # Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, # Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, @@ -799,8 +799,8 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, -# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, -# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, @@ -5134,11 +5134,11 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, - CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, + CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, - GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, + GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint, @@ -6523,7 +6523,7 @@ EOF "CelOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' - + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@@# @@@ @@ ,#%%%%%(. (@ @@ -7384,29 +7384,29 @@ ${c1} /:-------------:\\ :---------------------:// EOF ;; - + "Fedora"*) set_colors 12 7 read -rd '' ascii_data <<'EOF' ${c1} .',;::::;,'. - .';:cccccccccccc:;,. - .;cccccccccccccccccccccc;. - .:cccccccccccccccccccccccccc:. + .';:cccccccccccc:;,. + .;cccccccccccccccccccccc;. + .:cccccccccccccccccccccccccc:. .;ccccccccccccc;${c2}.:dddl:.${c1};ccccccc;. - .:ccccccccccccc;${c2}OWMKOOXMWd${c1};ccccccc:. + .:ccccccccccccc;${c2}OWMKOOXMWd${c1};ccccccc:. .:ccccccccccccc;${c2}KMMc${c1};cc;${c2}xMMc${c1};ccccccc:. ,cccccccccccccc;${c2}MMM.${c1};cc;${c2};WW:${c1};cccccccc, :cccccccccccccc;${c2}MMM.${c1};cccccccccccccccc: :ccccccc;${c2}oxOOOo${c1};${c2}MMM0OOk.${c1};cccccccccccc: cccccc;${c2}0MMKxdd:${c1};${c2}MMMkddc.${c1};cccccccccccc; ccccc;${c2}XM0'${c1};cccc;${c2}MMM.${c1};cccccccccccccccc' -ccccc;${c2}MMo${c1};ccccc;${c2}MMW.${c1};ccccccccccccccc; -ccccc;${c2}0MNc.${c1}ccc${c2}.xMMd${c1};ccccccccccccccc; -cccccc;${c2}dNMWXXXWM0:${c1};cccccccccccccc:, -cccccccc;${c2}.:odl:.${c1};cccccccccccccc:,. -:cccccccccccccccccccccccccccc:'. -.:cccccccccccccccccccccc:;,.. - '::cccccccccccccc::;,. +ccccc;${c2}MMo${c1};ccccc;${c2}MMW.${c1};ccccccccccccccc; +ccccc;${c2}0MNc.${c1}ccc${c2}.xMMd${c1};ccccccccccccccc; +cccccc;${c2}dNMWXXXWM0:${c1};cccccccccccccc:, +cccccccc;${c2}.:odl:.${c1};cccccccccccccc:,. +:cccccccccccccccccccccccccccc:'. +.:cccccccccccccccccccccc:;,.. + '::cccccccccccccc::;,. EOF ;; @@ -7895,6 +7895,24 @@ WW W EOF ;; + "iglunix"*|"iglu"*) + set_colors 8 + read -rd '' ascii_data <<'EOF' +${c1} | + | | + | +| ________ +| /\ | \ + / \ | \ | + / \ \ | +/ \________\ +\ / / + \ / / + \ / / + \/________/ +EOF + ;; + "januslinux"*|"janus"*|"Ataraxia Linux"*|"Ataraxia"*) set_colors 4 5 6 2 read -rd '' ascii_data <<'EOF' @@ -8461,27 +8479,27 @@ EOF "TeArch"*) set_colors 39 7 1 read -rd '' ascii_data <<'EOF' -${c1} @@@@@@@@@@@@@@ - @@@@@@@@@ @@@@@@ - @@@@@ @@@@@ - @@ @@ - @% @@ - @ @ - @@@@@@@@@@@@@@@@@@@@@@@@ @@ - .@@@@@@@@@@@@/@@@@@@@@@@@@ - @@@@@@@@@@@@///@@@@@@@@@@@@ - @@@@@@@@@@@@@((((@@@@@@@@@@@@ - @@@@@@@@@@@#(((((((#@@@@@@@@@@@ - @@@@@@@@@@@#//////////@@@@@@@@@@& - @@@@@@@@@@////@@@@@////@@@@@@@@@@ - @@@@@@@@//////@@@@@/////@@@@@@@@@ - @@@@@@@//@@@@@@@@@@@@@@@//@@@@@@@ +${c1} @@@@@@@@@@@@@@ + @@@@@@@@@ @@@@@@ + @@@@@ @@@@@ + @@ @@ + @% @@ + @ @ + @@@@@@@@@@@@@@@@@@@@@@@@ @@ + .@@@@@@@@@@@@/@@@@@@@@@@@@ + @@@@@@@@@@@@///@@@@@@@@@@@@ + @@@@@@@@@@@@@((((@@@@@@@@@@@@ + @@@@@@@@@@@#(((((((#@@@@@@@@@@@ + @@@@@@@@@@@#//////////@@@@@@@@@@& + @@@@@@@@@@////@@@@@////@@@@@@@@@@ + @@@@@@@@//////@@@@@/////@@@@@@@@@ + @@@@@@@//@@@@@@@@@@@@@@@//@@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@ .@@@@@@@@@@@@@@@@@@@@@@@@@ @ @@@@@@ @@@. @@@@@@@ - @@@@@@@&@@@@@@@# #@@@@@@@@@@@@@@@@ - @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - @@@@@@@@@@@@@@@@@@@@@ + @@@@@@@&@@@@@@@# #@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@ EOF ;; @@ -9466,25 +9484,25 @@ EOF read -rd '' ascii_data <<'EOF' ${c1} - ``.---..` `--` - ``.---........-:.${c2}-::`${c1} - ${c2}./::-${c1}........${c2}--::.````${c1} - ${c2}.:://:::${c1}----${c2}::::-..${c1} - ..${c2}--:::::--::::++-${c1}.` - ${c2}`-:-`${c1} .-ohy+::${c2}-:::${c1}/sdmdd:.${c2} `-:- - .-:::${c1}...${c3}sNNmds$y${c1}o/+${c3}sy+NN$m${c1}d+.`${c2}-:::-. - `.-:-${c1}./${c3}dN${c1}()${c3}yyooosd${c1}()${c3}$m${c1}dy${c2}-.::-.`${c1} - ${c2}`.${c1}-...-${c3}+hNdyyyyyydmy${c1}:......${c2}`${c1} - ``..--.....-${c3}yNNm${c4}hssssh${c3}mmdo${c1}.........``` + ``.---..` `--` + ``.---........-:.${c2}-::`${c1} + ${c2}./::-${c1}........${c2}--::.````${c1} + ${c2}.:://:::${c1}----${c2}::::-..${c1} + ..${c2}--:::::--::::++-${c1}.` + ${c2}`-:-`${c1} .-ohy+::${c2}-:::${c1}/sdmdd:.${c2} `-:- + .-:::${c1}...${c3}sNNmds$y${c1}o/+${c3}sy+NN$m${c1}d+.`${c2}-:::-. + `.-:-${c1}./${c3}dN${c1}()${c3}yyooosd${c1}()${c3}$m${c1}dy${c2}-.::-.`${c1} + ${c2}`.${c1}-...-${c3}+hNdyyyyyydmy${c1}:......${c2}`${c1} + ``..--.....-${c3}yNNm${c4}hssssh${c3}mmdo${c1}.........``` `-:://:.....${c3}hNNNNN${c4}mddm${c3}NNNmds${c1}.....//::--` - ```.:-...${c3}oNNNNNNNNNNNNNNmd/${c1}...:-.``` - .....${c3}hNNNNNNNNNNNNNNmds${c1}....` - --...${c3}hNNNNNNNNNNNNNNmdo${c1}..... - .:...${c3}/NNNNNNNNNNNNNNdd${c1}:....` - `-...${c3}+mNNNNNNNNNNNmh${c1}:...-. - ${c4}.:+o+/:-${c1}:+oo+///++o+/:-${c4}:/+ooo/:. - ${c4}+oo/:o- +oooooso.` - ${c4}.` ` `/ .-//- + ```.:-...${c3}oNNNNNNNNNNNNNNmd/${c1}...:-.``` + .....${c3}hNNNNNNNNNNNNNNmds${c1}....` + --...${c3}hNNNNNNNNNNNNNNmdo${c1}..... + .:...${c3}/NNNNNNNNNNNNNNdd${c1}:....` + `-...${c3}+mNNNNNNNNNNNmh${c1}:...-. + ${c4}.:+o+/:-${c1}:+oo+///++o+/:-${c4}:/+ooo/:. + ${c4}+oo/:o- +oooooso.` + ${c4}.` ` `/ .-//- EOF ;; @@ -9597,14 +9615,14 @@ EOF ;; "PuffOS"*) - set_colors 3 + set_colors 3 read -rd '' ascii_data <<'EOF' ${c1} - _,..._,m, - ,/' '""; + _,..._,m, + ,/' '""; / ". - ,'mmmMMMMmm. \ - _/-"^^^^^"""%#%mm, ; + ,'mmmMMMMmm. \ + _/-"^^^^^"""%#%mm, ; ,m,_,' "###) ;, (###% \#/ ;##mm. ^#/ __ ___ ; (######) From 55cce2dfef4cdaf73c1541a906f0b2769c38454b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 15 Jun 2021 06:15:36 +0200 Subject: [PATCH 51/55] Update ubuntu logo. Closes #1750 (#1779) --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index d9e86e42..029bf74e 100755 --- a/neofetch +++ b/neofetch @@ -10886,26 +10886,26 @@ EOF "Ubuntu"* | "i3buntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` +${c1} .-/+oossssoo+\-. + ´:+ssssssssssssssssss+:` -+ssssssssssssssssssyyssss+- .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ + /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss\ +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss\ .ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. +ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso +ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ .ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ + \ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ - /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ + \sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ .ossssssssssssssssss${c2}dMMMNy${c1}sssso. -+sssssssssssssssss${c2}yyy${c1}ssss+- `:+ssssssssssssssssss+:` - .-/+oossssoo+/-. + .-\+oossssoo+/-. EOF ;; From a980dc8e8be54e57a1c64518fb68c166b84cbd2c Mon Sep 17 00:00:00 2001 From: Biel Date: Tue, 15 Jun 2021 01:18:02 -0300 Subject: [PATCH 52/55] Add Aperio GNU/Linux information. (#1778) --- neofetch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/neofetch b/neofetch index 029bf74e..f1b2d633 100755 --- a/neofetch +++ b/neofetch @@ -5540,6 +5540,16 @@ h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y EOF ;; + "Aperio GNU/Linux"*) + set_colors 255 + read -rd '' ascii_data <<'EOF' +${c2} + _.._ _ ._.. _ +(_][_)(/,[ |(_) + | GNU/Linux +EOF + ;; + "Hash"*) set_colors 123 read -rd '' ascii_data <<'EOF' From bc71e732a905e6f27518058970cfe5b789ef2e7f Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Thu, 17 Jun 2021 15:29:19 +0800 Subject: [PATCH 53/55] Add macOS 12 to version name list (#1783) --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f1b2d633..32a8e4be 100755 --- a/neofetch +++ b/neofetch @@ -1151,6 +1151,7 @@ get_distro() { 10.15*) codename="macOS Catalina" ;; 10.16*) codename="macOS Big Sur" ;; 11.0*) codename="macOS Big Sur" ;; + 12.0*) codename="macOS Monterey" ;; *) codename=macOS ;; esac From bbbb68f8b2eb70651a6b33343f97eeb1b223a4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berk=20=C3=87akar?= Date: Tue, 22 Jun 2021 07:00:27 +0300 Subject: [PATCH 54/55] Added Pisi Linux support for Neofetch. (#1723) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added PiSi support * Add placeholder PiSi ascii art * Added actual PisiLinux logo * Colorize PisiLinux logo * Improvement in ascii art * Added Pisi to the list of supported distributions * Updated manpage * Fixed flaws in ascii art Co-authored-by: Berkan Şahin --- neofetch | 32 +++++++++++++++++++++++++++++--- neofetch.1 | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 55 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 32a8e4be..d0830a2b 100755 --- a/neofetch +++ b/neofetch @@ -798,7 +798,7 @@ image_source="auto" # Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, -# TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, +# TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, # Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, @@ -1554,6 +1554,7 @@ get_packages() { has alps && tot alps showinstalled has butch && tot butch list has swupd && tot swupd bundle-list --quiet + has pisi && tot pisi li # Using the dnf package cache is much faster than rpm. if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then @@ -5147,7 +5148,7 @@ ASCII: NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, - PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, + PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, @@ -5550,7 +5551,7 @@ ${c2} | GNU/Linux EOF ;; - + "Hash"*) set_colors 123 read -rd '' ascii_data <<'EOF' @@ -9490,6 +9491,31 @@ ${c1} PPPPPPPPPPPPPP EOF ;; + "Pisi"*) + set_colors 12 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} \Fv/!- `:?lzC +${c1} Q!::=zFx! ${c2}`;v6WBCicl;` ${c1},vCC\!::#. +${c1} ,%:::,'` ${c2}+#%@@FQ@@. ,cF%i${c1}``-',::a? +${c1} +m:,'```${c2}}3,/@@Q\@@ "af-${c1} `-'"7f + =o'.` ${c2}/m' :Q@:Qg ,kl${c1} `.|o + :k` '${c2}$+ 'Narm >d,${c1} ii + #`${c2}!p. `C , 'd+${c1} %' +${c2} !0m `6Kv + =a m+ + !A !\L|: :|L\! $: + .8` Q''%Q#' '#Q%''Q `0- + :6 E|.6QQu uQQ6.|E p: + i{ \jts9? ?9stj\ u\ + |a` -''. `e> + ,m+ ${c1}'^ !`${c2}s@@@@a${c1}'"`+`${c2} >e' + !3|${c1}`|=>>r- ${c2}'U%:${c1} '>>>=:`\3! + 'xopE| ${c2}`'${c1} `ledoz- + `;=>>+`${c2}`^llci/|==|/iclc;`${c1}'>>>>: + `^`+~ ${c2}````${c1} !!-^ +EOF + ;; + "PNM Linux"* | "WHPNM Linux"*) set_colors 33 9 15 202 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 39676dfb..0e5bffaa 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH NEOFETCH "1" "August 2020" "Neofetch 7.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.3. +.TH NEOFETCH "1" "April 2021" "Neofetch 7.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -152,6 +152,9 @@ URL to query for public IP \fB\-\-ip_timeout\fR int Public IP timeout (in seconds). .TP +\fB\-\-ip_interface\fR value +Interface(s) to use for local IP +.TP \fB\-\-song_format\fR format Print the song data in a specific format (see config file). .TP @@ -215,10 +218,6 @@ Length in spaces to make the bars. Colors to make the bar. Set in this order: elapsed, total .TP -\fB\-\-cpu_display\fR mode -Bar mode. -Possible values: bar, infobar, barinfo, off -.TP \fB\-\-memory_display\fR mode Bar mode. Possible values: bar, infobar, barinfo, off @@ -234,8 +233,8 @@ Possible values: bar, infobar, barinfo, off .TP \fB\-\-backend\fR backend Which image backend to use. -Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', -\&'off', 'sixel', 'tycat', 'w3m', 'kitty', 'ueberzug' +Possible values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', +\&'iterm2', 'off', 'sixel', 'tycat', 'w3m', 'kitty', 'viu' .TP \fB\-\-source\fR source Which image or ascii file to use. @@ -250,6 +249,9 @@ NEW: neofetch \fB\-\-ascii\fR "$(fortune | cowsay \fB\-W\fR 30)" \fB\-\-caca\fR source Shortcut to use 'caca' backend. .TP +\fB\-\-catimg\fR source +Shortcut to use 'catimg' backend. +.TP \fB\-\-chafa\fR source Shortcut to use 'chafa' backend. .TP @@ -281,7 +283,10 @@ Shortcut to use 'tycat' backend. Shortcut to use 'w3m' backend. .TP \fB\-\-ueberzug\fR source -Shortcut to use 'ueberzug' backend. +Shortcut to use 'ueberzug' backend +.TP +\fB\-\-viu\fR source +Shortcut to use 'viu' backend .TP \fB\-\-off\fR Shortcut to use 'off' backend (Disable ascii art). @@ -314,15 +319,15 @@ Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, -TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, +TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, -Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, -openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, -Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, -Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, +Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +Ubuntu\-Cinnamon, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, +Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -331,8 +336,8 @@ NOTE: Use '{distro name}_old' to use the old logos. .IP NOTE: Ubuntu has flavor variants. .TP -Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, -Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. +NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu\-GNOME, +Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors. .TP NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, @@ -358,6 +363,9 @@ in some terminals emulators when using image mode. How to size the image. Possible values: auto, 00px, 00%, none .TP +\fB\-\-catimg_size\fR 1/2 +Change the resolution of catimg. +.TP \fB\-\-crop_mode\fR mode Which crop mode to use Takes the values: normal, fit, fill @@ -369,11 +377,11 @@ west, center, east, southwest, south, southeast .TP \fB\-\-xoffset\fR px How close the image will be to the left edge of the -window. This only works with w3m and ueberzug. +window. This only works with w3m. .TP \fB\-\-yoffset\fR px How close the image will be to the top edge of the -window. This only works with w3m and ueberzug. +window. This only works with w3m. .TP \fB\-\-bg_color\fR color Background color to display behind transparent image. From 8fc31ac001f800d4de1675e7af4caab096c28cde Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Wed, 23 Jun 2021 12:01:53 -0400 Subject: [PATCH 55/55] add windows 11 ascii art (#1793) --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index d0830a2b..315f4c7a 100755 --- a/neofetch +++ b/neofetch @@ -11072,6 +11072,29 @@ ${c1} ,;::::; EOF ;; + *"[Windows 11]"*|*"on Windows 11"*|\ + "Windows 11"* |"windows11") + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ + +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +EOF + ;; + *"[Windows 10]"*|*"on Windows 10"*|"Windows 8"*|\ "Windows 10"* |"windows10"|"windows8") set_colors 6 7