From 3eb7e13e2757a003b7c6e9ea4f6d44d4532eb7f7 Mon Sep 17 00:00:00 2001 From: Th1nhhdk <58503327+th1nhhdk@users.noreply.github.com> Date: Mon, 8 Nov 2021 11:35:52 +0700 Subject: [PATCH 01/11] Added VNux GNU/Linux Neofetch Logo (#1937) --- neofetch | 31 +++++++++++++++++++++++++++++-- neofetch.1 | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index f3907d32..003ab119 100755 --- a/neofetch +++ b/neofetch @@ -806,7 +806,7 @@ 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, LangitKetujuh, semc, +# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, 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. @@ -5156,7 +5156,7 @@ 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, LangitKetujuh, semc, + Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -11078,6 +11078,33 @@ ${c1} -1vvnvv. `~+++` ++|+++ EOF ;; + + "VNux"*) + set_colors 11 8 15 1 7 + read -rd '' ascii_data <<'EOF' +${c1} ` + ^[XOx~. + ^_nwdbbkp0ti' + +${c2} _j>!vC1,, + ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" +`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ +'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; + ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' + ' ;^${c3}u$$$$$$$$^<${c2}:^ + ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: + `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": + ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` + <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< +${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ +!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< + ^x00J(" + ^" +EOF + + ;; "LangitKetujuh"*) set_colors 7 4 diff --git a/neofetch.1 b/neofetch.1 index f17a21be..b90b5781 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -327,7 +327,7 @@ 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, +Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, VNux, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. From 0d08c130ff689389005dc8f6b0705f95480f2b52 Mon Sep 17 00:00:00 2001 From: Nathan Thomas Date: Tue, 9 Nov 2021 19:41:10 -0800 Subject: [PATCH 02/11] Add support for nushell (#1878) * Add support for nushell * Update neofetch Co-authored-by: Tyler J Russell Co-authored-by: Tyler J Russell --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 003ab119..4d9015aa 100755 --- a/neofetch +++ b/neofetch @@ -1744,6 +1744,12 @@ get_shell() { shell=${shell/ Yet another shell} shell=${shell/Copyright*} ;; + + nu) + shell+=$("$SHELL" -c "version | get version") + shell=${shell/ $shell_name} + ;; + *) shell+=$("$SHELL" --version 2>&1) From e784522206f4f60b37a4186574ba6b3bc3163247 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 11 Nov 2021 06:10:54 +0200 Subject: [PATCH 03/11] neofetch: minor cleanup --- neofetch | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/neofetch b/neofetch index 4d9015aa..64fa042b 100755 --- a/neofetch +++ b/neofetch @@ -8,7 +8,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2015-2020 Dylan Araps +# Copyright (c) 2015-2021 Dylan Araps # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -1744,7 +1744,7 @@ get_shell() { shell=${shell/ Yet another shell} shell=${shell/Copyright*} ;; - + nu) shell+=$("$SHELL" -c "version | get version") shell=${shell/ $shell_name} @@ -11084,30 +11084,30 @@ ${c1} -1vvnvv. `~+++` ++|+++ EOF ;; - + "VNux"*) set_colors 11 8 15 1 7 read -rd '' ascii_data <<'EOF' -${c1} ` - ^[XOx~. - ^_nwdbbkp0ti' - -${c2} _j>!vC1,, - ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" -`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ -'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; - ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' - ' ;^${c3}u$$$$$$$$^<${c2}:^ - ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: - `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": - ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` - <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< -${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ -!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< +${c1} ` + ^[XOx~. + ^_nwdbbkp0ti' + +${c2} _j>!vC1,, + ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" +`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ +'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; + ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' + ' ;^${c3}u$$$$$$$$^<${c2}:^ + ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: + `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": + ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` + <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< +${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ +!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< ^x00J(" - ^" +?QOZmqqqpb${c2}t[run/?!${c1}0pwqqQj-, + ^:l<{nUUv> ^x00J(" + ^" EOF ;; From 24b1281f9a38d2ff94490adf7a7f720338e0eb15 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 14 Nov 2021 10:53:00 +0100 Subject: [PATCH 04/11] docs: update (#1956) --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index a4f19eb8..eeb066f7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2020 Dylan Araps +Copyright (c) 2015-2021 Dylan Araps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From d4070d515d25402da06c2aea8ea04fe8f0dc3148 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 25 Nov 2021 04:17:34 +0100 Subject: [PATCH 05/11] Update openEuler logo (#1966) --- neofetch | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 64fa042b..a15b0e54 100755 --- a/neofetch +++ b/neofetch @@ -9095,23 +9095,29 @@ EOF "openEuler"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} - (##### - (((######## ##### - ((( ########## __...__ - (((((((( ####### /((((((###\ - ((((((((((( ....... \(((((####/ - (((((( ((((######### ******* - %((((((# ((######## - /////((((( ### -/////(((((((# (((& - ((((((((((((( - (((((((((((( - ((((((((( ((((((### - /((((((###### - //((((((###### - /((((((##### - *********/ +${c1} `.cc.` + ``.cccccccc..` + `.cccccccccccccccc.` + ``.cccccccccccccccccccccc.`` + `..cccccccccccccccccccccccccccc..` +`.ccccccccccccccc${c2}/++/${c1}ccccccccccccccccc.` +.ccccccccccccccc${c2}mNMMNdo+oso+${c1}ccccccccccc. +.cccccccccc${c2}/++odms+//+mMMMMm/:+syso/${c1}cccc +.ccccccccc${c2}yNNMMMs:::/::+o+/:${c1}c${c2}dMMMMMm${c1}cccc +.ccccccc${c2}:+NmdyyhNNmNNNd:${c1}ccccc${c1}${c2}:oyyyo:${c1}cccc +.ccc${c2}:ohdmMs:${c1}cccc${c2}+mNMNmy${c1}ccccccccccccccccc +.cc${c2}/NMMMMMo////:${c1}c${c2}:///:${c1}cccccccccccccccccc +.cc${c2}:syysyNMNNNMNy${c1}ccccccccccccccccccccccc +.cccccccc${c2}+MMMMMNy${c1}c${c2}:/+++/${c1}cccccccccccccccc +.ccccccccc${c2}ohhhs/${c1}c${c2}omMMMMNh${c1}ccccccccccccccc +.ccccccccccccccc${c2}:MMMMMMMM/${c1}cccccccccccccc +.cccccccccccccccc${c2}sNNNNNd+${c1}cccccccccccccc. +`..cccccccccccccccc${c2}/+/:${c1}cccccccccccccc..` + ``.cccccccccccccccccccccccccccc.`` + `.cccccccccccccccccccccc.` + ``.cccccccccccccc.`` + `.cccccccc.` + `....` EOF ;; From c1c699378f6c94cd67be75aa2f20f2e4a79e4483 Mon Sep 17 00:00:00 2001 From: Stealth <67294868+ImNotStealth@users.noreply.github.com> Date: Sat, 27 Nov 2021 05:00:54 +0100 Subject: [PATCH 06/11] Added Qubyt OS Logo (#1969) --- neofetch | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index a15b0e54..69e9c1b5 100755 --- a/neofetch +++ b/neofetch @@ -799,7 +799,7 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, -# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, 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, @@ -5155,7 +5155,7 @@ ASCII: openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, - Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, + Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, 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, @@ -9837,6 +9837,27 @@ ${c1} `..--..` EOF ;; + "Qubyt"*) + set_colors 4 5 0 4 + read -rd '' ascii_data <<'EOF' +${c1} ########################${c2}(${c3}ooo +${c1} ########################${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}##${c3}o ${c2}((((${c3}ooo +${c1}###${c2}(${c3}ooo o${c2}((${c1}### ${c3}oooooo +${c1}###${c2}(${c3}ooo oo${c2}((${c1}###${c3}o +${c1}###${c2}(${c3}ooo ooo${c2}((${c1}### +${c1}################${c2}(${c3}oo oo${c2}((((${c3}o +${c2}(((((((((((((((((${c3}ooo ooooo + oooooooooooooooooo o +EOF + ;; + "Quibian"*) set_colors 3 7 read -rd '' ascii_data <<'EOF' From c4fba8bb0b8b0e362555e5a7431a9767205047ec Mon Sep 17 00:00:00 2001 From: alexcoder04 <70093931+alexcoder04@users.noreply.github.com> Date: Tue, 30 Nov 2021 04:12:04 +0100 Subject: [PATCH 07/11] add CBL Mariner ascii art (#1972) --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index 69e9c1b5..9fef38fe 100755 --- a/neofetch +++ b/neofetch @@ -6536,6 +6536,29 @@ ${c2} .......... EOF ;; + "CBL-Mariner"*) + set_colors 6 + read -rd '' ascii_data <<'EOF' +${c1} . + :- . + :==. .=: + :===: -==: + :-===: .====: + :-====- -=====: + -====== :=======: + -======. .=========: + -======: -==========. + -======- -===========. + :======- :===========. + :=======. .-==========. + :=======: -==========. + :=======- :==========. + :=======- .-========- +:--------. :========- + ..:::--=========- + ..::---================-=- +EOF + ;; "CelOS"*) set_colors 4 6 0 5 From aab631c7dd701ae35a70632a9672c8e9b18fe656 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Dec 2021 05:31:15 +0200 Subject: [PATCH 08/11] neofetch: Fix WSL windows version. Closes #1848 --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 9fef38fe..85ccb8db 100755 --- a/neofetch +++ b/neofetch @@ -1102,10 +1102,13 @@ get_distro() { fi if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then + windows_version=$(wmic os get Version) + windows_version=$(trim "${windows_version/Version}") + case $distro_shorthand in - on) distro+=" [Windows 10]" ;; - tiny) distro="Windows 10" ;; - *) distro+=" on Windows 10" ;; + on) distro+=" [Windows $windows_version]" ;; + tiny) distro="Windows ${windows_version::2}" ;; + *) distro+=" on Windows $windows_version" ;; esac elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then From 7b1f0c275eba9d5681c647def3f8d845f43941a6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Dec 2021 06:36:44 +0200 Subject: [PATCH 09/11] neofetch: Fix windows detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 85ccb8db..9db82184 100755 --- a/neofetch +++ b/neofetch @@ -1102,7 +1102,7 @@ get_distro() { fi if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then - windows_version=$(wmic os get Version) + windows_version=$(wmic.exe os get Version) windows_version=$(trim "${windows_version/Version}") case $distro_shorthand in From 3eaac2d9eec198e63e4904d46c6704ad7f5a2d87 Mon Sep 17 00:00:00 2001 From: The TwilightBlood Date: Wed, 8 Dec 2021 02:11:14 -0600 Subject: [PATCH 10/11] Add pacstall to package managers (#1979) * Add pacstall to package managers https://github.com/pacstall/pacstall * Fix indents on Pacstall * Fix tabbing again --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 9db82184..e6adbade 100755 --- a/neofetch +++ b/neofetch @@ -1564,6 +1564,7 @@ get_packages() { has butch && tot butch list has swupd && tot swupd bundle-list --quiet has pisi && tot pisi li + has pacstall && tot pacstall -L # 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 From 644f9d29eb9dd9f68b29f80f37fb4ad57236a67d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 10 Dec 2021 08:41:28 +0200 Subject: [PATCH 11/11] neofetch: Fix #1989 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9db82184..90bf0966 100755 --- a/neofetch +++ b/neofetch @@ -11577,7 +11577,7 @@ main() { err "Neofetch command: $0 $*" err "Neofetch version: $version" - [[ $verbose == on ]] && printf %b "$err" >&2 + [[ $verbose == on ]] && printf '%b\033[m' "$err" >&2 # If `--loop` was used, constantly redraw the image. while [[ $image_loop == on && $image_backend == w3m ]]; do