From c8185944dce617d46232104bbda6a95f38a38056 Mon Sep 17 00:00:00 2001 From: Bailey Kasin Date: Tue, 22 Aug 2023 23:47:53 -0700 Subject: [PATCH 1/8] Update Makefile to be able to install hyfetch --- Makefile | 27 +- docs/hyfetch.1 | 73 ++++++ neofetch.1 => docs/neofetch.1 | 0 docs/neowofetch.1 | 473 ++++++++++++++++++++++++++++++++++ 4 files changed, 569 insertions(+), 4 deletions(-) create mode 100644 docs/hyfetch.1 rename neofetch.1 => docs/neofetch.1 (100%) create mode 100644 docs/neowofetch.1 diff --git a/Makefile b/Makefile index 2b41f34f..e17fe654 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,35 @@ PREFIX = /usr MANDIR = $(PREFIX)/share/man -all: - @echo Run \'make install\' to install Neofetch. +all: build install + +build: + python setup.py build install: + python setup.py install --prefix=${PREFIX} + +install-doc: + @mkdir -p $(DESTDIR)$(MANDIR)/man1 + @cp -p docs/hyfetch.1 $(DESTDIR)$(MANDIR)/man1 + @cp -p docs/neowofetch.1 $(DESTDIR)$(MANDIR)/man1 + +uninstall: + @rm -rf $(DESTDIR)$(PREFIX)/bin/hyfetch + @rm -rf $(DESTDIR)$(PREFIX)/bin/neowofetch + @rm -rf $(DESTDIR)$(MANDIR)/man1/hyfetch.1* + @rm -rf $(DESTDIR)$(MANDIR)/man1/neowofetch.1* + +clean: + rm -rf build/ HyFetch.egg-info + +install-neofetch: @mkdir -p $(DESTDIR)$(PREFIX)/bin @mkdir -p $(DESTDIR)$(MANDIR)/man1 @cp -p neofetch $(DESTDIR)$(PREFIX)/bin/neofetch - @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 + @cp -p docs/neofetch.1 $(DESTDIR)$(MANDIR)/man1 @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch -uninstall: +uninstall-neofetch: @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* diff --git a/docs/hyfetch.1 b/docs/hyfetch.1 new file mode 100644 index 00000000..cd73c3b4 --- /dev/null +++ b/docs/hyfetch.1 @@ -0,0 +1,73 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. +.TH VERSION "1" "August 2023" "Version is 1.4.10" "User Commands" +.SH NAME +Version \- manual page for Version is 1.4.10 +.SH DESCRIPTION +usage: hyfetch [\-h] [\-c] [\-C CONFIG_FILE] +.IP +[\-p {rainbow,transgender,nonbinary,agender,queer,genderfluid,bisexual,pansexual,polysexual,omnisexual,omniromantic,gay\-men,lesbian,abrosexual,asexual,aromantic,aroace1,aroace2,aroace3,autosexual,intergender,greygender,akiosexual,bigender,demigender,demiboy,demigirl,transmasculine,transfeminine,genderfaun,demifaun,genderfae,demifae,neutrois,biromantic1,biromantic2,autoromantic,boyflux2,finsexual,unlabeled1,unlabeled2,pangender,gendernonconforming1,gendernonconforming2,femboy,tomboy,gynesexual,androsexual,gendervoid,voidgirl,voidboy,nonhuman\-unity,beiyang,burger}] +[\-m {8bit,rgb}] +[\-b {qwqfetch,neofetch,fastfetch,fastfetch\-old}] [\-\-args ARGS] +[\-\-c\-scale SCALE] [\-\-c\-set\-l LIGHT] [\-\-c\-overlay] [\-V] [\-\-june] +[\-\-debug] [\-\-distro DISTRO] [\-\-ascii\-file ASCII_FILE] +.PP +hyfetch \- neofetch with flags <3 +.SS "options:" +.TP +\fB\-h\fR, \fB\-\-help\fR +show this help message and exit +.TP +\fB\-c\fR, \fB\-\-config\fR +Configure hyfetch +.TP +\fB\-C\fR CONFIG_FILE, \fB\-\-config\-file\fR CONFIG_FILE +Use another config file +.TP +\fB\-p\fR {rainbow,transgender,nonbinary,agender,queer,genderfluid,bisexual,pansexual,polysexual,omnisexual,omniromantic,gay\-men,lesbian,abrosexual,asexual,aromantic,aroace1,aroace2,aroace3,autosexual,intergender,greygender,akiosexual,bigender,demigender,demiboy,demigirl,transmasculine,transfeminine,genderfaun,demifaun,genderfae,demifae,neutrois,biromantic1,biromantic2,autoromantic,boyflux2,finsexual,unlabeled1,unlabeled2,pangender,gendernonconforming1,gendernonconforming2,femboy,tomboy,gynesexual,androsexual,gendervoid,voidgirl,voidboy,nonhuman\-unity,beiyang,burger}, \fB\-\-preset\fR {rainbow,transgender,nonbinary,agender,queer,genderfluid,bisexual,pansexual,polysexual,omnisexual,omniromantic,gay\-men,lesbian,abrosexual,asexual,aromantic,aroace1,aroace2,aroace3,autosexual,intergender,greygender,akiosexual,bigender,demigender,demiboy,demigirl,transmasculine,transfeminine,genderfaun,demifaun,genderfae,demifae,neutrois,biromantic1,biromantic2,autoromantic,boyflux2,finsexual,unlabeled1,unlabeled2,pangender,gendernonconforming1,gendernonconforming2,femboy,tomboy,gynesexual,androsexual,gendervoid,voidgirl,voidboy,nonhuman\-unity,beiyang,burger} +Use preset +.TP +\fB\-m\fR {8bit,rgb}, \fB\-\-mode\fR {8bit,rgb} +Color mode +.TP +\fB\-b\fR {qwqfetch,neofetch,fastfetch,fastfetch\-old}, \fB\-\-backend\fR {qwqfetch,neofetch,fastfetch,fastfetch\-old} +Choose a *fetch backend +.TP +\fB\-\-args\fR ARGS +Additional arguments pass\-through to backend +.TP +\fB\-\-c\-scale\fR SCALE +Lighten colors by a multiplier +.TP +\fB\-\-c\-set\-l\fR LIGHT +Set lightness value of the colors +.TP +\fB\-\-c\-overlay\fR +Use experimental overlay color adjusting instead of +HSL lightness +.TP +\fB\-V\fR, \fB\-\-version\fR +Check version +.TP +\fB\-\-june\fR +Show pride month easter egg +.TP +\fB\-\-debug\fR +Debug mode +.TP +\fB\-\-distro\fR DISTRO, \fB\-\-test\-distro\fR DISTRO +Test for a specific distro +.TP +\fB\-\-ascii\-file\fR ASCII_FILE +Use a specific file for the ascii art +.SH "SEE ALSO" +The full documentation for +.B Version +is maintained as a Texinfo manual. If the +.B info +and +.B Version +programs are properly installed at your site, the command +.IP +.B info Version +.PP +should give you access to the complete manual. diff --git a/neofetch.1 b/docs/neofetch.1 similarity index 100% rename from neofetch.1 rename to docs/neofetch.1 diff --git a/docs/neowofetch.1 b/docs/neowofetch.1 new file mode 100644 index 00000000..780e3f2b --- /dev/null +++ b/docs/neowofetch.1 @@ -0,0 +1,473 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. +.TH NEOFETCH "1" "August 2023" "Neofetch 7.3.10" "User Commands" +.SH NAME +Neofetch \- manual page for Neofetch 7.3.10 +.SH SYNOPSIS +.B neofetch +\fI\,func_name --option "value" --option "value"\/\fR +.SH DESCRIPTION +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. +.PP +NOTE: Every launch flag has a config option. +.SH OPTIONS +.SS "INFO:" +.TP +func_name +Specify a function name (second part of info() from config) to +quickly display only that function's information. +.IP +Example: neofetch uptime \fB\-\-uptime_shorthand\fR tiny +.IP +Example: neofetch uptime disk wm memory +.IP +This can be used in bars and scripts like so: +.IP +memory="$(neofetch memory)"; memory="${memory##*: }" +.IP +For multiple outputs at once (each line of info in an array): +.IP +IFS=$'\en' read \fB\-d\fR "" \fB\-ra\fR info < <(neofetch memory uptime wm) +.IP +info=("${info[@]##*: }") +.TP +\fB\-\-disable\fR infoname +Allows you to disable an info line from appearing +in the output. 'infoname' is the function name from the +\&'print_info()' function inside the config file. +For example: 'info "Memory" memory' would be '\-\-disable memory' +.IP +NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu' +.TP +\fB\-\-title_fqdn\fR on/off +Hide/Show Fully Qualified Domain Name in title. +.TP +\fB\-\-package_managers\fR on/off +Hide/Show Package Manager names. (on, tiny, off) +.TP +\fB\-\-package_separate\fR on/off +Whether to separate system/user modes for supported package managers +.TP +\fB\-\-os_arch\fR on/off +Hide/Show OS architecture. +.TP +\fB\-\-speed_type\fR type +Change the type of cpu speed to display. +Possible values: current, min, max, bios, +scaling_current, scaling_min, scaling_max +.IP +NOTE: This only supports Linux with cpufreq. +.TP +\fB\-\-speed_shorthand\fR on/off +Whether or not to show decimals in CPU speed. +.TP +NOTE: This flag is not supported in systems with CPU speed less than +1 GHz. +.TP +\fB\-\-cpu_brand\fR on/off +Enable/Disable CPU brand in output. +.TP +\fB\-\-cpu_cores\fR type +Whether or not to display the number of CPU cores +Possible values: logical, physical, off +.IP +NOTE: 'physical' doesn't work on BSD. +.TP +\fB\-\-cpu_speed\fR on/off +Hide/Show cpu speed. +.TP +\fB\-\-cpu_temp\fR C/F/off +Hide/Show cpu temperature. +.IP +NOTE: This only works on Linux and BSD. +.TP +NOTE: For FreeBSD and NetBSD\-based systems, you need to enable +coretemp kernel module. This only supports newer Intel processors. +.TP +\fB\-\-distro_shorthand\fR on/off +Shorten the output of distro (on, tiny, off) +.IP +NOTE: This option won't work in Windows (Cygwin) +.TP +\fB\-\-kernel_shorthand\fR on/off +Shorten the output of kernel +.IP +NOTE: This option won't work in BSDs (except PacBSD and PC\-BSD) +.TP +\fB\-\-uptime_shorthand\fR on/off +Shorten the output of uptime (on, tiny, off) +.TP +\fB\-\-refresh_rate\fR on/off +Whether to display the refresh rate of each monitor +Unsupported on Windows +.TP +\fB\-\-gpu_brand\fR on/off +Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) +.TP +\fB\-\-gpu_type\fR type +Which GPU to display. (all, dedicated, integrated) +.IP +NOTE: This only supports Linux. +.TP +\fB\-\-de_version\fR on/off +Show/Hide Desktop Environment version +.TP +\fB\-\-gtk_shorthand\fR on/off +Shorten output of gtk theme/icons +.TP +\fB\-\-gtk2\fR on/off +Enable/Disable gtk2 theme/font/icons output +.TP +\fB\-\-gtk3\fR on/off +Enable/Disable gtk3 theme/font/icons output +.TP +\fB\-\-shell_path\fR on/off +Enable/Disable showing $SHELL path +.TP +\fB\-\-shell_version\fR on/off +Enable/Disable showing $SHELL version +.TP +\fB\-\-editor_path\fR on/off +Enable/Disable showing $EDITOR path +.TP +\fB\-\-editor_version\fR on/off +Enable/Disable showing $EDITOR version +.TP +\fB\-\-disk_show\fR value +Which disks to display. +Possible values: '/', '/dev/sdXX', '/path/to/mount point' +.IP +NOTE: Multiple values can be given. (\fB\-\-disk_show\fR '/' '/dev/sdc1') +.TP +\fB\-\-disk_subtitle\fR type +What information to append to the Disk subtitle. +Takes: name, mount, dir, none +.IP +\&'name' shows the disk's name (sda1, sda2, etc) +.IP +\&'mount' shows the disk's mount point (/, \fI\,/mnt/Local\/\fP Disk, etc) +.IP +\&'dir' shows the basename of the disks's path. (/, Local Disk, etc) +.IP +\&'none' shows only 'Disk' or the configured title. +.TP +\fB\-\-disk_percent\fR on/off +Hide/Show disk percent. +.TP +\fB\-\-ip_host\fR url +URL to query for public IP +.TP +\fB\-\-ip_timeout\fR int +Public IP timeout (in seconds). +.TP +\fB\-\-ip_interface\fR value +Interface(s) to use for local IP +.TP +\fB\-\-song_format\fR format +Print the song data in a specific format (see config file). +.TP +\fB\-\-song_shorthand\fR on/off +Print the Artist/Album/Title on separate lines. +.TP +\fB\-\-memory_percent\fR on/off +Display memory percentage. +.TP +\fB\-\-memory_unit\fR (k/m/g/t)ib +Memory output unit. +.TP +\fB\-\-memory_precision\fR integer +Change memory output precision. (???0, default=2) +.TP +\fB\-\-music_player\fR player\-name +Manually specify a player to use. +Available values are listed in the config file +.SS "TEXT FORMATTING:" +.TP +\fB\-\-colors\fR x x x x x x +Changes the text colors in this order: +title, @, underline, subtitle, colon, info +.TP +\fB\-\-underline\fR on/off +Enable/Disable the underline. +.TP +\fB\-\-underline_char\fR char +Character to use when underlining title +.TP +\fB\-\-bold\fR on/off +Enable/Disable bold text +.TP +\fB\-\-separator\fR string +Changes the default ':' separator to the specified string. +.SS "COLOR BLOCKS:" +.TP +\fB\-\-color_blocks\fR on/off +Enable/Disable the color blocks +.TP +\fB\-\-col_offset\fR auto/num +Left\-padding of color blocks +.TP +\fB\-\-block_width\fR num +Width of color blocks in spaces +.TP +\fB\-\-block_height\fR num +Height of color blocks in lines +.TP +\fB\-\-block_range\fR num num +Range of colors to print as blocks +.SS "BARS:" +.TP +\fB\-\-bar_char\fR 'elapsed char' 'total char' +Characters to use when drawing bars. +.TP +\fB\-\-bar_border\fR on/off +Whether or not to surround the bar with '[]' +.TP +\fB\-\-bar_length\fR num +Length in spaces to make the bars. +.TP +\fB\-\-bar_colors\fR num num +Colors to make the bar. +Set in this order: elapsed, total +.TP +\fB\-\-memory_display\fR mode +Bar mode. +Possible values: bar, infobar, barinfo, off +.TP +\fB\-\-battery_display\fR mode +Bar mode. +Possible values: bar, infobar, barinfo, off +.TP +\fB\-\-disk_display\fR mode +Bar mode. +Possible values: bar, infobar, barinfo, off +.SS "IMAGE BACKEND:" +.TP +\fB\-\-backend\fR backend +Which image backend to use. +Possible values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', +\&'iterm2', 'off', 'sixel', 'tycat', 'w3m', 'kitty', 'viu' +.TP +\fB\-\-source\fR source +Which image or ascii file to use. +Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', +\&'/path/to/ascii', '/path/to/dir/', 'command output' [ascii] +.TP +\fB\-\-ascii\fR source +Shortcut to use 'ascii' backend. +.IP +NEW: neofetch \fB\-\-ascii\fR "$(fortune | cowsay \fB\-W\fR 30)" +.TP +\fB\-\-caca\fR source +Shortcut to use 'caca' backend. +.TP +\fB\-\-catimg\fR source +Shortcut to use 'catimg' backend. +.TP +\fB\-\-chafa\fR source +Shortcut to use 'chafa' backend. +.TP +\fB\-\-iterm2\fR source +Shortcut to use 'iterm2' backend. +.TP +\fB\-\-jp2a\fR source +Shortcut to use 'jp2a' backend. +.TP +\fB\-\-kitty\fR source +Shortcut to use 'kitty' backend. +.TP +\fB\-\-pot\fR source +Shortcut to use 'pot' backend. +.TP +\fB\-\-pixterm\fR source +Shortcut to use 'pixterm' backend. +.TP +\fB\-\-sixel\fR source +Shortcut to use 'sixel' backend. +.TP +\fB\-\-termpix\fR source +Shortcut to use 'termpix' backend. +.TP +\fB\-\-tycat\fR source +Shortcut to use 'tycat' backend. +.TP +\fB\-\-w3m\fR source +Shortcut to use 'w3m' backend. +.TP +\fB\-\-ueberzug\fR source +Shortcut to use 'ueberzug' backend +.TP +\fB\-\-viu\fR source +Shortcut to use 'viu' backend +.TP +\fB\-\-off\fR +Shortcut to use 'off' backend (Disable ascii art). +.IP +NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', +\&'/path/to/ascii', '/path/to/dir/' +.SS "ASCII:" +.TP +\fB\-\-ascii_colors\fR x x x x x x +Colors to print the ascii art +.TP +\fB\-\-ascii_distro\fR distro +Which Distro's ascii art to print +.TP +NOTE: AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, +Android, Antergos, antiX, AOSC OS, AOSC OS/Retro, Aperio GNU/Linux, +Aperture, Apricity, Arch, ArchBox, Archcraft, archcraft_ascii, +archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike, ArcoLinux, +ArseLinux, Artix, Arya, Asahi, Aster, AsteroidOS, astOS, Astra +Linux, Athena, Bedrock, BigLinux, Bitrig, BlackArch, blackPanther, +BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, CachyOS, +Calculate, CalinixOS, Carbs, CBL\-Mariner, CelOS, Center, CentOS, +Chakra, ChaletOS, Chapeau, ChonkySealOS, Chrom, Cleanjaro, Clear +Linux OS, ClearOS, Clover, Cobalt, Condres, Container Linux by +CoreOS, CRUX, Crystal Linux, Cucumber, CutefishOS, CuteOS, CyberOS, +dahlia, DarkOs, Darwin, Debian, Deepin, DesaOS, Devuan, DietPi, +DracOS, DragonFly, Drauger, Droidian, Elementary, Elive, EncryptOS, +EndeavourOS, Endless, Enso, EuroLinux, EvolutionOS, Exherbo, Exodia +Predator OS, Fedora, FemboyOS, Feren, Finnix, Floflis, FreeBSD, +FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, GhostBSD, +glaucus, gNewSense, GNOME, GNU, GoboLinux, GrapheneOS, Grombyang, +Guix, Haiku, HamoniKR, HarDClanZ, Hash, Huayra, Hybrid, 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, +Meowix, Mer, Minix, MIRACLE LINUX, MX, Namib, NekOS, Neptune, +NetBSD, Netrunner, Nitrux, NixOS, Nobara, NomadBSD, Nurunner, NuTyX, +Obarun, OBRevenge, OmniOS, Open Source Media Center, OpenBSD, +openEuler, OpenIndiana, openKylin, openmamba, OpenMandriva, +OpenStage, openSUSE, openSUSE Leap, openSUSE Tumbleweed, OPNsense, +Oracle, orchid, OS Elbrus, PacBSD, Panwah, Parabola, parch, Pardus, +Parrot, Parsix, PCBSD, PCLinuxOS, pearOS, Pengwin, Pentoo, +Peppermint, phyOS, PikaOS, Pisi, PNM Linux, Pop!_OS, Porteus, +PostMarketOS, Profelis SambaBOX, Proxmox, PuffOS, Puppy, PureOS, +Q4OS, Qubes, Qubyt, Quibian, Radix, Raspbian, ravynOS, Reborn OS, +Red Star, Redcore, Redhat, Refracted Devuan, Regata, Regolith, +RhaymOS, rocky, Rosa, Sabayon, sabotage, Sailfish, SalentOS, Salient +OS, Salix, Sasanqua, Scientific, semc, Septor, Serene, SharkLinux, +ShastraOS, Siduction, SkiffOS, Slackel, Slackware, SliTaz, SmartOS, +Soda, Solus, Source Mage, Sparky, Star, SteamOS, Stock Linux, 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, unicodearch, Univalent, Univention, +Uos, UrukOS, uwuntu, Vanilla, Venom, VNux, Void, VzLinux, wii\-linuxngx, Windows, Windows 10, Windows 11, Windows95, Wrt, XFerience, +Xubuntu, yiffOS, Zorin have ascii logos. +.TP +NOTE: arch, dragonfly, Fedora, LangitKetujuh, nixos, redhat, Ubuntu +have 'old' logo variants, use {distro}_old to use them. +.TP +NOTE: alpine, android, aoscosretro, arch, arcolinux, artix, +CalinixOS, centos, cleanjaro, crux, debian, dragonfly, elementary, +fedora, freebsd, garuda, gentoo, guix, haiku, hyperbola, kali, +linuxlite, linuxmint, mac, mageia, manjaro, mx, netbsd, nixos, +openbsd, opensuse, orchid, parabola, popos, postmarketos, pureos, +Raspbian, rocky, slackware, sunos, ubuntu, venom, 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. +.TP +\fB\-L\fR, \fB\-\-logo\fR +Hide the info text and only show the ascii logo. +.SS "IMAGE:" +.TP +\fB\-\-loop\fR +Redraw the image constantly until Ctrl+C is used. This fixes issues +in some terminals emulators when using image mode. +.TP +\fB\-\-size\fR 00px | \fB\-\-size\fR 00% +How to size the image. +Possible values: auto, 00px, 00%, none +.TP +\fB\-\-catimg_size\fR 1/2 +Change the resolution of catimg. +.TP +\fB\-\-crop_mode\fR mode +Which crop mode to use +Takes the values: normal, fit, fill +.TP +\fB\-\-crop_offset\fR value +Change the crop offset for normal mode. +Possible values: northwest, north, northeast, +west, center, east, southwest, south, southeast +.TP +\fB\-\-xoffset\fR px +How close the image will be to the left edge of the +window. This only works with w3m. +.TP +\fB\-\-yoffset\fR px +How close the image will be to the top edge of the +window. This only works with w3m. +.TP +\fB\-\-bg_color\fR color +Background color to display behind transparent image. +This only works with w3m. +.TP +\fB\-\-gap\fR num +Gap between image and text. +.TP +NOTE: \fB\-\-gap\fR can take a negative value which will move the text +closer to the left side. +.TP +\fB\-\-clean\fR +Delete cached files and thumbnails. +.SS "OTHER:" +.TP +\fB\-\-config\fR \fI\,/path/to/config\/\fP +Specify a path to a custom config file +.TP +\fB\-\-config\fR none +Launch the script without a config file +.TP +\fB\-\-no_config\fR +Don't create the user config file. +.TP +\fB\-\-print_config\fR +Print the default config file to stdout. +.TP +\fB\-\-stdout\fR=\fI\,on\/\fR +Turn off all colors and disables any ASCII/image backend. +.TP +\fB\-\-stdout\fR=\fI\,off\/\fR +Enable the colored output and ASCII/image backend +.TP +\fB\-\-stdout\fR=\fI\,auto\/\fR +Let the program decide basing on the output type (default behavior) +.TP +\fB\-\-stdout\fR +Equivalent to '\-\-stdout=on', for backward compatibility +.TP +\fB\-\-help\fR +Print this text and exit +.TP +\fB\-\-version\fR +Show neofetch version +.TP +\fB\-v\fR +Display error messages. +.TP +\fB\-vv\fR +Display a verbose log for error reporting. +.SS "DEVELOPER:" +.TP +\fB\-\-gen\-man\fR +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. From 4536dafa09618379f35832db3615e01d13a4dbfb Mon Sep 17 00:00:00 2001 From: Bailey Kasin Date: Tue, 22 Aug 2023 23:55:49 -0700 Subject: [PATCH 2/8] remove neowofetch.1 since it was a copy of neofetch.1 --- Makefile | 2 +- docs/neowofetch.1 | 473 ---------------------------------------------- 2 files changed, 1 insertion(+), 474 deletions(-) delete mode 100644 docs/neowofetch.1 diff --git a/Makefile b/Makefile index e17fe654..994ee904 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ install: install-doc: @mkdir -p $(DESTDIR)$(MANDIR)/man1 @cp -p docs/hyfetch.1 $(DESTDIR)$(MANDIR)/man1 - @cp -p docs/neowofetch.1 $(DESTDIR)$(MANDIR)/man1 + @cp -p docs/neofetch.1 $(DESTDIR)$(MANDIR)/man1/neowofetch.1 uninstall: @rm -rf $(DESTDIR)$(PREFIX)/bin/hyfetch diff --git a/docs/neowofetch.1 b/docs/neowofetch.1 deleted file mode 100644 index 780e3f2b..00000000 --- a/docs/neowofetch.1 +++ /dev/null @@ -1,473 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH NEOFETCH "1" "August 2023" "Neofetch 7.3.10" "User Commands" -.SH NAME -Neofetch \- manual page for Neofetch 7.3.10 -.SH SYNOPSIS -.B neofetch -\fI\,func_name --option "value" --option "value"\/\fR -.SH DESCRIPTION -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. -.PP -NOTE: Every launch flag has a config option. -.SH OPTIONS -.SS "INFO:" -.TP -func_name -Specify a function name (second part of info() from config) to -quickly display only that function's information. -.IP -Example: neofetch uptime \fB\-\-uptime_shorthand\fR tiny -.IP -Example: neofetch uptime disk wm memory -.IP -This can be used in bars and scripts like so: -.IP -memory="$(neofetch memory)"; memory="${memory##*: }" -.IP -For multiple outputs at once (each line of info in an array): -.IP -IFS=$'\en' read \fB\-d\fR "" \fB\-ra\fR info < <(neofetch memory uptime wm) -.IP -info=("${info[@]##*: }") -.TP -\fB\-\-disable\fR infoname -Allows you to disable an info line from appearing -in the output. 'infoname' is the function name from the -\&'print_info()' function inside the config file. -For example: 'info "Memory" memory' would be '\-\-disable memory' -.IP -NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu' -.TP -\fB\-\-title_fqdn\fR on/off -Hide/Show Fully Qualified Domain Name in title. -.TP -\fB\-\-package_managers\fR on/off -Hide/Show Package Manager names. (on, tiny, off) -.TP -\fB\-\-package_separate\fR on/off -Whether to separate system/user modes for supported package managers -.TP -\fB\-\-os_arch\fR on/off -Hide/Show OS architecture. -.TP -\fB\-\-speed_type\fR type -Change the type of cpu speed to display. -Possible values: current, min, max, bios, -scaling_current, scaling_min, scaling_max -.IP -NOTE: This only supports Linux with cpufreq. -.TP -\fB\-\-speed_shorthand\fR on/off -Whether or not to show decimals in CPU speed. -.TP -NOTE: This flag is not supported in systems with CPU speed less than -1 GHz. -.TP -\fB\-\-cpu_brand\fR on/off -Enable/Disable CPU brand in output. -.TP -\fB\-\-cpu_cores\fR type -Whether or not to display the number of CPU cores -Possible values: logical, physical, off -.IP -NOTE: 'physical' doesn't work on BSD. -.TP -\fB\-\-cpu_speed\fR on/off -Hide/Show cpu speed. -.TP -\fB\-\-cpu_temp\fR C/F/off -Hide/Show cpu temperature. -.IP -NOTE: This only works on Linux and BSD. -.TP -NOTE: For FreeBSD and NetBSD\-based systems, you need to enable -coretemp kernel module. This only supports newer Intel processors. -.TP -\fB\-\-distro_shorthand\fR on/off -Shorten the output of distro (on, tiny, off) -.IP -NOTE: This option won't work in Windows (Cygwin) -.TP -\fB\-\-kernel_shorthand\fR on/off -Shorten the output of kernel -.IP -NOTE: This option won't work in BSDs (except PacBSD and PC\-BSD) -.TP -\fB\-\-uptime_shorthand\fR on/off -Shorten the output of uptime (on, tiny, off) -.TP -\fB\-\-refresh_rate\fR on/off -Whether to display the refresh rate of each monitor -Unsupported on Windows -.TP -\fB\-\-gpu_brand\fR on/off -Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) -.TP -\fB\-\-gpu_type\fR type -Which GPU to display. (all, dedicated, integrated) -.IP -NOTE: This only supports Linux. -.TP -\fB\-\-de_version\fR on/off -Show/Hide Desktop Environment version -.TP -\fB\-\-gtk_shorthand\fR on/off -Shorten output of gtk theme/icons -.TP -\fB\-\-gtk2\fR on/off -Enable/Disable gtk2 theme/font/icons output -.TP -\fB\-\-gtk3\fR on/off -Enable/Disable gtk3 theme/font/icons output -.TP -\fB\-\-shell_path\fR on/off -Enable/Disable showing $SHELL path -.TP -\fB\-\-shell_version\fR on/off -Enable/Disable showing $SHELL version -.TP -\fB\-\-editor_path\fR on/off -Enable/Disable showing $EDITOR path -.TP -\fB\-\-editor_version\fR on/off -Enable/Disable showing $EDITOR version -.TP -\fB\-\-disk_show\fR value -Which disks to display. -Possible values: '/', '/dev/sdXX', '/path/to/mount point' -.IP -NOTE: Multiple values can be given. (\fB\-\-disk_show\fR '/' '/dev/sdc1') -.TP -\fB\-\-disk_subtitle\fR type -What information to append to the Disk subtitle. -Takes: name, mount, dir, none -.IP -\&'name' shows the disk's name (sda1, sda2, etc) -.IP -\&'mount' shows the disk's mount point (/, \fI\,/mnt/Local\/\fP Disk, etc) -.IP -\&'dir' shows the basename of the disks's path. (/, Local Disk, etc) -.IP -\&'none' shows only 'Disk' or the configured title. -.TP -\fB\-\-disk_percent\fR on/off -Hide/Show disk percent. -.TP -\fB\-\-ip_host\fR url -URL to query for public IP -.TP -\fB\-\-ip_timeout\fR int -Public IP timeout (in seconds). -.TP -\fB\-\-ip_interface\fR value -Interface(s) to use for local IP -.TP -\fB\-\-song_format\fR format -Print the song data in a specific format (see config file). -.TP -\fB\-\-song_shorthand\fR on/off -Print the Artist/Album/Title on separate lines. -.TP -\fB\-\-memory_percent\fR on/off -Display memory percentage. -.TP -\fB\-\-memory_unit\fR (k/m/g/t)ib -Memory output unit. -.TP -\fB\-\-memory_precision\fR integer -Change memory output precision. (???0, default=2) -.TP -\fB\-\-music_player\fR player\-name -Manually specify a player to use. -Available values are listed in the config file -.SS "TEXT FORMATTING:" -.TP -\fB\-\-colors\fR x x x x x x -Changes the text colors in this order: -title, @, underline, subtitle, colon, info -.TP -\fB\-\-underline\fR on/off -Enable/Disable the underline. -.TP -\fB\-\-underline_char\fR char -Character to use when underlining title -.TP -\fB\-\-bold\fR on/off -Enable/Disable bold text -.TP -\fB\-\-separator\fR string -Changes the default ':' separator to the specified string. -.SS "COLOR BLOCKS:" -.TP -\fB\-\-color_blocks\fR on/off -Enable/Disable the color blocks -.TP -\fB\-\-col_offset\fR auto/num -Left\-padding of color blocks -.TP -\fB\-\-block_width\fR num -Width of color blocks in spaces -.TP -\fB\-\-block_height\fR num -Height of color blocks in lines -.TP -\fB\-\-block_range\fR num num -Range of colors to print as blocks -.SS "BARS:" -.TP -\fB\-\-bar_char\fR 'elapsed char' 'total char' -Characters to use when drawing bars. -.TP -\fB\-\-bar_border\fR on/off -Whether or not to surround the bar with '[]' -.TP -\fB\-\-bar_length\fR num -Length in spaces to make the bars. -.TP -\fB\-\-bar_colors\fR num num -Colors to make the bar. -Set in this order: elapsed, total -.TP -\fB\-\-memory_display\fR mode -Bar mode. -Possible values: bar, infobar, barinfo, off -.TP -\fB\-\-battery_display\fR mode -Bar mode. -Possible values: bar, infobar, barinfo, off -.TP -\fB\-\-disk_display\fR mode -Bar mode. -Possible values: bar, infobar, barinfo, off -.SS "IMAGE BACKEND:" -.TP -\fB\-\-backend\fR backend -Which image backend to use. -Possible values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', -\&'iterm2', 'off', 'sixel', 'tycat', 'w3m', 'kitty', 'viu' -.TP -\fB\-\-source\fR source -Which image or ascii file to use. -Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', -\&'/path/to/ascii', '/path/to/dir/', 'command output' [ascii] -.TP -\fB\-\-ascii\fR source -Shortcut to use 'ascii' backend. -.IP -NEW: neofetch \fB\-\-ascii\fR "$(fortune | cowsay \fB\-W\fR 30)" -.TP -\fB\-\-caca\fR source -Shortcut to use 'caca' backend. -.TP -\fB\-\-catimg\fR source -Shortcut to use 'catimg' backend. -.TP -\fB\-\-chafa\fR source -Shortcut to use 'chafa' backend. -.TP -\fB\-\-iterm2\fR source -Shortcut to use 'iterm2' backend. -.TP -\fB\-\-jp2a\fR source -Shortcut to use 'jp2a' backend. -.TP -\fB\-\-kitty\fR source -Shortcut to use 'kitty' backend. -.TP -\fB\-\-pot\fR source -Shortcut to use 'pot' backend. -.TP -\fB\-\-pixterm\fR source -Shortcut to use 'pixterm' backend. -.TP -\fB\-\-sixel\fR source -Shortcut to use 'sixel' backend. -.TP -\fB\-\-termpix\fR source -Shortcut to use 'termpix' backend. -.TP -\fB\-\-tycat\fR source -Shortcut to use 'tycat' backend. -.TP -\fB\-\-w3m\fR source -Shortcut to use 'w3m' backend. -.TP -\fB\-\-ueberzug\fR source -Shortcut to use 'ueberzug' backend -.TP -\fB\-\-viu\fR source -Shortcut to use 'viu' backend -.TP -\fB\-\-off\fR -Shortcut to use 'off' backend (Disable ascii art). -.IP -NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', -\&'/path/to/ascii', '/path/to/dir/' -.SS "ASCII:" -.TP -\fB\-\-ascii_colors\fR x x x x x x -Colors to print the ascii art -.TP -\fB\-\-ascii_distro\fR distro -Which Distro's ascii art to print -.TP -NOTE: AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, -Android, Antergos, antiX, AOSC OS, AOSC OS/Retro, Aperio GNU/Linux, -Aperture, Apricity, Arch, ArchBox, Archcraft, archcraft_ascii, -archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike, ArcoLinux, -ArseLinux, Artix, Arya, Asahi, Aster, AsteroidOS, astOS, Astra -Linux, Athena, Bedrock, BigLinux, Bitrig, BlackArch, blackPanther, -BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, CachyOS, -Calculate, CalinixOS, Carbs, CBL\-Mariner, CelOS, Center, CentOS, -Chakra, ChaletOS, Chapeau, ChonkySealOS, Chrom, Cleanjaro, Clear -Linux OS, ClearOS, Clover, Cobalt, Condres, Container Linux by -CoreOS, CRUX, Crystal Linux, Cucumber, CutefishOS, CuteOS, CyberOS, -dahlia, DarkOs, Darwin, Debian, Deepin, DesaOS, Devuan, DietPi, -DracOS, DragonFly, Drauger, Droidian, Elementary, Elive, EncryptOS, -EndeavourOS, Endless, Enso, EuroLinux, EvolutionOS, Exherbo, Exodia -Predator OS, Fedora, FemboyOS, Feren, Finnix, Floflis, FreeBSD, -FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, GhostBSD, -glaucus, gNewSense, GNOME, GNU, GoboLinux, GrapheneOS, Grombyang, -Guix, Haiku, HamoniKR, HarDClanZ, Hash, Huayra, Hybrid, 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, -Meowix, Mer, Minix, MIRACLE LINUX, MX, Namib, NekOS, Neptune, -NetBSD, Netrunner, Nitrux, NixOS, Nobara, NomadBSD, Nurunner, NuTyX, -Obarun, OBRevenge, OmniOS, Open Source Media Center, OpenBSD, -openEuler, OpenIndiana, openKylin, openmamba, OpenMandriva, -OpenStage, openSUSE, openSUSE Leap, openSUSE Tumbleweed, OPNsense, -Oracle, orchid, OS Elbrus, PacBSD, Panwah, Parabola, parch, Pardus, -Parrot, Parsix, PCBSD, PCLinuxOS, pearOS, Pengwin, Pentoo, -Peppermint, phyOS, PikaOS, Pisi, PNM Linux, Pop!_OS, Porteus, -PostMarketOS, Profelis SambaBOX, Proxmox, PuffOS, Puppy, PureOS, -Q4OS, Qubes, Qubyt, Quibian, Radix, Raspbian, ravynOS, Reborn OS, -Red Star, Redcore, Redhat, Refracted Devuan, Regata, Regolith, -RhaymOS, rocky, Rosa, Sabayon, sabotage, Sailfish, SalentOS, Salient -OS, Salix, Sasanqua, Scientific, semc, Septor, Serene, SharkLinux, -ShastraOS, Siduction, SkiffOS, Slackel, Slackware, SliTaz, SmartOS, -Soda, Solus, Source Mage, Sparky, Star, SteamOS, Stock Linux, 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, unicodearch, Univalent, Univention, -Uos, UrukOS, uwuntu, Vanilla, Venom, VNux, Void, VzLinux, wii\-linuxngx, Windows, Windows 10, Windows 11, Windows95, Wrt, XFerience, -Xubuntu, yiffOS, Zorin have ascii logos. -.TP -NOTE: arch, dragonfly, Fedora, LangitKetujuh, nixos, redhat, Ubuntu -have 'old' logo variants, use {distro}_old to use them. -.TP -NOTE: alpine, android, aoscosretro, arch, arcolinux, artix, -CalinixOS, centos, cleanjaro, crux, debian, dragonfly, elementary, -fedora, freebsd, garuda, gentoo, guix, haiku, hyperbola, kali, -linuxlite, linuxmint, mac, mageia, manjaro, mx, netbsd, nixos, -openbsd, opensuse, orchid, parabola, popos, postmarketos, pureos, -Raspbian, rocky, slackware, sunos, ubuntu, venom, 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. -.TP -\fB\-L\fR, \fB\-\-logo\fR -Hide the info text and only show the ascii logo. -.SS "IMAGE:" -.TP -\fB\-\-loop\fR -Redraw the image constantly until Ctrl+C is used. This fixes issues -in some terminals emulators when using image mode. -.TP -\fB\-\-size\fR 00px | \fB\-\-size\fR 00% -How to size the image. -Possible values: auto, 00px, 00%, none -.TP -\fB\-\-catimg_size\fR 1/2 -Change the resolution of catimg. -.TP -\fB\-\-crop_mode\fR mode -Which crop mode to use -Takes the values: normal, fit, fill -.TP -\fB\-\-crop_offset\fR value -Change the crop offset for normal mode. -Possible values: northwest, north, northeast, -west, center, east, southwest, south, southeast -.TP -\fB\-\-xoffset\fR px -How close the image will be to the left edge of the -window. This only works with w3m. -.TP -\fB\-\-yoffset\fR px -How close the image will be to the top edge of the -window. This only works with w3m. -.TP -\fB\-\-bg_color\fR color -Background color to display behind transparent image. -This only works with w3m. -.TP -\fB\-\-gap\fR num -Gap between image and text. -.TP -NOTE: \fB\-\-gap\fR can take a negative value which will move the text -closer to the left side. -.TP -\fB\-\-clean\fR -Delete cached files and thumbnails. -.SS "OTHER:" -.TP -\fB\-\-config\fR \fI\,/path/to/config\/\fP -Specify a path to a custom config file -.TP -\fB\-\-config\fR none -Launch the script without a config file -.TP -\fB\-\-no_config\fR -Don't create the user config file. -.TP -\fB\-\-print_config\fR -Print the default config file to stdout. -.TP -\fB\-\-stdout\fR=\fI\,on\/\fR -Turn off all colors and disables any ASCII/image backend. -.TP -\fB\-\-stdout\fR=\fI\,off\/\fR -Enable the colored output and ASCII/image backend -.TP -\fB\-\-stdout\fR=\fI\,auto\/\fR -Let the program decide basing on the output type (default behavior) -.TP -\fB\-\-stdout\fR -Equivalent to '\-\-stdout=on', for backward compatibility -.TP -\fB\-\-help\fR -Print this text and exit -.TP -\fB\-\-version\fR -Show neofetch version -.TP -\fB\-v\fR -Display error messages. -.TP -\fB\-vv\fR -Display a verbose log for error reporting. -.SS "DEVELOPER:" -.TP -\fB\-\-gen\-man\fR -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. From 57a28da23bdbb09ee6e954efd3c6b68403a6ee89 Mon Sep 17 00:00:00 2001 From: Bailey Kasin <31324979+BKasin@users.noreply.github.com> Date: Wed, 23 Aug 2023 01:38:39 -0700 Subject: [PATCH 3/8] =?UTF-8?q?all=20shouldn=E2=80=99t=20call=20install,?= =?UTF-8?q?=20whoops?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 994ee904..9556396b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ PREFIX = /usr MANDIR = $(PREFIX)/share/man -all: build install +all: build build: python setup.py build From 8182224dc7da9943e467c8d9c286d24f7b448fe0 Mon Sep 17 00:00:00 2001 From: Bailey Kasin Date: Fri, 25 Aug 2023 21:14:00 -0700 Subject: [PATCH 4/8] [F] Fix config file argument not being used --- hyfetch/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyfetch/main.py b/hyfetch/main.py index 3462e06d..3ef66816 100755 --- a/hyfetch/main.py +++ b/hyfetch/main.py @@ -27,7 +27,7 @@ def check_config(path) -> Config: """ if path.is_file(): try: - return Config.from_dict(json.loads(CONFIG_PATH.read_text('utf-8'))) + return Config.from_dict(json.loads(path.read_text('utf-8'))) except KeyError: return create_config() From 1ff772a01b1a4f435a28b5fe616bcf4812205a6c Mon Sep 17 00:00:00 2001 From: Bailey Kasin Date: Wed, 30 Aug 2023 00:46:44 -0700 Subject: [PATCH 5/8] [+] Add ability to set backend args in config file Adds the option to set permanent backend args in the config file, as requested in #180. --- hyfetch/main.py | 4 +++- hyfetch/models.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hyfetch/main.py b/hyfetch/main.py index 3462e06d..f1b89ecf 100755 --- a/hyfetch/main.py +++ b/hyfetch/main.py @@ -401,6 +401,8 @@ def run(): config.mode = args.mode if args.backend: config.backend = args.backend + if args.args: + config.args = args.args # Override global color mode GLOBAL_CFG.color_mode = config.mode @@ -421,7 +423,7 @@ def run(): try: asc = get_distro_ascii() if not args.ascii_file else Path(args.ascii_file).read_text("utf-8") asc = config.color_align.recolor_ascii(asc, preset) - neofetch_util.run(asc, config.backend, args.args or '') + neofetch_util.run(asc, config.backend, config.args or '') except Exception as e: print(f'Error: {e}') traceback.print_exc() diff --git a/hyfetch/models.py b/hyfetch/models.py index 7050e3b0..9f3a747d 100644 --- a/hyfetch/models.py +++ b/hyfetch/models.py @@ -16,6 +16,7 @@ class Config: lightness: float | None = None color_align: ColorAlignment = field(default_factory=lambda: ColorAlignment('horizontal')) backend: BackendLiteral = "neofetch" + args: str | None = None distro: str | None = None pride_month_shown: list[int] = field(default_factory=list) # This is deprecated, see issue #136 pride_month_disable: bool = False From 5122d08ff658896023a76c781b87dd2dc9fe98f0 Mon Sep 17 00:00:00 2001 From: Azalea Date: Wed, 6 Sep 2023 20:18:00 -0700 Subject: [PATCH 6/8] [U] Update release script for #174 --- tools/deploy-release.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/deploy-release.py b/tools/deploy-release.py index 343bbbdf..f3ea76ae 100755 --- a/tools/deploy-release.py +++ b/tools/deploy-release.py @@ -92,7 +92,8 @@ def finalize_neofetch(): # 2. Regenerate man page print('Regenerating neofetch man page...') - Path('neofetch.1').write_text(subprocess.check_output(['help2man', './neofetch']).decode()) + Path('docs/neofetch.1').write_text(subprocess.check_output(['help2man', './neofetch']).decode()) + Path('docs/hyfetch.1').write_text(subprocess.check_output(['help2man', 'python3 -m hyfetch']).decode()) # 3. Reformat readme links print('Reformatting readme links...') From 1e8fade4be7d86dc79e71b8e763e9b83ae993917 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Fri, 8 Sep 2023 15:45:36 +0800 Subject: [PATCH 7/8] neofetch: use new AOSC OS logo --- neofetch | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 5eecbe63..76df71de 100755 --- a/neofetch +++ b/neofetch @@ -7230,28 +7230,25 @@ EOF ;; "AOSC OS"*) - set_colors 4 7 1 + set_colors 4 0 1 3 read -rd '' ascii_data <<'EOF' -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. +${c2} __ + ${c2}gpBBBBBBBBBP + ${c2}_gBBBBBBBBBRP + ${c2}4BBBBBBBBRP ${c4},_____ + ${c2}`"" ${c4}_g@@@@@@@@@@@@@%g> + ${c4}__@@@@@@@@@@@@@@@@P" ${c1}___ + ${c4}_g@@@@@@@@@@@@@@@N"` ${c1}_gN@@@@@N^ + ${c4}_w@@@@@@@@@@@@@@@@P" ${c1}_g@@@@@@@P" + ${c4}_g@@@@@@@@@@@@@@@N"` ${c1}VMNN@NNNM^` + ${c4}^MMM@@@@@@@@@@@MP" ${c3},ggppww__ + ${c4}`""""" ${c3}_wNNNNNNNNNNNNNNNNNNN + ${c3}_gBNNNNNNNNNNNNNNNNNP" + ${c3}_wNNNNNNNNNNNNNNNNNNMP` + ${c3}_gBNNNNNNNNNNNNNNNNNP" + ${c3}_wNNNNNNNNNNNNNNNNNNNM^ + ${c3}""Y^^MNNNNNNNNNNNNP` + ${c3}`""""""" EOF ;; From a8f26f9e360537e592938a4740b7b548a0a49fc6 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Fri, 8 Sep 2023 16:07:37 +0800 Subject: [PATCH 8/8] neofetch: rename AOSC OS/Retro as Afterglow; update logo Refer to our newsletter for details on the rebranding. Ref: https://aosc.io/news/posts/2023-08-25-coffee-break/ --- neofetch | 82 +++++++++++++------------------------------------------- 1 file changed, 19 insertions(+), 63 deletions(-) diff --git a/neofetch b/neofetch index 5eecbe63..0d31ad1f 100755 --- a/neofetch +++ b/neofetch @@ -846,7 +846,7 @@ image_source="auto" # Flag: --ascii_distro # # NOTE: AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, Android, Antergos, antiX, AOSC OS, -# AOSC OS/Retro, Aperio GNU/Linux, Aperture, Apricity, Arch, ArchBox, Archcraft, archcraft_ascii, +# Afterglow, Aperio GNU/Linux, Aperture, Apricity, Arch, ArchBox, Archcraft, archcraft_ascii, # archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike, ArcoLinux, ArseLinux, Artix, Arya, Asahi, # Aster, AsteroidOS, astOS, Astra Linux, Athena, Bedrock, BigLinux, Bitrig, BlackArch, blackPanther, # BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, CachyOS, Calculate, CalinixOS, Carbs, @@ -6312,7 +6312,7 @@ ASCII: --ascii_distro distro Which Distro's ascii art to print NOTE: AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, - Android, Antergos, antiX, AOSC OS, AOSC OS/Retro, Aperio GNU/Linux, + Android, Antergos, antiX, AOSC OS, Afterglow, Aperio GNU/Linux, Aperture, Apricity, Arch, ArchBox, Archcraft, archcraft_ascii, archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike, ArcoLinux, ArseLinux, Artix, Arya, Asahi, Aster, AsteroidOS, astOS, Astra @@ -7190,68 +7190,24 @@ ${c1} EOF ;; - "AOSC OS/Retro"*) - set_colors 4 7 1 3 + "Afterglow"*) + set_colors 5 1 3 4 read -rd '' ascii_data <<'EOF' -${c2} ......... - ................... - .....................${c1}################${c2} - .............. ....${c1}################${c2} -.............. ...${c1}################${c2} -............. ..${c1}****************${c2} -............ . .${c1}****************${c2} -........... ... ${c1}................${c2} -.......... ..... ${c1}...............${c2} -......... ....... ... - .${c3}...... ${c2}. - ${c3}..... .....${c2}.... ${c4}........... - ${c3}.... ......${c2}. ${c4}........... - ${c3}... ....... ${c4}........... - ${c3}................ ${c4}*********** - ${c3}................ ${c4}########### - ${c3}**************** - ${c3}################ -EOF - ;; - - "aoscosretro_small") - set_colors 4 7 1 3 - read -rd '' ascii_data <<'EOF' -${c2} _____ ${c1}_____${c2} - -' '-${c1}| |${c2} - / ___ ${c1}| |${c2} -| / _ \\${c1}|_____|${c2} -' / /_\\ \\ - \\ / _____ \\${c4}___ - ${c3}|${c2}/_/ ${c3}| ${c4}| | - ${c3}| | ${c4}|___| - ${c3}|_____| -EOF - ;; - - "AOSC OS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. +${c2} . + ${c1}. ${c2}.{! + ${c1}.L! ${c2}J@||* + ${c1}gJJJJL` ${c2}g@FFS" + ${c1},@FFFJF`${c2}_g@@LLP` + ${c1}_@FFFFF`${c2}_@@@@@P` ${c4}. + ${c1}J@@@LLF ${c2}_@@@@@P` ${c4}.J! + ${c1}g@@@@@" ${c2}_@@@@@P`${c3}. ${c4}.L|||* + ${c1}g@@@@M" ${c2}"VP`${c3}.L! ${c4}<@JJJJ` + ${c1}"@N" ${c3}:||||! ${c4}JFFFFS" + ${c3}.{JJ||F`${c4}_gFFFF@' + ${c3}.@FJJJF`${c4},@LFFFF` + ${c3}_@FFFFF ${c4}VLLLP` + ${c3}J@@LL@" ${c4}`" + ${c3}V@@" EOF ;;