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 01/31] 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 02/31] 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 From cc39539c55c612ca8cfcd313cc8ccb84d89b0f82 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Fri, 25 Jun 2021 15:10:22 +0800 Subject: [PATCH 03/31] Better kitty terminal font detection (#1795) * Better kitty terminal font detection * Fix indent --- neofetch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 315f4c7a..c7f4860e 100755 --- a/neofetch +++ b/neofetch @@ -3428,11 +3428,9 @@ END ;; "kitty"*) - kitty_config="$(kitty --debug-config)" - [[ "$kitty_config" != *font_family* ]] && return - - term_font="$(awk '/^font_family|^font_size/ {$1="";gsub("^ *","",$0);print $0}' \ - <<< "$kitty_config")" + term_font="from kitty.cli import *; o = create_default_opts(); \ + print(f'{o.font_family} {o.font_size}')" + term_font="$(kitty +runpy ''"$term_font"'')" ;; "konsole" | "yakuake") From 1096b22c18088da5fed025eebdc96facdc8b2e66 Mon Sep 17 00:00:00 2001 From: Guangyuan Yang Date: Sat, 26 Jun 2021 00:39:07 -0400 Subject: [PATCH 04/31] Fixes GPU info read error on MINGW64 (#1799) Closes #1798. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index c7f4860e..f084d753 100755 --- a/neofetch +++ b/neofetch @@ -2611,7 +2611,7 @@ get_gpu() { ;; "Windows") - while read -r line; do + wmic path Win32_VideoController get caption | while read -r line; do line=$(trim "$line") case $line in @@ -2623,7 +2623,7 @@ get_gpu() { prin "${subtitle:+${subtitle}${gpu_name}}" "$line" ;; esac - done < <(wmic path Win32_VideoController get caption) + done ;; "Haiku") From dcd180cb6727fa8c8427a00694b82cd26764bceb Mon Sep 17 00:00:00 2001 From: lockheed3k <49485763+lockheed3k@users.noreply.github.com> Date: Sun, 27 Jun 2021 00:10:19 -0400 Subject: [PATCH 05/31] Update neofetch (#1801) Fix deformed Debian logo on line 6999 by adding 3 spaces before """Y$$.". --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f084d753..72357469 100755 --- a/neofetch +++ b/neofetch @@ -6996,7 +6996,7 @@ EOF read -rd '' ascii_data <<'EOF' ${c2} _,met$$$$$gg. ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". + ,g$$P" """Y$$.". ,$$P' `$$$. ',$$P ,ggs. `$$b: `d$$' ,$P"' ${c1}.${c2} $$$ From 5a436bd8be9248e4f6c839bfa1f3b8acfba2a039 Mon Sep 17 00:00:00 2001 From: Kevin Lapointe <80723850+klpnt@users.noreply.github.com> Date: Thu, 1 Jul 2021 01:10:34 -0300 Subject: [PATCH 06/31] Added new small Fedora ASCII art (#1806) --- neofetch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 72357469..28da670c 100755 --- a/neofetch +++ b/neofetch @@ -7359,16 +7359,16 @@ EOF ;; "fedora_small") - set_colors 4 7 1 + set_colors 12 read -rd '' ascii_data <<'EOF' -${c2} _____ - / __)${c1}\\${c2} - | / ${c1}\\ \\${c2} - ${c1}__${c2}_| |_${c1}_/ /${c2} - ${c1}/ ${c2}(_ _)${c1}_/${c2} -${c1}/ /${c2} | | -${c1}\\ \\${c2}__/ | - ${c1}\\${c2}(_____/ +${c1} ...... + .' .. : + : : :.: + .....: :.. +.' ..:: ..: +: : : : +'. '...' .' + '.....' EOF ;; From 07770633fb570156cb1a86665bd4d4b54d48c533 Mon Sep 17 00:00:00 2001 From: Kevin Lapointe <80723850+klpnt@users.noreply.github.com> Date: Fri, 2 Jul 2021 00:27:26 -0300 Subject: [PATCH 07/31] Modified small Fedora ASCII art (#1807) * Added new small Fedora ASCII art * Modified ASCII art for small fedora * modified --- neofetch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 28da670c..2743558a 100755 --- a/neofetch +++ b/neofetch @@ -7361,14 +7361,15 @@ EOF "fedora_small") set_colors 12 read -rd '' ascii_data <<'EOF' -${c1} ...... - .' .. : - : : :.: - .....: :.. -.' ..:: ..: -: : : : -'. '...' .' - '.....' +${c1} ,'''''. + | ,. | + | | "_" + ,....| |.. +.' ,.'| ..' +| | | | +| ',_,' | + '. ,' + ''''' EOF ;; From e6499671c10a74bf6a6cf03f294212003e267bfb Mon Sep 17 00:00:00 2001 From: bejelentkezni <67395204+bejelentkezni@users.noreply.github.com> Date: Fri, 2 Jul 2021 15:41:35 -0600 Subject: [PATCH 08/31] Add ascii art for glaucus (#1809) * Update neofetch * Update neofetch * Update neofetch * Update neofetch * Update neofetch * Update neofetch --- neofetch | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2743558a..fb64a865 100755 --- a/neofetch +++ b/neofetch @@ -7661,7 +7661,25 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; - + + "glaucus"*) + set_colors 5 + read -rd '' ascii_data <<'EOF' +${c1} ,, ,d88P + ,d8P ,ad8888* + ,888P d88888* ,,ad8888P* + d d888P a88888P* ,ad8888888* + .d8 d8888: d888888* ,d888888P* + .888; 88888b d8888888b8888888P + d8888J888888a88888888888888P* ,d + 88888888888888888888888888P ,,d8* + 888888888888888888888888888888888* + *8888888888888888888888888888888* + Y888888888P* `*``*888888888888* + *^888^* *Y888P** +EOF + ;; + "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' From 095fd04094a0bd0dd1f7e501cbe4085a631ffbf7 Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Mon, 5 Jul 2021 01:00:13 -0400 Subject: [PATCH 09/31] fix macos big sur and monterey not showing codenames (#1815) --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index fb64a865..f45cf061 100755 --- a/neofetch +++ b/neofetch @@ -1150,8 +1150,8 @@ get_distro() { 10.14*) codename="macOS Mojave" ;; 10.15*) codename="macOS Catalina" ;; 10.16*) codename="macOS Big Sur" ;; - 11.0*) codename="macOS Big Sur" ;; - 12.0*) codename="macOS Monterey" ;; + 11.*) codename="macOS Big Sur" ;; + 12.*) codename="macOS Monterey" ;; *) codename=macOS ;; esac From 798d587c9cbdf0b72afa0dfd496be2e97430f125 Mon Sep 17 00:00:00 2001 From: Kevin <80723850+klpnt@users.noreply.github.com> Date: Mon, 5 Jul 2021 14:14:42 -0400 Subject: [PATCH 10/31] minor ascii edit (#1816) --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index f45cf061..8a3fea96 100755 --- a/neofetch +++ b/neofetch @@ -7363,13 +7363,13 @@ EOF read -rd '' ascii_data <<'EOF' ${c1} ,'''''. | ,. | - | | "_" - ,....| |.. -.' ,.'| ..' -| | | | -| ',_,' | - '. ,' - ''''' + | | '_' + ,....| |.. +.' ,_;| ..' +| | | | +| ',_,' | + '. ,' + ''''' EOF ;; From 9e8ed741b38925455deb0ad1e6c31fe81074679f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 9 Jul 2021 10:52:10 +0300 Subject: [PATCH 11/31] neofetch: add -L to curl. Closes #1823 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8a3fea96..71a8043e 100755 --- a/neofetch +++ b/neofetch @@ -3903,7 +3903,7 @@ get_public_ip() { fi if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then - public_ip="$(curl --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")" + public_ip="$(curl -L --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")" fi if [[ -z "$public_ip" ]] && type -p wget >/dev/null; then From 65e01ab42131b849d10ac7212acf25ded9056159 Mon Sep 17 00:00:00 2001 From: zhullyb <43305366+zhullyb@users.noreply.github.com> Date: Wed, 14 Jul 2021 18:12:04 +0800 Subject: [PATCH 12/31] Update manjaro logo (#1825) Manjaro has changed its logo, see manjaro.org --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 71a8043e..4d4b677c 100755 --- a/neofetch +++ b/neofetch @@ -8475,8 +8475,8 @@ EOF "manjaro_small"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}||||||||| |||| -||||||||| |||| +${c1}|||| |||| +|||| |||| |||| |||| |||| |||| |||| |||| |||| |||| @@ -8488,10 +8488,10 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ +${c1}████████ ████████ +████████ ████████ +████████ ████████ +████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From c2c1cfbf4f6e34bf23dbb2df6740f32103ab3b32 Mon Sep 17 00:00:00 2001 From: zhullyb <43305366+zhullyb@users.noreply.github.com> Date: Wed, 14 Jul 2021 18:22:33 +0800 Subject: [PATCH 13/31] Fix manjaro logo (#1826) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4d4b677c..13f46438 100755 --- a/neofetch +++ b/neofetch @@ -8488,7 +8488,7 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}████████ ████████ +${c1}████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From 38cbfeca5ae9f7715f792a9681b6c522a3f99789 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 14 Jul 2021 14:37:28 +0300 Subject: [PATCH 14/31] Revert "Fix manjaro logo (#1826)" This reverts commit c2c1cfbf4f6e34bf23dbb2df6740f32103ab3b32. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 13f46438..4d4b677c 100755 --- a/neofetch +++ b/neofetch @@ -8488,7 +8488,7 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}████████ ████████ +${c1}████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From 7913ad35ffb5f76bec0b961d4ba94f3ad2eddf4a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 14 Jul 2021 14:37:30 +0300 Subject: [PATCH 15/31] Revert "Update manjaro logo (#1825)" This reverts commit 65e01ab42131b849d10ac7212acf25ded9056159. --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 4d4b677c..71a8043e 100755 --- a/neofetch +++ b/neofetch @@ -8475,8 +8475,8 @@ EOF "manjaro_small"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}|||| |||| -|||| |||| +${c1}||||||||| |||| +||||||||| |||| |||| |||| |||| |||| |||| |||| |||| |||| @@ -8488,10 +8488,10 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}████████ ████████ -████████ ████████ -████████ ████████ -████████ ████████ +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From 139b722c48f546ec2715d6b40c3756964fec0ed4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 19 Jul 2021 16:57:41 +0300 Subject: [PATCH 16/31] neofetch: fix #1832 --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index 0e5bffaa..f17a21be 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -341,7 +341,7 @@ 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, -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 017aa041d86340f2b4f82c765ba84aaa096136ec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 19 Jul 2021 18:00:49 +0300 Subject: [PATCH 17/31] neofetch: Only try pkg if on a BSD. Closes #1834 --- neofetch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 71a8043e..ee193cfb 100755 --- a/neofetch +++ b/neofetch @@ -1608,13 +1608,15 @@ get_packages() { # TODO: Fix this somehow. has pkginfo && tot pkginfo -i - case $kernel_name in - FreeBSD|DragonFly) has pkg && tot pkg info ;; + case $os-$kernel_name in + BSD-FreeBSD|BSD-DragonFly) + has pkg && tot pkg info + ;; - *) + BSD-*) has pkg && dir /var/db/pkg/* - ((packages == 0)) && \ + ((packages == 0)) && has pkg && tot pkg list ;; esac From 0ce03cfd7e0899297403fbbb1f8db26a2c76dc4d Mon Sep 17 00:00:00 2001 From: omame Date: Mon, 26 Jul 2021 10:01:10 +0200 Subject: [PATCH 18/31] Update CyberOS logo to match downstream (#1846) Resolves #1845. --- neofetch | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index ee193cfb..ea17a5cb 100755 --- a/neofetch +++ b/neofetch @@ -6936,24 +6936,24 @@ 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 + "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 ;; From 07822a3c42ea39098caf9165037bcb3bc7d7d6ed Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Date: Thu, 5 Aug 2021 11:06:06 +0700 Subject: [PATCH 19/31] Add LangitKetujuh OS (#1824) --- neofetch | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index ea17a5cb..8bed79a5 100755 --- a/neofetch +++ b/neofetch @@ -806,8 +806,8 @@ image_source="auto" # 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. +# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, +# Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # 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. @@ -5156,8 +5156,8 @@ ASCII: 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. + Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, + Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -11050,6 +11050,27 @@ EOF ;; + "LangitKetujuh"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c1} + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L + 'L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L + L7L. 'L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L L7L7L7L7L7L7L7L7L7L7L7L + L7L7L7L 'L7L7L7L7L7L7L7L7L7L + L7L7L7L 'L7L7L7L7L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L. 'L7L + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L. + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L +${c2} +EOF + ;; + "semc"*) set_colors 2 8 1 read -rd '' ascii_data <<'EOF' From cf928f3b9b123cf8530114643d648a16e6d1941d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 5 Aug 2021 10:15:12 +0300 Subject: [PATCH 20/31] meta: fix makefile, closes #1858 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4adbd5f6..2b41f34f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -PREFIX ?= /usr -MANDIR ?= $(PREFIX)/share/man +PREFIX = /usr +MANDIR = $(PREFIX)/share/man all: @echo Run \'make install\' to install Neofetch. From bb272ac3e8ea534e50c1d716993f7670e3ae68eb Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 5 Aug 2021 16:02:29 +0200 Subject: [PATCH 21/31] Add Kaisen Linux (#1859) --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 8bed79a5..118c85f1 100755 --- a/neofetch +++ b/neofetch @@ -7974,6 +7974,30 @@ ${c1} cooo: ${c2}coooooooooooooooooool EOF ;; + "Kaisen"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ` + `:+oyyho. + `+:`sdddddd/ + `+` :ho oyo++ohds-` + .ho :dd. .: `sddddddhhyso+/- + ody.ddd-:yd- +hysssyhddddddddho` + yddddddhddd` ` `--` -+hddddddh. + hddy-+dddddy+ohh/..+sddddy/:::+ys + :ddd/sdddddddddd- oddddddd ` + `yddddddddddddddd/ /ddddddd/ +:. :ydddddddddddddddddo..sddddddy/` +odhdddddddo- `ddddh+-``....-+hdddddds. +-ddddddhd: /dddo -ydddddddhdddddddd- + /hdy:o - `:sddds .`./hdddddddddddddo + `/- `+hddyosy+ :dddddddy-.-od/ + :sydds -hddddddd` / + .+shd- `:ohddddddddd` + `:+ooooooooooooo: +EOF + ;; + "Kali"*) set_colors 4 8 read -rd '' ascii_data <<'EOF' From 733a7295391a917bf54eda595fa684795958dbc3 Mon Sep 17 00:00:00 2001 From: NeXT STEP <80169337+C47F15H@users.noreply.github.com> Date: Sat, 7 Aug 2021 08:29:50 +0530 Subject: [PATCH 22/31] Update CelOS (#1864) --- neofetch | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index 118c85f1..10a58414 100755 --- a/neofetch +++ b/neofetch @@ -6533,21 +6533,30 @@ EOF "CelOS"*) - set_colors 3 2 4 5 7 + set_colors 4 6 0 5 read -rd '' ascii_data <<'EOF' -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -@@@# @@@ -@@ ,#%%%%%(. (@ -@# %%%%%%%%%%%%%%# @ -@# %%%%%%%%# %%%/ @ -@# #%%%%%%%%. #%%%* @ -@# %%%%%%%%%%%* (%%%%%# @ -@# #%%%% %%%%%%%%%%%, @ -@# #%%%%%%%%%%%%%%%%%, @ -@# #%%%%%%%%%%%%%* @ -@@ *##%#(, @@ -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +${c4} .,cmmmmmmmmmmmc,. + .,cmMMMMMMMMMMMMMMMMMMMMmc. + .cMMMMMMMMMMMMMMMMMMMMMMMMMMMmc. + .cMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMc. + ,:MMM ${c3}####################################${c4} + cMMMMMMmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmc. + .MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM. + .MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMc + "******************************MMMMMMMMMMMMMc: +${c3}#################################### ${c4}MMMMMMMMMMMMMc + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM: + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM" + 'MMMMMMMMM*******************************: + \"MMMMMM ${c3}##################################### + ${c4}`:MMMMMMmmmmmmmmmmmmmmmmmmmmmmmmmmmmm; + `"MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM" + `":MMMMMMMMMMMMMMMMMMMMMMMMM;' + `":MMMMMMMMMMMMMMMMMMM:" + "************" + + EOF From 5db2127b7a24ee0978518f3aa954f954d8bdaa7a Mon Sep 17 00:00:00 2001 From: "Benjamin S. Osenbach" Date: Fri, 6 Aug 2021 23:00:17 -0400 Subject: [PATCH 23/31] fix issue #1757 (#1863) --- neofetch | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 10a58414..d96706df 100755 --- a/neofetch +++ b/neofetch @@ -784,7 +784,7 @@ image_source="auto" # Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft, # ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, -# 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, # Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, @@ -5133,7 +5133,7 @@ ASCII: 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, bonsai, BSD, BunsenLabs, + BlackArch, BLAG, BlankOn, BlueLight, Bodhi, 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, @@ -6409,6 +6409,30 @@ ${c1} oMMNMMMMMMMMMMMMMMMMMMMMMM EOF ;; + "Bodhi"*) + set_colors 7 11 2 + read -rd '' ascii_data <<'EOF' +${c1}| ${c2},,mmKKKKKKKKWm,, + ${c1}' ${c2},aKKP${c1}LL**********|L*${c2}TKp, + ${c1}t ${c2}aKP${c1}L**``` ```**L${c2}*Kp + IX${c1}EL${c3}L,wwww, ${c1}``*||${c2}Kp + ,#P${c1}L|${c3}KKKpPP@IPPTKmw, ${c1}`*||${c2}K + ,K${c1}LL*${c3}{KKKKKKPPb$KPhpKKPKp ${c1}`||${c2}K + #${c1}PL ${c3}!KKKKKKPhKPPP$KKEhKKKKp ${c1}`||${c2}K +!H${c1}L* ${c3}1KKKKKKKphKbPKKKKKK$KKp ${c1}`|I${c2}W +$${c1}bL ${c3}KKKKKKKKBQKhKbKKKKKKKK ${c1}|I${c2}N +$${c1}bL ${c3}!KKKKKKKKKKNKKKKKKKPP` ${c1}|I${c2}b +TH${c1}L* ${c3}TKKKKKK##KKKN@KKKK^ ${c1}|I${c2}M + K@${c1}L ${c3}*KKKKKKKKKKKEKE5 ${c1}||${c2}K + `NL${c1}L ${c3}`KKKKKKKKKK"```|L ${c1}||${c2}#P + `K@${c1}LL ${c3}`"**"` ${c1}'. :||${c2}#P + Yp${c1}LL ${c1}' |L${c2}$M` + `Tp${c1}pLL, ,|||${c2}p'L + "Kpp${c1}LL++,., ,,|||$${c2}#K* ${c1}'. + ${c2}`"MKWpppppppp#KM"` ${c1}`h, +EOF + ;; + "bonsai"*) set_colors 6 2 3 read -rd '' ascii_data <<'EOF' From 547acd8d55b2e6b6c5b4f164756dbd336b72c4a4 Mon Sep 17 00:00:00 2001 From: RustedTerrier <58403628+RustedTerrier@users.noreply.github.com> Date: Wed, 11 Aug 2021 03:07:03 +0000 Subject: [PATCH 24/31] RiverWM support (#1870) * Feat: WM support for river. * Update neofetch --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index d96706df..e3ff4b50 100755 --- a/neofetch +++ b/neofetch @@ -1908,6 +1908,7 @@ get_wm() { -e orbital \ -e orbment \ -e perceptia \ + -e river \ -e rustland \ -e sway \ -e ulubis \ From 5dc9a2fa61719efc3e9614e44d9d8df5d9043c8d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 15 Aug 2021 11:14:57 +0200 Subject: [PATCH 25/31] song: Switch cmus to get_song_dbus (#1875) --- neofetch | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/neofetch b/neofetch index e3ff4b50..9fd88247 100755 --- a/neofetch +++ b/neofetch @@ -2883,6 +2883,7 @@ get_song() { "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; + "cmus"*) get_song_dbus "cmus" ;; "juk"*) get_song_dbus "juk" ;; "bluemindo"*) get_song_dbus "Bluemindo" ;; "guayadeque"*) get_song_dbus "guayadeque" ;; @@ -2918,14 +2919,6 @@ get_song() { song="$(xmms2 current -f "\${artist}"$' \n'"\${album}"$' \n'"\${title}")" ;; - "cmus"*) - # NOTE: cmus >= 2.8.0 supports mpris2 - song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; a=$0} - /tag album / {$1=$2=""; b=$0} - /tag title/ {$1=$2=""; t=$0} - END {print a " \n" b " \n" t}')" - ;; - "spotify"*) case $os in "Linux") get_song_dbus "spotify" ;; From aa026545b963e54e22740fc6bf625a409a47567c Mon Sep 17 00:00:00 2001 From: Crestwave <35413013+Crestwave@users.noreply.github.com> Date: Wed, 25 Aug 2021 12:42:08 +0800 Subject: [PATCH 26/31] packages: fix dpkg (#1888) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9fd88247..8ee14ba1 100755 --- a/neofetch +++ b/neofetch @@ -1541,7 +1541,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list 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 apk && tot apk info has opkg && tot opkg list-installed From b3e21d89cd4acb09cc89b1ae4aca0929111176c7 Mon Sep 17 00:00:00 2001 From: Angelo F Date: Sun, 29 Aug 2021 18:21:15 +0800 Subject: [PATCH 27/31] Modify the two "Darwin" Apple logos (#1892) Make them more consistent with the actual Apple logo modified: neofetch --- neofetch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 8ee14ba1..a8c94984 100755 --- a/neofetch +++ b/neofetch @@ -8420,11 +8420,11 @@ EOF "mac"* | "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' -${c1} 'c. +${c1} c.' ,xNMM. .OMMMMo - OMMM0, - .;loddo:' loolloddol;. + lMM" + .;loddo:. .olloddol;. cKMMMMMMMMMMNWMMMMMMMMMM0: ${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. XMMMMMMMMMMMMMMMMMMMMMMMX. @@ -8432,11 +8432,11 @@ ${c3};MMMMMMMMMMMMMMMMMMMMMMMM: :MMMMMMMMMMMMMMMMMMMMMMMM: ${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c5}'XMMMMMMMMMMMMMMMMMMMMMMMMMMk + 'XMMMMMMMMMMMMMMMMMMMMMMMMK. ${c6}kMMMMMMMMMMMMMMMMMMMMMMd ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. + "cooc*" "*coo'" EOF ;; @@ -11336,11 +11336,11 @@ EOF "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' -${c1} 'c. +${c1} c.' ,xNMM. .OMMMMo - OMMM0, - .;loddo:' loolloddol;. + lMMM" + .;loddo:. .olloddol;. cKMMMMMMMMMMNWMMMMMMMMMM0: ${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. XMMMMMMMMMMMMMMMMMMMMMMMX. @@ -11348,11 +11348,11 @@ ${c3};MMMMMMMMMMMMMMMMMMMMMMMM: :MMMMMMMMMMMMMMMMMMMMMMMM: ${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c5}'XMMMMMMMMMMMMMMMMMMMMMMMMMMk + 'XMMMMMMMMMMMMMMMMMMMMMMMMK. ${c6}kMMMMMMMMMMMMMMMMMMMMMMd ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. + "cooc*" "*coo'" EOF ;; From 7f7d824b4421662aea74c6f2833b8f82da5f9605 Mon Sep 17 00:00:00 2001 From: "Benjamin S. Osenbach" Date: Wed, 1 Sep 2021 15:14:10 -0400 Subject: [PATCH 28/31] Fix Haiku logo (#1812) (#1898) * Fix Haiku logo (#1812) * fixed padding and color --- neofetch | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index a8c94984..616348d6 100755 --- a/neofetch +++ b/neofetch @@ -7858,25 +7858,22 @@ EOF ;; "Haiku"*) - set_colors 2 8 + set_colors 1 3 7 2 read -rd '' ascii_data <<'EOF' -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} +${c3} + + MMMM MMMM + MMMM MMMM + MMMM MMMM + MMMM MMMM + MMMM${c4} .ciO| /YMMMMM*" +${c3} MMMM${c4} .cOMMMMM|/MMMMM/` + , ,iMM|/MMMMMMMMMMMMMMM* + `*.__,-cMMMMMMMMMMMMMMMMM/`${c3}.MMM + MM${c4}MMMMMMM/`:MMM/ ${c3}MMMM + MMMM MMMM + MMMM MMMM + """" """" EOF ;; From 47f46834e788bfab383775ce9e2508c3d3827b28 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 4 Sep 2021 18:06:43 +0300 Subject: [PATCH 29/31] misc: nits --- neofetch | 53 ++++++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/neofetch b/neofetch index 8bed79a5..9eb6e518 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, AmogOS, Anarchy, Android, instantOS, +# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, 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, @@ -5686,31 +5686,6 @@ dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd .:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. `.:+shNMMMMMh yMMMMMNhs+:`` `-+shy shs+:` -EOF - ;; - "AmogOS"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ' -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⣤⣤⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⠟⠉⠉⠉⠉⠉⠉⠉⠙⠻⢶⣄⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣷⡀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡟⠀⣠⣶⠛⠛⠛⠛⠛⠛⠳⣦⡀⠀⠘⣿⡄⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⠁⠀⢹⣿⣦⣀⣀⣀⣀⣀⣠⣼⡇⠀⠀⠸⣷⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠀⠀⠀⠉⠛⠿⠿⠿⠿⠛⠋⠁⠀⠀⠀⠀⣿⡄ -⠀⠀ ⠀⠀⢠⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⡇⠀ - ⠀⠀⣸⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡇⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣧⠀ -⠀⠀⠀⠀⠀⠀⠀⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣿⠀ -⠀⠀⠀⠀⠀⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠀⠀⠀⠀⠀⠀⠀⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠀⠀⠀⠀⠀⠀⢰⣿⠀⠀⠀⠀⣠⡶⠶⠿⠿⠿⠿⢷⣦⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠀⠀⣀⣀⣀⠀⣸⡇⠀⠀⠀⠀⣿⡀⠀⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⣿⠀ -⣠⡿⠛⠛⠛⠛⠻⠀⠀⠀⠀⠀⢸⣇⠀⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⠀⠀⠀⣿⠀ -⢻⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⡟⠀⠀⢀⣤⣤⣴⣿⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠈⠙⢷⣶⣦⣤⣤⣤⣴⣶⣾⠿⠛⠁⢀⣶⡟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡟⠀ - ⠀⠀⠀⠀⠈⣿⣆⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⡾⠃⠀ -⠀ ⠀⠀⠀⠀⠀⠀⠈⠛⠻⢿⣿⣾⣿⡿⠿⠟⠋⠁⠀⠀⠀ EOF ;; "Anarchy"*) @@ -7663,25 +7638,25 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; - + "glaucus"*) set_colors 5 read -rd '' ascii_data <<'EOF' -${c1} ,, ,d88P - ,d8P ,ad8888* +${c1} ,, ,d88P + ,d8P ,ad8888* ,888P d88888* ,,ad8888P* - d d888P a88888P* ,ad8888888* - .d8 d8888: d888888* ,d888888P* - .888; 88888b d8888888b8888888P - d8888J888888a88888888888888P* ,d - 88888888888888888888888888P ,,d8* - 888888888888888888888888888888888* - *8888888888888888888888888888888* - Y888888888P* `*``*888888888888* + d d888P a88888P* ,ad8888888* + .d8 d8888: d888888* ,d888888P* + .888; 88888b d8888888b8888888P + d8888J888888a88888888888888P* ,d + 88888888888888888888888888P ,,d8* + 888888888888888888888888888888888* + *8888888888888888888888888888888* + Y888888888P* `*``*888888888888* *^888^* *Y888P** EOF ;; - + "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' @@ -11124,7 +11099,7 @@ ${c1} ################ ################ ################ ################ ################ ################ - + ################ ################ ################ ################ ################ ################ From 1c62849a125fb48a30fd170fc8aa3ed8e0e919af Mon Sep 17 00:00:00 2001 From: Zayac-The-Engineer <50628024+Zayac-The-Engineer@users.noreply.github.com> Date: Sat, 11 Sep 2021 02:34:30 +0000 Subject: [PATCH 30/31] added pkgin to BSD case (#1906) --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index d4fe3d1b..aa93ec09 100755 --- a/neofetch +++ b/neofetch @@ -1549,6 +1549,7 @@ get_packages() { has lvu && tot lvu installed has tce-status && tot tce-status -i has pkg_info && tot pkg_info + has pkgin && tot pkgin list has tazpkg && pkgs_h=6 tot tazpkg list && ((packages-=6)) has sorcery && tot gaze installed has alps && tot alps showinstalled From 429499e9b9b39127a8a781d135cafb6babdea631 Mon Sep 17 00:00:00 2001 From: jnats Date: Mon, 13 Sep 2021 04:37:06 +0100 Subject: [PATCH 31/31] CrystalUX to Crystal Linux rebrand (#1907) --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index aa93ec09..268b10aa 100755 --- a/neofetch +++ b/neofetch @@ -786,7 +786,7 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # Bodhi, 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, Crystal 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, @@ -5131,7 +5131,7 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, Bodhi, 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, + Crystal 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, @@ -6887,7 +6887,7 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - *"CrystalUX"*) + *"Crystal Linux"*) set_colors 13 5 read -rd '' ascii_data <<'EOF' ${c1} mysssym