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/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) 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', diff --git a/neofetch b/neofetch index dcbf110d..e9e5e990 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, @@ -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 @@ -5329,10 +5329,10 @@ 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}\[39;49mnl}" + [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}\[0mnl}" fi # Determine the horizontal offset of the blocks. @@ -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' 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"',