From 07e23e2a5b4709ad5e110e390b20d1949f41c244 Mon Sep 17 00:00:00 2001 From: iris Date: Tue, 11 Jun 2024 00:37:41 -0500 Subject: [PATCH 1/7] allow lightness values like '45' to parse --- hyfetch/main.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hyfetch/main.py b/hyfetch/main.py index 8d751ea7..41e16ac1 100755 --- a/hyfetch/main.py +++ b/hyfetch/main.py @@ -210,12 +210,15 @@ def create_config() -> Config: return def_lightness try: - lightness = int(lightness[:-1]) / 100 if lightness.endswith('%') else float(lightness) + if lightness.endswith('%') or int(lightness) > 1: + lightness = int(lightness[:-1]) / 100 if lightness.endswith('%') else int(lightness) / 100 + else: + lightness = float(lightness) assert 0 <= lightness <= 1 return lightness except Exception: - printc('&cUnable to parse lightness value, please input it as a decimal or percentage (e.g. 0.5 or 50%)') + printc('&cUnable to parse lightness value, please enter a lightness value such as 45%, .45, or 45') lightness = select_lightness() _prs = _prs.set_light_dl(lightness, light_dark) From 5051b692f029df95c65f1adeab77c81fbb537426 Mon Sep 17 00:00:00 2001 From: AnarchistHoneybun <74085528+AnarchistHoneybun@users.noreply.github.com> Date: Thu, 13 Jun 2024 18:21:51 +0530 Subject: [PATCH 2/7] xenogender flag preset added source : https://commons.wikimedia.org/wiki/File:Xenogender_pride_flag.svg --- hyfetch/presets.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hyfetch/presets.py b/hyfetch/presets.py index a289792d..0822c04c 100644 --- a/hyfetch/presets.py +++ b/hyfetch/presets.py @@ -189,6 +189,17 @@ PRESETS: dict[str, ColorProfile] = { '#282828' ]), + # xenogender sourced from https://commons.wikimedia.org/wiki/File:Xenogender_pride_flag.svg + 'xenogender': ColorProfile([ + '#FF6692', + '#FF9A98', + '#FFB883', + '#FBFFA8', + '#85BCFF', + '#9D85FF', + '#A510FF' + ]), + 'agender': ColorProfile([ '#000000', '#BABABA', From ced109f0eaebd6d9970d54e49f371863036ea95f Mon Sep 17 00:00:00 2001 From: Quinn <99677023+thepigeongenerator@users.noreply.github.com> Date: Thu, 20 Jun 2024 13:45:40 +0200 Subject: [PATCH 3/7] fix colours not reverting properly --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0dd0cefb..8a7d2cfd 100755 --- a/neofetch +++ b/neofetch @@ -5332,7 +5332,7 @@ get_cols() { [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}nl}" else [[ "$blocks" ]] && cols+="${block_spaces// /${blocks}\[39;49mnl}" - [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}\[39;49mnl}" + [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}\[0mnl}" fi # Determine the horizontal offset of the blocks. From 5ee89eb14811b7f988a215857c8411e5a3576bad Mon Sep 17 00:00:00 2001 From: Quinn <99677023+thepigeongenerator@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:13:18 +0200 Subject: [PATCH 4/7] include bash version < 5 case --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8a7d2cfd..510e2aad 100755 --- a/neofetch +++ b/neofetch @@ -5329,7 +5329,7 @@ get_cols() { # Convert the spaces into rows of blocks. if [ "${BASH_VERSION%%.*}" -lt 5 ]; then [[ "$blocks" ]] && cols+="${block_spaces// /${blocks}nl}" - [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}nl}" + [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}nl}" else [[ "$blocks" ]] && cols+="${block_spaces// /${blocks}\[39;49mnl}" [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}\[0mnl}" From ca77102be18ab63d56f9b51afbc01f7b2f96be03 Mon Sep 17 00:00:00 2001 From: ark-lamp-umbrella <173660797+ark-lamp-umbrella@users.noreply.github.com> Date: Tue, 25 Jun 2024 22:15:45 -0700 Subject: [PATCH 5/7] add BlackMesa --- docs/neofetch.1 | 2 +- neofetch | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/docs/neofetch.1 b/docs/neofetch.1 index 71004e97..f61118e9 100644 --- a/docs/neofetch.1 +++ b/docs/neofetch.1 @@ -319,7 +319,7 @@ GNU/Linux, Aperture, Apricity, Arch, ArchBox, Archcraft, archcraft_ascii, archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike, ArcoLinux, ArseLinux, Artix, Arya, Asahi, AsteroidOS, astOS, Astra Linux, Athena, azos, Bedrock, BigLinux, Bitrig, BlackArch, -blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, +BlackMesa, blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, CachyOS, Calculate, CalinixOS, Carbs, CBL\-Mariner, CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, Chimera, ChonkySealOS, Chrom, Cleanjaro, Clear Linux OS, ClearOS, Clover, Cobalt, Condres, diff --git a/neofetch b/neofetch index 0dd0cefb..8aae0839 100755 --- a/neofetch +++ b/neofetch @@ -869,7 +869,7 @@ image_source="auto" # Antergos, antiX, AOSC OS, Aperio GNU/Linux, Aperture, Apricity, Arch, ArchBox, Archcraft, # archcraft_ascii, archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike, ArcoLinux, ArseLinux, Artix, # Arya, Asahi, AsteroidOS, astOS, Astra Linux, Athena, azos, Bedrock, BigLinux, Bitrig, BlackArch, -# blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, CachyOS, Calculate, +# BlackMesa, blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, CachyOS, Calculate, # CalinixOS, Carbs, CBL-Mariner, CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, Chimera, ChonkySealOS, # Chrom, Cleanjaro, Clear Linux OS, ClearOS, Clover, Cobalt, Condres, Container Linux by CoreOS, # CRUX, Crystal Linux, Cucumber, CutefishOS, CuteOS, CyberOS, dahlia, DarkOs, Darwin, Debian, @@ -8213,6 +8213,34 @@ ${c2} .oossssso-`${c3}//${c1}`/ossssss+` EOF ;; + "BlackMesa") + set_colors 1 + read -rd '' ascii_data <<'EOF' +${c1} + .-;+$XHHHHHHX$+;-. + ,;X@@X%/;=----=:/%X@@X/, + =$@@%=. .=+H@X: + -XMX: =XMX= + /@@: =H@+ + %@X, .$@$ + +@X. $@% +-@@, .@@= +%@% +@$ +H@: :@H +H@: :HHHHHHHHHHHHHHHHHHX, =@H +%@% ;@M@@@@@@@@@@@@@@@@@H- +@$ +=@@, :@@@@@@@@@@@@@@@@@@@@@= .@@: + +@X :@@@@@@@@@@@@@@@M@@@@@@:%@% + $@$, ;@@@@@@@@@@@@@@@@@M@@@@@@$. + +@@HHHHHHH@@@@@@@@@@@@@@@@@@@@@@@+ + =X@@@@@@@@@@@@@@@@@@@@@@@@@@@@X= + :$@@@@@@@@@@@@@@@@@@@M@@@@$: + ,;$@@@@@@@@@@@@@@@@@@X/- + .-;+$XXHHHHHX$+;-. + +EOF + ;; + "blackPanther"* | 'blackpanther'*) set_colors 1 11 12 read -rd '' ascii_data <<'EOF' From 2a01c50aa6c8fc0cebfac5d8b982811b53802800 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Thu, 27 Jun 2024 01:07:08 +0800 Subject: [PATCH 6/7] [-] Remove lilu detection Closes #310 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3e669a76..4f20a555 100755 --- a/neofetch +++ b/neofetch @@ -1584,7 +1584,7 @@ get_model() { ;; "Mac OS X"|"macOS"|"ravynOS") - if [ "$(arch)" != "arm64" ] && [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC" -e "Lilu") != "" ]]; then + if [ "$(arch)" != "arm64" ] && [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC") != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else if [[ $osx_version == 10.[4-5]* ]]; then From 5b759e098630f84fdd5f2dcf0ee2bd814199b8b8 Mon Sep 17 00:00:00 2001 From: psykose Date: Thu, 11 Jul 2024 06:10:19 +0200 Subject: [PATCH 7/7] remove unneeded setuptools dependency this was added back in 2b5ef302a5e8fd617de4974353e4afc29f4400d8 when pkg_resources was used, but that is no longer used since 5c34876c538cede13ffe8bf21275151b7259a511 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ed8ba71b..85d427ca 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ setup( include_package_data=True, install_requires=[ # Universal dependencies - 'setuptools', 'typing_extensions; python_version < "3.8"', + 'typing_extensions; python_version < "3.8"', # Windows dependencies 'psutil ; platform_system=="Windows"',