[U] Update distro list, generate man page

[U] Release v1.4.0
[U] Update readme
2022-08-12 20:29:57 -04:00 · 2022-08-12 20:27:38 -04:00 · 2022-08-12 20:11:44 -04:00 · 2022-08-12 19:51:58 -04:00 · 2022-08-12 19:41:43 -04:00 · 2022-08-12 15:25:51 +05:30
22 changed files with 3116 additions and 552 deletions
@@ -0,0 +1,24 @@
+name: Shellcheck
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  workflow_dispatch:
+
+jobs:
+  # Shellcheck
+  check:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      
+      - name: Install shellcheck
+        run: sudo apt-get update && sudo apt-get install -y shellcheck
+      
+      - name: Run shellcheck
+        run: |
+          shellcheck -V
+          shellcheck neofetch
+          ./neofetch
@@ -115,3 +115,4 @@ dmypy.json

 # Custom
 .idea
+._*
@@ -1,16 +0,0 @@
-language: bash
-sudo: required
-
-os:
-    - linux
-    - osx
-
-before_install:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi
-
-script:
-    - time ./neofetch --travis -v
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2244 -e SC2243 neofetch; fi
-    # Check for lines longer than 100 chars.
-    - if grep '.\{102\}' neofetch; then (exit 1); else (exit 0); fi
@@ -2,7 +2,15 @@

 neofetch with pride flags <3

-![image](https://user-images.githubusercontent.com/22280294/162614541-af2b4660-f1f7-4287-b978-1aa2266ac70f.png)
+<img src="https://user-images.githubusercontent.com/22280294/162614541-af2b4660-f1f7-4287-b978-1aa2266ac70f.png" width="60%">
+
+### 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 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 2: `npx neowofetch`
+* Method 3: `bash <(curl -sL neowofetch.hydev.org)`

 ## Installation

@@ -19,26 +27,22 @@ pip install hyfetch
 Currently, these distributions have existing packages for HyFetch:

 * ArchLinux: `yay -S hyfetch` (Thanks to @ Aleksana)
-* NixOS: `nix-env -i hyfetch` ([In Progress](https://github.com/NixOS/nixpkgs/pull/170309))
-* Guix: [In progress](https://issues.guix.gnu.org/54847#8-lineno27)
-
-Currently, if you're using NixOS, you can use HyFetch with `nix-env -if https://github.com/hykilpikonna/hyfetch/tarball/master -A hyfetch`
+* Nix: `nix-env -i hyfetch` (Thanks to @ YisuiDenghua)
+* Guix: `guix install hyfetch` (Thanks to @ WammKD)

 ## 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!

+If you want to use the updated `neofetch` without LGBTQ flags, check out [this section](https://github.com/hykilpikonna/hyfetch#running-updated-original-neofetch)
+
 #### Q: How do I change my config?

 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!

@@ -46,10 +50,223 @@ 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 interactive configurator for adjusting brightness
-* [ ] 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
+
+### Unpublished 1.4.0
+
+* 🌈 Add finsexual flag (#12)
+* 🚀 Addressed a total of 128 currently open pull requests from neofetch
+
+<details>
+  <summary>🖼️ Meta Changes</summary>  
+
+* Meta - Fixed shellcheck warnings in `neowofetch`
+* Meta - Moved shellcheck from travis to GitHub Actions
+* Meta - Created a script to automatically generate distro list
+* Colors - Allow RGB colors in neofetch `--ascii_colors` argument ([dylanaraps#1726](https://github.com/dylanaraps/neofetch/pull/1726))
+
+</details>
+
+<details>
+  <summary>🖼️ Distro/OS Support Changes</summary>  
+
+* Distro - Update Ubuntu logo ([dylanaraps#2125](https://github.com/dylanaraps/neofetch/pull/2125))
+* Distro - Add Exodia OS Predator ([dylanaraps#2174](https://github.com/dylanaraps/neofetch/pull/2174))
+* Distro - Add Parch ([dylanaraps#2045](https://github.com/dylanaraps/neofetch/pull/2045))
+* Distro - Add VzLinux ([dylanaraps#1971](https://github.com/dylanaraps/neofetch/pull/1971))
+* Distro - Add Twister OS ([dylanaraps#1890](https://github.com/dylanaraps/neofetch/pull/1890))
+* Distro - Add BlackPantherOS ([dylanaraps#1761](https://github.com/dylanaraps/neofetch/pull/1761))
+* Distro - Add TorizonCore ([dylanaraps#1744](https://github.com/dylanaraps/neofetch/pull/1744))
+* Distro - Add KrassOS ([dylanaraps#1631](https://github.com/dylanaraps/neofetch/pull/1631))
+* Distro - Add Synology DSM ([dylanaraps#1666](https://github.com/dylanaraps/neofetch/pull/1666))
+* Distro - Add MatuusOS ([dylanaraps#1902](https://github.com/dylanaraps/neofetch/pull/1902))
+* Distro - Add HarDClanZ Linux ([dylanaraps#1797](https://github.com/dylanaraps/neofetch/pull/1797))
+
+</details>
+
+<details>
+  <summary>🖼️ Device Support Changes</summary>
+
+* Host - Identify iMac, Mac mini, Mac Pro Models ([dylanaraps#1944](https://github.com/dylanaraps/neofetch/pull/1944))
+* Host - Identify FreeBSD host model ([dylanaraps#1588](https://github.com/dylanaraps/neofetch/pull/1588))
+* Font - Better font matching for st ([dylanaraps#1877](https://github.com/dylanaraps/neofetch/pull/1877))
+* Theme - Use XSETTINGS to get theme without a DE ([dylanaraps#1831](https://github.com/dylanaraps/neofetch/pull/1831))
+* Theme - Add QT theme detection ([dylanaraps#1713](https://github.com/dylanaraps/neofetch/pull/1713))
+* Theme - Add LeftWM theme detection ([dylanaraps#1963](https://github.com/dylanaraps/neofetch/pull/1963))
+* Cursor - Add cursor theme detection ([dylanaraps#1149](https://github.com/dylanaraps/neofetch/pull/1149))
+* Terminal - Improve NixOS terminal identification ([dylanaraps#1134](https://github.com/dylanaraps/neofetch/pull/1134))
+* Terminal - Use `/proc/.../cmdline` instead of `.../comm` ([dylanaraps#2034](https://github.com/dylanaraps/neofetch/pull/2034))
+* Packages - Improve scoop/choco package count ([dylanaraps#1642](https://github.com/dylanaraps/neofetch/pull/1642))
+
+</details>
+
+<details>
+  <summary>🖼️ Bug Fixes</summary>
+
+* Bug Fix - Fix prepended `=` for kitty ([dylanaraps#2116](https://github.com/dylanaraps/neofetch/pull/2116))
+* Bug Fix - Hide domain in hostname by default ([dylanaraps#2095](https://github.com/dylanaraps/neofetch/pull/2095))
+* Bug Fix - Respect TMPDIR if it exists ([dylanaraps#1891](https://github.com/dylanaraps/neofetch/pull/1891))
+* Bug Fix - Fix terminal size over slow connection ([dylanaraps#1895](https://github.com/dylanaraps/neofetch/pull/1895))
+* Bug Fix - Fix GPU detection for bumblebee dual-GPU ([dylanaraps#1131](https://github.com/dylanaraps/neofetch/pull/1131))
+* Bug Fix - Strip colors in ASCII length calculation ([dylanaraps#1543](https://github.com/dylanaraps/neofetch/pull/1543))
+
+</details>
+
+### 1.3.0
+
+<details>
+  <summary>🖼️ Ascii Art Changes</summary>  
+
+* Ascii - Improve Trisquel ([dylanaraps#1946](https://github.com/dylanaraps/neofetch/pull/1946))
+* Ascii - Improve LangitKetujuh ([dylanaraps#1948](https://github.com/dylanaraps/neofetch/pull/1948))
+* Ascii - Improve Artix small ([dylanaraps#1872](https://github.com/dylanaraps/neofetch/pull/1872))
+* Ascii - Update Archcraft ([dylanaraps#1919](https://github.com/dylanaraps/neofetch/pull/1919))
+
+</details>
+
+<details>
+  <summary>🖼️ Distro/OS Support Changes</summary>  
+
+* OS - Support Old macOS 10.4 and 10.5 ([dylanaraps#2151](https://github.com/dylanaraps/neofetch/pull/2151))
+* OS - Identify Hackintosh VM ([dylanaraps#2005](https://github.com/dylanaraps/neofetch/pull/2005))
+* Distro - Fix model detection for Ubuntu Touch ([dylanaraps#2167](https://github.com/dylanaraps/neofetch/pull/2167))
+* Distro - Add EncryptOS ([dylanaraps#2158](https://github.com/dylanaraps/neofetch/pull/2158))
+* Distro - Add BigLinux ([dylanaraps#2061](https://github.com/dylanaraps/neofetch/pull/2061))
+* Distro - Add AmogOS ([dylanaraps#1904](https://github.com/dylanaraps/neofetch/pull/1904))
+* Distro - Add CutefishOS ([dylanaraps#2054](https://github.com/dylanaraps/neofetch/pull/2054))
+* Distro - Add PearOS ([dylanaraps#2049](https://github.com/dylanaraps/neofetch/pull/2049))
+* Distro - Add FusionX ([dylanaraps#2011](https://github.com/dylanaraps/neofetch/pull/2011))
+* Distro - Add Q4OS ([dylanaraps#1973](https://github.com/dylanaraps/neofetch/pull/1973))
+* Distro - Add CachyOS ([dylanaraps#2026](https://github.com/dylanaraps/neofetch/pull/2026))
+* Distro - Add Soda Linux ([dylanaraps#2023](https://github.com/dylanaraps/neofetch/pull/2023))
+* Distro - Add Elive Linux ([dylanaraps#1957](https://github.com/dylanaraps/neofetch/pull/1957))
+* Distro - Add Uos ([dylanaraps#1991](https://github.com/dylanaraps/neofetch/pull/1991))
+* Distro - Add MassOS ([dylanaraps#1947](https://github.com/dylanaraps/neofetch/pull/1947))
+* Distro - Add CalinixOS ([dylanaraps#1988](https://github.com/dylanaraps/neofetch/pull/1988))
+* Distro - Add Kaisen Linux ([dylanaraps#1958](https://github.com/dylanaraps/neofetch/pull/1958))
+* Distro - Add yiffOS ([dylanaraps#1920](https://github.com/dylanaraps/neofetch/pull/1920))
+* Distro - Add Sulin ([dylanaraps#1896](https://github.com/dylanaraps/neofetch/pull/1896))
+* Distro - Add Wii Linux ([dylanaraps#1929](https://github.com/dylanaraps/neofetch/pull/1929))
+* Distro - Add Linspire ([dylanaraps#1905](https://github.com/dylanaraps/neofetch/pull/1905))
+* Distro - Add Ubuntu Kylin ([dylanaraps#1974](https://github.com/dylanaraps/neofetch/pull/1974))
+* Distro - Add OPNsense ([dylanaraps#1055](https://github.com/dylanaraps/neofetch/pull/1055))
+* Distro - Improve BSD machine arch detection ([dylanaraps#2015](https://github.com/dylanaraps/neofetch/pull/2015))
+* Distro - Improve Manjaro version detection ([dylanaraps#1879](https://github.com/dylanaraps/neofetch/pull/1879))
+
+</details>
+
+<details>
+  <summary>🖼️ Device Support Changes</summary>  
+
+* Terminal - Add Fig ([dylanaraps#2077](https://github.com/dylanaraps/neofetch/pull/2077))
+* Terminal - Identify font for Apple Terminal ([dylanaraps#2017](https://github.com/dylanaraps/neofetch/pull/2017))
+* CPU - Identify core count for Apple M1 ([dylanaraps#2038](https://github.com/dylanaraps/neofetch/pull/2038))
+* GPU - Identify OpenCL GPU without PCIe ([dylanaraps#1928](https://github.com/dylanaraps/neofetch/pull/1928))
+* Host - Identify MacBook & Update iDevice models ([dylanaraps#1944](https://github.com/dylanaraps/neofetch/pull/1944))
+* Battery - Identify power adapter for MacBooks ([dylanaraps#1945](https://github.com/dylanaraps/neofetch/pull/1945))
+* DE - Identify KF5 and Qt versions for Plasma ([dylanaraps#2019](https://github.com/dylanaraps/neofetch/pull/2019))
+* Packages - Improve GUIX package detection ([dylanaraps#2021](https://github.com/dylanaraps/neofetch/pull/2021))
+* Packages - Add `pm` and `cargo` ([dylanaraps#1876](https://github.com/dylanaraps/neofetch/pull/1876))
+* Network - Identify network capabilities ([dylanaraps#1511](https://github.com/dylanaraps/neofetch/pull/1511))
+
+</details>
+
+<details>
+  <summary>🖼️ Bug Fixes</summary>
+
+* Bug Fix - Fix `col_offset` ([dylanaraps#2042](https://github.com/dylanaraps/neofetch/pull/2042))
+* Bug Fix - Prioritize `/etc/os-release` ([dylanaraps#2067](https://github.com/dylanaraps/neofetch/pull/2067))
+* Bug Fix - Ignore case when counting `.appimage` ([dylanaraps#2006](https://github.com/dylanaraps/neofetch/pull/2006))
+* Bug Fix - Fix BSD freezing if pkg is not bootstrapped ([dylanaraps#2014](https://github.com/dylanaraps/neofetch/pull/2014))
+* Bug Fix - Fix wrong icon theme ([dylanaraps#1873](https://github.com/dylanaraps/neofetch/pull/1873))
+
+</details>
+
+### 1.2.0
+
+* 🚀 Take over `neofetch` with `neowofetch`
+
+<details>
+  <summary>🖼️ Ascii Art Changes</summary>
+
+* 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#2114](https://github.com/dylanaraps/neofetch/pull/2114))
+
+</details>
+
+<details>
+  <summary>🖼️ Distro/OS Support Changes</summary>
+
+* OS - Identify macOS 13 Ventura ([#8](https://github.com/hykilpikonna/hyfetch/pull/8))
+* OS - Windows 11 Fluent ([dylanaraps#2109](https://github.com/dylanaraps/neofetch/pull/2109))
+* Distro - Add Asahi Linux ([dylanaraps#2079](https://github.com/dylanaraps/neofetch/pull/2079))
+* Distro - Add CenterOS ([dylanaraps#2097](https://github.com/dylanaraps/neofetch/pull/2097))
+* Distro - Add Finnix ([dylanaraps#2099](https://github.com/dylanaraps/neofetch/pull/2099))
+* Distro - Add Miracle Linux ([dylanaraps#2085](https://github.com/dylanaraps/neofetch/pull/2085))
+* Distro - Add Univalent ([dylanaraps#2162](https://github.com/dylanaraps/neofetch/pull/2162))
+* Distro - Add NomadBSD ([dylanaraps#2147](https://github.com/dylanaraps/neofetch/pull/2147))
+* Distro - Add GrapheneOS ([dylanaraps#2146](https://github.com/dylanaraps/neofetch/pull/2146))
+* Distro - Add ShastraOS ([dylanaraps#2149](https://github.com/dylanaraps/neofetch/pull/2149))
+* Distro - Add Ubuntu Touch ([dylanaraps#2167](https://github.com/dylanaraps/neofetch/pull/2167))
+* Distro - Add Ubuntu Sway ([dylanaraps#2136](https://github.com/dylanaraps/neofetch/pull/2136))
+* Distro - Add Orchid Linux ([dylanaraps#2144](https://github.com/dylanaraps/neofetch/pull/2144))
+* Distro - Add AOSC OS/Retro ([dylanaraps#2124](https://github.com/dylanaraps/neofetch/pull/2124))
+* Distro - Add Ultramarine Linux ([dylanaraps#2115](https://github.com/dylanaraps/neofetch/pull/2115))
+* Distro - Improve NixOS version detection ([dylanaraps#2157](https://github.com/dylanaraps/neofetch/pull/2157))
+
+</details>
+
+<details>
+  <summary>🖼️ Device/Program Support Changes</summary>
+
+* Terminal - Add Termux ([dylanaraps#1923](https://github.com/dylanaraps/neofetch/pull/1923))
+* CPU - Add loongarch64 ([dylanaraps#2140](https://github.com/dylanaraps/neofetch/pull/2140))
+* CPU - Identify CPU name for ARM / RISCV ([dylanaraps#2139](https://github.com/dylanaraps/neofetch/pull/2139))
+* Battery - Fix file not found ([dylanaraps#2130](https://github.com/dylanaraps/neofetch/pull/2130))
+* GPU - Identify open-kernal Nvidia driver version ([dylanaraps#2128](https://github.com/dylanaraps/neofetch/pull/2128))
+
+</details>
+
+<details>
+  <summary>🖼️ Bug Fixes</summary>
+
+* Bug Fix - Fix broken fedora output ([dylanaraps#2084](https://github.com/dylanaraps/neofetch/pull/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
+* Added Beiyang flag xD
+* Added interactive configurator for brightness adjustment
+* Added dark/light mode selection
+* Added color bar preview for RGB/8bit mode selection
+* Added random color arrangement feature (for NixOS)

 ### 1.0.7

@@ -111,6 +328,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.


@@ -1,66 +1,71 @@
+"""
+This version of color_scale is a special version made without numpy dependency. The numpy version
+would be faster, but numpy is 11 MB large. In comparison, hyfetch 1.0.7 is only 105 kB, so it's not
+a good idea to depend on numpy.
+"""
 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:
+def create_gradient_hex(colors: list[str], resolution: int = 300) -> list[RGB]:
    """
    Create gradient array from hex
    """
-    colors = np.array([RGB.from_hex(s) for s in colors])
+    colors = [RGB.from_hex(s) for s in colors]
    return create_gradient(colors, resolution)


-def create_gradient(colors: ndarray, resolution: int) -> ndarray:
+def create_gradient(colors: list[RGB], resolution: int) -> list[RGB]:
    """
-    Create gradient 2d array.
+    Create gradient array

-    Usage: arr[ratio / len(arr), :] = Scaled gradient color at that point
+    Usage: arr[ratio / len(arr)] = Scaled gradient color at that point
    """
-    result = np.zeros((resolution * (len(colors) - 1), 3), dtype='uint8')
+    result = []

    # Create gradient mapping
    for i in range(len(colors) - 1):
-        c1 = colors[i, :]
-        c2 = colors[i + 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)
+        for ri in range(resolution):
+            ratio = ri / resolution
+            r = int(c2.r * ratio + c1.r * (1 - ratio))
+            g = int(c2.g * ratio + c1.g * (1 - ratio))
+            b = int(c2.b * ratio + c1.b * (1 - ratio))
+            result.append(RGB(r, g, b))

    return result


-def get_raw(gradient: ndarray, ratio: float) -> ndarray:
+def get_raw(gradient: list[RGB], ratio: float) -> RGB:
    """
    :param gradient: Gradient array (2d)
    :param ratio: Between 0-1
    :return: RGB subarray (1d, has 3 values)
    """
    if ratio == 1:
-        return gradient[-1, :]
+        return gradient[-1]

    i = int(ratio * len(gradient))
-    return gradient[i, :]
+    return gradient[i]


 class Scale:
-    colors: ndarray
-    rgb: ndarray
+    colors: list[RGB]
+    rgb: list[RGB]

    def __init__(self, scale: list[str], resolution: int = 300):
-        self.colors = np.array([RGB.from_hex(s) for s in scale])
+        self.colors = [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))
+        return get_raw(self.rgb, ratio)


 def test_color_scale():
@@ -7,7 +7,7 @@ from pathlib import Path
 from typing_extensions import Literal

 CONFIG_PATH = Path.home() / '.config/hyfetch.json'
-VERSION = '1.1.0'
+VERSION = '1.4.0'

 # Obtain terminal size
 try:
@@ -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


@@ -27,7 +25,10 @@ def check_config() -> Config:
    :return: Config object
    """
    if CONFIG_PATH.is_file():
-        return Config.from_dict(json.loads(CONFIG_PATH.read_text('utf-8')))
+        try:
+            return Config.from_dict(json.loads(CONFIG_PATH.read_text('utf-8')))
+        except KeyError:
+            return create_config()

    return create_config()

@@ -51,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:
@@ -178,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]
@@ -210,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')
@@ -217,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

@@ -252,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()

@@ -303,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)
@@ -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)
@@ -168,7 +178,7 @@ def run_neofetch(preset: ColorProfile, alignment: ColorAlignment):
        if platform.system() != 'Windows':
            os.system(f'{get_command_path()} --ascii --source {path.absolute()} --ascii-colors')

-        if platform.system() == 'Windows':
+        else:
            cmd = get_command_path().replace("\\", "/").replace("C:/", "/c/")
            path_str = str(path.absolute()).replace('\\', '/').replace('C:/', '/c/')

@@ -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),
 }

@@ -201,6 +201,30 @@ PRESETS: dict[str, ColorProfile] = {
        '#1AB3FF'
    ]),

+    'polysexual': ColorProfile([
+        '#F714BA',
+        '#01D66A',
+        '#1594F6',
+    ]),
+
+    # omnisexual sorced from https://www.flagcolorcodes.com/omnisexual
+    'omnisexual': ColorProfile([
+        '#FE9ACE',
+        '#FF53BF',
+        '#200044',
+        '#6760FE',
+        '#8EA6FF',
+    ]),
+
+    # gay men sourced from https://www.flagcolorcodes.com/gay-men
+    'gay-men': ColorProfile([
+        '#078D70',
+        '#98E8C1',
+        '#FFFFFF',
+        '#7BADE2',
+        '#3D1A78'
+    ]),
+
    'lesbian': ColorProfile([
        '#D62800',
        '#FF9B56',
@@ -209,6 +233,16 @@ PRESETS: dict[str, ColorProfile] = {
        '#A40062'
    ]),

+    # abrosexual used colorpicker to source from
+    # https://fyeahaltpride.tumblr.com/post/151704251345/could-you-guys-possibly-make-an-abrosexual-pride
+    'abrosexual': ColorProfile([
+        '#46D294',
+        '#A3E9CA',
+        '#FFFFFF',
+        '#F78BB3',
+        '#EE1766',
+    ]),
+
    'asexual': ColorProfile([
        '#000000',
        '#A4A4A4',
@@ -224,6 +258,35 @@ PRESETS: dict[str, ColorProfile] = {
        '#000000'
    ]),

+    # aroace1 sourced from https://flag.library.lgbt/flags/aroace/
+    'aroace1': ColorProfile([
+        '#E28C00',
+        '#ECCD00',
+        '#FFFFFF',
+        '#62AEDC',
+        '#203856'
+    ]),
+
+    'aroace2': ColorProfile([
+        '#000000',
+        '#810081',
+        '#A4A4A4',
+        '#FFFFFF',
+        '#A8D47A',
+        '#3BA740'
+    ]),
+
+    'aroace3': ColorProfile([
+        '#3BA740',
+        '#A8D47A',
+        '#FFFFFF',
+        '#ABABAB',
+        '#000000',
+        '#A4A4A4',
+        '#FFFFFF',
+        '#810081'
+    ]),
+
    # below sourced from https://www.flagcolorcodes.com/flags/pride
    # goto f"https://www.flagcolorcodes.com/{preset}" for info
    # todo: sane sorting
@@ -260,6 +323,51 @@ PRESETS: dict[str, ColorProfile] = {
        '#000000',
    ]),

+    # bigender sourced from https://www.flagcolorcodes.com/bigender
+    'bigender': ColorProfile([
+        '#C479A2',
+        '#EDA5CD',
+        '#D6C7E8',
+        '#FFFFFF',
+        '#D6C7E8',
+        '#9AC7E8',
+        '#6D82D1',
+    ]),
+
+    # demigender yellow sourced from https://lgbtqia.fandom.com/f/p/4400000000000041031
+    # other colors sourced from demiboy and demigirl flags
+    'demigender': ColorProfile([
+        '#7F7F7F',
+        '#C4C4C4',
+        '#FBFF75',
+        '#FFFFFF',
+        '#FBFF75',
+        '#C4C4C4',
+        '#7F7F7F',
+    ]),
+
+    # demiboy sourced from https://www.flagcolorcodes.com/demiboy
+    'demiboy': ColorProfile([
+        '#7F7F7F',
+        '#C4C4C4',
+        '#9DD7EA',
+        '#FFFFFF',
+        '#9DD7EA',
+        '#C4C4C4',
+        '#7F7F7F',
+    ]),
+
+    # demigirl sourced from https://www.flagcolorcodes.com/demigirl
+    'demigirl': ColorProfile([
+        '#7F7F7F',
+        '#C4C4C4',
+        '#FDADC8',
+        '#FFFFFF',
+        '#FDADC8',
+        '#C4C4C4',
+        '#7F7F7F',
+    ]),
+
    'transmasculine': ColorProfile([
        '#FF8ABD',
        '#CDF5FE',
@@ -270,6 +378,29 @@ PRESETS: dict[str, ColorProfile] = {
        '#FF8ABD',
    ]),

+    # transfeminine used colorpicker to source from https://www.deviantart.com/pride-flags/art/Trans-Woman-Transfeminine-1-543925985
+    # linked from https://gender.fandom.com/wiki/Transfeminine
+    'transfeminine': ColorProfile([
+        '#73DEFF',
+        '#FFE2EE',
+        '#FFB5D6',
+        '#FF8DC0',
+        '#FFB5D6',
+        '#FFE2EE',
+        '#73DEFF',
+    ]),
+
+    # genderfaun sourced from https://www.flagcolorcodes.com/genderfaun
+    'genderfaun': ColorProfile([
+        '#FCD689',
+        '#FFF09B',
+        '#FAF9CD',
+        '#FFFFFF',
+        '#8EDED9',
+        '#8CACDE',
+        '#9782EC',
+    ]),
+
    'demifaun': ColorProfile([
        '#7F7F7F',
        '#7F7F7F',
@@ -286,6 +417,34 @@ PRESETS: dict[str, ColorProfile] = {
        '#7F7F7F',
    ]),

+    # genderfae sourced from https://www.flagcolorcodes.com/genderfae
+    'genderfae': ColorProfile([
+        '#97C3A5',
+        '#C3DEAE',
+        '#F9FACD',
+        '#FFFFFF',
+        '#FCA2C4',
+        '#DB8AE4',
+        '#A97EDD',
+    ]),
+
+    # demifae used colorpicker to source form https://www.deviantart.com/pride-flags/art/Demifae-870194777
+    'demifae': ColorProfile([
+        '#7F7F7F',
+        '#7F7F7F',
+        '#C5C5C5',
+        '#C5C5C5',
+        '#97C3A4',
+        '#C4DEAE',
+        '#FFFFFF',
+        '#FCA2C5',
+        '#AB7EDF',
+        '#C5C5C5',
+        '#C5C5C5',
+        '#7F7F7F',
+        '#7F7F7F',
+    ]),
+
    'neutrois': ColorProfile([
        '#FFFFFF',
        '#1F9F00',
@@ -366,4 +525,11 @@ PRESETS: dict[str, ColorProfile] = {
        '#FFFFFF',
        '#000000',
    ]),
+    "finsexual": ColorProfile([
+        "#B18EDF",
+        "#D7B1E2",
+        "#F7CDE9",
+        "#F39FCE",
+        "#EA7BB3",
+    ]),
 }
@@ -1,7 +1,7 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.48.3.
-.TH NEOFETCH "1" "April 2021" "Neofetch 7.1.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.2.
+.TH NEOFETCH "1" "August 2022" "Neofetch 7.3.0" "User Commands"
 .SH NAME
-Neofetch \- A fast, highly customizable system info script
+Neofetch \- manual page for Neofetch 7.3.0
 .SH SYNOPSIS
 .B neofetch
 \fI\,func_name --option "value" --option "value"\/\fR
@@ -44,7 +44,7 @@ NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu'
 Hide/Show Fully Qualified Domain Name in title.
 .TP
 \fB\-\-package_managers\fR on/off
-Hide/Show Package Manager names . (on, tiny, off)
+Hide/Show Package Manager names. (on, tiny, off)
 .TP
 \fB\-\-os_arch\fR on/off
 Hide/Show OS architecture.
@@ -301,52 +301,55 @@ Colors to print the ascii art
 \fB\-\-ascii_distro\fR distro
 Which Distro's ascii art to print
 .TP
-NOTE: AIX, 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,
-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,
-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,
-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,
-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,
-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, semc, Obarun,
-windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
-.IP
-NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
-.IP
-NOTE: Use '{distro name}_old' to use the old logos.
-.IP
-NOTE: Ubuntu has flavor variants.
+NOTE: AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy,
+Android, Antergos, antiX, AOSC OS, AOSC OS/Retro, Aperio GNU/Linux,
+Apricity, Arch, ArchBox, Archcraft, ARCHlabs, ArchMerge, ArchStrike,
+ArcoLinux, Artix, Arya, Asahi, AsteroidOS, Bedrock, BigLinux,
+Bitrig, BlackArch, blackPanther, BLAG, BlankOn, BlueLight, Bodhi,
+bonsai, BSD, BunsenLabs, Cachy OS, Calculate, CalinixOS, Carbs, CBLMariner, CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, Chrom,
+Cleanjaro, Clear Linux OS, ClearOS, Clover, Condres, Container Linux
+by CoreOS, CRUX, Crystal Linux, Cucumber, CutefishOS, CyberOS,
+dahlia, DarkOs, Darwin, Debian, Deepin, DesaOS, Devuan, DracOS,
+DragonFly, Drauger, Elementary, Elive, EncryptOS, EndeavourOS,
+Endless, EuroLinux, Exherbo, Exodia Predator OS, Fedora, Feren,
+Finnix, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda,
+Gentoo, glaucus, gNewSense, GNOME, GNU, GoboLinux, GrapheneOS,
+Grombyang, Guix, Haiku, HarDClanZ, Hash, Huayra, HydroOS, 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, Neptune, NetBSD, Netrunner, Nitrux, NixOS,
+NomadBSD, Nurunner, NuTyX, Obarun, OBRevenge, Open Source Media
+Center, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva,
+OpenStage, openSUSE, openSUSE Leap, openSUSE Tumbleweed, OpenWrt,
+OPNsense, Oracle, orchid, OS Elbrus, PacBSD, Parabola, parch,
+Pardus, Parrot, Parsix, PCBSD, PCLinuxOS, pearOS, Pengwin, Pentoo,
+Peppermint, Pisi, PNM Linux, Pop!_OS, Porteus, PostMarketOS,
+Profelis SambaBOX, Proxmox, PuffOS, Puppy, PureOS, Q4OS, Qubes,
+Qubyt, Quibian, Radix, Raspbian, Reborn OS, Red Star, Redcore,
+Redhat, Refracted Devuan, Regata, Regolith, rocky, Rosa, Sabayon,
+sabotage, Sailfish, SalentOS, Scientific, semc, Septor, Serene,
+SharkLinux, ShastraOS, Siduction, SkiffOS, Slackware, SliTaz,
+SmartOS, Soda, Solus, Source Mage, Sparky, Star, SteamOS, Sulin,
+SunOS, SwagArch, t2, Tails, TeArch, TorizonCore, Trisquel, Twister,
+Ubuntu, Ubuntu Budgie, Ubuntu Cinnamon, Ubuntu Kylin, Ubuntu MATE,
+Ubuntu Studio, Ubuntu Sway, Ubuntu Touch, Ubuntu\-GNOME,
+ubuntu_old02, Ultramarine Linux, Univalent, Univention, Uos, uwuntu,
+Venom, VNux, Void, VzLinux, wii\-linux\-ngx, Windows, Windows 10,
+Windows 11, XFerience, Xubuntu, yiffOS, Zorin have ascii logos.
 .TP
-NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu\-GNOME,
-Ubuntu\-Studio, Ubuntu\-Mate  or Ubuntu\-Budgie to use the flavors.
+NOTE: arch, dragonfly, Fedora, LangitKetujuh, nixos, redhat, Ubuntu
+have 'old' logo variants, use {distro}_old to use them.
 .TP
-NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu,
-CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android,
-Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola,
-Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS,
-Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian,
-postmarketOS, and Void have a smaller logo variant.
-.IP
-NOTE: Use '{distro name}_small' to use the small variants.
+NOTE: alpine, android, aoscosretro, arch, arcolinux, artix,
+CalinixOS, centos, cleanjaro, crux, debian, dragonfly, elementary,
+fedora, freebsd, gentoo, guix, haiku, hyperbola, linuxlite,
+linuxmint, mac, mageia, manjaro, mx, netbsd, nixos, openbsd,
+opensuse, orchid, parabola, popos, postmarketos, pureos, Raspbian,
+rocky, slackware, sunos, ubuntu, void have 'small' logo variants,
+use {distro}_small to use them.
 .TP
 \fB\-\-ascii_bold\fR on/off
 Whether or not to bold the ascii logo.
@@ -429,3 +432,15 @@ Display a verbose log for error reporting.
 Generate a manpage for Neofetch in your PWD. (Requires GNU help2man)
 .SH "REPORTING BUGS"
 Report bugs to https://github.com/dylanaraps/neofetch/issues
+.SH "SEE ALSO"
+The full documentation for
+.B Neofetch
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B Neofetch
+programs are properly installed at your site, the command
+.IP
+.B info Neofetch
+.PP
+should give you access to the complete manual.
@@ -0,0 +1,25 @@
+{
+  "name": "neowofetch",
+  "version": "1.4.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"
+}
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 import pathlib

 from setuptools import setup
@@ -32,10 +33,11 @@ setup(
    packages=['hyfetch'],
    package_data={'hyfetch': ['hyfetch/*']},
    include_package_data=True,
-    install_requires=['setuptools', 'typing_extensions', 'numpy'],
+    install_requires=['setuptools', 'typing_extensions'],
    entry_points={
        "console_scripts": [
            "hyfetch=hyfetch.main:run",
        ]
    },
+    scripts=['hyfetch/scripts/neowofetch']
 )
@@ -0,0 +1,97 @@
+#!/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'
+
+
+def copy_comment():
+    # 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 maintains an updated version of the original neofetch, addressing many pull requests that are not merged in the original repo.
+
+Read the ["Running Updated Original Neofetch" section](https://github.com/hykilpikonna/hyfetch#running-updated-original-neofetch) for more info!
+    """
+    pyperclip.copy(comment.strip())
+    print()
+    print('Done!')
+    print('Comment response copied to clipboard.')
+
+
+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()
+    user = info['user']['login']
+
+    # Fetch commit information
+    commits = requests.get(f'https://api.github.com/repos/{upstream}/pulls/{pr}/commits').json()
+    author = commits[0]['commit']['author']
+
+    # Create commit message
+    title = info["title"].replace('"', '\\"')
+    msg = (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"]}>"')
+
+    # head could be null, if the pr repo is deleted
+    if info['head'] is None or info['head']['repo'] is None:
+        print(f'Original repo is deleted. Please manually merge.')
+        input('Press any key to continue when the changes are made...')
+
+        # Commit with merge
+        print()
+        print('Committing merge...')
+        os.system(f'git commit -a {msg}')
+
+    # Automatically merge
+    else:
+        head = info['head']['repo']['full_name']
+        head_br = info['head']['ref']
+        head_lbl = info['head']['label']
+        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 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...')
+        os.system(f'git merge FETCH_HEAD --no-ff --no-edit {msg}')
+
+    # Push
+    print()
+    print('Pushing...')
+    os.system('git push')
+
+    copy_comment()
@@ -0,0 +1,111 @@
+#!/usr/bin/env python3
+
+"""
+List distributions supported by neofetch
+"""
+from __future__ import annotations
+
+import string
+import textwrap
+from dataclasses import dataclass
+
+from pathlib import Path
+
+import regex
+
+RE_SPLIT = regex.compile('EOF[ \n]*?;;')
+RE_COLORS = regex.compile("""(?<=set_colors )[a-z\\d ]+(?=\n)""")
+
+
+@dataclass
+class AsciiArt:
+    match: str
+    color: str
+    ascii: str
+
+    def get_friendly_name(self) -> str:
+        return self.match.split("|")[0].strip(string.punctuation + '* ')\
+            .replace('"', '').replace('*', '')
+
+
+def substr(s: str, start: str, end: str | None = None):
+    """
+    Get substring between start and end
+    """
+    start = s.index(start) + len(start)
+
+    if end is None:
+        return s[start:]
+
+    return s[start:s.index(end, start)]
+
+
+def parse_ascii_distros() -> list[AsciiArt]:
+    """
+    Parse ascii distros from neofetch script
+    """
+    nf = (Path(__file__).parent.parent / 'neofetch').read_text()
+
+    # Get the content of "get_distro_ascii" function
+    nf = nf[nf.index('get_distro_ascii() {\n'):]
+    nf = nf[:nf.index('\n}\n')]
+
+    # Remove trailing spaces
+    while ' \n' in nf:
+        nf = nf.replace(' \n', '\n')
+
+    # Split by blocks
+    blocks = [sub.strip() for b in regex.split('case .*? in\n', nf) for sub in RE_SPLIT.split(b)]
+
+    # Parse blocks
+    def parse_block(block: str) -> AsciiArt:
+        try:
+            # Get ascii art
+            assert "'EOF'\n" in block
+            art = substr(block, "'EOF'\n")
+
+            # Join \
+            block = block.replace('\\\n', ' ')
+
+            # Get switch-case matching parameter
+            match = block.split('\n')[0].strip()
+            assert match.endswith(')')
+            match = match[:-1]
+
+            # Get colors
+            color = RE_COLORS.findall(block)[0]
+            if len(color) == 0:
+                raise Exception(block)
+
+            return AsciiArt(match, color, art)
+
+        except AssertionError:
+            pass
+
+    out = [parse_block(block) for block in blocks]
+    return [v for v in out if v]
+
+
+def wrap(text: str, max_len: int, leading: str):
+    length = max_len - len(leading)
+    lines = [line for raw in text.split('\n') for line in textwrap.wrap(raw, length) or ['']]
+    return '\n'.join(leading + line if line else line for line in lines)
+
+
+def generate_help(max_len: int, leading: str):
+    distros = sorted(list({a.get_friendly_name() for a in parse_ascii_distros()}), key=str.casefold)
+
+    smalls = [d.replace('_small', '') for d in distros if d.endswith('_small')]
+    olds = [d.replace('_old', '') for d in distros if d.endswith('_old')]
+    distros = [d for d in distros if not d.endswith('_small') and not d.endswith('_old')]
+
+    out = f"NOTE: {', '.join(distros)} have ascii logos.\n\n"\
+          f"NOTE: {', '.join(olds)} have 'old' logo variants, use {{distro}}_old to use them.\n\n" \
+          f"NOTE: {', '.join(smalls)} have 'small' logo variants, use {{distro}}_small to use them."
+
+    return wrap(out, max_len, leading)
+
+
+if __name__ == '__main__':
+    print(generate_help(100, ' ' * 32))
+    print(generate_help(100, '# '))
@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+import math
+import os
+import shlex
+from collections import Counter
+from pathlib import Path
+from subprocess import check_output
+
+from github import Github
+from github.PullRequest import PullRequest
+import ruamel.yaml as yaml
+from hypy_utils.tqdm_utils import tq, pmap, tmap
+
+
+def obtain_resolved():
+    """
+    Obtain a list of resolved issues.
+    """
+    prefix = 'dylanaraps/neofetch#'
+    commits = check_output(shlex.split('git log --pretty=format:"%s"')).decode().strip().split('\n')
+    commits = [(c, c.find(prefix)) for c in commits]
+    commits = [(c, i+len(prefix)) for c, i in commits if i != -1]
+    return sorted([int(c[i:c.find(' ', i)]) for c, i in commits])
+
+
+if __name__ == '__main__':
+    # Obtain a list of resolved issues
+    resolved = set(obtain_resolved())
+
+    # Read the ignore-list
+    with open(Path(__file__).parent / "pull_request_markings.yaml") as stream:
+        ignore_list: dict[int, str] = yaml.safe_load(stream)['IgnoreList']
+        ignore_list.update({r: 'merged' for r in resolved})
+
+    # Obtain a list of open issues
+    g = Github(per_page=100, login_or_token=os.environ.get('GH_TOKEN'))
+    repo = g.get_repo('dylanaraps/neofetch')
+    pager = repo.get_pulls(state='all')
+
+    # Filter only unresolved issues
+    pages = list(range(math.ceil(pager.totalCount // 100) + 1))
+    pulls: list[list[PullRequest]] = tmap(pager.get_page, pages, desc='Crawling pull requests...', unit='page')
+    pulls: set[PullRequest] = {p for lst in pulls for p in lst}
+    unresolved: set[PullRequest] = {p for p in pulls if p.number not in resolved and p.number not in ignore_list}
+
+    # Filter merged / closed
+    draft = {p for p in unresolved if p.draft}
+    unresolved -= draft
+    merged = {p for p in unresolved if p.merged_at}
+    unresolved -= merged
+    closed = {p for p in unresolved if p.state == 'closed'}
+    unresolved -= closed
+
+    ignore_counter = Counter(ignore_list.values())
+    hyfetch_merged = ignore_counter.pop('merged')
+    print(f'Pull Request Statistics:')
+    print(f'> {hyfetch_merged} PRs merged by HyFetch')
+    print('\n'.join(f'> {c} PRs closed as {v} by HyFetch' for v, c in sorted(ignore_counter.items(), key=lambda x: -x[1])))
+    print()
+    print(f'> {len(draft)} PR drafts')
+    print(f'> {len(merged)} PRs merged by neofetch')
+    print(f'> {len(closed)} PRs closed without merging')
+    print()
+    print(f'> {len(unresolved)} open PRs that needs to be addressed:')
+    print()
+
+    opened = sorted(list(unresolved), key=lambda p: p.number)
+
+    # Print unresolved issues
+    print('\n'.join(f'[{p.number}] {p.title} {p.html_url}' for p in opened))
@@ -0,0 +1,59 @@
+# Pull request that I don't plan on merging, or already merged pull request that the script didn't
+# detect.
+IgnoreList:
+  # [2154] Added Support for Uwuntu
+  2154: merged
+  # [2156] Update neofetch (for macOS 13)
+  2156: duplicate
+  # [2152] created much cleaner void ascii art
+  2152: merged
+  # [2150] Add macOS 13 to version name list
+  2150: merged
+  # [2113] Updated Ubuntu logo
+  2113: duplicate
+  # [2104] Make DE Fluent on Windows 11
+  2104: duplicate
+  # [2092] Update neofetch
+  2092: troll
+  # [2081] added a q4os ascii
+  2081: duplicate
+  # [2078] Fixed distro detection on CentOS 6
+  2078: incorrect
+  # [2057] add AmogOS (Duplicate of 1904)
+  2057: duplicate
+  # [2051] Typo in comment for col_offset
+  2051: incorrect
+  # [1996] set_text_color: fix color code for multi-digit ones
+  1996: duplicate
+  # [1940] Added code to display battery percentage and resolution in termux on android devices
+  1940: bad
+  # [1936] Added PiluX logo.
+  1936: deleted
+  # [1927] improve/add model name for arm linux cpus
+  1927: duplicate
+  # [1925] New OS added: CBL-Mariner
+  1925: duplicate
+  # [1922] Added BugTrack asciiart
+  1922: bad
+  # [1897] Change source_mage's colors.
+  1897: deleted
+  # [1889] Fix Windows 11 detection
+  1889: duplicate
+  # [1861] Added FriendlyOS
+  1861: bad
+  # [1857] Speed up `get_packages`
+  1857: bad
+  # [1852] Added Aravalli Logo
+  1852: deleted
+  # [1850] neofetch: remove duplicate distro ASCII logo
+  1850: duplicate
+  # [1830] Replace non-posix use of 'hostname' command with 'uname -n'
+  1830: deleted
+  # [1827] Improve manjaro logo
+  1827: deleted
+  # [1700] Added Xeonix by Xinux Uzbekistan support
+  1700: deleted
+  # [1585] Fix for Improvement idea for multiprocessor systems, current output is unclear
+  1585: incorrect
+  # [1031] Use nvidia-smi for NVIDIA GPUs
+  1031: incorrect
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+"""
+This script turns readme shorthand pull request references (i.e. dylanaraps/neofetch#1946) into full
+GitHub pull request links.
+"""
+import re
+from pathlib import Path
+
+
+RE_SHORTHAND = re.compile(r"""[a-z0-9]+?/[a-z0-9]+?#[0-9]+""")
+
+
+if __name__ == '__main__':
+    readme = Path('README.md').read_text()
+
+    for shorthand in RE_SHORTHAND.findall(readme):
+        user, pull = shorthand.split('/')
+        repo, pull = pull.split('#')
+        readme = readme.replace(shorthand, f'[{user}#{pull}](https://github.com/{user}/{repo}/pull/{pull})')
+
+    Path('README.md').write_text(readme)