[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
10 changed files with 1154 additions and 213 deletions
@@ -115,3 +115,4 @@ dmypy.json

 # Custom
 .idea
+._*
@@ -2,17 +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 install the python package and use `neowofetch` xD.
+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` :)

-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")
-```
+* Method 1: `pip install hyfetch` then run `neowofetch`
+* Method 2: `npx neowofetch`
+* Method 3: `bash <(curl -sL neowofetch.hydev.org)`

 ## Installation

@@ -36,6 +34,8 @@ Currently, these distributions have existing packages for HyFetch:

 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`
@@ -60,56 +60,126 @@ Updates to `neowofetch` begins with the emoji 🖼️
 * [ ] 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><br>
+  <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/neofetch#2114)
+* Ascii - Update old NixOS logo for compatibility ([dylanaraps#2114](https://github.com/dylanaraps/neofetch/pull/2114))

 </details>

 <details>
-  <summary>🖼️ Distro/OS Support Changes</summary><br>
+  <summary>🖼️ Distro/OS Support Changes</summary>

 * 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)
+* 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 Support Changes</summary><br>
+  <summary>🖼️ Device/Program Support Changes</summary>

-* 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)
+* 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><br>
+  <summary>🖼️ Bug Fixes</summary>

-* Bug Fix - Fix broken fedora output (dylanaraps/neofetch#2084)
+* Bug Fix - Fix broken fedora output ([dylanaraps#2084](https://github.com/dylanaraps/neofetch/pull/2084))

 </details>

@@ -7,7 +7,7 @@ from pathlib import Path
 from typing_extensions import Literal

 CONFIG_PATH = Path.home() / '.config/hyfetch.json'
-VERSION = '1.2.0'
+VERSION = '1.3.0'

 # Obtain terminal size
 try:
@@ -70,7 +70,9 @@ 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.
+[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()
@@ -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,14 +304,14 @@ 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, Finnix, FreeBSD,
-FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo,
-gNewSense, GNOME, GNU, GoboLinux, GrapheneOS, Grombyang, Guix, Haiku, Huayra,
+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,
@@ -324,7 +324,7 @@ Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS,
 Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa,
 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,
@@ -1,6 +1,6 @@
 {
  "name": "neowofetch",
-  "version": "1.2.0",
+  "version": "1.3.0",
  "description": "Updated neofetch",
  "repository": {
    "type": "git",