From a61724f6b28b6285a003e403c184b5a5a2e155c9 Mon Sep 17 00:00:00 2001 From: Hayao0819 Date: Sun, 19 Apr 2020 21:02:20 +0900 Subject: [PATCH 1/4] Added support for Alter Linux and Serene Linux (#1447) * neofetch : Added alterlinux logo. * os: Added SereneLinux * Added Serene Linux and Alter Linux to the description * Added Serene Linux and Alter Linux to help message * Added Serene Linux and Alter Linux to man --- neofetch | 70 +++++++++++++++++++++++++++++++++++++++++++++++------- neofetch.1 | 8 +++---- 2 files changed, 65 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index a1d5ef19..98a017b5 100755 --- a/neofetch +++ b/neofetch @@ -757,7 +757,7 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", +# NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, "AOSC OS", # "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, # XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, # BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, @@ -778,9 +778,9 @@ image_source="auto" # Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, -# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -# SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +# Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, # Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX @@ -4836,9 +4836,9 @@ ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", - "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, - XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, + NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, + "AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, + ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, @@ -4858,8 +4858,8 @@ ASCII: PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, - SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, - Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, + SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, + Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX @@ -5273,6 +5273,32 @@ hdddyo+ohddyosdddddddddho+oydddy++ohdddh EOF ;; + "Alter"*) + set_colors 6 6 + read -rd '' ascii_data <<'EOF' +${c1} %, + ^WWWw + 'wwwwww + !wwwwwwww + #`wwwwwwwww + @wwwwwwwwwwww + wwwwwwwwwwwwwww + wwwwwwwwwwwwwwwww + wwwwwwwwwwwwwwwwwww + wwwwwwwwwwwwwwwwwwww, + w~1i.wwwwwwwwwwwwwwwww, + 3~:~1lli.wwwwwwwwwwwwwwww. + :~~:~?ttttzwwwwwwwwwwwwwwww + #<~:~~~~?llllltO-.wwwwwwwwwww + #~:~~:~:~~?ltlltlttO-.wwwwwwwww + @~:~~:~:~:~~(zttlltltlOda.wwwwwww + @~:~~: ~:~~:~:(zltlltlO a,wwwwww + 8~~:~~:~~~~:~~~~_1ltltu ,www + 5~~:~~:~~:~~:~~:~~~_1ltq N,, + g~:~~:~~~:~~:~~:~:~~~~1q N, +EOF + ;; + "Amazon"*) set_colors 3 7 read -rd '' ascii_data <<'EOF' @@ -9221,6 +9247,32 @@ yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy EOF ;; + "Serene"*) + set_colors 6 6 + read -rd '' ascii_data <<'EOF' +${c1} __---''''''---__ + . . + : : + - _______----_- + s __----''' __---- + __h_ _-' _-' h + '-._''--.._ ; _-' y + : ''-._ '-._/ _-' : + y ':_ _--'' y + m .--'' '-._.;' m + m : : m + y '.._ '-__ y + : '--._ '''----___ : + y '--._ ''-- _ y + h '--._ : h + s __'; vs + - __..--'' - + :_..--'' : + . _ . + `''---______---''-`` +EOF + ;; + "SharkLinux"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 1b45673d..22d21105 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -287,8 +287,8 @@ Colors to print the ascii art \fB\-\-ascii_distro\fR distro Which Distro's ascii art to print .TP -NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, -Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, +AOSC, Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, @@ -309,8 +309,8 @@ Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX From c85509f838eeb107a48190d982c9886714787a22 Mon Sep 17 00:00:00 2001 From: Shantanu Joshi Date: Fri, 24 Apr 2020 22:06:33 +0530 Subject: [PATCH 2/4] WM: Add support for xmonad (#1451) * WM: add xmonad * Fix shellcheck warning --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 98a017b5..c386112e 100755 --- a/neofetch +++ b/neofetch @@ -1798,7 +1798,8 @@ get_wm() { -e "[d]wm" \ -e "[2]bwm" \ -e "[m]onsterwm" \ - -e "[t]inywm") + -e "[t]inywm" \ + -e "[x]monad") else case $os in @@ -4837,7 +4838,7 @@ ASCII: --ascii_distro distro Which Distro's ascii art to print NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, - "AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, + \"AOSC OS\", \"AOSC OS/Retro\", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, From a1f80c3a613692c9e727e8cef67d729e2f335e82 Mon Sep 17 00:00:00 2001 From: Erick Cafferata Date: Fri, 1 May 2020 14:25:05 -0500 Subject: [PATCH 3/4] distro: speed up guix lookup (#1452) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c386112e..37d82900 100755 --- a/neofetch +++ b/neofetch @@ -1031,7 +1031,7 @@ get_distro() { elif type -p guix >/dev/null; then case $distro_shorthand in on|tiny) distro="Guix System" ;; - *) distro="Guix System $(guix system -V | awk 'NR==1{printf $5}')" + *) distro="Guix System $(guix -V | awk 'NR==1{printf $4}')" esac # Display whether using '-current' or '-release' on OpenBSD. From 1c2b5ff624cbe655c141b4be7a747c35637bc87c Mon Sep 17 00:00:00 2001 From: Noah Cain Date: Sun, 3 May 2020 12:48:38 -0700 Subject: [PATCH 4/4] Update neofetch (#1454) --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 37d82900..f2577883 100755 --- a/neofetch +++ b/neofetch @@ -6424,6 +6424,30 @@ o/${c2}--...::-:/::/:-......-::::::-/-...-${c1}:/o `.-://++++++//:-.` EOF ;; + + "dahlia"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} + .#. + *%@@@%* + .,,,,,(&@@@@@@@&/,,,,,. + ,#@@@@@@@@@@@@@@@@@@@@@#. + ,#@@@@@@@&#///#&@@@@@@@#. + ,/%&@@@@@%/, .,(%@@@@@&#/. + *#&@@@@@@#,. .*#@@@@@@&#, + .&@@@@@@@@@( .(@@@@@@@@@&&. +#@@@@@@@@@@( )@@@@@@@@@@@# + °@@@@@@@@@@( .(@@@@@@@@@@@° + *%@@@@@@@(. ,#@@@@@@@%* + ,(&@@@@@@%*. ./%@@@@@@%(, + ,#@@@@@@@&(***(&@@@@@@@#. + ,#@@@@@@@@@@@@@@@@@@@@@#. + ,*****#&@@@@@@@&(*****, + ,/%@@@%/. + ,#, +EOF + ;; "debian_small") set_colors 1 7 3