[U] Release v1.2.0

Upstream PR: https://github.com/dylanaraps/neofetch/pull/2079
Thanks to @Candygoblen123

Co-authored-by: Candygoblen123 <andrew.glaze76@gmail.com>

README.md

@@ -4,6 +4,16 @@ neofetch with pride flags <3
 
 ![image](https://user-images.githubusercontent.com/22280294/162614541-af2b4660-f1f7-4287-b978-1aa2266ac70f.png)
 
+### Running Updated Original Neofetch
+
+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 install the python package and use `neowofetch` xD.
+
+If you installed `npm`, you can also run the updated original neofetch using `npx neowofetch`. If not, you can also do this:
+
+```sh
+bash <(curl -s "https://raw.githubusercontent.com/Hykilpikonna/HyFetch/HEAD/neofetch")
+```
+
 ## Installation
 
 ### Method 1: Install using Python pip (Recommended)
@@ -19,22 +29,9 @@ pip install hyfetch
 Currently, these distributions have existing packages for HyFetch:
 
 * ArchLinux: `yay -S hyfetch` (Thanks to @ Aleksana)
-* Nix (Nixpkgs): `nix-env -i hyfetch` ([In Progress](https://github.com/NixOS/nixpkgs/pull/170309))
-* Nix (NUR): ([In Progress](https://github.com/nix-community/NUR/pull/467))
+* Nix: `nix-env -i hyfetch` (Thanks to @ YisuiDenghua)
 * Guix: `guix install hyfetch` (Thanks to @ WammKD)
 
-Currently, if you're using Nix the package manager or NixOS, you can use HyFetch with `nix-env -if https://github.com/hykilpikonna/hyfetch/tarball/master -A hyfetch`
-
-> Now `hyfetch` is available in our NixOS-CN's flake. You can add [NixOS-CN](https://github.com/nixos-cn/flakes) in your [Nix Flake](https://nixos.org/manual/nix/unstable/command-ref/new-cli/nix3-flake.html) at first, then install package `hyfetch`.
-> ```
-> #flake.nix
-> 
->             environment.systemPackages =
->               [ nixos-cn.legacyPackages.${system}.hyfetch ];
->               
-> ```              
-> (Thanks to @ YisuiDenghua and @ linyinfeng )
-
 ## Usage
 
 When you run `hyfetch` for the first time, it will prompt you to choose a color system and a preset. Just follow the prompt, and everything should work (hopefully). If something doesn't work, feel free to submit an issue!
@@ -45,11 +42,7 @@ A: Use `hyfetch -c`
 
 #### Q: What do I do if the color is too dark/light for my theme?
 
-A: You can try setting the colors' "lightness" using the `--c-set-l` parameter. The value should be between 0 and 1. For example, if you are using dark theme and the rainbow flag is too dark to display, you can type:
-
-```sh
-hyfetch -p rainbow --c-set-l 0.8
-```
+A: You can try setting the colors' "lightness" in the configuration menu. The value should be between 0 and 1. For example, if you are using dark theme and the rainbow flag is too dark to display, you can set lightness to 0.7.
 
 Feel free to experiment with it!
 
@@ -57,16 +50,85 @@ Feel free to experiment with it!
 
 ## Change Log
 
+### About Notation
+
+Updates to HyFetch begins with the emoji 🌈  
+Updates to `neowofetch` begins with the emoji 🖼️
+
 ### TODO
 
-* [ ] Add configuration to emphasize certain parts of the original ASCII art (to make icons like Fedora and Ubuntu look nicer)
 * [ ] Paginate flags
+* [ ] Implement light/dark background detection based on https://github.com/muesli/termenv
+
+### 1.2.0
+
+* 🚀 Take over `neofetch` with `neowofetch`
+
+<details>
+  <summary>🖼️ Ascii Art Changes</summary><br>
+
+* Ascii - Add uwuntu ([#9](https://github.com/hykilpikonna/hyfetch/pull/9)) (use it with `hyfetch --test-distro uwuntu` or `neowofetch --ascii_distro uwuntu`)
+* Ascii - Better Void ascii art ([#10](https://github.com/hykilpikonna/hyfetch/pull/10))
+* Ascii - Update old NixOS logo for compatibility (dylanaraps/neofetch#2114)
+
+</details>
+
+<details>
+  <summary>🖼️ Distro/OS Support Changes</summary><br>
+
+* OS - Identify macOS 13 Ventura ([#8](https://github.com/hykilpikonna/hyfetch/pull/8))
+* OS - Windows 11 Fluent (dylanaraps/neofetch#2109)
+* Distro - Add Asahi Linux (dylanaraps/neofetch#2079)
+* Distro - Add CenterOS (dylanaraps/neofetch#2097)
+* Distro - Add Finnix (dylanaraps/neofetch#2099)
+* Distro - Add Miracle Linux (dylanaraps/neofetch#2085)
+* Distro - Add Univalent (dylanaraps/neofetch#2162)
+* Distro - Add NomadBSD (dylanaraps/neofetch#2147)
+* Distro - Add GrapheneOS (dylanaraps/neofetch#2146)
+* Distro - Add ShastraOS (dylanaraps/neofetch#2149)
+* Distro - Add Ubuntu Touch (dylanaraps/neofetch#2167)
+* Distro - Add Ubuntu Sway (dylanaraps/neofetch#2136)
+* Distro - Add Orchid Linux (dylanaraps/neofetch#2144)
+* Distro - Add AOSC OS/Retro (dylanaraps/neofetch#2124)
+* Distro - Add Ultramarine Linux (dylanaraps/neofetch#2115)
+* Distro - Improve NixOS version detection (dylanaraps/neofetch#2157)
+
+</details>
+
+<details>
+  <summary>🖼️ Device Support Changes</summary><br>
+
+* Terminal - Add Termux (dylanaraps/neofetch#2168)
+* CPU - Add loongarch64 (dylanaraps/neofetch#2140)
+* CPU - Identify CPU name for ARM / RISCV (dylanaraps/neofetch#2139)
+* Battery - Fix file not found (dylanaraps/neofetch#2130)
+* GPU - Identify open-kernal Nvidia driver version (dylanaraps/neofetch#2128)
+
+</details>
+
+<details>
+  <summary>🖼️ Bug Fixes</summary><br>
+
+* Bug Fix - Fix broken fedora output (dylanaraps/neofetch#2084)
+
+</details>
+
+<img width="200px" src="https://user-images.githubusercontent.com/22280294/181790059-47aa6f80-be99-4e67-8fa5-5c02b02842c6.png" align="right">
+
+### 1.1.3rc1
+
+* 🌈 Add foreground-background color arrangement to make Fedora and Ubuntu look nicer
+* 🌈 Allow typing abbreviations in flag selection
+* 🌈 Fix: Duplicate random color arrangements are appearing in selection screen
+* 🌈 Fix: Inconsistant color arrangement when saved to config file
 
 ### 1.1.2
 
 * Add more flags ([#5](https://github.com/hykilpikonna/hyfetch/pull/5))
 * Removed `numpy` dependency that was used in 1.1.0
 
+<img width="200px" src="https://user-images.githubusercontent.com/22280294/180901539-014f036e-c926-4470-ac72-a6d6dcf30672.png" align="right">
+
 ### 1.1.0
 
 * Refactored a lot of things
@@ -76,8 +138,6 @@ Feel free to experiment with it!
 * Added color bar preview for RGB/8bit mode selection
 * Added random color arrangement feature (for NixOS)
 
-<img src="https://user-images.githubusercontent.com/22280294/180901539-014f036e-c926-4470-ac72-a6d6dcf30672.png" width="100px" />
-
 ### 1.0.7
 
 * Fix: Make config path not on init but when it's actually needed.
@@ -138,6 +198,7 @@ The information by default is displayed alongside your operating system's logo.
 
 You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones.
 
+
 Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.
 
 

accept-upstream.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+import argparse
+import os
+import shlex
+from subprocess import check_output
+
+import pyperclip
+import requests
+from github import Github
+
+upstream = 'dylanaraps/neofetch'
+my_fork = 'hykilpikonna/hyfetch'
+my_base = 'master'
+# gh_token = os.environ['GH_TOKEN']
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Helper for accepting upstream pull requests')
+    parser.add_argument('pull', type=int, help='Pull request number')
+    args = parser.parse_args()
+    pr = args.pull
+
+    print(f'Accepting pull request {pr}...')
+
+    # Fetch original pr's information
+    info = requests.get(f'https://api.github.com/repos/{upstream}/pulls/{pr}').json()
+    # print(info)
+    head = info['head']['repo']['full_name']
+    head_br = info['head']['ref']
+    head_lbl = info['head']['label']
+    user = info['user']['login']
+    print()
+    print('Original Pull Request Info:')
+    print('> State:', info['state'])
+    print('> Title:', info['title'])
+    print('> User:', user)
+    print('> Created:', info['created_at'])
+    print('> Head:', head, head_br, head_lbl)
+
+    # Fetch commit information
+    commits = requests.get(f'https://api.github.com/repos/{upstream}/pulls/{pr}/commits').json()
+    author = commits[0]['commit']['author']
+
+    # Fetch head branch
+    print()
+    print('Fetching head branch...')
+    os.system(f'git fetch https://github.com/{head} {head_br}')
+
+    # Merge head branch
+    print()
+    print('Merging fetch_head...')
+    title = info["title"].replace('"', '\\"')
+    os.system(f'git merge FETCH_HEAD --no-ff --no-edit '
+              f'-m "[PR] {upstream}#{pr} from {user} - {title}" '
+              f'-m "Upstream PR: https://github.com/{upstream}/pull/{pr}  \n'
+              f'Thanks to @{user}\n\n'
+              f'Co-authored-by: {author["name"]} <{author["email"]}>"')
+
+    # Push
+    print()
+    print('Pushing...')
+    os.system('git push')
+
+    # Get commit SHA
+    sha = check_output(shlex.split('git rev-parse --short HEAD')).decode().strip()
+
+    # Copy comment to clipboard
+    comment = f"""
+Thank you for your contribution! 
+
+This PR is [merged into hyfetch](https://github.com/hykilpikonna/hyfetch/commit/{sha}) since this repo (dylanaraps/neofetch) seems no longer maintained.
+
+[HyFetch](https://github.com/hykilpikonna/hyfetch) is a fork of neofetch with LGBTQ pride flags, but the repo also serves as an updated version of neofetch, addressing many pull requests that are not merged in the original repo.
+    """
+    pyperclip.copy(comment.strip())
+    print()
+    print('Done!')
+    print('Comment response copied to clipboard.')

hyfetch/color_scale_numpy.py

@@ -1,71 +0,0 @@
-from __future__ import annotations
-
-import numpy as np
-from numpy import ndarray
-
-from .color_util import RGB
-
-
-def create_gradient_hex(colors: list[str], resolution: int = 300) -> ndarray:
-    """
-    Create gradient array from hex
-    """
-    colors = np.array([RGB.from_hex(s) for s in colors])
-    return create_gradient(colors, resolution)
-
-
-def create_gradient(colors: ndarray, resolution: int) -> ndarray:
-    """
-    Create gradient 2d array.
-
-    Usage: arr[ratio / len(arr), :] = Scaled gradient color at that point
-    """
-    result = np.zeros((resolution * (len(colors) - 1), 3), dtype='uint8')
-
-    # Create gradient mapping
-    for i in range(len(colors) - 1):
-        c1 = colors[i, :]
-        c2 = colors[i + 1, :]
-        bi = i * resolution
-
-        for r in range(resolution):
-            ratio = r / resolution
-            result[bi + r, :] = c2 * ratio + c1 * (1 - ratio)
-
-    return result
-
-
-def get_raw(gradient: ndarray, ratio: float) -> ndarray:
-    """
-    :param gradient: Gradient array (2d)
-    :param ratio: Between 0-1
-    :return: RGB subarray (1d, has 3 values)
-    """
-    if ratio == 1:
-        return gradient[-1, :]
-
-    i = int(ratio * len(gradient))
-    return gradient[i, :]
-
-
-class Scale:
-    colors: ndarray
-    rgb: ndarray
-
-    def __init__(self, scale: list[str], resolution: int = 300):
-        self.colors = np.array([RGB.from_hex(s) for s in scale])
-        self.rgb = create_gradient(self.colors, resolution)
-
-    def __call__(self, ratio: float) -> RGB:
-        """
-        :param ratio: Between 0-1
-        """
-        return RGB(*get_raw(self.rgb, ratio))
-
-
-def test_color_scale():
-    scale = Scale(['#232323', '#4F1879', '#B43A78', '#F98766', '#FCFAC0'])
-
-    colors = 100
-    for i in range(colors + 1):
-        print(scale(i / colors).to_ansi_rgb(False), end=' ')

hyfetch/constants.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from typing_extensions import Literal
 
 CONFIG_PATH = Path.home() / '.config/hyfetch.json'
-VERSION = '1.1.2'
+VERSION = '1.2.0'
 
 # Obtain terminal size
 try:

hyfetch/main.py

@@ -8,12 +8,10 @@ import re
 from itertools import permutations
 from typing import Iterable
 
-from hyfetch import presets
-
-from .color_util import printc, color, clear_screen, LightDark
+from .color_util import printc, color, clear_screen
 from .constants import CONFIG_PATH, VERSION, TERM_LEN, TEST_ASCII_WIDTH, TEST_ASCII, GLOBAL_CFG
 from .models import Config
-from .neofetch_util import run_neofetch, get_distro_ascii, ColorAlignment, ascii_size, color_alignments
+from .neofetch_util import run_neofetch, get_distro_ascii, ColorAlignment, ascii_size, get_fore_back
 from .presets import PRESETS
 
 
@@ -54,13 +52,29 @@ def literal_input(prompt: str, options: Iterable[str], default: str, show_ops: b
     else:
         printc(f'{prompt} (default: {default})')
 
-    selection = input('> ') or default
-    while not selection.lower() in lows:
+    def find_selection(sel: str):
+        if not sel:
+            return None
+
+        # Find exact match
+        if sel in lows:
+            return options[lows.index(sel)]
+
+        # Find starting abbreviation
+        for i, op in enumerate(lows):
+            if op.startswith(sel):
+                return options[i]
+
+        return None
+
+    selection = input('> ').lower() or default
+    while not find_selection(selection):
         print(f'Invalid selection! {selection} is not one of {"|".join(options)}')
-        selection = input('> ') or default
+        selection = input('> ').lower() or default
+
     print()
 
-    return options[lows.index(selection)]
+    return find_selection(selection)
 
 
 def create_config() -> Config:
@@ -181,29 +195,30 @@ def create_config() -> Config:
     color_alignment = None
     while True:
         clear_screen(title)
-        printc(f'&a5. Let\'s choose a color arrangement!')
-        printc(f'You can choose standard horizontal or vertical alignment, or use one of the random color schemes, or assign colors yourself (TODO).')
-        print()
 
         asc = get_distro_ascii()
         asc_width = ascii_size(asc)[0]
-        asciis = [
-            [*ColorAlignment('horizontal').recolor_ascii(asc, _prs).split('\n'), 'Horizontal'.center(asc_width)],
-            [*ColorAlignment('vertical').recolor_ascii(asc, _prs).split('\n'), 'Vertical'.center(asc_width)],
+        fore_back = get_fore_back()
+        arrangements = [
+            ('Horizontal', ColorAlignment('horizontal', fore_back=fore_back)),
+            ('Vertical', ColorAlignment('vertical'))
         ]
         ascii_per_row = TERM_LEN // (asc_width + 2)
 
         # Random color schemes
-        # ascii_indices =
         pis = list(range(len(_prs.unique_colors().colors)))
-        while len(pis) < len(set(re.findall('(?<=\\${c)[0-9](?=})', asc))):
+        slots = len(set(re.findall('(?<=\\${c)[0-9](?=})', asc)))
+        while len(pis) < slots:
             pis += pis
-        perm = list(permutations(pis))
+        perm = {p[:slots] for p in permutations(pis)}
         random_count = ascii_per_row * 2 - 2
-        choices = random.sample(perm, random_count)
-        choices = [{i: n for i, n in enumerate(c)} for c in choices]
-        asciis += [[*ColorAlignment('custom', r).recolor_ascii(asc, _prs).split('\n'), f'random{i}'.center(asc_width)]
-                   for i, r in enumerate(choices)]
+        if random_count > len(perm):
+            choices = perm
+        else:
+            choices = random.sample(perm, random_count)
+        choices = [{i + 1: n for i, n in enumerate(c)} for c in choices]
+        arrangements += [(f'random{i}', ColorAlignment('custom', r)) for i, r in enumerate(choices)]
+        asciis = [[*ca.recolor_ascii(asc, _prs).split('\n'), k.center(asc_width)] for k, ca in arrangements]
 
         while asciis:
             current = asciis[:ascii_per_row]
@@ -213,6 +228,8 @@ def create_config() -> Config:
             [printc('  '.join(line)) for line in zip(*current)]
             print()
 
+        printc(f'&a5. Let\'s choose a color arrangement!')
+        printc(f'You can choose standard horizontal or vertical alignment, or use one of the random color schemes.')
         print('You can type "roll" to randomize again.')
         print()
         choice = literal_input(f'Your choice?', ['horizontal', 'vertical', 'roll'] + [f'random{i}' for i in range(random_count)], 'horizontal')
@@ -220,12 +237,13 @@ def create_config() -> Config:
         if choice == 'roll':
             continue
 
-        if choice in ['horizontal', 'vertical']:
-            color_alignment = ColorAlignment(choice)
-        elif choice.startswith('random'):
-            color_alignment = ColorAlignment('custom', choices[int(choice[6])])
+        # Save choice
+        arrangement_index = {k.lower(): ca for k, ca in arrangements}
+        if choice in arrangement_index:
+            color_alignment = arrangement_index[choice]
         else:
-            raise NotImplementedError()
+            print('Invalid choice.')
+            continue
 
         break
 
@@ -255,10 +273,9 @@ def run():
     parser.add_argument('--c-scale', dest='scale', help=f'Lighten colors by a multiplier', type=float)
     parser.add_argument('--c-set-l', dest='light', help=f'Set lightness value of the colors', type=float)
     parser.add_argument('-V', '--version', dest='version', action='store_true', help=f'Check version')
-    parser.add_argument('--debug', action='store_true', help=color(f'Debug mode'))
-    parser.add_argument('--debug-list', help=color(f'Debug recommendations'))
-    parser.add_argument('--test-distro', help=color(f'Test for a specific distro'))
-    parser.add_argument('--test-print', action='store_true', help=color(f'Test print distro ascii art only'))
+    parser.add_argument('--debug', action='store_true', help=f'Debug mode')
+    parser.add_argument('--test-distro', help=f'Test for a specific distro')
+    parser.add_argument('--test-print', action='store_true', help=f'Test print distro ascii art only')
 
     args = parser.parse_args()
 
@@ -306,16 +323,5 @@ def run():
     if config.lightness:
         preset = preset.set_light_dl(config.lightness)
 
-    # Debug recommendations
-    if args.debug_list:
-        distro = args.debug_list
-        ca = color_alignments[distro]
-
-        print(distro)
-        GLOBAL_CFG.override_distro = distro
-        asciis = [ca.recolor_ascii(get_distro_ascii(distro), p).split('\n') for p in list(PRESETS.values())[:3]]
-        [printc('  '.join(line)) for line in zip(*asciis)]
-        return
-
     # Run
     run_neofetch(preset, config.color_align)

hyfetch/neofetch_util.py

@@ -127,7 +127,7 @@ def get_command_path() -> str:
 
     :return: Command path
     """
-    return pkg_resources.resource_filename(__name__, 'scripts/neofetch_mod.sh')
+    return pkg_resources.resource_filename(__name__, 'scripts/neowofetch')
 
 
 def get_distro_ascii(distro: str | None = None) -> str:
@@ -150,7 +150,17 @@ def get_distro_ascii(distro: str | None = None) -> str:
     return normalize_ascii(check_output([get_command_path(), cmd]).decode().strip())
 
 
+def get_distro_name():
+    return check_output([get_command_path(), 'ascii_distro_name']).decode().strip()
+
+
 def run_neofetch(preset: ColorProfile, alignment: ColorAlignment):
+    """
+    Run neofetch with colors
+
+    :param preset: Color palette
+    :param alignment: Color alignment settings
+    """
     asc = get_distro_ascii()
     w, h = ascii_size(asc)
     asc = alignment.recolor_ascii(asc, preset)
@@ -179,12 +189,26 @@ def run_neofetch(preset: ColorProfile, alignment: ColorAlignment):
             subprocess.run(full_cmd)
 
 
-# Color alignment recommendations
-color_alignments = {
-    'fedora': ColorAlignment('horizontal', fore_back=(2, 1)),
-    'ubuntu': ColorAlignment('horizontal', fore_back=(2, 1)),
-    'NixOS.*': ColorAlignment('custom', {1: 1, 2: 0}),
-    # 'arch': ColorAlignment('horizontal'),
-    # 'centos': ColorAlignment('horizontal'),
+def get_fore_back(distro: str | None = None) -> tuple[int, int] | None:
+    """
+    Get recommended foreground-background configuration for distro, or None if the distro ascii is
+    not suitable for fore-back configuration.
+
+    :return:
+    """
+    if not distro and GLOBAL_CFG.override_distro:
+        distro = GLOBAL_CFG.override_distro
+    if not distro:
+        distro = get_distro_name().lower()
+    for k, v in fore_back.items():
+        if distro.startswith(k.lower()):
+            return v
+    return None
+
+
+# Foreground-background recommendation
+fore_back = {
+    'fedora': (2, 1),
+    'ubuntu': (2, 1),
 }
 

neofetch

@@ -780,41 +780,41 @@ image_source="auto"
 # Default: 'auto'
 # Values:  'auto', 'distro_name'
 # Flag:    --ascii_distro
-# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS,
+# NOTE: AIX, Asahi, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS,
 #       Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft,
 #       ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch,
 #       Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight,
-#       Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS,
+#       Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, CenterOS, Chakra, ChaletOS,
 #       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, Exherbo, Fedora, Feren, Finnix, 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,
+#       gNewSense, GNOME, GNU, GoboLinux, GrapheneOS, Grombyang, Guix, Haiku, Huayra,
+#       HydroOS, Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora,
 #       KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE,
 #       Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui,
-#       Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD,
-#       Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD,
+#       Mer, Minix, MIRACLE_LINUX, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD,
+#       Netrunner, Nitrux, NixOS, NomadBSD, Nurunner, NuTyX, OBRevenge, OpenBSD,
 #       openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt,
-#       osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix,
+#       osmc, Oracle, Orchid, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix,
 #       TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS,
 #       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,
+#       Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, ShastraOS, Scientific, Septor,
 #       SereneLinux, SharkLinux, Siduction, SkiffOS, 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, VNux, LangitKetujuh, semc,
+#       Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu Touch, Ubuntu-MATE,
+#       Ubuntu-Studio, Ubuntu-Sway, Ubuntu, Ultramarine, 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.
 # NOTE: Ubuntu has flavor variants.
 #       Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME,
 #       Ubuntu-Studio, Ubuntu-Mate  or Ubuntu-Budgie to use the flavors.
-# NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu,
-#       CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android,
+# NOTE: "AOSC OS/Retro", Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu,
+#       CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, Orchid, android,
 #       Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola,
 #       Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS,
 #       Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian,
@@ -999,6 +999,13 @@ get_distro() {
                     *) distro="OS Elbrus $(< /etc/mcst_version)"
                 esac
 
+            elif [[ -f /etc/NIXOS ]]; then
+                case $distro_shorthand in
+                    on) distro="NixOS $(nixos-version | awk '{print substr($1,0,5),$2}')" ;;
+                    tiny) distro="NixOS" ;;
+                    *) distro="NixOS $(nixos-version)" ;;
+                esac
+
             elif type -p pveversion >/dev/null; then
                 case $distro_shorthand in
                     on|tiny) distro="Proxmox VE" ;;
@@ -1034,6 +1041,9 @@ get_distro() {
                     off)  distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;;
                 esac
 
+                # Workaround for NomadBSD.
+                [[ $distro = "FreeBSD"* ]] && [[ -f /usr/bin/nomadbsd-sysinfo ]] && distro=NomadBSD
+
             elif [[ -f /etc/GoboLinuxVersion ]]; then
                 case $distro_shorthand in
                     on|tiny) distro=GoboLinux ;;
@@ -1124,6 +1134,15 @@ get_distro() {
             distro=$(trim_quotes "$distro")
             distro=${distro/NAME=}
 
+            if [[ -f /usr/bin/system-image-cli ]]; then
+            	local ut_ota
+                ut_ota=$(system-image-cli -i | awk '/version tag:/ { print $3 }');
+                distro="Ubuntu Touch $ut_ota";
+
+                # There's a weird UT bug where the HOSTNAME is set to android.
+                HOSTNAME=$(hostname);
+            fi
+
             # Get Ubuntu flavor.
             if [[ $distro == "Ubuntu"* ]]; then
                 case $XDG_CONFIG_DIRS in
@@ -1134,6 +1153,7 @@ get_distro() {
                     *"Lubuntu"*)  distro=${distro/Ubuntu/Lubuntu} ;;
                     *"budgie"*)   distro=${distro/Ubuntu/Ubuntu Budgie} ;;
                     *"cinnamon"*) distro=${distro/Ubuntu/Ubuntu Cinnamon} ;;
+                    *"ubuntusway"*) distro=${distro/Ubuntu/Ubuntu Sway} ;;
                 esac
             fi
         ;;
@@ -1155,6 +1175,7 @@ get_distro() {
                 10.16*) codename="macOS Big Sur" ;;
                 11.*)  codename="macOS Big Sur" ;;
                 12.*)  codename="macOS Monterey" ;;
+                13.*)  codename="macOS Ventura" ;;
                 *)      codename=macOS ;;
             esac
 
@@ -1549,6 +1570,7 @@ get_packages() {
             has kiss       && tot kiss l
             has cpt-list   && tot cpt-list
             has pacman-key && tot pacman -Qq --color never
+            has click      && tot click list
             has dpkg       && tot dpkg-query -f '.\n' -W
             has xbps-query && tot xbps-query -l
             has apk        && tot apk info
@@ -1781,7 +1803,7 @@ get_de() {
 
         Windows)
             case $distro in
-                *"Windows 10"*)
+                *"Windows 10"*|*"Windows 11"*)
                     de=Fluent
                 ;;
 
@@ -2210,6 +2232,18 @@ get_cpu() {
                     [[ -z "$cpu" ]] && cpu="$(awk -F':' '/family/ {printf $2; exit}' "$cpu_file")"
                 ;;
 
+                "loongarch64")
+                    cpu="$(awk -F':' '/Model/ {print $2; exit}' "$cpu_file")"
+                ;;
+
+                "arm"* | "aarch64")
+                    cpu="$(lscpu | awk -F': ' '/Vendor ID/ {print $2; exit}' ) $(lscpu | awk -F': ' '/Model name/ {print $2; exit}')"
+                ;;
+                
+                "riscv"*)
+                    cpu="$(awk -F': ' '/uarch/ {print $2; exit}' "$cpu_file")"
+                ;;
+		
                 *)
                     cpu="$(awk -F '\\s*: | @' \
                             '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ {
@@ -2453,7 +2487,7 @@ get_cpu() {
     cpu="${cpu//, * Compute Cores}"
     cpu="${cpu//Core / }"
     cpu="${cpu//(\"AuthenticAMD\"*)}"
-    cpu="${cpu//with Radeon * Graphics}"
+    cpu="${cpu//with Radeon*Graphics}"
     cpu="${cpu//, altivec supported}"
     cpu="${cpu//FPU*}"
     cpu="${cpu//Chip Revision*}"
@@ -3311,6 +3345,7 @@ get_term() {
     [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && term="TosWin2"
     [[ "$SSH_CONNECTION" ]] && term="$SSH_TTY"
     [[ "$WT_SESSION" ]]     && term="Windows Terminal"
+    [[ "$TERMUX_VERSION" ]] && term="Termux $TERMUX_VERSION"
 
     # Check $PPID for terminal emulator.
     while [[ -z "$term" ]]; do
@@ -3598,6 +3633,10 @@ END
                          "$termite_config")"
         ;;
 
+        "Termux $TERMUX_VERSION")
+            term_font=$(fc-scan /data/data/com.termux/files/home/.termux/font.ttf|grep fullname:|cut -d '"' -f2)
+            ;;
+
         urxvt|urxvtd|rxvt-unicode|xterm)
             xrdb=$(xrdb -query)
             term_font=$(grep -im 1 -e "^${term/d}"'\**\.*font:' -e '^\*font:' <<< "$xrdb")
@@ -3769,6 +3808,7 @@ get_battery() {
             # We use 'prin' here so that we can do multi battery support
             # with a single battery per line.
             for bat in "/sys/class/power_supply/"{BAT,axp288_fuel_gauge,CMB}*; do
+                [[ -f ${bat}/capacity && -f ${bat}/status ]] || continue
                 capacity="$(< "${bat}/capacity")"
                 status="$(< "${bat}/status")"
 
@@ -3944,8 +3984,7 @@ get_gpu_driver() {
             gpu_driver="${gpu_driver%, }"
 
             if [[ "$gpu_driver" == *"nvidia"* ]]; then
-                gpu_driver="$(< /proc/driver/nvidia/version)"
-                gpu_driver="${gpu_driver/*Module  }"
+                gpu_driver="$(< /sys/module/nvidia/version)"
                 gpu_driver="NVIDIA ${gpu_driver/  *}"
             fi
         ;;
@@ -4724,11 +4763,11 @@ set_text_colors() {
         bar_color_elapsed="$(color "$bar_color_elapsed")"
     fi
 
-    case ${bar_color_total}${1} in
-        distro[736]) bar_color_total=$(color "$1") ;;
-        distro[0-9]) bar_color_total=$(color "$2") ;;
-        *)           bar_color_total=$(color "$bar_color_total") ;;
-    esac
+    if [[ "$bar_color_total" == "distro" ]]; then
+        bar_color_total="$(color fg)"
+    else
+        bar_color_total="$(color "$bar_color_total")"
+    fi
 }
 
 color() {
@@ -5148,7 +5187,7 @@ 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, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android,
+                                NOTE: AIX, Asahi, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android,
                                 instantOS, Antergos, antiX, \"AOSC OS\", \"AOSC OS/Retro\",
                                 Apricity, ArchCraft, ArcoLinux, ArchBox, ARCHlabs, ArchStrike,
                                 XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig,
@@ -5157,25 +5196,25 @@ 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, Exherbo, Fedora, Feren, Finnix, FreeBSD, FreeMiNT, Frugalware,
                                 Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU,
-                                GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, iglunix, janus, Kali,
+                                GoboLinux, GrapheneOS, Grombyang, Guix, Haiku, Huayra, Hyperbola, iglunix, janus, Kali,
                                 KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE,
                                 LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos,
-                                Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint,
+                                Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, MIRACLE_LINUX, LinuxMint,
                                 Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux,
-                                NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana,
-                                openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle,
+                                NixOS, NomadBSD, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana,
+                                openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, Orchid,
                                 OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS,
                                 PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS,
                                 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,
+                                sabotage, Sabayon, Sailfish, SalentOS, ShastraOS, Scientific, Septor,
                                 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, VNux, LangitKetujuh, semc,
+                                Ubuntu-Studio, Ubuntu-Sway, Ubuntu, Ultramarine, 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.
@@ -5187,8 +5226,8 @@ ASCII:
                                 NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME,
                                 Ubuntu-Studio, Ubuntu-Mate  or Ubuntu-Budgie to use the flavors.
 
-                                NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu,
-                                CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android,
+                                NOTE: \"AOSC OS/Retro\", Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu,
+                                CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, Orchid, android,
                                 Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola,
                                 Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS,
                                 Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian,
@@ -5561,15 +5600,41 @@ h//NNNNh  ossss` +h  md- .hm/ `sNNNNN:+y
 EOF
         ;;
 
-	"Aperio GNU/Linux"*)
-	    set_colors 255
-	    read -rd '' ascii_data <<'EOF'
+    "Aperio GNU/Linux"*)
+        set_colors 255
+        read -rd '' ascii_data <<'EOF'
 ${c2}
  _.._  _ ._.. _
 (_][_)(/,[  |(_)
    |   GNU/Linux
 EOF
 	;;
+	
+        "Asahi"*)
+            set_colors 3 2 1 8 7 6 4
+            read -rd '' ascii_data <<'EOF'
+${c1}                   ##  ${c2}**                 
+                ${c1}*####${c2}****.                
+                  ${c1}###${c2},                     
+               ${c3}...,${c1}/#${c3},,,..                
+          ${c3}/*,,,,,,,,${c1}*${c3},........${c4},,          
+        ${c3},((((((//*,,,,,,,,${c4},......         
+       ${c3}((((((((((((((${c5}%..${c4}..........       
+     ${c3},(((((((((((((((${c5}@@(${c4}............      
+    ${c3}(((((((((((((((((${c5}@@@@/${c4}............    
+  ${c3},((((((((((((((((((${c5}@@@@@&*${c4}...........   
+ ${c3}((((((((((((((((((((${c5}@@@@@@@&${c4},........... 
+${c3}(((((((((((((((((((((${c5}@@@${c6}&%&${c5}@@@%${c4},..........
+ ${c3}/(((((((((((((((((((${c5}@@@${c6}&%%&${c5}@@@@(${c4}........ 
+    ${c3},((((((((((((((((${c5}@@@${c6}&&${c5}@@&/&@@@/${c4}..     
+        ${c3}/((((((((((((${c5}@@@@@@/${c4}.../&&        
+           ${c3}.(((((((((${c5}@@@@(${c4}....            
+               ${c3}/(((((${c5}@@#${c4}...               
+                  ${c3}.((${c4}&,                   
+                   
+
+EOF
+    ;;
 
         "Hash"*)
             set_colors 123
@@ -5872,6 +5937,21 @@ ${c2}          .........
   ${c3}################
 EOF
         ;;
+        
+        "aoscosretro_small")
+            set_colors 4 7 1 3
+            read -rd '' ascii_data <<'EOF'
+${c2}    _____   ${c1}_____${c2} 
+  -'     '-${c1}|     |${c2}
+ /     ___ ${c1}|     |${c2}
+|     / _ \\${c1}|_____|${c2}
+'    / /_\\ \\     
+ \\  / _____ \\${c4}___ 
+  ${c3}|${c2}/_/  ${c3}|   ${c4}|   | 
+  ${c3}|     |   ${c4}|___| 
+  ${c3}|_____|         
+EOF
+        ;;
 
         "AOSC OS"*)
             set_colors 4 7 1
@@ -6641,6 +6721,24 @@ ${c2}              <><><><>
 EOF
         ;;
 
+        "Center"*)
+            read -rd '' ascii_data <<'EOF'
+${c2}                    .
+                    o,
+            .       d,       .
+            ';'   ..d;..  .cl'
+              .:; 'oldO,.oo.
+              ..,:,xKXxoo;'.
+        ,;;;;;ldxkONMMMXxkxc;;;;;.
+        .....':oddXWMNOxlcl:......
+               .:dlxk0c;:. .
+              :d:.,xcld,.,:.
+            ;l,    .l;     ';'
+                   .o;
+                    l,
+EOF
+                ;;
+
         "Chakra"*)
             set_colors 4 5 7 6
             read -rd '' ascii_data <<'EOF'
@@ -7495,6 +7593,29 @@ ${c1} `----------`
 EOF
         ;;
 
+        "Finnix"*)
+            set_colors 4 7 7
+            read -rd '' ascii_data <<'EOF'
+${c1}            ,,:;;;;:,,
+        ,;*%S########S%*;,
+      ;?#################S?:
+    :%######################?:
+   +##########################;
+  +############################;
+ :#############.**,#############,
+ *###########+      +###########+
+ ?##########  ${c3}Finnix${c1}  ##########*
+ *###########,      ,###########+
+ :#############%..%#############,
+  *############################+
+   *##########################+
+    ;S######################%:
+     ,+%##################%;
+        :+?S##########S?+:
+            ,:;++++;:,
+EOF
+        ;;
+
         "freebsd_small")
             set_colors 1 7 3
             read -rd '' ascii_data <<'EOF'
@@ -7813,6 +7934,35 @@ ${c1}  _____       _
 EOF
         ;;
 
+        "GrapheneOS"*)
+            set_colors 7 4
+            read -rd '' ascii_data <<'EOF'
+${c1}                        B?
+                        G~
+                        G~&
+                      G!^:^?#
+                     &^.:::.J
+    &PG&          #G5JJ7~^~?JY5B&          #PG
+     B5JJPGJ77YG5JYP#   &&   &B5JYPGJ7?YG5JYP#
+        &Y..::.:P&               &?..::.:G
+         #!::::?                  B~::::J
+           B~J#                     B!?#
+            !P                       75
+            !P                       75
+            !5                       7Y
+         &Y~:^!P                  &J~:^!P
+         P..::.:B                 Y..::.:#
+      #PYJJ~^^!JJYP#          &B5YJ?~^^!JJYG#
+    &YYG#   &&   #PYJ5G5??JGGYJ5G&   &&   #PYP
+                     B^.::..7&
+                      J::::^G
+                       #Y^G&
+                        B~
+                        G!
+                        #
+EOF
+        ;;
+
         "Grombyang"*)
             set_colors 4 2 1
             read -rd '' ascii_data <<'EOF'
@@ -8687,6 +8837,28 @@ ${c2}   -sdhyo+:-`                -/syymm:
 EOF
         ;;
 
+        "MIRACLE LINUX"* | "MIRACLE_LINUX"*)
+            set_colors 29
+            read -rd '' ascii_data <<'EOF'
+${c1}            ,A
+          .###
+     .#' .####   .#.
+   r##:  :####   ####.
+  +###;  :####  ######C
+  :####:  #### ,######".#.
+.# :####. :### #####'.#####.
+##: `####. ### ###'.########+.
+#### `####::## ##'.#######+'
+ ####+.`###i## #',####:'
+ `+###MI`##### 'l###:'
+   `+####+`### ;#E'
+      `+###:## #'
+         `:### '
+           '##
+            ';
+EOF
+        ;;
+
         "linuxmint_small"*)
             set_colors 2 7
             read -rd '' ascii_data <<'EOF'
@@ -8960,25 +9132,34 @@ EOF
         "nixos_old"*)
             set_colors 4 6
             read -rd '' ascii_data <<'EOF'
-${c1}          ::::.    ${c2}':::::     ::::'
-${c1}          ':::::    ${c2}':::::.  ::::'
-${c1}            :::::     ${c2}'::::.:::::
-${c1}      .......:::::..... ${c2}::::::::
-${c1}     ::::::::::::::::::. ${c2}::::::    ${c1}::::.
-    ::::::::::::::::::::: ${c2}:::::.  ${c1}.::::'
-${c2}           .....           ::::' ${c1}:::::'
-${c2}          :::::            '::' ${c1}:::::'
-${c2} ........:::::               ' ${c1}:::::::::::.
-${c2}:::::::::::::                 ${c1}:::::::::::::
-${c2} ::::::::::: ${c1}..              ${c1}:::::
-${c2}     .::::: ${c1}.:::            ${c1}:::::
-${c2}    .:::::  ${c1}:::::          ${c1}'''''    ${c2}.....
-    :::::   ${c1}':::::.  ${c2}......:::::::::::::'
-     :::     ${c1}::::::. ${c2}':::::::::::::::::'
-${c1}            .:::::::: ${c2}'::::::::::
-${c1}           .::::''::::.     ${c2}'::::.
-${c1}          .::::'   ::::.     ${c2}'::::.
-${c1}         .::::      ::::      ${c2}'::::.
+${c1}              ____       ${c2}_______        ____
+${c1}             /####\      ${c2}\######\      /####\
+${c1}             ######\      ${c2}\######\    /#####/
+${c1}             \######\      ${c2}\######\  /#####/
+${c1}              \######\      ${c2}\######\/#####/    ${c1}/\
+${c1}               \######\      ${c2}\###########/    ${c1}/##\
+${c1}        ________\######\______${c2}\#########/    ${c1}/####\
+${c1}       /#######################${c2}\#######/    ${c1}/######
+${c1}      /#########################${c2}\######\   ${c1}/######/
+${c1}     /###########################${c2}\######\ ${c1}/######/
+${c1}     ¯¯¯¯¯¯¯¯¯¯¯¯${c2}/######/${c1}¯¯¯¯¯¯¯¯¯${c2}\######${c1}/######/
+${c2}                /######/           ${c2}\####${c1}/######/________
+${c2}  _____________/######/             ${c2}\##${c1}/################\
+${c2} /###################/               ${c2}\${c1}/##################\
+${c2} \##################/${c1}\               /###################/
+${c2}  \################/${c1}##\             /######/¯¯¯¯¯¯¯¯¯¯¯¯¯
+${c2}   ¯¯¯¯¯¯¯¯/######/${c1}####\           /######/
+${c2}          /######/${c1}######\${c2}_________${c1}/######/${c2}____________
+${c2}         /######/ ${c1}\######\${c2}###########################/
+${c2}        /######/   ${c1}\######\${c2}#########################/
+${c2}        ######/    ${c1}/#######\${c2}#######################/
+${c2}        \####/    ${c1}/#########\${c2}¯¯¯¯¯¯\######\¯¯¯¯¯¯¯¯
+${c2}         \##/    ${c1}/###########\${c2}      \######\
+${c2}          \/    ${c1}/#####/\######\${c2}      \######\
+${c1}               ${c1}/#####/  \######\${c2}      \######\
+${c1}              ${c1}/#####/    \######\${c2}      \######
+${c1}              ${c1}\####/      \######\${c2}      \####/
+${c1}               ${c1}¯¯¯¯        ¯¯¯¯¯¯¯${c2}       ¯¯¯¯
 EOF
         ;;
 
@@ -9008,6 +9189,25 @@ ${c1}         ▝▀▀▀    ▀▀▀▀▘       ${c2}▀▀▀▘
 EOF
         ;;
 
+        "NomadBSD"*)
+            set_colors 4
+            read -rd '' ascii_data <<'EOF'
+${c1}         _======__
+     (===============\\
+   (===================\\
+   _              _---__
+  (=               ====-
+ (=                ======
+ (==                ======
+ (==                ======
+ (==\\ \\=-_      _=/ /====/
+  (==\\ \\========/ /====/  /====-_
+   (==\\ \\=====/ /==/   /===--
+/================/  /===-
+\\===========/
+EOF
+        ;;
+
         "Nurunner"*)
             set_colors 4
             read -rd '' ascii_data <<'EOF'
@@ -9316,6 +9516,51 @@ ${c1}
 EOF
         ;;
 
+        "orchid_small"*)
+            set_colors 255 127
+            read -rd '' ascii_data <<'EOF'
+${c2}                       :##:
+                     -#${c1}@@@@${c2}#-
+                    #${c1}@@${c2}=..=${c1}@@${c2}#
+                    +${c1}@@${c2}-  -${c1}@@${c2}+
+               -#${c1}@@${c2}*..*${c1}@${c2}..${c1}@${c2}*..*${c1}@@${c2}#-
+             :#${c1}@@${c2}*+%${c1}@${c2}= .  . =${c1}@${c2}%+*${c1}@@${c2}#:
+           +${c1}@@@${c2}:    :-.    .-:   :${c1}@@@${c2}+
+             :#${c1}@@${c2}*+%${c1}@${c2}= .  . =${c1}@${c2}%+*${c1}@@${c2}#:
+               -#${c1}@@${c2}*..*${c1}@${c2}..${c1}@${c2}*..*${c1}@@${c2}#-
+                    +${c1}@@${c2}-  -${c1}@@${c2}+
+                    #${c1}@@${c2}=..=${c1}@@${c2}#
+                     -#${c1}@@@@${c2}#-
+                       :##:
+EOF
+        ;;
+
+        "orchid"*)
+            set_colors 255 127 127
+            read -rd '' ascii_data <<'EOF'
+${c2}                  .==.                  
+                .-${c3}#${c1}@@${c3}#${c2}-.                
+              .-${c3}##${c1}@@@@${c3}##${c2}-.              
+            .-${c3}##${c1}@@@@@@@@${c3}##${c2}-.            
+           :*${c1}@@@@@${c3}####${c1}@@@@@${c2}*:           
+         ..:*${c1}@@@@${c2}==--==${c1}@@@@${c2}*:..         
+      .-*${c1}%%${c3}#${c2}==${c3}#${c1}@@${c3}#${c2}====${c3}#${c1}@@${c3}#${c2}==${c3}#${c1}%%${c2}*-.      
+    .-${c3}#${c1}@@@@@${c3}##${c2}==${c3}#${c1}@@${c2}++${c1}@@${c3}##${c2}==${c3}#${c1}@@@@@${c3}#${c2}-.    
+  .-${c3}#${c1}@@@@@${c2}#${c1}@@@${c3}#${c2}++#====${c3}#${c2}++#${c1}@@@${c2}#${c1}@@@@@${c3}#${c2}-.  
+.-${c3}#${c1}@@@@@${c3}#${c2}-==**${c3}###${c2}+:--:+${c3}###${c2}**==-${c3}#${c1}@@@@@${c3}#${c2}-.
+.-${c3}#${c1}@@@@@${c3}#${c2}-==**${c3}###${c2}+:--:+${c3}###${c2}**==-${c3}#${c1}@@@@@${c3}#${c2}-.
+  .-${c3}#${c1}@@@@@${c2}#${c1}@@@${c3}#${c2}++#====${c3}#${c2}++#${c1}@@@${c2}#${c1}@@@@@${c3}#${c2}-.  
+    .-${c3}#${c1}@@@@@${c3}##${c2}==${c3}#${c1}@@${c2}++${c1}@@${c3}##${c2}==${c3}#${c1}@@@@@${c3}#${c2}-.    
+      .-*${c1}%%${c3}#${c2}==${c3}#${c1}@@${c3}#${c2}====${c3}#${c1}@@${c3}#${c2}==${c3}#${c1}%%${c2}*-.     
+         ..:*${c1}@@@@${c2}==--==${c1}@@@@${c2}*:..       
+           :*${c1}@@@@@${c3}####${c1}@@@@@${c2}*:          
+            .-${c3}##${c1}@@@@@@@@${c3}##${c2}-.            
+              .-${c3}##${c1}@@@@${c3}##${c2}-.              
+                .-${c3}#${c1}@@${c3}#${c2}-.               
+                  .==.       
+EOF
+        ;;
+
         "OS Elbrus"*)
             set_colors 4 7 3
             read -rd '' ascii_data <<'EOF'
@@ -10332,6 +10577,31 @@ ${c2}             `:smMM${c4}yy${c3}MMNy/`
 EOF
         ;;
 
+        "ShastraOS"*)
+            set_colors 6
+            read -rd '' ascii_data <<'EOF'
+${c1}                          ..,;;,'.              
+                       ':oo.     ;o:            
+                     :o,           ol           
+                   .oo        ..';co:           
+                   ooo',;:looo;                 
+               .;lddl                           
+             cx   .xl     .c:'                  
+            dd     xx     xx ,d;                
+           .xd     cx.    xx   dd.              
+            cx:    .xo    xx    ,x:             
+             'xl    xx    cx'    .xl            
+               xd,  xx    .xd     dx.           
+                .xo:xx     xx    .xx            
+                   'c      xx:.'lx:             
+                      ..,;cxxxo                 
+             .';:codxxl   lxo                   
+           cd.           'xo                    
+           :o,         'ld                      
+            .oc'...';lo      
+EOF
+        ;;
+
         "Scientific"*)
             set_colors 4 7 1
             read -rd '' ascii_data <<'EOF'
@@ -10948,6 +11218,20 @@ ${c4}       `soooo.     .oooo`
 EOF
         ;;
 
+        "Ubuntu Touch"*)
+            set_colors 3 7
+            read -rd '' ascii_data <<'EOF'
+${c1}
+     ###############
+   ##               ##
+  ##  ${c2}##${c1}         ${c2}##${c1}  ##
+  ##  ${c2}##${c1}  ${c2}#${c1}   ${c2}#${c1}  ${c2}##${c1}  ##
+  ##       ${c2}###${c1}       ##
+   ##               ##
+     ###############
+EOF
+        ;;
+
         "Ubuntu MATE"* | "Ubuntu-MATE"*)
             set_colors 2 7
             read -rd '' ascii_data <<'EOF'
@@ -11024,7 +11308,33 @@ ${c1}              ..-::::::-.`
               ..-::::::-..
 EOF
         ;;
-
+        
+        "Ubuntu Sway"* | "Ubuntu-Sway")
+            set_colors 6 7
+            read -rd '' ascii_data <<'EOF'
+${c1}            .-/+oossssoo+\-.
+        ´:+ssssssssssssssssss+:`
+      -+ssssssssssssssssss${c2}yy${c1}ssss+-
+    .ossssssssssssssssss${c2}dMMMNyy${c1}ssso.
+   /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss\
+  +sssssssss${c2}hm${c1}ydMMMMMMMNdd${c2}ddy${c1}ssssssss+
+ /ssssssss${c2}hN${c1}MM${c2}M${c1}yh${c2}hyyyyhmNM${c1}MM${c2}Nh${c1}ssssssss\
+.ssssssss${c2}dM${c1}MM${c2}Nh${c1}ssssssssss${c2}hN${c1}MM${c2}Md${c1}ssssssss.
++sss${c2}yyyyyN${c1}MM${c2}Ny${c1}ssssssssssss${c2}yN${c1}MM${c2}My${c1}sssssss+
+ossy${c2}NMMMNy${c1}MM${c2}h${c1}ssssssssssssss${c2}hm${c1}mm${c2}h${c1}ssssssso
+ossy${c2}NMMMNy${c1}MM${c2}h${c1}sssssssssssssshmmmh${c1}ssssssso
++sss${c2}yyyyyN${c1}MM${c2}Ny${c1}ssssssssssss${c2}yN${c1}MM${c2}My${c1}sssssss+
+.ssssssss${c2}dM${c1}MM${c2}Nh${c1}ssssssssss${c2}hN${c1}MM${c2}Md${c1}ssssssss.
+ \ssssssss${c2}hN${c1}MM${c2}M${c1}yh${c2}hyyyyhdNM${c1}M${c2}MNh${c1}ssssssss/
+  +sssssssss${c2}dm${c1}ydMMMMMMMMdd${c2}ddy${c1}ssssssss+
+   \sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/
+    .ossssssssssssssssss${c2}dMMMNyy${c1}ssso.
+      -+sssssssssssssssss${c2}yy${c1}sss+-
+        `:+ssssssssssssssssss+:`
+            .-\+oossssoo+/-.
+EOF
+        ;;
+    
         "ubuntu_small")
             set_colors 1 7 3
             read -rd '' ascii_data <<'EOF'
@@ -11062,6 +11372,57 @@ oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso
             .-\+oossssoo+/-.
 EOF
         ;;
+        "Ultramarine Linux"* | "ultramarine"*)
+            set_colors 4 7
+            read -rd '' ascii_data <<'EOF'
+${c1}            .cd0NNNNNNNXOdc.            
+        .:xKNNNNNNNNNNNNNNNNKd;.        
+      ,dXNNNNNNNNNNNNNNNNNNNNNNNd,      
+    'ONNNNNNNNNNNNNNNNNNNNNNNNNNNNO'    
+  .xNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNk.  
+ .0NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN0. 
+.0NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN0.
+dNNNNNNNNNNNNWWWWWWWWNNNNNNNNNNNNNNNNNNd
+NNNNNNNNNNNNNW${c2}MMMMMMMM${c1}WWNNNNNNNNNNNNNNNN
+NNNNNNNNNNNNNNW${c2}MMMMMMMMM${c1}WWNNNNNNNNNNNNNN
+NNNNNNNNNNNNNNW${c2}MMMMMMMMMMMM${c1}WNNNNNNNNNNNN
+NNNNNNNNNNWWW${c2}MMMMMMMMMMMMMMMM${c1}WWWNNNNNNNX
+oNWWWW${c2}MMMMMMMMMMMMMMMMMMMMMMMMMMMM${c1}WWWNNo
+ OW${c2}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM${c1}WO 
+ .OW${c2}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM${c1}WO. 
+   lNW${c2}MMMMMMMMMMMMMMMMMMMMMMMMMMMM${c1}WNl   
+    .dNW${c2}MMMMMMMMMMMMMMMMMMMMMMMM${c1}WNd.    
+      .cKW${c2}MMMMMMMMMMMMMMMMMMMM${c1}WKc.      
+         'oOXWWW${c2}MMMMMMMM${c1}WWWXOl.         
+             ;lkXNNNNNNXkl'    
+EOF
+        ;;
+
+
+        "Univalent"*)
+            set_colors 6 6
+            read -rd '' ascii_data <<'EOF'
+${c1}
+   UUUUUUU                   UUUUUUU
+   UUUUUUU                   UUUUUUU
+   UUUUUUU         A         UUUUUUU
+   UUUUUUU        A|A        UUUUUUU
+   UUUUUUU       A | A       UUUUUUU
+   UUUUUUU      A  |  A      UUUUUUU
+   UUUUUUU     A|  |  |A     UUUUUUU
+   UUUUUUU    A |  |  | A    UUUUUUU
+   UUUUUUU    A |  |  | A    UUUUUUU
+   UUUUUUU    A |  |  | A    UUUUUUU
+   UUUUUUU    A |  |  | A    UUUUUUU
+   UUUUUUU    A |  |  | A    UUUUUUU
+   UUUUUUU    A |  |  | A    UUUUUUU
+    UUUUUUU   A |  |  | A   UUUUUUU
+     UUUUUUU  A |  |  | A  UUUUUUU
+       UUUUUUUAAAAAAAAAAAUUUUUUU
+          UUUUUUUUUUUUUUUUUUU
+             UUUUUUUUUUUUU
+EOF
+        ;;
 
         "Univention"*)
             set_colors 1 7
@@ -11089,6 +11450,32 @@ ${c1}         ./osssssssssssssssssssssso+-
 EOF
         ;;
 
+        "uwuntu"*)
+            set_colors 225 206 52
+            read -rd '' ascii_data <<'EOF'
+${c1}                                  &&
+                               &&&&&&&&
+   ,                  *&&&&&&  &&&&&&&&(
+    &%%%%&&&&     &&&&&&&&&&&&  ,&&&&&
+     %%${c2}%%%%&&${c1}&&&   ,&&&&&&&&&&&&&,   %&&&$&&&%%$%%%.
+     &%%%${c2}%&&&&&${c1}&&#   &,       &&&&&&${c2}&&&&&&&%%%${c1}%%
+      &%%&&${c2}&&&&${c1}&&&(               &&&${c2}&&&&&&%${c1}%%%
+       &&&&&${c2}&&&${c1}&%                  *&&${c2}&&&&&${c1}&&%
+    &&&/  &&&&${c3}\${c1}&                    ,${c3}/${c1}*.**
+ %&&&&&&&&  &&&${c3}⟩${c1}.,                *.${c3}⟨${c1}
+ %&&&&&&&&  &&${c3}/${c1}..      ${c3}/    \${c1}      ..${c3}\${c1}(&&&&&&
+   #&&&#%%%%.%%%(      ${c3}\_/\_/${c1}      (%%%.%%%%/
+        /%%%%%%%&&*              ,&&&%%%%%%&
+           &&&&&&&&           &&&&&&&&&&&
+            (&&&&&    &&&&&&&&&&&
+            ${c2}%%${c1}  &   &&&&&&&&&&&&  &&&&&&&
+           ${c2}%%%${c1}        #&&&&&&#   &&&&&&&&&
+ ${c2}%%%%%     %%${c1}                     #&&&&&(
+${c2}&%.      %%%${c1}
+  ${c2}%%%%%%%
+EOF
+        ;;
+
         "Venom"*)
             set_colors 8 4
             read -rd '' ascii_data <<'EOF'
@@ -11124,28 +11511,34 @@ EOF
         ;;
 
         "Void"*)
-            set_colors 2 8
+            set_colors 8 2 7
             read -rd '' ascii_data <<'EOF'
-${c1}                __.;=====;.__
-            _.=+==++=++=+=+===;.
-             -=+++=+===+=+=+++++=_
-        .     -=:``     `--==+=++==.
-       _vi,    `            --+=++++:
-      .uvnvi.       _._       -==+==+.
-     .vvnvnI`    .;==|==;.     :|=||=|.
-${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQm.
-${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE
-${c2}  -$QQQQmmU'  jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@'
-${c2}   -$WQ8Y${c1}nI:   ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@!
-${c1}     -1vvnvv.     `~+++`        ++|+++
-      +vnvnnv,                 `-|===
-       +vnvnvns.           .      :=-
-        -Invnvvnsi..___..=sv=.     `
-          +Invnvnvnnnnnnnnvvnn;.
-            ~|Invnvnvvnvvvnnv}+`
-               -~|{*l}*|~
+${c1}                        ..........
+                   .::::::::::::::::::..
+               ..:::::::::::::::::::::::::.
+                '::::::::::::::::::::::::::::.
+                  ':::::''      '':::::::::::::.
+${c3}         ..         ${c1}'                '':::::::::.
+${c3}        .||.                            ${c1}':::::::::
+${c3}       .|||||.                            ${c1}'::::::::
+${c3}      .|||||||:                             ${c1}::::::::
+${c3}      |||||||:          ${c1}.::::::::.           ::::::::
+${c2} ######${c3}||||||'   ${c2}##^ v##########v${c1}::. ${c2}#####  #############v
+${c2}  ######${c3}||||| ${c2}##^ v####${c1}::::::${c2}####v${c1}::${c2}#####  #####${c1}:::::${c2}#####
+${c2}   ######${c3}||${c2}##^   #####${c1}::::::${c2}#####${c1}::${c2}#####  #####${c1}:::::${c2}######
+${c2}    ######^${c3}||    ${c2}#####${c1}:::::${c2}####^${c1}::${c2}#####  #####${c1}:::::${c2}#####^
+${c2}     ##^${c3}|||||    ${c2}^###########^${c1}:::${c2}#####  ##############^
+${c3}      |||||||:          ${c1}'::::::::'          .::::::::
+${c3}      '|||||||:                            ${c1}.::::::::'
+${c3}       '|||||||:.                           ${c1}'::::::
+${c3}        '||||||||:.                           ${c1}':::
+${c3}         ':|||||||||.                .          ${c1}'
+${c3}           '|||||||||||:...    ...:||||.
+${c3}             ':||||||||||||||||||||||||||.
+${c3}                ':|||||||||||||||||||||||''
+${c3}                   '':||||||||||||||:''
+${c3}                          ''''''
 EOF
-
         ;;
 
         "VNux"*)
@@ -11239,7 +11632,7 @@ EOF
 
         *"[Windows 11]"*|*"on Windows 11"*|\
         "Windows 11"* |"windows11")
-            set_colors 6 7
+            set_colors 4 6 
             read -rd '' ascii_data <<'EOF'
 ${c1}
 ################  ################
@@ -11619,17 +12012,4 @@ get_print_custom_ascii() {
     echo "$ascii_data"
 }
 
-get_test_distro_ascii() {
-    # Load default config.
-    eval "$config"
-
-    distro="$CUSTOM_DISTRO"
-    ascii_distro=$distro
-    get_bold
-    get_distro_ascii
-
-    image_backend
-    dynamic_prompt
-}
-
 main "$@"

neofetch.1

@@ -309,20 +309,20 @@ bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS,
 Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres,
 Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS,
 Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary,
-EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD,
+EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, Finnix, FreeBSD,
 FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo,
-gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS,
-Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora,
+gNewSense, GNOME, GNU, GoboLinux, GrapheneOS, Grombyang, Guix, Haiku, Huayra,
+HydroOS, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora,
 KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE,
 Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui,
 Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD,
-Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD,
+Netrunner, Nitrux, NixOS, NomadBSD, Nurunner, NuTyX, OBRevenge, OpenBSD,
 openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt,
 osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix,
 TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS,
 Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS,
 Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa,
-sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor,
+sabotage, Sabayon, Sailfish, SalentOS, ShastraOS, Scientific, Septor,
 SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS,
 Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
 t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,

package.json

@@ -0,0 +1,25 @@
+{
+  "name": "neowofetch",
+  "version": "1.2.0",
+  "description": "Updated neofetch",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/hykilpikonna/neofetch.git"
+  },
+  "bin": {
+    "neowofetch": "neofetch"
+  },
+  "keywords": [
+    "neofetch",
+    "screenfetch"
+  ],
+  "author": "dylanaraps",
+  "contributors": [
+    "Azalea Gui <me@hydev.org> (https://github.com/hykilpikonna)"
+  ],
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/hykilpikonna/neofetch/issues"
+  },
+  "homepage": "https://github.com/hykilpikonna/neofetch#readme"
+}

setup.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import pathlib
 
 from setuptools import setup
@@ -38,4 +39,5 @@ setup(
             "hyfetch=hyfetch.main:run",
         ]
     },
+    scripts=['hyfetch/scripts/neowofetch']
 )