Compare commits

...

148 Commits

Author SHA1 Message Date
Azalea (on HyDEV-Daisy) 3f220b5270 [U] Update distro list, generate man page 2022-08-12 20:29:57 -04:00
Azalea (on HyDEV-Daisy) 900820ffee [U] Release v1.4.0 2022-08-12 20:27:38 -04:00
Azalea (on HyDEV-Daisy) 7559fc516a [U] Update readme 2022-08-12 20:11:44 -04:00
Azalea (on HyDEV-Daisy) e3c799ae9e [PR] dylanaraps/neofetch#1877 from AtifChy - st xresources patch support
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1877
Thanks to @AtifChy

Co-authored-by: AtifChy <iftakhar.awal@yahoo.com>
2022-08-12 19:51:58 -04:00
Azalea (on HyDEV-Daisy) 664b7c2e30 [PR] dylanaraps/neofetch#2034 from subnut - Use /proc/.../cmdline instead of /proc/.../comm
Upstream PR: https://github.com/dylanaraps/neofetch/pull/2034
Thanks to @subnut

Co-authored-by: Subhaditya Nath <sn03.general@gmail.com>
2022-08-12 19:41:43 -04:00
Subhaditya Nath 2fb6f214eb Use /proc/.../cmdline instead of /proc/.../comm
/proc/.../comm is limited to 16 bytes. So, long terminal names like
io.elementary.terminal (default terminal for Elementary OS) gets
truncated to 15 characters.
2022-08-12 15:25:51 +05:30
Azalea (on HyDEV-Daisy) 086705ff07 [U] Update readme 2022-08-12 02:39:07 -04:00
Azalea (on HyDEV-Daisy) 783a006abf [PR] dylanaraps/neofetch#1963 from blackdragon2447 - added compatibility with LeftWM temes
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1963
Thanks to @blackdragon2447

Co-authored-by: blackdragon2447 <blackdragon2447@e.email>
2022-08-12 00:12:00 -04:00
Azalea (on HyDEV-Daisy) b0b4ef9d80 [PR] dylanaraps/neofetch#1642 from rasa - neofetch: Strengthen scoop/choco app reporting
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1642
Thanks to @rasa

Co-authored-by: Ross Smith II <ross@smithii.com>
2022-08-12 00:00:10 -04:00
Azalea (on HyDEV-Daisy) 6c665d9c6c [PR] dylanaraps/neofetch#1797 from EmptiedSoul - Rebased HarDClanZ Linux
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1797
Thanks to @EmptiedSoul

Co-authored-by: emptiedsoul <arslesin@icloud.com>
2022-08-11 23:42:58 -04:00
Azalea (on HyDEV-Daisy) 078ff79c16 [PR] dylanaraps/neofetch#1902 from MatusModder - Added MatuusOS
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1902
Thanks to @MatusModder

Co-authored-by: MatusModder <76532262+MatusModder@users.noreply.github.com>
2022-08-11 23:38:27 -04:00
Azalea (on HyDEV-Daisy) e31d3df4c6 [O] Unify shellcheck disable list 2022-08-11 23:31:49 -04:00
Azalea (on HyDEV-Daisy) 2a84f63fd5 [PR] dylanaraps/neofetch#1666 from vicchi - Add (rudimentary) Synology DSM support
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1666
Thanks to @vicchi

Co-authored-by: vicchi <gary@vicchi.org>
2022-08-11 23:29:49 -04:00
Azalea (on HyDEV-Daisy) 39e5dd0471 [+] PR statistics feature 2022-08-11 23:14:16 -04:00
Azalea (on HyDEV-Daisy) 503cc3ec98 [O] Fix duplicated variable
https://github.com/dylanaraps/neofetch/pull/1588
2022-08-11 22:26:33 -04:00
Azalea (on HyDEV-Daisy) 3f4b5b2a1f [PR] dylanaraps/neofetch#1588 from dvogit - FreeBSD Host Model Patch
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1588
Thanks to @dvogit

Co-authored-by: Dvonik <dvogit@protonmail.com>
2022-08-11 22:20:53 -04:00
Azalea (on HyDEV-Daisy) 1d9fac6f1f [F] Missing brackets 2022-08-11 22:14:21 -04:00
Azalea (on HyDEV-Daisy) c176e6ffae [O] Display number of sockets for multi-cpu systems
Fix for https://github.com/dylanaraps/neofetch/issues/1574
Corrected implementation of https://github.com/dylanaraps/neofetch/pull/1585
2022-08-11 22:12:20 -04:00
Azalea (on HyDEV-Daisy) eeead8d7c3 [PR] dylanaraps/neofetch#1543 from Syphist - Strip color codes from ascii art line length calculations
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1543
Thanks to @Syphist

Co-authored-by: Syphist <thesyphist@gmail.com>
2022-08-11 21:23:35 -04:00
Azalea (on HyDEV-Daisy) 9cf4b6cdcb [PR] dylanaraps/neofetch#1149 from alaughlin - adding cursor theme support
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1149
Thanks to @alaughlin

Co-authored-by: Adam Laughlin <adamlaughlin@outlook.com>
2022-08-11 21:15:26 -04:00
Azalea (on HyDEV-Daisy) 42ca4dd5bd [F] Fix shellcheck 2022-08-11 21:06:28 -04:00
Azalea (on HyDEV-Daisy) 1f55b8d2e8 [PR] dylanaraps/neofetch#1134 from bessonm - Improve nix support with termite
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1134
Thanks to @bessonm

Co-authored-by: bessonm <besson.mael@gmail.com>
2022-08-11 20:55:34 -04:00
Azalea (on HyDEV-Daisy) 002a10466f [U] Update PR list 2022-08-11 20:55:30 -04:00
Azalea (on HyDEV-Daisy) 8278b92e12 [O] Manually commit for deleted PR 2022-08-11 20:55:19 -04:00
Azalea (on HyDEV-Daisy) 2850674070 [PR] dylanaraps/neofetch#1131 from xudong-yang - fix GPU driver detection bug with bumblebee-managed dual video cards
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1131
Thanks to @xudong-yang

Co-authored-by: xudong-yang <xudong.yang@ucl.ac.uk>
2022-08-11 20:34:18 -04:00
Azalea (on HyDEV-Daisy) bd0415884a [F] Fix shellcheck warnings 2022-08-11 20:22:40 -04:00
Azalea (on HyDEV-Daisy) e07241349d [PR] dylanaraps/neofetch#1713 from capezotte - Add Qt theme detection + Option
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1713
Thanks to @capezotte

Co-authored-by: Carlos Eduardo <carana2099@gmail.com>
2022-08-11 17:43:02 -04:00
Azalea (on HyDEV-Daisy) 93d7b8b881 [PR] dylanaraps/neofetch#1726 from coolreader18 - Allow rgb truecolors to be passed to --ascii_color
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1726
Thanks to @coolreader18

Co-authored-by: Noah <33094578+coolreader18@users.noreply.github.com>
2022-08-11 17:38:53 -04:00
Azalea (on HyDEV-Daisy) 3b781bc84f [PR] dylanaraps/neofetch#1631 from FreeApp2014 - Added KrassOS Linux
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1631
Thanks to @FreeApp2014

Co-authored-by: FreeApp2014 <contact@freeappsw.space>
2022-08-11 16:47:25 -04:00
Azalea (on HyDEV-Daisy) a656531726 [PR] dylanaraps/neofetch#1895 from hpjansson - image: Fix terminal size detection in slow/remote sessions
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1895
Thanks to @hpjansson

Co-authored-by: Hans Petter Jansson <hpj@hpjansson.org>
2022-08-11 16:41:08 -04:00
Azalea (on HyDEV-Daisy) a4b05891b9 [U] Update readme 2022-08-11 16:35:34 -04:00
Azalea (on HyDEV-Daisy) 4894c472e6 [F] Disable similar variable misspelling prompt shellcheck 2022-08-11 16:35:23 -04:00
Azalea (on HyDEV-Daisy) 371e660a39 [U] Update PR markings 2022-08-11 16:26:16 -04:00
Azalea (on HyDEV-Daisy) e184c99055 [PR] dylanaraps/neofetch#1891 from kidonng - Respect if it exists
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1891
Thanks to @kidonng

Co-authored-by: Kid <44045911+kidonng@users.noreply.github.com>
2022-08-11 16:23:44 -04:00
Azalea (on HyDEV-Daisy) 5b307d53cc [PR] dylanaraps/neofetch#1744 from andreriesco - Add TorizonCore logo
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1744
Thanks to @andreriesco

Co-authored-by: andreriesco <andre.riesco@toradex.com>
2022-08-11 16:01:53 -04:00
Azalea (on HyDEV-Daisy) 4daff3b04d [PR] dylanaraps/neofetch#1761 from blackPantherOS - Add blackPanther OS support
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1761
Thanks to @blackPantherOS

Co-authored-by: blackPanther OS <info@blackpanther.hu>
2022-08-11 15:52:21 -04:00
Azalea (on HyDEV-Daisy) 9d48719fb9 [PR] dylanaraps/neofetch#1831 from vincentbernat - Use XSETTINGS to get theme without a DE
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1831
Thanks to @vincentbernat

Co-authored-by: Vincent Bernat <vincent@bernat.ch>
2022-08-11 15:50:33 -04:00
Azalea (on HyDEV-Daisy) 26495b59cd [PR] dylanaraps/neofetch#1890 from Jai-JAP - Twister os support
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1890
Thanks to @Jai-JAP

Co-authored-by: Jai A P <78354625+Jai-JAP@users.noreply.github.com>
2022-08-11 15:45:07 -04:00
Azalea (on HyDEV-Daisy) 78397b27a2 [PR] dylanaraps/neofetch#1971 from minmemory - Add Virtuozzo Linux Logo
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1971
Thanks to @minmemory

Co-authored-by: Yvonne Lu <minmemory@users.noreply.github.com>
2022-08-11 15:33:58 -04:00
Azalea (on HyDEV-Daisy) 6357e8909f [PR] dylanaraps/neofetch#2045 from mmdbalkhi - add parch logo
Upstream PR: https://github.com/dylanaraps/neofetch/pull/2045
Thanks to @mmdbalkhi

Co-authored-by: mmdbalkhi <ahmdparsh129@gmail.com>
2022-08-11 15:25:00 -04:00
Azalea (on HyDEV-Daisy) 09ea0c3356 [PR] dylanaraps/neofetch#2095 from tidux - Fix hostname detection for obscuring FQDN.
Upstream PR: https://github.com/dylanaraps/neofetch/pull/2095
Thanks to @tidux

Co-authored-by: tidux <1330562+tidux@users.noreply.github.com>
2022-08-11 15:13:09 -04:00
Azalea (on HyDEV-Daisy) d610559b01 [U] Update readme 2022-08-11 14:45:26 -04:00
Azalea (on HyDEV-Daisy) e1494bf07d [PR] dylanaraps/neofetch#2116 from chrisfair - Removed an prepended '=' sign from terminal font output for kitty
Upstream PR: https://github.com/dylanaraps/neofetch/pull/2116
Thanks to @chrisfair

Co-authored-by: Christopher Patrick Fair <christopherpfair@comcast.net>
2022-08-11 14:37:50 -04:00
Azalea (on HyDEV-Daisy) ea4b11a6a1 [F] Fix exodia colors
https://github.com/dylanaraps/neofetch/pull/2174
2022-08-11 14:33:50 -04:00
Azalea (on HyDEV-Daisy) 42973cc700 [F] Fix indent for exodia
https://github.com/dylanaraps/neofetch/pull/2174
2022-08-11 14:28:35 -04:00
Azalea (on HyDEV-Daisy) 210c002c61 [PR] dylanaraps/neofetch#2174 from mmsaeed509 - added Exodia OS Predator Edition logo
Upstream PR: https://github.com/dylanaraps/neofetch/pull/2174
Thanks to @mmsaeed509

Co-authored-by: Mahmoud Mohammed <62524855+mmsaeed509@users.noreply.github.com>
2022-08-11 14:27:55 -04:00
Azalea (on HyDEV-Daisy) e30df6c719 [F] Fix indent for ubuntu
https://github.com/dylanaraps/neofetch/pull/2125
2022-08-11 14:26:04 -04:00
Azalea (on HyDEV-Daisy) 48884c419b [PR] dylanaraps/neofetch#2125 from L1kwidus - new Ubuntu ASCII logo
Upstream PR: https://github.com/dylanaraps/neofetch/pull/2125
Thanks to @L1kwidus

Co-authored-by: Kevin Lapointe <80723850+L1kwidus@users.noreply.github.com>
2022-08-11 14:23:27 -04:00
Mahmoud Mohammed ca9edf4e3f added Exodia OS Predator Edition logo 2022-08-09 01:15:49 +02:00
Azalea (on HyDEV-Daisy) 64a997ed0a [U] Update file permissions 2022-08-05 22:40:48 -04:00
Azalea (on HyDEV-Daisy) 32631d9217 [PR] dylanaraps/neofetch#1944 from EriksRemess - Mac identification and updated list of iDevices
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1944
Thanks to @EriksRemess

Co-authored-by: Ēriks Remess <eriks@remess.lv>
2022-08-04 20:56:52 -04:00
Ēriks Remess 350cb26755 iMac models 2022-08-03 13:00:13 +03:00
Ēriks Remess 0c730cad1a New Macbook Air/Pro with M2, Mac Studio/mini/Pro 2022-08-03 12:45:19 +03:00
Ēriks Remess 22622767d8 Merge branch 'dylanaraps:master' into master 2022-08-03 12:30:36 +03:00
Azalea (on HyDEV-Daisy) d201644dc5 [U] Generate man page for Neofetch 7.2.0 2022-08-01 18:44:31 -04:00
Azalea (on HyDEV-Daisy) 9778ebf3cf [U] Regenerate help string 2022-08-01 18:41:47 -04:00
Azalea (on HyDEV-Daisy) 769580314c [+] Create help ascii list generator 2022-08-01 18:38:38 -04:00
Azalea (on HyDEV-Daisy) 8d9d8a487e [+] Ascii distros parser 2022-08-01 18:38:20 -04:00
Azalea (on HyDEV-Daisy) 283125f7c5 [+] Add missing set_colors for CenterOS 2022-08-01 14:37:30 -04:00
Azalea (on HyDEV-Daisy) e9fc94096e [O] Optimize freebsd hardenedbsd coloring 2022-08-01 14:25:21 -04:00
Azalea (on HyDEV-Daisy) 50420c8044 [-] Remove trailing spaces in neofetch 2022-08-01 13:53:18 -04:00
Azalea (on HyDEV-Daisy) 9ab2b511d7 [F] Fix indent in get_distro_ascii 2022-08-01 13:21:59 -04:00
Azalea (on HyDEV-Daisy) c4027dd91e [-] Remove travis 2022-08-01 12:51:40 -04:00
Hykilpikonna c3176656ef [U] Update shellcheck CI to 0.8.0 2022-08-01 12:46:32 -04:00
Hykilpikonna 16024267d0 [F] Fix shellcheck CI 2022-08-01 12:43:50 -04:00
Hykilpikonna 7a7955e58a [F] Fix shellcheck CI 2022-08-01 12:43:13 -04:00
Hykilpikonna 2dac990718 [F] Fix shellcheck CI 2022-08-01 12:39:52 -04:00
Hykilpikonna e7b92d9e57 [F] Fix shellcheck CI 2022-08-01 12:33:52 -04:00
Hykilpikonna b7f1655472 [+] Shellcheck github CI 2022-08-01 12:32:04 -04:00
Azalea (on HyDEV-Daisy) 47c32f07d7 [M] Rename /merging to /tools 2022-08-01 11:52:40 -04:00
Azalea (on HyDEV-Daisy) 97cbdecb5e [U] Update readme 2022-08-01 11:49:14 -04:00
Azalea (on HyDEV-Daisy) a351a7c731 [O] Optimize if else 2022-08-01 11:48:16 -04:00
Azalea (on HyDEV-Daisy) 4be8be3a61 [F] Fix shellcheck warnings 2022-08-01 11:47:41 -04:00
Azalea (on HyDEV-Daisy) a60aa8ee41 Merge branch 'master' of github.com:hykilpikonna/hyfetch 2022-08-01 11:45:09 -04:00
Azalea (on HyDEV-Daisy) e12efe5535 [F] Fix UOS entry
https://github.com/dylanaraps/neofetch/pull/1991
2022-08-01 11:44:49 -04:00
Azalea (on HyDEV-Daisy) 2de5282b9c [F] Rename duplicate LangitKetujuh to LangitKetujuh_old 2022-08-01 11:39:39 -04:00
Azalea (on HyDEV-Daisy) a2b6df6d9e [-] Remove duplicate Kaisen 2022-08-01 11:37:07 -04:00
Hykilpikonna 8cd70044a1 [PR] #12 from Amolith - add finsexual flag colours
add finsexual flag colours
2022-08-01 11:19:37 -04:00
Azalea (on HyDEV-Daisy) d797a8c28a [F] Fix file permissions 2022-08-01 11:11:17 -04:00
Amolith 44b3eb7b56 add finsexual flag colours 2022-08-01 10:55:23 -04:00
Azalea (on HyDEV-Daisy) aac56be0c1 [PR] dylanaraps/neofetch#1961 from satmandu - Add CPU temp file for Raspberry Pi/linux and fix CPU detection for Raspberry Pi devices
Upstream PR: https://github.com/dylanaraps/neofetch/pull/1961
Thanks to @satmandu

Co-authored-by: Satadru Pramanik <satadru@gmail.com>
2022-07-31 20:29:09 -04:00
Kevin Lapointe 256759ce08 Added Small Ubuntu logo 2022-06-03 22:12:24 -04:00
Kevin Lapointe 45d88a346c modification 2022-06-02 20:01:29 -04:00
Kevin Lapointe 6e58b2b217 fix 2022-06-02 16:10:54 -04:00
Kevin Lapointe c6c297a3b5 modifications 2022-06-01 23:16:45 -04:00
Kevin Lapointe f3b8a26d0e fix 2022-06-01 21:21:48 -04:00
Kevin Lapointe b0b9c65d0c fix 2022-06-01 21:12:09 -04:00
Kevin Lapointe 82bd8c1c4e modification 2022-06-01 21:06:49 -04:00
Kevin Lapointe b53bd3a1c5 modification 2022-06-01 20:59:27 -04:00
Kevin Lapointe 315037c32f new Ubuntu logo 2022-06-01 17:53:06 -04:00
Christopher Patrick Fair 3f7b6aa3e2 Realized that you will not take pipes so did it this way instead 2022-05-23 15:48:44 -06:00
Christopher Patrick Fair c779230f0b Removed the single quotes in the font as well in kitty 2022-05-21 07:23:22 -06:00
Christopher Patrick Fair 6a393986ac Removed an prepended '=' sign from terminal font output for kitty 2022-05-19 08:00:29 -06:00
tidux 4dc28cd65d Fix hostname detection for obscuring FQDN. 2022-04-09 13:19:46 -07:00
Syphist bd9a01e334 Merge branch 'dylanaraps:master' into master 2022-02-07 17:23:14 -06:00
mmdbalkhi 983b4bed75 add parch logo 2022-02-06 12:13:57 +03:30
Yvonne Lu 201dc17c9d Update neofetch
Add Virtuozzo Linux Logo
2021-11-28 11:02:24 +08:00
blackdragon2447 c26bf9fb4a added compatibility with LeftWM temes 2021-11-19 17:19:51 +01:00
Satadru Pramanik b97f562780 Add proper cpu detection for Raspberry PI devices 2021-11-18 22:37:05 -05:00
Satadru Pramanik d561057cd8 Add CPU temp file for Raspberry Pi/linux 2021-11-18 12:01:21 -05:00
Syphist 7254d787cd Merge branch 'dylanaraps:master' into master 2021-09-28 17:45:58 -05:00
Syphist 7b3b51a5ce Merge branch 'dylanaraps:master' into master 2021-09-18 12:37:20 -05:00
MatusModder 0d8ff614c9 Added MatuusOS 2021-09-08 18:25:56 +02:00
Jai A P 2250f05cca Merge branch 'dylanaraps:master' into twister-os 2021-09-07 12:20:09 +05:30
Hans Petter Jansson 9cdf849193 image: Fix terminal size detection in slow/remote sessions
Remote or just generally slow sessions could have too high latency
for the terminal response to get through before the timeout,
rendering in-terminal image backends unusable. Increase the timeout
to accommodate these.

See #1339.
2021-08-31 16:16:37 +02:00
Kid 765b03643d Respect $TMPDIR if it exists 2021-08-29 12:53:58 +08:00
Jai A P f04bca3045 Fix Armbian version detection 2021-08-27 13:40:03 +05:30
Jai A P 0e0613588e Update neofetch.1 2021-08-27 12:48:32 +05:30
Jai A P c392685004 Update neofetch 2021-08-27 12:40:10 +05:30
Jai A P 34006a6f75 Fix ASCII in Twister UI 2021-08-27 12:35:56 +05:30
Jai A P 3aa5a6d99e Update neofetch 2021-08-27 12:08:20 +05:30
AtifChy 31578af72b st xresource patch support 2021-08-17 13:43:05 +06:00
Vincent Bernat f2fefb5379 Use XSETTINGS to get theme without a DE
GTK is using XSETTINGS as the primary information for theme, icons and
font. It surpasses what's inside the configuration files. DE will
advertise the values they have in their own registries to XSETTINGS.
Without a DE, users can get XSETTINGS with xsettingsd. It is shipped
with `dump_xsettings` to get the current values.

Unrelated, but without a DE, I doubt the content of gsettings matter
much. GTK will not read it by itself. I would remove it. People
running a part of a DE (gnome-control-center maybe?) will get
XSETTINGS.
2021-07-18 17:44:37 +02:00
Ross Smith II 6b43063ca1 Fix for directories with spaces 2021-07-16 07:19:58 -07:00
Ross Smith II ef29fa6e57 Fix shellcheck errors 2021-06-30 23:18:11 -07:00
Ross Smith II 15c2b33575 Merge branch 'master' into fix-scoop-choco 2021-06-30 22:18:24 -07:00
emptiedsoul ca0e3edcfa Added HarDClanZ Linux 2021-06-24 21:29:36 +03:00
lesin 5a9ac6ee95 Merge branch 'dylanaraps:master' into master 2021-06-24 21:02:45 +03:00
emptiedsoul 3ed56a46b3 Revert "Added HarDClanZ Linux"
This reverts commit 118be2c6e6.
2021-06-24 21:04:00 +03:00
emptiedsoul 6ff0b0a28b Revert "removed blank line"
This reverts commit 1e2ccf07a8.
2021-06-24 21:02:35 +03:00
emptiedsoul 1e2ccf07a8 removed blank line 2021-06-24 20:51:50 +03:00
Syphist 3e383f68f1 Merge remote-tracking branch 'upstream/master'
Merge upstream changes
2021-06-17 23:35:45 -05:00
blackPanther OS 4f519e3aae Add blackPanther OS support 2021-05-25 12:03:20 +02:00
andreriesco 116f038d86 Add TorizonCore logo
Adds the TorizonCore OS to neofetch. Torizon is an open-source software
platform that simplifies the development and maintenance of embedded
Linux software.

Signed-off-by: Andre Riesco <andre.riesco@toradex.com>
Signed-off-by: Matheus Castello <matheus.castello@toradex.com>
2021-05-05 08:58:46 -03:00
Noah d1fac5df1d Allow rgb truecolors to be passed to --ascii_color 2021-04-12 22:02:05 -05:00
Carlos Eduardo f85fd46f63 Fix GTK shorthand 2021-03-29 22:36:56 -03:00
Carlos Eduardo 4f49053c8f Add Qt theme detection + Option 2021-03-29 17:47:29 -03:00
Ross Smith II 0f5a329522 Quiet spurious shellcheck issues 2021-01-30 09:48:07 -08:00
vicchi e68bb3dd2e feat: Add (rudimentary) Synology DSM support 2021-01-23 12:09:53 +00:00
Syphist 1456af01ba Merge branch 'master' of https://github.com/dylanaraps/neofetch
Merge upstream changes.
2021-01-08 20:43:15 -06:00
Ross Smith II 4917191cdb Fix typo 2020-12-26 23:13:41 -08:00
Ross Smith II 5d9b77c9b0 neofetch: Strengthen scoop/choco app reporting 2020-12-26 22:34:54 -08:00
FreeApp2014 0a4a58c1fb Added KrassOS 2020-12-14 00:03:27 +03:00
emptiedsoul 118be2c6e6 Added HarDClanZ Linux 2020-11-29 16:38:48 +03:00
Syphist a0221c51ff Merge branch 'master' of https://github.com/dylanaraps/neofetch
Merge changes from main repo to this fork.
2020-11-13 15:48:48 -06:00
Dvonik ddd8dad7ef updated freebsd host fix to latest commit 2020-10-24 14:10:46 -04:00
Dvonik e407d5bad1 freebsd host model fix 2020-10-24 14:06:57 -04:00
Syphist d2ea94a15d Merge branch 'master' of https://github.com/dylanaraps/neofetch into master
Merge all changes to master to this fork.
2020-10-13 14:30:29 -05:00
Syphist 1b5dcdf7bc Fixed build error detected due to long comment. 2020-08-25 05:44:17 -05:00
Syphist cb32928102 Added patch from dylanaraps/neofetch/1220 as it runs faster in some instances and does not hinder performance where it doesn't work 2020-08-25 05:34:33 -05:00
Syphist 86e266e5b7 Made comment accurate 2020-08-25 04:49:06 -05:00
Syphist 10cf43e53a Added support for pasted character and removed unecessary variables. 2020-08-25 04:45:13 -05:00
Syphist 4141531b22 Fixed SC2001 error, you also need to use \033 instead of pasting the character in. 2020-08-25 04:40:42 -05:00
Syphist 0e7799ff7e Using regex I was able to strip color codes from ascii art line length calculations. 2020-08-25 00:00:26 -05:00
Adam Laughlin 9281ae5ed1 cleaning up logic 2019-01-04 19:46:20 -05:00
Adam Laughlin e64b4d29f9 adding cursor theme support 2019-01-04 19:18:30 -05:00
xudong-yang 00e0343150 shrink the changed line to make sure it pass travis check 2018-12-06 18:16:01 +08:00
xudong-yang e5d28f28c6 fix GPU driver detection bug with bumblebee-managed dual video cards 2018-12-06 16:35:57 +08:00
20 changed files with 1512 additions and 659 deletions
+24
View File
@@ -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
-16
View File
@@ -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
+60
View File
@@ -60,6 +60,66 @@ Updates to `neowofetch` begins with the emoji 🖼️
* [ ] 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>
+1 -1
View File
@@ -7,7 +7,7 @@ from pathlib import Path
from typing_extensions import Literal
CONFIG_PATH = Path.home() / '.config/hyfetch.json'
VERSION = '1.3.0'
VERSION = '1.4.0'
# Obtain terminal size
try:
+1 -1
View File
@@ -178,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/')
+7
View File
@@ -525,4 +525,11 @@ PRESETS: dict[str, ColorProfile] = {
'#FFFFFF',
'#000000',
]),
"finsexual": ColorProfile([
"#B18EDF",
"#D7B1E2",
"#F7CDE9",
"#F39FCE",
"#EA7BB3",
]),
}
-48
View File
@@ -1,48 +0,0 @@
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))
-29
View File
@@ -1,29 +0,0 @@
# 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
Regular → Executable
+1050 -467
View File
File diff suppressed because it is too large Load Diff
+63 -48
View File
@@ -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, 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, 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, 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, ShastraOS, Scientific, Septor,
SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS,
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,
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.
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "neowofetch",
"version": "1.3.0",
"version": "1.4.0",
"description": "Updated neofetch",
"repository": {
"type": "git",
Regular → Executable
View File
Regular → Executable
View File
+65 -48
View File
@@ -11,56 +11,9 @@ 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')
def copy_comment():
# Get commit SHA
sha = check_output(shlex.split('git rev-parse --short HEAD')).decode().strip()
@@ -78,3 +31,67 @@ Read the ["Running Updated Original Neofetch" section](https://github.com/hykilp
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()
Regular → Executable
View File
View File
+111
View File
@@ -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, '# '))
+70
View File
@@ -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))
+59
View File
@@ -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
View File