From 2dea4d54e0c171ec08f9bf4b81b7511aa0202159 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Sun, 16 Jul 2023 18:00:04 +0200 Subject: [PATCH 01/17] Smoothen the Tumbleweed logo --- neofetch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 48b96d21..d1eb227f 100755 --- a/neofetch +++ b/neofetch @@ -10744,17 +10744,17 @@ EOF read -rd '' ascii_data <<'EOF' ${c2} ...... .,cdxxxoc,. .:kKMMMNWMMMNk:. - cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. - ;WMK;. .lKMMNM, :NMK, .OMW; - cMW; 'WMMMN ,XMK, oMM' -.MMc ..;l. xMN: KM0 -'MM. 'NMO oMM + cKMMN0OOOKWMMXo. A ;0MWk:' ':OMMk. + ;WMK;' 'lKMMNM, :NMK' 'OMW; + cMW; WMMMN ,XMK' oMM. +.MMc ''^*~l. xMN: KM0 +'MM. .NMO oMM .MM, .kMMl xMN - KM0 .kMM0. .dl:,.. .WMd - .XM0. ,OMMK, OMMMK. .XMK - oWMO:. .;xNMMk, NNNMKl. .xWMx - :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, + KM0 .kMM0' .dl>~,. .WMd + 'XM0. ,OMMK' OMMM7' .XMK + *WMO:. .;xNMMk' NNNMKl. .xWMx + ^ONMMNXMMMKx; V 'xNMWKkxllox0NMWk' + ''''' ':dOOXXKOxl' EOF ;; From a32028755a6f9163e9ffcf99869878dc16a01257 Mon Sep 17 00:00:00 2001 From: enfyna Date: Thu, 20 Jul 2023 18:10:58 +0300 Subject: [PATCH 02/17] Add windows 95 ASCII logo --- neofetch | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 48b96d21..228e870e 100755 --- a/neofetch +++ b/neofetch @@ -807,7 +807,7 @@ image_source="auto" # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, # Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, -# Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. +# Obarun, windows10, Windows7, windows95, 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. @@ -11277,6 +11277,30 @@ llllllllllllll lllllllllllllllllll EOF ;; + "Windows95") + set_colors 6 4 3 2 1 0 + read -rd '' ascii_data <<'EOF' +${c6} ___ + .--=+++++=-:. + . _ *%@@@@@@@@@@@@@@* + *:+:.__ :+* @@@ @"${c5}_*&%${c6}@@${c4}%&&&*${c6}"@@@ + "+.-#+ +%* " _ ${c5}++&&&%${c6}@@${c4}%&&&&&#${c6}@@ +${c5} " , ${c6}%@@ ${c5}&&&&&%${c6}@@${c4}%&&&&&#${c6}@@ +${c5} * oo *# ${c6}" _ ${c5}&&&&&%${c6}@@${c4}%&&&&&#${c6}@@ +${c5} " , ${c6}%@@ ${c5}&&&&"${c6}@@@@#*${c4}"&&&${c6}@@ + .${c5} * oo *# ${c6}" _ %@@@@@@@@@@@@@@@@ + *:+:.__ :=* %@@ @"${c1}**&%${c6}@@${c3}%&&&*${c6}"@@@ + "+.-#+ +%* " _ ${c1}&&&&&%${c6}@@${c3}%&&&&&#${c6}@@ +${c1} " , ${c6}%@@ ${c1}&&&&&%${c6}@@${c3}%&&&&&#${c6}@@ +${c1} * oo *# ${c6}" _ ${c1}&&&&&%${c6}@@${c3}%&&&&&#${c6}@@ +${c1} " , ${c6}%@@ ${c1}&&*"${c6}%@@@@@@${c3}"*%&${c6}@@ + .${c1} * oo *# ${c6}" _ @@@@@@@@@@@@@@@@@ + *:+:.__ :+# @@@ @%#=+""""""+==%#@ + "+.-#+ +%* %+" " ":@ + " " +EOF + ;; + "Windows"*) set_colors 1 2 4 3 read -rd '' ascii_data <<'EOF' From bec385d02f1bba61002c3dd214888350b442eec7 Mon Sep 17 00:00:00 2001 From: OldWorldOrdr Date: Sat, 22 Jul 2023 22:19:47 -0400 Subject: [PATCH 03/17] typo that caused a bug when running on wsl --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2211095e..8960843c 100755 --- a/neofetch +++ b/neofetch @@ -1277,7 +1277,7 @@ get_distro() { windows_version_verbose=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v ProductName | grep REG_) windows_version_verbose=$(trim "${windows_version_verbose/ProductName}") - windows_version_verbose=$(trim "${windows_version_verbose/REG_SZ}")buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_) + windows_version_verbose=$(trim "${windows_version_verbose/REG_SZ}") buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_) windows_version_verbose=$(trim "${windows_version_verbose/Windows}") windows_buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_) windows_buildnumber=${buildnumber/CurrentBuildNumber} From 576facfd69d6bb6751b3061cd97be0b43c85de68 Mon Sep 17 00:00:00 2001 From: OldWorldOrdr Date: Sat, 22 Jul 2023 22:24:12 -0400 Subject: [PATCH 04/17] would a newline be better? --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8960843c..c3758ad0 100755 --- a/neofetch +++ b/neofetch @@ -1277,7 +1277,8 @@ get_distro() { windows_version_verbose=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v ProductName | grep REG_) windows_version_verbose=$(trim "${windows_version_verbose/ProductName}") - windows_version_verbose=$(trim "${windows_version_verbose/REG_SZ}") buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_) + windows_version_verbose=$(trim "${windows_version_verbose/REG_SZ}") + buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_) windows_version_verbose=$(trim "${windows_version_verbose/Windows}") windows_buildnumber=$(reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -v CurrentBuildNumber | grep REG_) windows_buildnumber=${buildnumber/CurrentBuildNumber} From 04a6744e6dc7c6f586524366890e3006b4d3c693 Mon Sep 17 00:00:00 2001 From: Azalea Date: Sun, 23 Jul 2023 13:32:16 -0700 Subject: [PATCH 05/17] [+] Add squirrel package manager Closes #153 Co-Authored-By: Skythrew <76571984+skythrew@users.noreply.github.com> --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index c3758ad0..7c96260a 100755 --- a/neofetch +++ b/neofetch @@ -1992,6 +1992,7 @@ get_packages() { has bulge && tot bulge list has pm && tot-safe pm list packages has evox && tot cat /var/evox/packages/DB + has squirrel && tot ls /var/packages has tea && tot find "$HOME/.tea" -maxdepth 2 -mindepth 2 -type d # Using the dnf package cache is much faster than rpm. From 05c60fddfd54fc6e3dc144385edc550606b09505 Mon Sep 17 00:00:00 2001 From: Azalea Date: Sun, 23 Jul 2023 13:51:13 -0700 Subject: [PATCH 06/17] [+] Add steam as a package manager Closes #152 --- neofetch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/neofetch b/neofetch index 7c96260a..37ed690a 100755 --- a/neofetch +++ b/neofetch @@ -2028,6 +2028,16 @@ get_packages() { shopt -u nullglob } + # Steam games + STEAM_P=".local/share/Steam/steamapps/common" + if [[ -d "$HOME/$STEAM_P" ]]; then + manager=steam && dir "$HOME/$STEAM_P/*/" + elif [[ -d "$HOME/.var/app/com.valvesoftware.Steam/$STEAM_P" ]]; then + manager=steam && dir "$HOME/.var/app/com.valvesoftware.Steam/$STEAM_P/*/" + elif [[ -d "$HOME/.steam/steam/steamapps/common" ]]; then + manager=steam && dir "$HOME/.steam/steam/steamapps/common/*/" + fi + # Other (Needs complex command) has kpm-pkg && ((packages+=$(kpm --get-selections | grep -cv deinstall$))) From 8e63a77335e76599aabca1191a1d154f4676f75a Mon Sep 17 00:00:00 2001 From: Azalea Date: Sun, 23 Jul 2023 14:15:40 -0700 Subject: [PATCH 07/17] [O] Separate flatpak-system and user #135 --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 37ed690a..6d46faa4 100755 --- a/neofetch +++ b/neofetch @@ -2079,7 +2079,10 @@ get_packages() { esac # List these last as they accompany regular package managers. - has flatpak && tot flatpak list + has flatpak && { + manager=flatpak-system && tot flatpak list --system + manager=flatpak-user && tot flatpak list --user + } has spm && tot spm list -i has puyo && dir ~/.puyo/installed From cf8307320056b02873620d9529090d617100801c Mon Sep 17 00:00:00 2001 From: Azalea Date: Sun, 23 Jul 2023 14:20:27 -0700 Subject: [PATCH 08/17] [+] Implement --package_separate flag #135 --- neofetch | 77 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index 6d46faa4..4da97cde 100755 --- a/neofetch +++ b/neofetch @@ -214,6 +214,18 @@ mem_precision=2 package_managers="on" +# Show separate user and system packages for supported package managers +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --package_separate +# +# Example: +# on: '8 packages (flatpak-system), 9 packages (flatpak-user)' +# off: '17 packages (flatpak)' +package_separate="on" + + # Shell @@ -2041,21 +2053,52 @@ get_packages() { # Other (Needs complex command) has kpm-pkg && ((packages+=$(kpm --get-selections | grep -cv deinstall$))) - has guix && { - manager=guix-system && tot guix package -p /run/current-system/profile -I - manager=guix-user && tot guix package -I - manager=guix-home && tot guix package -p ~/.guix-home/profile -I - } - - has nix-store && { - nix-user-pkgs() { - nix-store -qR ~/.nix-profile - nix-store -qR /etc/profiles/per-user/"$USER" + # Separate system and user packages + if [[ $package_separate == on ]]; then + has guix && { + manager=guix-system && tot guix package -p /run/current-system/profile -I + manager=guix-user && tot guix package -I + manager=guix-home && tot guix package -p ~/.guix-home/profile -I } - manager=nix-system && tot nix-store -qR /run/current-system/sw - manager=nix-user && tot nix-user-pkgs - manager=nix-default && tot nix-store -qR /nix/var/nix/profiles/default - } + + has nix-store && { + nix-user-pkgs() { + nix-store -qR ~/.nix-profile + nix-store -qR /etc/profiles/per-user/"$USER" + } + manager=nix-system && tot nix-store -qR /run/current-system/sw + manager=nix-user && tot nix-user-pkgs + manager=nix-default && tot nix-store -qR /nix/var/nix/profiles/default + } + + has flatpak && { + manager=flatpak-system && tot flatpak list --system + manager=flatpak-user && tot flatpak list --user + } + else + has guix && { + guix-all() { + guix package -p /run/current-system/profile -I + guix package -I + guix package -p ~/.guix-home/profile -I + } + manager=guix && tot guix-all + } + + has nix-store && { + nix-all() { + nix-store -qR ~/.nix-profile + nix-store -qR /etc/profiles/per-user/"$USER" + nix-store -qR /run/current-system/sw + nix-store -qR /nix/var/nix/profiles/default + } + manager=nix && tot nix-all + } + + has flatpak && { + manager=flatpak && tot flatpak list + } + fi # pkginfo is also the name of a python package manager which is painfully slow. # TODO: Fix this somehow. @@ -2079,10 +2122,6 @@ get_packages() { esac # List these last as they accompany regular package managers. - has flatpak && { - manager=flatpak-system && tot flatpak list --system - manager=flatpak-user && tot flatpak list --user - } has spm && tot spm list -i has puyo && dir ~/.puyo/installed @@ -6072,6 +6111,7 @@ INFO: --title_fqdn on/off Hide/Show Fully Qualified Domain Name in title. --package_managers on/off Hide/Show Package Manager names. (on, tiny, off) + --package_separate on/off Whether to separate system/user modes for supported package managers --os_arch on/off Hide/Show OS architecture. --speed_type type Change the type of cpu speed to display. Possible values: current, min, max, bios, @@ -6332,6 +6372,7 @@ get_args() { # Info "--title_fqdn") title_fqdn="$2" ;; "--package_managers") package_managers="$2" ;; + "--package_separate") package_separate="$2" ;; "--os_arch") os_arch="$2" ;; "--cpu_cores") cpu_cores="$2" ;; "--cpu_speed") cpu_speed="$2" ;; From cec8152f3de362d267524b119f40ae58d4d1cf35 Mon Sep 17 00:00:00 2001 From: Azalea Date: Sun, 23 Jul 2023 15:24:44 -0700 Subject: [PATCH 09/17] [U] Changelog --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index 5c68d889..40208f1c 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,25 @@ pip install git+https://github.com/hykilpikonna/hyfetch.git@master +* 🌈 Add option to disable pride month animation (#134) +* 🌈 Fix: Should not assume ~/.config is writable (#136) +* 🖼 OS - Update macOS version name list (#132) +* 🖼 Distro - Add Windows 95 ASCII logo (dylanaraps/neofetch#2346) +* 🖼 Distro - Smoothen the Tumbleweed logo (dylanaraps/neofetch#2342) +* 🖼 Distro - Add ParchLinux (dylanaraps/neofetch#2045) +* 🖼 Distro - Add OpenKylin logo (dylanaraps/neofetch#2341) +* 🖼 Distro - Add PhyOS (#142) +* 🖼 Distro - Add Athena OS (#130) +* 🖼 Version - Fix a typo that broke OS detection on WSL (#155) +* 🖼 Packages - Implement --package_separate flag (#135) +* 🖼 Packages - Separate flatpak-system and flatpak-user (#135) +* 🖼 Packages - Add steam as a package manager (#152) +* 🖼 Packages - Add squirrel package manager (#153) +* 🖼 Packages - Make cargo run on all systems (#146) +* 🖼 Packages - Fix cargo package count (#144) +* 🖼 Packages - Add Devbox package manager (#137) +* 🖼 Config - Allow specifying default config to copy to ~/.config (#133) + ### 1.4.9 * 🌈 Add pride month easter-egg animation! ⭐️ From 0385fd836d55af63464be6e2fd87f17a5a17d23f Mon Sep 17 00:00:00 2001 From: Azalea Date: Sun, 23 Jul 2023 15:33:09 -0700 Subject: [PATCH 10/17] [U] Changelog --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 40208f1c..720a3dda 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ neofetch with pride flags <3 This repo also serves as an updated version of the original `neofetch` since the upstream [dylanaraps/neofetch](https://github.com/dylanaraps/neofetch) doesn't seem to be maintained anymore (as of Jul 30, 2022, the original repo hasn't merged a pull request for 6 months). If you only want to use the updated neofetch without pride flags, you can use the `neofetch` script from this repo. To prevent command name conflict, I call it `neowofetch` :) -* Method 1: `pip install hyfetch` then run `neowofetch` +* Method 1: `pip install -U hyfetch` then run `neowofetch` * Method 2: `npx neowofetch` * Method 3: `P="$HOME/.local/bin/neowofetch" curl -L nf.hydev.org -o $P && chmod +x $P` * Method 4: Run without install `bash <(curl -sL nf.hydev.org)` @@ -21,7 +21,7 @@ This repo also serves as an updated version of the original `neofetch` since the Install Python >= 3.7 first. Then, just do: ```sh -pip install hyfetch +pip install -U hyfetch ``` ### Method 2: Install using system package manager @@ -101,9 +101,11 @@ pip install git+https://github.com/hykilpikonna/hyfetch.git@master +* 🌈 Add support for qwqfetch backend (#148) +* 🌈 Add nonhuman-unity flag (#139) * 🌈 Add option to disable pride month animation (#134) * 🌈 Fix: Should not assume ~/.config is writable (#136) -* 🖼 OS - Update macOS version name list (#132) +* 🖼 OS - Update macOS version name list (#140) * 🖼 Distro - Add Windows 95 ASCII logo (dylanaraps/neofetch#2346) * 🖼 Distro - Smoothen the Tumbleweed logo (dylanaraps/neofetch#2342) * 🖼 Distro - Add ParchLinux (dylanaraps/neofetch#2045) @@ -118,6 +120,7 @@ pip install git+https://github.com/hykilpikonna/hyfetch.git@master * 🖼 Packages - Make cargo run on all systems (#146) * 🖼 Packages - Fix cargo package count (#144) * 🖼 Packages - Add Devbox package manager (#137) +* 🖼 Packages - Fix phantom package when pm command fails (#145) * 🖼 Config - Allow specifying default config to copy to ~/.config (#133) ### 1.4.9 From 26453ea3d7dac230e6212a6a05678249b35c3367 Mon Sep 17 00:00:00 2001 From: Azalea Date: Tue, 25 Jul 2023 20:33:15 -0700 Subject: [PATCH 11/17] [O] Custom ^C message --- hyfetch/__main__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hyfetch/__main__.py b/hyfetch/__main__.py index debf90a4..f50c20c2 100644 --- a/hyfetch/__main__.py +++ b/hyfetch/__main__.py @@ -1,4 +1,9 @@ -from hyfetch import main +from . import main +from .color_util import printc if __name__ == '__main__': - main.run() + try: + main.run() + except KeyboardInterrupt: + printc('&cThe program is interrupted by ^C, exiting...') + exit(0) \ No newline at end of file From e9ae4dbb6f74d94f8c16cd69f9a19333c8edd6cf Mon Sep 17 00:00:00 2001 From: Nekosis <37462865+Nekosis@users.noreply.github.com> Date: Sun, 30 Jul 2023 20:59:43 -0500 Subject: [PATCH 12/17] Add Meowix Linux logo --- neofetch | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f70e7ce9..8c2f6357 100755 --- a/neofetch +++ b/neofetch @@ -860,7 +860,7 @@ image_source="auto" # Hyperbola, iglunix, instantOS, IRIX, Itc, januslinux, Kaisen, Kali, KaOS, KDE, Kibojoe, Kogaion, # Korora, KrassOS, KSLinux, Kubuntu, LangitKetujuh, LaxerOS, LEDE, LibreELEC, Linspire, Linux, Linux # Lite, Linux Mint, Linux Mint Old, Live Raizo, LMDE, Lubuntu, Lunar, mac, Mageia, MagpieOS, -# Mandriva, Manjaro, MassOS, MatuusOS, Maui, Mer, Minix, MIRACLE LINUX, MX, Namib, NekOS, Neptune, +# Mandriva, Manjaro, MassOS, MatuusOS, Maui, Meowix, Mer, Minix, MIRACLE LINUX, MX, Namib, NekOS, Neptune, # NetBSD, Netrunner, Nitrux, NixOS, Nobara, NomadBSD, Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, # Open Source Media Center, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, # openSUSE, openSUSE Leap, openSUSE Tumbleweed, OpenWrt, OPNsense, Oracle, orchid, OS Elbrus, @@ -6278,7 +6278,7 @@ ASCII: LangitKetujuh, LaxerOS, LEDE, LibreELEC, Linspire, Linux, Linux Lite, Linux Mint, Linux Mint Old, Live Raizo, LMDE, Lubuntu, Lunar, mac, Mageia, MagpieOS, Mandriva, Manjaro, MassOS, MatuusOS, Maui, - Mer, Minix, MIRACLE LINUX, MX, Namib, NekOS, Neptune, NetBSD, + Meowix, Mer, Minix, MIRACLE LINUX, MX, Namib, NekOS, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nobara, NomadBSD, Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, Open Source Media Center, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, openSUSE, openSUSE @@ -10740,6 +10740,22 @@ ${c1} `.-://////:--` EOF ;; + "Meowix"*) + set_colors 1 3 3 4 + read -rd '' ascii_data <<'EOF' +${c1} #${c2}% ${c3}&${c4}* +${c1} ##${c2}%% ${c3}&&${c4}** +${c1} ## ${c2}%% ${c3}&& ${c4}** +${c1} ## ${c2}%% ${c3}&& ${c4}** +${c1} ## ${c2}%% ${c3}&& ${c4}** +${c1} ## ${c2}%% ${c3}&& ${c4}** +${c1} ## ${c2}%%${c3}&& ${c4}** +${c1} ## ${c2}%% ${c4}** +${c1} ## ${c4}** +${c1}## ${c4}** +EOF + ;; + "Mer"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 08029959f3b01ab609c23c04e6731d50c09e78b0 Mon Sep 17 00:00:00 2001 From: Shun Li Date: Wed, 2 Aug 2023 12:11:28 +0800 Subject: [PATCH 13/17] Wild card for various OpenWrt distribution --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 48b96d21..04767c56 100755 --- a/neofetch +++ b/neofetch @@ -9248,7 +9248,7 @@ ${c1} /(/ EOF ;; - "OpenWrt"*) + *"Wrt"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} _______ From 75fd94fa61269599da373d4408835c325fea8dd6 Mon Sep 17 00:00:00 2001 From: Tracker-Friendly Date: Wed, 26 Jul 2023 20:20:36 +0100 Subject: [PATCH 14/17] Added evolutionOS ASCII art --- neofetch | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 48b96d21..480789f9 100755 --- a/neofetch +++ b/neofetch @@ -788,7 +788,7 @@ image_source="auto" # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, # Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, -# EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +# EndeavourOS, Endless, EuroLinux, EvolutionOS, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS # Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, @@ -5148,7 +5148,7 @@ ASCII: Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, 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, + EuroLinux, EvolutionOS, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, @@ -7373,6 +7373,29 @@ wWW${c2}N${c1}WWWWw EOF ;; + "EvolutionOS"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1}\e[1;32m dddddddddddddddddddddddd + .ddd. .ddd. + :dd :dddddddddddddddddd dd: + :dd ldl dd: + :dd ldl dd: + :dd ldl dd: + :dd ldl dd: + :dd ldl dd: + :dd ldl ddddddd ddddd dd: + :dd ldl dd: + :dd ldl dd: + :dd ldl dd: + :dd ldl dd: + :dd ldl dd: + :dd ldl dddddddddddddd dd: + ddd:. .:ddd + dddddddddddddddddddddddd\e[0m +EOF + ;; + "Exherbo"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 1efafdfb81264fd02620b8e1737d2b5ad6602ff8 Mon Sep 17 00:00:00 2001 From: Tracker-Friendly Date: Wed, 26 Jul 2023 20:26:53 +0100 Subject: [PATCH 15/17] Improved evolutionOS ASCII art --- neofetch | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index 480789f9..9a87cfeb 100755 --- a/neofetch +++ b/neofetch @@ -7378,19 +7378,19 @@ EOF read -rd '' ascii_data <<'EOF' ${c1}\e[1;32m dddddddddddddddddddddddd .ddd. .ddd. - :dd :dddddddddddddddddd dd: - :dd ldl dd: - :dd ldl dd: - :dd ldl dd: - :dd ldl dd: - :dd ldl dd: - :dd ldl ddddddd ddddd dd: - :dd ldl dd: - :dd ldl dd: - :dd ldl dd: - :dd ldl dd: - :dd ldl dd: - :dd ldl dddddddddddddd dd: + :dd ddddddddddddddddddd dd: + :dd ddd dd: + :dd ddd dd: + :dd ddd dd: + :dd ddd dd: + :dd ddd dd: + :dd ddd ddddddd ddddd dd: + :dd ddd dd: + :dd ddd dd: + :dd ddd dd: + :dd ddd dd: + :dd ddd dd: + :dd ddd dddddddddddddd dd: ddd:. .:ddd dddddddddddddddddddddddd\e[0m EOF From 988ca7993edfdff77261e68c22065e87ccae56dd Mon Sep 17 00:00:00 2001 From: Tracker-Friendly Date: Wed, 26 Jul 2023 20:33:32 +0100 Subject: [PATCH 16/17] Improved evolutionOS ASCII art further --- neofetch | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index 9a87cfeb..e8bcce7a 100755 --- a/neofetch +++ b/neofetch @@ -7377,22 +7377,23 @@ EOF set_colors 4 7 read -rd '' ascii_data <<'EOF' ${c1}\e[1;32m dddddddddddddddddddddddd - .ddd. .ddd. - :dd ddddddddddddddddddd dd: - :dd ddd dd: - :dd ddd dd: - :dd ddd dd: - :dd ddd dd: - :dd ddd dd: - :dd ddd ddddddd ddddd dd: - :dd ddd dd: - :dd ddd dd: - :dd ddd dd: - :dd ddd dd: - :dd ddd dd: - :dd ddd dddddddddddddd dd: - ddd:. .:ddd - dddddddddddddddddddddddd\e[0m + .dddd''''''''''''''''''''''dddd. + dd: dddddddddddddddddddd; dd: + dd: ldl:'''''''''''''''' dd: + dd: ldl: dd: + dd: ldl: dd: + dd: ldl: dd: + dd: ldl: dd: + dd: ldl: ddddddd; ddddd; dd: + dd: ldl: ''''''' ''''' dd: + dd: ldl: dd: + dd: ldl: dd: + dd: ldl: dd: + dd: ldl: dd: + dd: ldl: ddddddddddddddd; dd: + dddd:.''' ''''''''''''''' dddd: + dddddddddddddddddddddddddd;;' + '''''''''''''''''''''''''\e[0m EOF ;; From 25df70367a91b21792b84dd6301c9cdefe8cde9f Mon Sep 17 00:00:00 2001 From: Azalea Date: Sat, 5 Aug 2023 11:04:52 -0700 Subject: [PATCH 17/17] [+] gynesexual, androsexual flags Closes #157 --- hyfetch/presets.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hyfetch/presets.py b/hyfetch/presets.py index 93edcdcf..6c0b9e79 100644 --- a/hyfetch/presets.py +++ b/hyfetch/presets.py @@ -597,6 +597,18 @@ PRESETS: dict[str, ColorProfile] = { "#2f3fb9" ]), + 'gynesexual': ColorProfile([ + "#F4A9B7", + "#903F2B", + "#5B953B", + ]), + + 'androsexual': ColorProfile([ + "#01CCFF", + "#603524", + "#B799DE", + ]), + # gendervoid and related flags sourced from: https://gender.fandom.com/wiki/Gendervoid 'gendervoid' : ColorProfile([ "#081149",