Merge branch 'master' into master

.gitignore

@@ -115,3 +115,4 @@ dmypy.json
 
 # Custom
 .idea
+._*

README.md

@@ -60,56 +60,101 @@ Updates to `neowofetch` begins with the emoji 🖼️
 * [ ] Paginate flags
 * [ ] Implement light/dark background detection based on https://github.com/muesli/termenv
 
+### Unreleased 1.2.1
+
+<details>
+  <summary>🖼️ Ascii Art Changes</summary>  
+
+* Ascii - Improve Trisquel ([dylanaraps#1946](https://github.com/dylanaraps/neofetch/pull/1946))
+* 
+
+</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))
+* 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 - Improve GUIX package detection ([dylanaraps#2021](https://github.com/dylanaraps/neofetch/pull/2021))
+
+</details>
+
+<details>
+  <summary>🖼️ Device Support Changes</summary>  
+
+* Terminal - Add Fig ([dylanaraps#2077](https://github.com/dylanaraps/neofetch/pull/2077))
+* CPU - Identify core count for Apple M1 ([dylanaraps#2038](https://github.com/dylanaraps/neofetch/pull/2038))
+
+</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))
+
+</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 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#2168](https://github.com/dylanaraps/neofetch/pull/2168))
+* 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>
 

merging/pull_request_markings.yaml

@@ -9,5 +9,13 @@ IgnoreList:
   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

merging/reformat_readme.py

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

neofetch.1

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