[U] Release v1.3.0

[U] Reformat readme links
[U] Update readme changelog
2022-07-31 19:21:43 -04:00 · 2022-07-31 19:06:17 -04:00 · 2022-07-31 19:05:36 -04:00 · 2022-07-31 18:34:05 -04:00 · 2022-07-31 18:28:38 -04:00 · 2022-07-31 18:26:05 -04:00
15 changed files with 1842 additions and 396 deletions
@@ -115,3 +115,4 @@ dmypy.json

 # Custom
 .idea
+._*
@@ -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,37 +27,22 @@ 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!

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

@@ -57,16 +50,155 @@ 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.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
@@ -76,8 +208,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 +268,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,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=' ')
@@ -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.3.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


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

@@ -0,0 +1,80 @@
+#!/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 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.')
@@ -0,0 +1,48 @@
+import shlex
+from pathlib import Path
+from subprocess import check_output
+
+from github import Github
+from github.PullRequest import PullRequest
+import ruamel.yaml as yaml
+
+
+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 = yaml.safe_load(stream)['IgnoreList']
+
+    # Obtain a list of open issues
+    g = Github(per_page=100)
+    repo = g.get_repo('dylanaraps/neofetch')
+    pager = repo.get_pulls(state='open')
+
+    # Filter only unresolved issues
+    unresolved: list[PullRequest] = []
+    for i in range(10000000):
+        pulls: list[PullRequest] = pager.get_page(i)
+        if len(pulls) == 0:
+            break
+
+        unresolved += [p for p in pulls if p.number not in resolved and p.number not in ignore_list and not p.draft]
+        if len(unresolved) > 50:
+            break
+
+    unresolved.sort(key=lambda p: p.number)
+
+    # Print unresolved issues
+    print('\n'.join(f'[{p.number}] {p.title} {p.html_url}' for p in unresolved))
@@ -0,0 +1,29 @@
+# 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
+  # [2104] Make DE Fluent on Windows 11
+  2104: duplicate
+  # [2092] Update neofetch
+  2092: troll
+  # [2081] added a q4os ascii
+  2081: duplicate
+  # [2057] add AmogOS (Duplicate of 1904)
+  2057: duplicate
+  # [2051] Typo in comment for col_offset
+  2051: incorrect
+  # [1936] Added PiluX logo.
+  1936: deleted
+  # [1927] improve/add model name for arm linux cpus
+  1927: duplicate
+  # [1850] neofetch: remove duplicate distro ASCII logo
+  1850: duplicate
+  # [1827] Improve manjaro logo
+  1827: deleted
@@ -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)
@@ -304,27 +304,27 @@ Which Distro's ascii art to print
 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,
+Artix, Arya, Bedrock, BigLinux, Bitrig, BlackArch, BLAG, BlankOn, BlueLight,
+bonsai, BSD, BunsenLabs, "Cachy OS", 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,
+EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, Finnix, FreeBSD,
+FreeMiNT, Frugalware, Funtoo, FusionX, GalliumOS, Garuda, Gentoo, Pentoo,
+Glaucus, 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,
+Solus, Soda, 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,
@@ -0,0 +1,25 @@
+{
+  "name": "neowofetch",
+  "version": "1.3.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
@@ -38,4 +39,5 @@ setup(
            "hyfetch=hyfetch.main:run",
        ]
    },
+    scripts=['hyfetch/scripts/neowofetch']
 )