From 679c7397247031a1d6cb8828dad5518d49d37d78 Mon Sep 17 00:00:00 2001 From: William Gathoye Date: Sat, 14 Jul 2018 15:32:34 +0200 Subject: [PATCH 001/550] Add Proxmox VE --- neofetch | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/neofetch b/neofetch index a781e224..e9324cab 100755 --- a/neofetch +++ b/neofetch @@ -826,6 +826,14 @@ get_distro() { "on" | "tiny") distro="Siduction" ;; *) distro="Siduction ($(lsb_release -sic))" esac + elif type -p pveversion >/dev/null; then + case "$distro_shorthand" in + "on" | "tiny") distro="Proxmox VE" ;; + *) + distro="$(pveversion)" + distro="${distro#pve-manager/}" + distro="Proxmox VE ${distro%/*}" + esac elif type -p lsb_release >/dev/null; then case "$distro_shorthand" in @@ -7323,6 +7331,32 @@ ${c1} ss EOF ;; + "Proxmox"*) + set_colors 7 202 + read -rd '' ascii_data <<'EOF' +${c1} .://:` `://:. + `hMMMMMMd/ /dMMMMMMh` + `sMMMMMMMd: :mMMMMMMMs` +${c2}`-/+oo+/:${c1}`.yMMMMMMMh- -hMMMMMMMy.`${c2}:/+oo+/-` +`:oooooooo/${c1}`-hMMMMMMMyyMMMMMMMh-`${c2}/oooooooo:` + `/oooooooo:${c1}`:mMMMMMMMMMMMMm:`${c2}:oooooooo/` + ./ooooooo+-${c1} +NMMMMMMMMN+ ${c2}-+ooooooo/. + .+ooooooo+-${c1}`oNMMMMNo`${c2}-+ooooooo+. + -+ooooooo/.${c1}`sMMs`${c2}./ooooooo+- + :oooooooo/${c1}`..`${c2}/oooooooo: + :oooooooo/`${c1}..${c2}`/oooooooo: + -+ooooooo/.`${c1}sMMs${c2}`./ooooooo+- + .+ooooooo+-`${c1}oNMMMMNo${c2}`-+ooooooo+. + ./ooooooo+-${c1} +NMMMMMMMMN+ ${c2}-+ooooooo/. + `/oooooooo:`${c1}:mMMMMMMMMMMMMm:${c2}`:oooooooo/` +`:oooooooo/`${c1}-hMMMMMMMyyMMMMMMMh-${c2}`/oooooooo:` +`-/+oo+/:`${c1}.yMMMMMMMh- -hMMMMMMMy.${c2}`:/+oo+/-` +${c1} `sMMMMMMMm: :dMMMMMMMs` + `hMMMMMMd/ /dMMMMMMh` + `://:` `://:` +EOF + ;; + "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' From acdd6828f8d919b15f8f5e03e386bed8d7198538 Mon Sep 17 00:00:00 2001 From: Phuurl Date: Thu, 6 Dec 2018 22:58:29 +0000 Subject: [PATCH 002/550] Adds scoop package manager support --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 38477f0a..d46aae58 100755 --- a/neofetch +++ b/neofetch @@ -1341,6 +1341,9 @@ get_packages() { "MSYS"*) has "pacman" && tot pacman -Qq --color never ;; esac + # Scoop environment throws errors if `tot scoop list` is used + has "scoop" && dir ~/scoop/apps/* && ((packages-=1)) + # Count chocolatey packages. [[ -d "/cygdrive/c/ProgramData/chocolatey/lib" ]] && \ dir /cygdrive/c/ProgramData/chocolatey/lib/* From a5405baec6a3c10984d606c564500aea2325d7cd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Jan 2019 21:20:14 +0200 Subject: [PATCH 003/550] packages: start work on bedrock support --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 497da49c..9e84fa59 100755 --- a/neofetch +++ b/neofetch @@ -1270,6 +1270,12 @@ get_packages() { pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } + [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]] && \ + tot() { + IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "${s}" "$@"; done) + ((packages+="${#pkgs[@]}")); pac "${#pkgs[@]}" + } + case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") # Package Manager Programs. From cc1be73077d34be5342d93cba26a6846dc6d2d2b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Jan 2019 21:21:59 +0200 Subject: [PATCH 004/550] docs: update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8e69d6b6..b3ada9a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,6 @@ install: script: - time ./neofetch --travis -v - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2244 neofetch; fi # Check for lines longer than 100 chars. - if grep '.\{102\}' neofetch; then (exit 1); else (exit 0); fi From 45d632d1f68b0fa984cb2e7514a2563c0cc8a925 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Jan 2019 21:22:41 +0200 Subject: [PATCH 005/550] docs: update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3ada9a9..f313c14a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,6 @@ install: script: - time ./neofetch --travis -v - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2244 neofetch; fi + - 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 From 8a96fd545d71041b61cef8c1e9aa220bdeeaea08 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 09:03:24 +0200 Subject: [PATCH 006/550] song: Fix issues with non-english tags --- neofetch | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 455b744c..d71f4c0a 100755 --- a/neofetch +++ b/neofetch @@ -2467,22 +2467,28 @@ get_song() { /"title"/ {t=$4} END {print a "\n" b "\n" t}')" ;; - *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" ;; + *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" || return ;; esac - [[ "$song" != *[a-z]* ]] && { unset -v song; return; } - IFS=$'\n' read -d "" -r artist album title <<< "$song" + # Make sure empty tags are truly empty. + artist="$(trim "$artist")" + album="$(trim "$album")" + title="$(trim "$title")" + + # Set default values if no tags were found. + : "${artist:=Unknown Artist}" "${album:=Unknown Album}" "${title:=Unknown Song}" + # Display Artist, Album and Title on separate lines. if [[ "$song_shorthand" == "on" ]]; then - [[ "$(trim "$artist")" ]] && prin "Artist" "$artist" - [[ "$(trim "$album")" ]] && prin "Album" "$album" - [[ "$(trim "$song")" ]] && prin "Song" "$title" + prin "Artist" "$artist" + prin "Album" "$album" + prin "Song" "$title" else - song="${song_format/\%artist\%/${artist}}" - song="${song/\%album\%/${album}}" - song="${song/\%title\%/${title}}" + song="${song_format/\%artist\%/$artist}" + song="${song/\%album\%/$album}" + song="${song/\%title\%/$title}" fi } From 86711645a05f1f8f640d6b5a0c967d7f6f52b648 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 09:07:24 +0200 Subject: [PATCH 007/550] song: Fix issues with broken newlines --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d71f4c0a..5c9096d1 100755 --- a/neofetch +++ b/neofetch @@ -2470,7 +2470,7 @@ get_song() { *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" || return ;; esac - IFS=$'\n' read -d "" -r artist album title <<< "$song" + IFS=$'\n' read -d "" -r artist album title <<< "${song//'\n'/$'\n'}" # Make sure empty tags are truly empty. artist="$(trim "$artist")" From 27258fb93ca8953636cdad039e3d98523c96d17f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 09:17:40 +0200 Subject: [PATCH 008/550] ascii: Added support for Huayra Linux. Closes #1138 --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index 455b744c..0d0ee7df 100755 --- a/neofetch +++ b/neofetch @@ -6182,6 +6182,29 @@ ${c2} :dc' EOF ;; + "Huayra"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c2} ` + . . ` + `` - . . + `.` -` `. - `` .` + ..`-`-` + - / .` ``` + .--.+--`+:- :/.` .-``.` + -+/so::h:.d-`./:`.` + :hNhyMomy:os-...-. ```` + .dhsshNmNhoo+:-``.``` + ${c1}`ohy:-${c2}NMds+::-.`` + ````${c1}.hNN+`${c2}mMNho/:-....```` + ````` ${c1}`..${c2}/dmNhoo+/:..`` + ```` .dh++o/:....` +.+s/` `/s-.-.:.`` ```` +::` `::`..` + .` `.. + `` +EOF + ;; + "Hyperbola"*) set_colors 8 read -rd '' ascii_data <<'EOF' From 17a56081a5e0b52b80dd8aa476630e7e4520109b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 09:18:35 +0200 Subject: [PATCH 009/550] ascii: Added support for Huayra Linux. Closes #1138 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0d0ee7df..e3786a2e 100755 --- a/neofetch +++ b/neofetch @@ -6196,7 +6196,7 @@ ${c2} ` .dhsshNmNhoo+:-``.``` ${c1}`ohy:-${c2}NMds+::-.`` ````${c1}.hNN+`${c2}mMNho/:-....```` - ````` ${c1}`..${c2}/dmNhoo+/:..`` + ````` `../dmNhoo+/:..`` ```` .dh++o/:....` .+s/` `/s-.-.:.`` ```` ::` `::`..` From c47826225e13838fdef85967bded870d30a3381b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 15:17:05 +0200 Subject: [PATCH 010/550] song: Added support for netease cloud music --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 5c9096d1..f0f0d2da 100755 --- a/neofetch +++ b/neofetch @@ -2347,6 +2347,7 @@ get_song() { "mocp" "mopidy" "mpd" + "netease-cloud-music" "pogo" "pragha" "qmmp" @@ -2407,6 +2408,7 @@ get_song() { "dragon"*) get_song_dbus "dragonplayer" ;; "smplayer"*) get_song_dbus "smplayer" ;; "rhythmbox"*) get_song_dbus "rhythmbox" ;; + "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; From 6f6b67f3871c26da3c3c940fe2bd546e3e6d9c5b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:10:53 +0200 Subject: [PATCH 011/550] general: Added new simple mode for script usage --- neofetch | 46 +++++++++++++++++++++++++++++++++------------- neofetch.1 | 14 +++++++++++--- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index e3786a2e..6c29c6f1 100755 --- a/neofetch +++ b/neofetch @@ -4033,18 +4033,8 @@ color() { stdout() { image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break + unset subtitle_color colon_color info_color underline_color bold title_color at_color \ + text_padding zws reset color_blocks get_line_break bar_color_elapsed bar_color_total } err() { @@ -4242,7 +4232,7 @@ decode_url() { # FINISH UP usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" +Usage: neofetch func_name --option \"value\" --option \"value\" Neofetch is a CLI system information tool written in BASH. Neofetch displays information about your system next to an image, your OS logo, @@ -4253,6 +4243,22 @@ NOTE: Every launch flag has a config option. Options: INFO: + func_name Specify a function name (second part of info() from config) to + quickly display only that function's information. + + Example: neofetch uptime --uptime_shorthand tiny + + Example: neofetch uptime disk wm memory + + This can be used in bars and scripts like so: + + memory=\"\$(neofetch memory)\"; memory=\"\${memory##*: }\" + + For multiple outputs at once (each line of info in an array): + + IFS=\$'\\n' read -d \"\" -ra info < <(neofetch memory uptime wm) + info=(\"\${info[@]##*: }\") + --disable 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. @@ -4696,6 +4702,19 @@ get_args() { done } +get_simple() { + while [[ "$1" ]]; do + [[ $(type -t "get_$1") == function ]] && { + get_distro + stdout + simple=1 + info "$1" "$1" + } + shift + done + ((simple)) && exit +} + get_distro_ascii() { # This function gets the distro ascii art and colors. # @@ -8666,6 +8685,7 @@ main() { eval "$config" get_args "$@" + get_simple "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null get_distro get_bold diff --git a/neofetch.1 b/neofetch.1 index ae57b426..1e328c40 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.7. -.TH NEOFETCH "1" "October 2018" "Neofetch 5.0.1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. +.TH NEOFETCH "1" "January 2019" "Neofetch 5.0.1" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS .B neofetch -\fI\,--option "value" --option "value"\/\fR +\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, @@ -14,6 +14,14 @@ 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 +.TP \fB\-\-disable\fR infoname Allows you to disable an info line from appearing in the output. 'infoname' is the function name from the From c29ecc3faef82df7f7abb31828b16f52764e06dd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:11:00 +0200 Subject: [PATCH 012/550] general: Added new simple mode for script usage --- neofetch.1 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/neofetch.1 b/neofetch.1 index 1e328c40..bfb861c2 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -21,6 +21,15 @@ quickly display only that function's information. 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): +.TP +IFS=$'\en' read \fB\-d\fR "" \fB\-ra\fR info < <(neofetch memory uptime wm) +info=("${info[@]##*: }") .TP \fB\-\-disable\fR infoname Allows you to disable an info line from appearing From 9b2796e168c15b049f0ba12f0295e78eca708acd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:13:59 +0200 Subject: [PATCH 013/550] general: Added new simple mode for script usage --- neofetch | 1 + neofetch.1 | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6c29c6f1..23c80a63 100755 --- a/neofetch +++ b/neofetch @@ -4257,6 +4257,7 @@ INFO: For multiple outputs at once (each line of info in an array): IFS=\$'\\n' read -d \"\" -ra info < <(neofetch memory uptime wm) + info=(\"\${info[@]##*: }\") --disable infoname Allows you to disable an info line from appearing diff --git a/neofetch.1 b/neofetch.1 index bfb861c2..5cde4afb 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -27,8 +27,9 @@ This can be used in bars and scripts like so: memory="$(neofetch memory)"; memory="${memory##*: }" .IP For multiple outputs at once (each line of info in an array): -.TP +.IP IFS=$'\en' read \fB\-d\fR "" \fB\-ra\fR info < <(neofetch memory uptime wm) +.IP info=("${info[@]##*: }") .TP \fB\-\-disable\fR infoname From ae2384dca8f164fe76697109183d297c07ebc31f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:25:44 +0200 Subject: [PATCH 014/550] song: Fix deadbeef --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f0f0d2da..d6e9e3ca 100755 --- a/neofetch +++ b/neofetch @@ -2386,7 +2386,7 @@ get_song() { "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; "mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; "google play"*) song="$(gpmdp-remote current)" ;; - "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\n%album%\n%title%')" ;; + "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; "qmmp"*) song="$(qmmp --nowplaying '%p\n%a\n%t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; From 186093ddc089ea6adb6282f35ed12708831be4a7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:28:36 +0200 Subject: [PATCH 015/550] song: Fix qmmp --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d6e9e3ca..490e6ff3 100755 --- a/neofetch +++ b/neofetch @@ -2388,7 +2388,7 @@ get_song() { "google play"*) song="$(gpmdp-remote current)" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; - "qmmp"*) song="$(qmmp --nowplaying '%p\n%a\n%t')" ;; + "qmmp"*) song="$(qmmp --nowplaying '%p\\n%a\\n%t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; From faae04f0eec427cfdb5f97876bf1816cf62186e7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:39:56 +0200 Subject: [PATCH 016/550] song: Remove gpmdp-remote support as tool is unmaintained. --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 490e6ff3..cb48230e 100755 --- a/neofetch +++ b/neofetch @@ -2385,7 +2385,6 @@ get_song() { case "${player/*\/}" in "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; "mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; - "google play"*) song="$(gpmdp-remote current)" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; "qmmp"*) song="$(qmmp --nowplaying '%p\\n%a\\n%t')" ;; From bbb06ad4a9fafa22952c3480fec935e5adb23c72 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:40:55 +0200 Subject: [PATCH 017/550] song: Remove gpmdp-remote support as tool is unmaintained. --- neofetch | 2 -- 1 file changed, 2 deletions(-) diff --git a/neofetch b/neofetch index cb48230e..0daa0367 100755 --- a/neofetch +++ b/neofetch @@ -429,7 +429,6 @@ disk_subtitle="mount" # exaile # gnome-music # gmusicbrowser -# Google Play # guayadeque # iTunes # juk @@ -2339,7 +2338,6 @@ get_song() { "exaile" "gnome-music" "gmusicbrowser" - "Google Play" "guayadeque" "iTunes" "juk" From 763f3a9af5fcf20dd24b2986648ea4e8b3c54374 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 17:09:29 +0200 Subject: [PATCH 018/550] song: Add netease to comment. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 0daa0367..57a2856d 100755 --- a/neofetch +++ b/neofetch @@ -436,6 +436,7 @@ disk_subtitle="mount" # mocp # mopidy # mpd +# netease-cloud-music # pogo # pragha # qmmp From ee30f29da9476f12833003d569dded710ffecd15 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 17:16:18 +0200 Subject: [PATCH 019/550] song: Added config option to display music player --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 57a2856d..bcebeecf 100755 --- a/neofetch +++ b/neofetch @@ -76,6 +76,7 @@ print_info() { # info "Battery" battery # info "Font" font # info "Song" song + # [[ $player ]] && prin "Music Player" "$player" # info "Local IP" local_ip # info "Public IP" public_ip # info "Users" users From a52115b364af33684c67ec5e5a9cd45e1ef68993 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 17:33:46 +0200 Subject: [PATCH 020/550] ascii: Added support for Pentoo. Closes #1069 --- neofetch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/neofetch b/neofetch index e9769b8e..5f1eb181 100755 --- a/neofetch +++ b/neofetch @@ -6072,6 +6072,33 @@ yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` EOF ;; + "Pentoo"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c2} `:oydNNMMMMNNdyo:` + :yNMMMMMMMMMMMMMMMMNy: + :dMMMMMMMMMMMMMMMMMMMMMMd: + oMMMMMMMho/-....-/ohMMMMMMMo + oMMMMMMy. .yMMMMMMo + .MMMMMMo oMMMMMM. + +MMMMMm mMMMMM+ + oMMMMMh hMMMMMo + //hMMMMMm//${c1}`${c2} ${c1}`${c2}////mMMMMMh// +MMMMMMMMMMM${c1}/${c2} ${c1}/o/`${c2} ${c1}.${c2}smMMMMMMMMMMM +MMMMMMMMMMm ${c1}`NMN:${c2} ${c1}.${c2}yMMMMMMMMMM +MMMMMMMMMMMh${c1}:.${c2} dMMMMMMMMM +MMMMMMMMMMMMMy${c1}.${c2} ${c1}-${c2}NMMMMMMMMM +MMMMMMMMMMMd:${c1}`${c2} ${c1}-${c2}yNMMMMMMMMMM +MMMMMMMMMMh${c1}`${c2} ${c1}./${c2}hNMMMMMMMMMMMM +MMMMMMMMMM${c1}s${c2} ${c1}.:${c2}ymMMMMMMMMMMMMMMM +MMMMMMMMMMN${c1}s:..-/${c2}ohNMMMMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM + MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM + +EOF + ;; + "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' From 1b356da175e030a3170f524d2d0cf7e95655a5ac Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:04:25 +0200 Subject: [PATCH 021/550] ascii: Added support for command output --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 5f1eb181..6ced94d3 100755 --- a/neofetch +++ b/neofetch @@ -3418,8 +3418,9 @@ image_backend() { get_ascii() { if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then ascii_data="$(< "$image_source")" - else - err "Ascii: Ascii file not found, using distro ascii." + + elif [[ "$image_source" != "auto" ]]; then + ascii_data="$image_source" fi # Set locale to get correct padding. @@ -3430,6 +3431,9 @@ get_ascii() { ((++lines,${#line}>ascii_length)) && ascii_length="${#line}" done <<< "${ascii_data//\$\{??\}}" + # Fallback if file not found. + ((lines==1)) && { image_source="auto"; get_distro_ascii; get_ascii; return; } + # Colors. ascii_data="${ascii_data//\$\{c1\}/$c1}" ascii_data="${ascii_data//\$\{c2\}/$c2}" @@ -4595,7 +4599,6 @@ get_args() { "--ascii_distro") image_backend="ascii" ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac ;; "--ascii_bold") ascii_bold="$2" ;; From 4fb30c040a8bd11f557877c8576789e95f4b0688 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:09:10 +0200 Subject: [PATCH 022/550] ascii: Added support for command output --- neofetch | 6 +++++- neofetch.1 | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 6ced94d3..f4c19a52 100755 --- a/neofetch +++ b/neofetch @@ -4375,8 +4375,12 @@ IMAGE BACKEND: 'sixel', 'tycat', 'w3m' --source source Which image or ascii file to use. Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' + '/path/to/ascii', '/path/to/dir/', 'command output' [ascii] + --ascii source Shortcut to use 'ascii' backend. + + NEW: neofetch --ascii \"\$(fortune | cowsay -W 30)\" + --caca source Shortcut to use 'caca' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. diff --git a/neofetch.1 b/neofetch.1 index ae57b426..2bf66158 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.7. -.TH NEOFETCH "1" "October 2018" "Neofetch 5.0.1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. +.TH NEOFETCH "1" "January 2019" "Neofetch 5.0.1" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -199,10 +199,12 @@ Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off', \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/' +\&'/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. From defee48d14d93ab4f2fc4a34f375586b1e84a905 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:09:55 +0200 Subject: [PATCH 023/550] ascii: Added support for command output --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f4c19a52..c6f092b9 100755 --- a/neofetch +++ b/neofetch @@ -660,6 +660,7 @@ image_backend="ascii" # # Default: 'auto' # Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' +# 'command output (neofetch --ascii "$(fortune | cowsay -W 30)")' # Flag: --source # # NOTE: 'auto' will pick the best image source for whatever image backend is used. From b399f49077a98790ab52b5c70efba5dc39120835 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:17:56 +0200 Subject: [PATCH 024/550] ascii: Fixed bug when files named auto or ascii were found. --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index c6f092b9..bf120339 100755 --- a/neofetch +++ b/neofetch @@ -3417,12 +3417,12 @@ image_backend() { } get_ascii() { - if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then - ascii_data="$(< "$image_source")" - - elif [[ "$image_source" != "auto" ]]; then - ascii_data="$image_source" - fi + [[ ! "$image_source" =~ (ascii|auto) ]] && + if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then + ascii_data="$(< "$image_source")" + else + ascii_data="$image_source" + fi # Set locale to get correct padding. LC_ALL="$sys_locale" From c99b864590902ab61f61a6e4530b9b14208a475e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:34:20 +0200 Subject: [PATCH 025/550] ascii: Fixed bug when long line is input --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index bf120339..3b56ea56 100755 --- a/neofetch +++ b/neofetch @@ -3429,11 +3429,11 @@ get_ascii() { # Calculate size of ascii file in line length / line count. while IFS=$'\n' read -r line; do - ((++lines,${#line}>ascii_length)) && ascii_length="${#line}" + ((++lines,${#line}>ascii_len)) && ascii_len="${#line}" done <<< "${ascii_data//\$\{??\}}" # Fallback if file not found. - ((lines==1)) && { image_source="auto"; get_distro_ascii; get_ascii; return; } + ((lines==1)) && { lines=; ascii_len=; image_source="auto"; get_distro_ascii; get_ascii; return; } # Colors. ascii_data="${ascii_data//\$\{c1\}/$c1}" @@ -3443,7 +3443,7 @@ get_ascii() { ascii_data="${ascii_data//\$\{c5\}/$c5}" ascii_data="${ascii_data//\$\{c6\}/$c6}" - ((text_padding=ascii_length+gap)) + ((text_padding=ascii_len+gap)) printf '%b\n' "$ascii_data${reset}" LC_ALL=C } From 981b2da634f9b46df3ceb3aba6f607c8005c6797 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:56:09 +0200 Subject: [PATCH 026/550] general: Fix issues when printing ascii --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 23c80a63..b410844c 100755 --- a/neofetch +++ b/neofetch @@ -4034,7 +4034,8 @@ color() { stdout() { image_backend="off" unset subtitle_color colon_color info_color underline_color bold title_color at_color \ - text_padding zws reset color_blocks get_line_break bar_color_elapsed bar_color_total + text_padding zws reset color_blocks get_line_break bar_color_elapsed bar_color_total \ + c1 c2 c3 c4 c5 c6 c7 c8 } err() { From ea44816a3c91507958d025474f51895f44b44e95 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 19:36:14 +0200 Subject: [PATCH 027/550] simple mode: expose window size and terminal size --- neofetch | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index b410844c..93021048 100755 --- a/neofetch +++ b/neofetch @@ -3581,19 +3581,19 @@ get_window_size() { # -put as a variable. # The 1 second timeout is required for older bash case "${BASH_VERSINFO[0]}" in - 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; - *) IFS=';t' read -d t -t 1 -sra term_size ;; + 4|5) IFS=';t' read -d t -t 0.05 -sra win_size ;; + *) IFS=';t' read -d t -t 1 -sra win_size ;; esac unset IFS # Split the string into height/width. if [[ "$image_backend" == "tycat" ]]; then - term_width="$((term_size[2] * term_size[0]))" - term_height="$((term_size[3] * term_size[1]))" + term_width="$((win_size[2] * win_size[0]))" + term_height="$((win_size[3] * win_size[1]))" else - term_height="${term_size[1]}" - term_width="${term_size[2]}" + term_height="${win_size[1]}" + term_width="${win_size[2]}" fi [[ "$image_backend" == "kitty" ]] && \ @@ -3623,16 +3623,16 @@ get_window_size() { # If the ID was found get the window size. if [[ "$current_window" ]]; then - term_size="$(xwininfo -id "$current_window")" - term_width="${term_size#*Width: }" + win_size="$(xwininfo -id "$current_window")" + term_width="${win_size#*Width: }" term_width="${term_width/$'\n'*}" - term_height="${term_size/*Height: }" + term_height="${win_size/*Height: }" term_height="${term_height/$'\n'*}" fi fi fi - term_width="${term_width:-0}" + window_size="${term_width:=0}x${term_height:=0}" } @@ -3643,6 +3643,7 @@ get_term_size() { # Calculate font size. font_width="$((term_width / columns))" font_height="$((term_height / lines))" + term_size="${lines}x${columns}" } get_image_size() { @@ -4696,7 +4697,7 @@ get_args() { # Known implicit unused variables. mpc_args=() - printf '%s\n' "$kernel $icons $font $battery $locale ${mpc_args[*]}" + : "$term_size $window_size $kernel $icons $font $battery $locale ${mpc_args[*]}" ;; esac From 7e96b428606b63b65acd59eb00e94165f960da97 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 19:40:37 +0200 Subject: [PATCH 028/550] simple mode: expose window size and terminal size --- neofetch | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 93021048..b410844c 100755 --- a/neofetch +++ b/neofetch @@ -3581,19 +3581,19 @@ get_window_size() { # -put as a variable. # The 1 second timeout is required for older bash case "${BASH_VERSINFO[0]}" in - 4|5) IFS=';t' read -d t -t 0.05 -sra win_size ;; - *) IFS=';t' read -d t -t 1 -sra win_size ;; + 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; + *) IFS=';t' read -d t -t 1 -sra term_size ;; esac unset IFS # Split the string into height/width. if [[ "$image_backend" == "tycat" ]]; then - term_width="$((win_size[2] * win_size[0]))" - term_height="$((win_size[3] * win_size[1]))" + term_width="$((term_size[2] * term_size[0]))" + term_height="$((term_size[3] * term_size[1]))" else - term_height="${win_size[1]}" - term_width="${win_size[2]}" + term_height="${term_size[1]}" + term_width="${term_size[2]}" fi [[ "$image_backend" == "kitty" ]] && \ @@ -3623,16 +3623,16 @@ get_window_size() { # If the ID was found get the window size. if [[ "$current_window" ]]; then - win_size="$(xwininfo -id "$current_window")" - term_width="${win_size#*Width: }" + term_size="$(xwininfo -id "$current_window")" + term_width="${term_size#*Width: }" term_width="${term_width/$'\n'*}" - term_height="${win_size/*Height: }" + term_height="${term_size/*Height: }" term_height="${term_height/$'\n'*}" fi fi fi - window_size="${term_width:=0}x${term_height:=0}" + term_width="${term_width:-0}" } @@ -3643,7 +3643,6 @@ get_term_size() { # Calculate font size. font_width="$((term_width / columns))" font_height="$((term_height / lines))" - term_size="${lines}x${columns}" } get_image_size() { @@ -4697,7 +4696,7 @@ get_args() { # Known implicit unused variables. mpc_args=() - : "$term_size $window_size $kernel $icons $font $battery $locale ${mpc_args[*]}" + printf '%s\n' "$kernel $icons $font $battery $locale ${mpc_args[*]}" ;; esac From 8aab756a153e4a19e72aa765ebdc3dec9040f23d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 19:48:05 +0200 Subject: [PATCH 029/550] packages: Don't run pkginfo on linux --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3b56ea56..a0b2454d 100755 --- a/neofetch +++ b/neofetch @@ -1289,7 +1289,6 @@ get_packages() { has "sorcery" && tot gaze installed has "alps" && tot alps showinstalled has "butch" && tot butch list - has "pkginfo" && tot pkginfo -i # Counting files/dirs. has "emerge" && dir /var/db/pkg/*/*/ @@ -1305,6 +1304,9 @@ get_packages() { # Other (Needs complex command) has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) + # pkginfo is also the name of a python package manager. + [[ $os != "Linux" ]] && has "pkginfo" && tot pkginfo -i + case "$kernel_name" in "FreeBSD") has "pkg" && tot pkg info ;; *) From 04420479dc452b37957afdbd936ad70a25f33645 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 20:22:59 +0200 Subject: [PATCH 030/550] image: store thumbnail with path name --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a0b2454d..84dbc183 100755 --- a/neofetch +++ b/neofetch @@ -3702,7 +3702,7 @@ get_image_size() { make_thumbnail() { # Name the thumbnail using variables so we can # use it later. - image_name="${crop_mode}-${crop_offset}-${width}-${height}-${image##*/}" + image_name="${crop_mode}-${crop_offset}-${width}-${height}-${image//\/}" # Handle file extensions. case "${image##*.}" in From e155df7a726177d2bbde55cbb7ddd6dd123ad69b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 20:42:49 +0200 Subject: [PATCH 031/550] os: Initial support for Bedrock Linux --- neofetch | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 1eea1091..afd5f1e2 100755 --- a/neofetch +++ b/neofetch @@ -829,7 +829,12 @@ get_distro() { case "$os" in "Linux" | "BSD" | "MINIX") - if [[ -f "/etc/redstar-release" ]]; then + if [[ -f "/bedrock/etc/bedrock-release" ]] && [[ $PATH == */bedrock/cross/* ]]; then + case "$distro_shorthand" in + "on" | "tiny") distro="Bedrock Linux" ;; + *) distro="$(< /bedrock/etc/bedrock-release)" + esac + elif [[ -f "/etc/redstar-release" ]]; then case "$distro_shorthand" in "on" | "tiny") distro="Red Star OS" ;; *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)" @@ -3431,6 +3436,7 @@ get_ascii() { # Calculate size of ascii file in line length / line count. while IFS=$'\n' read -r line; do + line="${line//\\\\/\\}" ((++lines,${#line}>ascii_len)) && ascii_len="${#line}" done <<< "${ascii_data//\$\{??\}}" @@ -5232,6 +5238,29 @@ ${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy EOF ;; + "Bedrock"*) + set_colors 0 7 + read -rd '' ascii_data <<'EOF' +${c1}-------------------------------------- +-------------------------------------- +-------------------------------------- +---${c2}\\\\\\\\\\\\\\\\\\\\\\\\${c1}----------------------- +----${c2}\\\\\\ \\\\\\${c1}---------------------- +-----${c2}\\\\\\ \\\\\\${c1}--------------------- +------${c2}\\\\\\ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\${c1}------ +-------${c2}\\\\\\ \\\\\\${c1}----- +--------${c2}\\\\\\ \\\\\\${c1}---- +---------${c2}\\\\\\ ______ \\\\\\${c1}--- +----------${c2}\\\\\\ ///${c1}--- +-----------${c2}\\\\\\ ///${c1}---- +------------${c2}\\\\\\ ///${c1}----- +-------------${c2}\\\\\\////////////////${c1}------ +-------------------------------------- +-------------------------------------- +-------------------------------------- +EOF + ;; + "Bitrig"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' From d36ee68f2cc603507bc65068917e3bef0155c3b0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 20:56:38 +0200 Subject: [PATCH 032/550] os: Initial support for Bedrock Linux --- neofetch | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index afd5f1e2..1af63da7 100755 --- a/neofetch +++ b/neofetch @@ -829,7 +829,7 @@ get_distro() { case "$os" in "Linux" | "BSD" | "MINIX") - if [[ -f "/bedrock/etc/bedrock-release" ]] && [[ $PATH == */bedrock/cross/* ]]; then + if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then case "$distro_shorthand" in "on" | "tiny") distro="Bedrock Linux" ;; *) distro="$(< /bedrock/etc/bedrock-release)" @@ -1277,6 +1277,16 @@ get_packages() { pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } + # Redefine tot() for Bedrock Linux. + [[ -f /bedrock/etc/bedrock-release && "$PATH" == */bedrock/cross/* ]] && { + tot() { + IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done) + ((packages+="${#pkgs[@]}")) + pac "${#pkgs[@]}" + } + br_prefix="/bedrock/strata/*" + } + case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") # Package Manager Programs. @@ -1296,15 +1306,20 @@ get_packages() { has "butch" && tot butch list # Counting files/dirs. - has "emerge" && dir /var/db/pkg/*/*/ - has "nix-env" && dir /nix/store/*/ - has "guix" && dir /gnu/store/*/ - has "Compile" && dir /Programs/*/ - has "eopkg" && dir /var/lib/eopkg/package/* - has "crew" && dir /usr/local/etc/crew/meta/*.filelist - has "pkgtool" && dir /var/log/packages/* - has "cave" && dir /var/db/paludis/repositories/cross-installed/*/data/*/ \ - /var/db/paludis/repositories/installed/data/*/ + # Variables need to be unquoted here. Only Bedrock Linux is affected. + # $br_prefix is fixed and won't change based on user input so this is safe either way. + # shellcheck disable=SC2086 + { + has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ + has "nix-env" && dir ${br_prefix}/nix/store/*/ + has "guix" && dir ${br_prefix}/gnu/store/*/ + has "Compile" && dir ${br_prefix}/Programs/*/ + has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* + has "crew" && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist + has "pkgtool" && dir ${br_prefix}/var/log/packages/* + has "cave" && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ + ${br_prefix}/var/db/paludis/repositories/installed/data/*/ + } # Other (Needs complex command) has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) From a450fc88c5c8f1de15922cf4ee524dd88aead73f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 21:18:33 +0200 Subject: [PATCH 033/550] terminal font [kitty]: Use kitty command instead of parsing config files. Closes #1150 --- neofetch | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/neofetch b/neofetch index 1eea1091..3050d448 100755 --- a/neofetch +++ b/neofetch @@ -2880,21 +2880,11 @@ END ;; "kitty"*) - shopt -s nullglob - confs=({$KITTY_CONFIG_DIRECTORY,$XDG_CONFIG_HOME,~/Library/Preferences}/kitty/kitty.con?) - shopt -u nullglob - - [[ -f "${confs[0]}" ]] || return - - term_font="$(awk '/^([[:space:]]*|[^#_])font_family[[:space:]]+/ { - $1 = ""; - gsub(/^[[:space:]]/, ""); - font = $0 - } - /^([[:space:]]*|[^#_])font_size[[:space:]]+/ { - size = $2 - } - END {print font,size}' "${confs[0]}")" + kitty_config="$(kitty --debug-config)" + term_font_size="${kitty_config/*font_size}" + term_font_size="${term_font_size/$'\n'*}" + term_font="${kitty_config/*font_family}" + term_font="${term_font/$'\n'*} $term_font_size" ;; "konsole" | "yakuake") From fbb69625a7e3a75c01d636e61a0c7a494e33b710 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 22:49:46 +0200 Subject: [PATCH 034/550] cleanup --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 1af63da7..17f87a7d 100755 --- a/neofetch +++ b/neofetch @@ -1278,7 +1278,7 @@ get_packages() { tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } # Redefine tot() for Bedrock Linux. - [[ -f /bedrock/etc/bedrock-release && "$PATH" == */bedrock/cross/* ]] && { + [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { tot() { IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done) ((packages+="${#pkgs[@]}")) From 594e1fa10da92a21a4313b69c7b0a4e8cdf498e4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 22:53:51 +0200 Subject: [PATCH 035/550] cleanup --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 3050d448..de905efe 100755 --- a/neofetch +++ b/neofetch @@ -2277,8 +2277,8 @@ get_memory() { "Solaris") hw_pagesize="$(pagesize)" - pages_total=$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}') - pages_free=$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}') + pages_total="$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')" + pages_free="$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')" mem_total="$((pages_total * hw_pagesize / 1024 / 1024))" mem_free="$((pages_free * hw_pagesize / 1024 / 1024))" mem_used="$((mem_total - mem_free))" From 804f88aa7a851311e983d1428f1d080b44005c6c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 08:27:33 +0200 Subject: [PATCH 036/550] packages: revert pkginfo change --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index de905efe..e6b48861 100755 --- a/neofetch +++ b/neofetch @@ -1304,8 +1304,9 @@ get_packages() { # Other (Needs complex command) has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) - # pkginfo is also the name of a python package manager. - [[ $os != "Linux" ]] && has "pkginfo" && tot pkginfo -i + # pkginfo is also the name of a python package manager which is painfully slow. + # TODO: Fix this somehow. + has pkginfo && tot pkginfo -i case "$kernel_name" in "FreeBSD") has "pkg" && tot pkg info ;; From ccabbbe6782a8c06097254f86ac2888eb3e92ed9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 08:37:19 +0200 Subject: [PATCH 037/550] docs: CHANGELOG --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 834fac39..f13149e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,9 +17,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [**@HolyStephano**](https://github.com/HolyStephano) - [**@nikitenich**](https://github.com/nikitenich) +**OS** + +- Added support for Namib GNU/Linux. [*@arisinfenix*](https://github.com/arisinfenix) +- Added support for Reborn OS. [*@iandrewt*](https://github.com/iandrewt) +- Added support for OpenMandriva Lx. [*@konimex*](https://github.com/konimex) + **Info** - **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero) +- **Packages**: Added support for `puyo`. [*@Appadeia*](https://github.com/Appadeia) +- **Packages**: Added support for `spm`. [*@Appadeia*](https://github.com/author=Appadeia) - **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) - **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) @@ -28,9 +36,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito) - **WM** [OpenBSD]: Added a new `ps_flags` to correctly detect non-EWMH WMs. [**@julianaito**](https://github.com/julianaito) - **Disk** [OpenBSD]: Added a separate disk array creation using `awk` since one cannot directly use `/dev/...` unless being root or in the `operator` group. [**@julianaito**](https://github.com/julianaito) +- **Battery** [OpenBSD]: Improve charge `%` and add status. **Charlène** +- **GPU** [AMD]: Remove unnecessary check. **ASCII** +- Added new Lubuntu logo. [*@marlonn*](https://github.com/marlonn) - Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) - Do not parse file as ASCII if the source is an image file. @@ -38,6 +49,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) - **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) +- **Kitty**: Update docs. [*@Snuggle*](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) ## [5.0.0] - 2018-06-18 From ad2727620c908f20f70573a8cc2c1522c36b6bb6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 08:49:52 +0200 Subject: [PATCH 038/550] docs: CHANGELOG --- CHANGELOG.md | 58 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f13149e4..bc25747a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **Contributors** +- [**@konimex**](https://github.com/konimex) +- [**@iandrewt**](https://github.com/iandrewt) +- [**@arisinfenix**](https://github.com/arisinfenix) +- [**@xPMo**](https://github.com/xPMo) - [**@nero**](https://github.com/nero) - [**@alyssais**](https://github.com/alyssais) - [**@plgruener**](https://github.com/plgruener) @@ -16,21 +20,60 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [**@julianaito**](https://github.com/julianaito) - [**@HolyStephano**](https://github.com/HolyStephano) - [**@nikitenich**](https://github.com/nikitenich) +- [**@Appadeia**](https://github.com/Appadeia) +- [**@marlonn**](https://github.com/marlonn) +- [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) +- [**@Phuurl**](https://github.com/Phuurl) +- [**@erikdubois**](https://github.com/erikdubois) **OS** -- Added support for Namib GNU/Linux. [*@arisinfenix*](https://github.com/arisinfenix) -- Added support for Reborn OS. [*@iandrewt*](https://github.com/iandrewt) -- Added support for OpenMandriva Lx. [*@konimex*](https://github.com/konimex) +- Added support for Namib GNU/Linux. [**@arisinfenix**](https://github.com/arisinfenix) +- Added support for Reborn OS. [**@iandrewt**](https://github.com/iandrewt) +- Added support for OpenMandriva Lx. [**@konimex**](https://github.com/konimex) +- Added support for Star. [**@arisinfenix**](https://github.com/arisinfenix) +- Added support for BlueLight OS. +- Added support for Huayra Linux. + +**General** + +- Added a new "simple" mode. You can now use neofetch for scripting by getting it to output individual info functions in plain text. + +```sh +# Example: +neofetch uptime --uptime_shorthand tiny +> uptime: 32m + +# Example: +neofetch uptime disk wm memory +> uptime: 33 mins +> disk (/): 212G / 235G (96%) +> wm: Openbox +> memory: 1215MiB / 7881MiB + +# This can be used in bars and scripts like so: +memory="$(neofetch memory)"; memory="${memory##*: }" + +# For multiple outputs at once (each line of info in an array): +# Much faster than running neofetch multiple times. +IFS=$'\n' read -d "" -ra info < <(neofetch memory uptime wm) +info=("${info[@]##*: }") +``` **Info** +- **Song**: Added support for Netease Cloud. +- **Song**: Fixed issues in various players. [**@arisinfenix**](https://github.com/arisinfenix) [**@xPMo**](https://github.com/xPMo) +- **Song**: Fixed issues with non-English tags. +- **Song**: Fixed issues with broken newlines. - **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero) -- **Packages**: Added support for `puyo`. [*@Appadeia*](https://github.com/Appadeia) -- **Packages**: Added support for `spm`. [*@Appadeia*](https://github.com/author=Appadeia) +- **Packages**: Added support for `scoop`. [**@Phuurl**](https://github.com/Phuurl) +- **Packages**: Added support for `puyo`. [**@Appadeia**](https://github.com/Appadeia) +- **Packages**: Added support for `spm`. [**@Appadeia**](https://github.com/author=Appadeia) - **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) - **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) +- **Memory** [Solaris]: Updated memory detection to use pages. [**@konimex**](https://github.com/konimex) - **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito) - **Model** [macOS]: Added VirtualSMC as a new FakeSMC alternative for Hackintosh. [**@nikitenich**](https://github.com/nikitenich) - **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito) @@ -41,7 +84,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **ASCII** -- Added new Lubuntu logo. [*@marlonn*](https://github.com/marlonn) +- Added small ArcoLinux logo. [**@erikdubois**](https://github.com/erikdubois) +- Added new Lubuntu logo. [**@marlonn**](https://github.com/marlonn) - Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) - Do not parse file as ASCII if the source is an image file. @@ -49,7 +93,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) - **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) -- **Kitty**: Update docs. [*@Snuggle*](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) +- **Kitty**: Update docs. [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) ## [5.0.0] - 2018-06-18 From 62ada359fcdb5c9799fa2632e59735fdde31eeb7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 09:04:09 +0200 Subject: [PATCH 039/550] docs: CHANGELOG --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc25747a..723f3577 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,12 +28,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **OS** +- Added support for Bedrock Linux. [**@paradigm**](https://github.com/paradigm) - Added support for Namib GNU/Linux. [**@arisinfenix**](https://github.com/arisinfenix) - Added support for Reborn OS. [**@iandrewt**](https://github.com/iandrewt) - Added support for OpenMandriva Lx. [**@konimex**](https://github.com/konimex) - Added support for Star. [**@arisinfenix**](https://github.com/arisinfenix) - Added support for BlueLight OS. - Added support for Huayra Linux. +- Added support for Pentoo. **General** @@ -62,10 +64,16 @@ info=("${info[@]##*: }") **Info** +- **Song**: Added snippet to display music player. + - `[[ $player ]] && prin "Music Player" "$player"` + - NOTE: Must have `info "Song" song` enabled. - **Song**: Added support for Netease Cloud. - **Song**: Fixed issues in various players. [**@arisinfenix**](https://github.com/arisinfenix) [**@xPMo**](https://github.com/xPMo) - **Song**: Fixed issues with non-English tags. - **Song**: Fixed issues with broken newlines. +- **Song**: Fixed issues with Deadbeef. +- **Song**: Fixed issues with `qmmp`. +- **Song**: Removed `gpmdp-remote` support (unmaintained/no longer works). - **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero) - **Packages**: Added support for `scoop`. [**@Phuurl**](https://github.com/Phuurl) - **Packages**: Added support for `puyo`. [**@Appadeia**](https://github.com/Appadeia) @@ -73,6 +81,7 @@ info=("${info[@]##*: }") - **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) - **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) +- **Terminal Font** [Kitty]: Use `kitty --debug-config` to get font information. - **Memory** [Solaris]: Updated memory detection to use pages. [**@konimex**](https://github.com/konimex) - **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito) - **Model** [macOS]: Added VirtualSMC as a new FakeSMC alternative for Hackintosh. [**@nikitenich**](https://github.com/nikitenich) @@ -84,9 +93,13 @@ info=("${info[@]##*: }") **ASCII** +- Added support for command output. + - `neofetch --ascii "$(fortune|cowsay -W 30)"` + - `neofetch --ascii "$(figlet -w 30 hello world)"` - Added small ArcoLinux logo. [**@erikdubois**](https://github.com/erikdubois) - Added new Lubuntu logo. [**@marlonn**](https://github.com/marlonn) - Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) +- Fixed a bug when files named `auto` or `ascii` exist. - Do not parse file as ASCII if the source is an image file. **Image** @@ -94,6 +107,7 @@ info=("${info[@]##*: }") - **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) - **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) - **Kitty**: Update docs. [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) +- Cached thumbnails are now stored with PATH to prevent collision issues. ## [5.0.0] - 2018-06-18 From 3a0e2ec68ccc1a71e0f17a493296cb6caa8d1339 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 09:09:02 +0200 Subject: [PATCH 040/550] docs: CHANGELOG --- CHANGELOG.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 723f3577..fdef4815 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +logo + **Contributors** - [**@konimex**](https://github.com/konimex) @@ -37,7 +39,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Added support for Huayra Linux. - Added support for Pentoo. -**General** +**Highlights** + +- [ASCII] Added support for command output. You can now use whatever terminal commands you like as the ASCII art. + +```sh +# Use fortune and cowsay as ascii art. +neofetch --ascii "$(fortune|cowsay -W 30)" + +# use figlet as ascii art. +neofetch --ascii "$(figlet -w 30 hello world)" +``` + +scrot - Added a new "simple" mode. You can now use neofetch for scripting by getting it to output individual info functions in plain text. From 7677cd2b4b9f4c6dbb9dfdb49c27067cc206b8de Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 10:14:43 +0200 Subject: [PATCH 041/550] image: higher quality thumbs. Closes #1079 --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 7ebef458..be8d711c 100755 --- a/neofetch +++ b/neofetch @@ -3769,11 +3769,9 @@ make_thumbnail() { -background none \ "$image" \ -strip \ - -define "jpeg:size=100x100" \ -gravity "$crop_offset" \ -crop "${size}x${size}+0+0" \ - -quality 40 \ - -sample "${width}x${height}" \ + -scale "${width}x${height}" \ "${thumbnail_dir}/${image_name}" ;; esac From 5316b568e711595bef0794f1e8e3782460ecfdc1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 10:15:01 +0200 Subject: [PATCH 042/550] docs: CHANGELOG --- CHANGELOG.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fdef4815..2cfcad06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,22 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **Contributors** -- [**@konimex**](https://github.com/konimex) -- [**@iandrewt**](https://github.com/iandrewt) -- [**@arisinfenix**](https://github.com/arisinfenix) -- [**@xPMo**](https://github.com/xPMo) -- [**@nero**](https://github.com/nero) -- [**@alyssais**](https://github.com/alyssais) -- [**@plgruener**](https://github.com/plgruener) -- [**@StarryTony**](https://github.com/StarryTony) -- [**@julianaito**](https://github.com/julianaito) -- [**@HolyStephano**](https://github.com/HolyStephano) -- [**@nikitenich**](https://github.com/nikitenich) -- [**@Appadeia**](https://github.com/Appadeia) -- [**@marlonn**](https://github.com/marlonn) -- [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) -- [**@Phuurl**](https://github.com/Phuurl) -- [**@erikdubois**](https://github.com/erikdubois) +[**@konimex**](https://github.com/konimex), [**@iandrewt**](https://github.com/iandrewt), [**@arisinfenix**](https://github.com/arisinfenix), [**@xPMo**](https://github.com/xPMo), [**@nero**](https://github.com/nero), [**@alyssais**](https://github.com/alyssais), [**@plgruener**](https://github.com/plgruener), [**@StarryTony**](https://github.com/StarryTony), [**@julianaito**](https://github.com/julianaito), [**@HolyStephano**](https://github.com/HolyStephano), [**@nikitenich**](https://github.com/nikitenich), [**@Appadeia**](https://github.com/Appadeia), [**@marlonn**](https://github.com/marlonn), [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle), [**@Phuurl**](https://github.com/Phuurl), [**@erikdubois**](https://github.com/erikdubois) **OS** From 85a1bd0af7e5b5752683c586305164f0d6444550 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 10:48:32 +0200 Subject: [PATCH 043/550] color_blocks: Fix newlines when disabled. --- neofetch | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index be8d711c..95da6417 100755 --- a/neofetch +++ b/neofetch @@ -82,9 +82,7 @@ print_info() { # info "Users" users # info "Locale" locale # This only works on glibc systems. - info line_break info cols - info line_break } @@ -3326,6 +3324,7 @@ get_gpu_driver() { gpu_driver="NVIDIA ${gpu_driver/ *}" fi ;; + "Mac OS X") if [[ "$(kextstat | grep "GeForceWeb")" != "" ]]; then gpu_driver="NVIDIA Web Driver" @@ -3368,9 +3367,9 @@ get_cols() { cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" # Add block height to info height. - ((info_height+=block_height-1)) + ((info_height+=block_height+2)) - printf '\e[%bC%b' "$text_padding" "${zws}${cols}" + printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" fi unset -v blocks blocks2 cols @@ -3947,17 +3946,6 @@ get_underline() { prin=1 } -get_line_break() { - # Print it directly. - printf '%b\n' "$zws" - - # Calculate info height. - ((++info_height)) - - # Tell info() that we printed manually. - prin=1 -} - get_bold() { case "$ascii_bold" in "on") ascii_bold='\e[1m' ;; @@ -4058,7 +4046,7 @@ color() { stdout() { image_backend="off" unset subtitle_color colon_color info_color underline_color bold title_color at_color \ - text_padding zws reset color_blocks get_line_break bar_color_elapsed bar_color_total \ + text_padding zws reset color_blocks bar_color_elapsed bar_color_total \ c1 c2 c3 c4 c5 c6 c7 c8 } @@ -4629,7 +4617,7 @@ get_args() { "--ascii_bold") ascii_bold="$2" ;; "--logo" | "-L") image_backend="ascii" - print_info() { info line_break; } + print_info() { printf '\n'; } ;; # Other @@ -4659,7 +4647,7 @@ get_args() { "--json") json="on" - unset -f get_title get_cols get_line_break get_underline + unset -f get_title get_cols get_underline printf '{\n' print_info 2>/dev/null @@ -4701,9 +4689,7 @@ get_args() { info "Public IP" public_ip info "Users" users - info line_break info cols - info line_break # Testing. prin "prin" @@ -4744,6 +4730,11 @@ get_simple() { ((simple)) && exit } +old_functions() { + # Removed functions for backwards compatability. + get_line_break() { :; } +} + get_distro_ascii() { # This function gets the distro ascii art and colors. # @@ -8782,6 +8773,7 @@ main() { image_backend get_cache_dir + old_functions print_info dynamic_prompt From 4d6a4fb4256d00aa9a2a8693c6ac8f0fa67057f5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 10:57:33 +0200 Subject: [PATCH 044/550] cursor: Fix issues in urxvt with padding --- neofetch | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 95da6417..8dab5305 100755 --- a/neofetch +++ b/neofetch @@ -3367,7 +3367,7 @@ get_cols() { cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" # Add block height to info height. - ((info_height+=block_height+2)) + ((info_height+=block_height+1)) printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" fi @@ -4166,9 +4166,23 @@ kde_config_dir() { kde_config_dir="${kde_config_dir/$'/:'*}" } +term_padding() { + # Get terminal padding to properly align cursor. + [[ -z $term ]] && get_term + + case "$term" in + urxvt*|"rxvt-unicode") + [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)" + padding="${xrdb/*.internalBorder:}" + ((padding=${padding/$'\n'*}*2)) + ;; + esac +} + dynamic_prompt() { [[ "$image_backend" == "off" ]] && { printf '\n'; return; } - [[ "$image_backend" != "ascii" ]] && lines="$(((height + yoffset) / font_height + 1))" + [[ "$image_backend" != "ascii" ]] && { + term_padding; lines="$(((height + yoffset + padding) / font_height + 1))"; } # If the ascii art is taller than the info. ((lines=lines>info_height?lines-info_height+1:1)) From 617769059bcdb58582f842a03f9e7531fa051c7e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 11:09:42 +0200 Subject: [PATCH 045/550] memory: Added option to display memory percentage. --- neofetch | 22 +++++++++++++++++++++- neofetch.1 | 3 +++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8dab5305..e928c5e5 100755 --- a/neofetch +++ b/neofetch @@ -142,6 +142,21 @@ os_arch="on" uptime_shorthand="on" +# Memory + + +# Show memory pecentage in output. +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --memory_percent +# +# Example: +# on: '1801MiB / 7881MiB (22%)' +# off: '1801MiB / 7881MiB' +memory_percent="off" + + # Packages @@ -2337,7 +2352,10 @@ get_memory() { ;; esac - memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB}" + + [[ $memory_percent == on ]] && ((mem_perc=mem_used * 100 / mem_total)) + + memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}" # Bars. case "$memory_display" in @@ -4359,6 +4377,7 @@ INFO: --ip_host url URL to query for public IP --song_format format Print the song data in a specific format (see config file). --song_shorthand on/off Print the Artist/Album/Title on separate lines. + --memory_percent on/off Display memory percentage. --music_player player-name Manually specify a player to use. Available values are listed in the config file @@ -4512,6 +4531,7 @@ get_args() { "--song_format") song_format="$2" ;; "--song_shorthand") song_shorthand="$2" ;; "--music_player") music_player="$2" ;; + "--memory_percent") memory_percent="$2" ;; "--cpu_temp") cpu_temp="$2" [[ "$cpu_temp" == "on" ]] && cpu_temp="C" diff --git a/neofetch.1 b/neofetch.1 index 6b80ab90..ccca6a55 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -144,6 +144,9 @@ Print the song data in a specific format (see config file). \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\-\-music_player\fR player\-name Manually specify a player to use. Available values are listed in the config file From de5a260f6b6fb0f5186a833a0612007e5c4ba8ad Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 12:12:11 +0200 Subject: [PATCH 046/550] public_ip: Added configurable timeout --- neofetch | 12 ++++++++++-- neofetch.1 | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index e928c5e5..c4078c54 100755 --- a/neofetch +++ b/neofetch @@ -375,6 +375,12 @@ gtk3="on" # Flag: --ip_host public_ip_host="http://ident.me" +# Public IP timeout. +# +# Default: '2' +# Values: 'int' +# Flag: --ip_timeout +public_ip_timeout=2 # Disk @@ -3312,11 +3318,11 @@ get_public_ip() { fi if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then - public_ip="$(curl --max-time 10 -w '\n' "$public_ip_host")" + public_ip="$(curl --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")" fi if [[ -z "$public_ip" ]] && type -p wget >/dev/null; then - public_ip="$(wget -T 10 -qO- "$public_ip_host")" + public_ip="$(wget -T "$public_ip_timeout" -qO- "$public_ip_host")" fi } @@ -4375,6 +4381,7 @@ INFO: 'dir' shows the basename of the disks's path. (/, Local Disk, etc) --ip_host url URL to query for public IP + --ip_timeout int Public IP timeout (in seconds). --song_format format Print the song data in a specific format (see config file). --song_shorthand on/off Print the Artist/Album/Title on separate lines. --memory_percent on/off Display memory percentage. @@ -4528,6 +4535,7 @@ get_args() { "--shell_path") shell_path="$2" ;; "--shell_version") shell_version="$2" ;; "--ip_host") public_ip_host="$2" ;; + "--ip_timeout") public_ip_timeout="$2" ;; "--song_format") song_format="$2" ;; "--song_shorthand") song_shorthand="$2" ;; "--music_player") music_player="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index ccca6a55..bb7d0b4e 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -138,6 +138,9 @@ Takes: name, mount, dir \fB\-\-ip_host\fR url URL to query for public IP .TP +\fB\-\-ip_timeout\fR int +Public IP timeout (in seconds). +.TP \fB\-\-song_format\fR format Print the song data in a specific format (see config file). .TP From 653712c06a4421e513be7c2231573b04df9018f6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 15:00:45 +0200 Subject: [PATCH 047/550] image: fix various bugs --- neofetch | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index c4078c54..e84f58b4 100755 --- a/neofetch +++ b/neofetch @@ -3729,9 +3729,12 @@ get_image_size() { *) image_size="${image_size/px}" ;; esac + # Check for terminal padding. + [[ $image_backend == w3m ]] && term_padding + width="${width:-$image_size}" height="${height:-$image_size}" - text_padding="$((width / font_width + gap + xoffset/font_width))" + text_padding="$(((width + padding + xoffset) / font_width + gap))" } make_thumbnail() { @@ -3816,9 +3819,9 @@ display_image() { "jp2a") jp2a \ + --colors \ --width="$((width / font_width))" \ --height="$((height / font_height))" \ - --colors \ "$image" ;; @@ -3872,7 +3875,7 @@ display_image() { # Add a tiny delay to fix issues with images not # appearing in specific terminal emulators. - sleep 0.05 + ((BASH_VERSINFO[0]>3)) && sleep 0.05 printf '%b\n%s;\n%s\n' "0;1;$xoffset;$yoffset;$width;$height;;;;;$image" 3 4 |\ "${w3m_img_path:-false}" -bg "$background_color" &>/dev/null ;; @@ -4198,15 +4201,15 @@ term_padding() { urxvt*|"rxvt-unicode") [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)" padding="${xrdb/*.internalBorder:}" - ((padding=${padding/$'\n'*}*2)) + ((padding=${padding/$'\n'*})) ;; esac } dynamic_prompt() { - [[ "$image_backend" == "off" ]] && { printf '\n'; return; } - [[ "$image_backend" != "ascii" ]] && { - term_padding; lines="$(((height + yoffset + padding) / font_height + 1))"; } + [[ $image_backend == off ]] && { printf '\n'; return; } + [[ $image_backend != ascii ]] && ((lines=(height + yoffset) / font_height + 1)) + [[ $image_backend == w3m ]] && ((lines=lines + padding / font_height + 1)) # If the ascii art is taller than the info. ((lines=lines>info_height?lines-info_height+1:1)) From 4f89361e50e33bd6a7c5aa215f346a5af93d09c6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 15:34:08 +0200 Subject: [PATCH 048/550] color_blocks: Fix cursor bug --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e84f58b4..0a8e503e 100755 --- a/neofetch +++ b/neofetch @@ -3391,7 +3391,7 @@ get_cols() { cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" # Add block height to info height. - ((info_height+=block_height+1)) + ((info_height+=block_range[1]>7?block_height+2:block_height+1)) printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" fi From 86372fe6a8849eecb3e69637a22b31e500022ea0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 15:52:12 +0200 Subject: [PATCH 049/550] distro: Remove broken distro lines --- neofetch | 5 ----- 1 file changed, 5 deletions(-) diff --git a/neofetch b/neofetch index 0a8e503e..85a23bee 100755 --- a/neofetch +++ b/neofetch @@ -924,11 +924,6 @@ get_distro() { "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; esac - - # Workarounds for distros that go against the os-release standard. - [[ -z "${distro// }" ]] && distro="$(awk '/BLAG/ {print $1; exit}')" "${files[@]}" - [[ -z "${distro// }" ]] && distro="$(awk -F'=' '{print $2; exit}')" "${files[@]}" - else for release_file in /etc/*-release; do distro+="$(< "$release_file")" From f24fed6df37ca8b53bee62d053495d83c9471deb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 15:53:08 +0200 Subject: [PATCH 050/550] version: bump --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 85a23bee..239e8d93 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version="5.0.1" +version="5.1.0" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" From 074323f0eddd3c306fa70d54bb51c75954071424 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 16:14:24 +0200 Subject: [PATCH 051/550] version: bump --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index bb7d0b4e..e1cfe00b 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. -.TH NEOFETCH "1" "January 2019" "Neofetch 5.0.1" "User Commands" +.TH NEOFETCH "1" "January 2019" "Neofetch 5.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 056a99bfa2d6b05900cc00ae5c7667eaa72c1417 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 16:26:28 +0200 Subject: [PATCH 052/550] resolution: If resolution is empty don't print it. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 239e8d93..39f0600e 100755 --- a/neofetch +++ b/neofetch @@ -2617,6 +2617,7 @@ get_resolution() { esac resolution="${resolution%,*}" + [[ -z ${resolution/x} ]] && resolution= } get_style() { From eaa59da1e9450cdfb9d37c019bc8efe1cc2ceaa3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 17:13:32 +0200 Subject: [PATCH 053/550] ascii: Fix bedrock colors. Closes #1156 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 39f0600e..0b18d238 100755 --- a/neofetch +++ b/neofetch @@ -5275,7 +5275,7 @@ EOF ;; "Bedrock"*) - set_colors 0 7 + set_colors 8 7 read -rd '' ascii_data <<'EOF' ${c1}-------------------------------------- -------------------------------------- From c76c122650faf31438bf683cd9b056c78e42c0a0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 17:27:23 +0200 Subject: [PATCH 054/550] image: Added support for Chafa. --- neofetch | 20 +++++++++++++------- neofetch.1 | 7 +++++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 0b18d238..60741189 100755 --- a/neofetch +++ b/neofetch @@ -669,7 +669,8 @@ disk_display="off" # Image backend. # # Default: 'ascii' -# Values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' +# Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off', +# 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' # Flag: --backend image_backend="ascii" @@ -3412,7 +3413,7 @@ image_backend() { "ascii") get_ascii ;; "off") image_backend="off" ;; - "caca" | "jp2a" | "iterm2" | "termpix" |\ + "caca" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ "tycat" | "w3m" | "sixel" | "pixterm" | "kitty") get_image_source @@ -3437,7 +3438,7 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." - err "Image: Valid backends are: 'ascii', 'caca', 'jp2a', 'iterm2', 'kitty', + err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty', 'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')" err "Image: Falling back to ascii mode." get_ascii @@ -3807,12 +3808,16 @@ display_image() { case "$image_backend" in "caca") img2txt \ - -W "$((width / font_width)))" \ + -W "$((width / font_width))" \ -H "$((height / font_height))" \ --gamma=0.6 \ "$image" ;; + "chafa") + chafa --size="$((width / font_width))x$((height / font_height))" "$image" + ;; + "jp2a") jp2a \ --colors \ @@ -4419,8 +4424,8 @@ BARS: IMAGE BACKEND: --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off', - 'sixel', 'tycat', 'w3m' + Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', + 'off', 'sixel', 'tycat', 'w3m' --source 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] @@ -4430,6 +4435,7 @@ IMAGE BACKEND: NEW: neofetch --ascii \"\$(fortune | cowsay -W 30)\" --caca source Shortcut to use 'caca' backend. + --chafa source Shortcut to use 'chafa' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. --kitty source Shortcut to use 'kitty' backend. @@ -4614,7 +4620,7 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" case "$2" in diff --git a/neofetch.1 b/neofetch.1 index e1cfe00b..925ac354 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -217,8 +217,8 @@ Possible values: bar, infobar, barinfo, off .TP \fB\-\-backend\fR backend Which image backend to use. -Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off', -\&'sixel', 'tycat', 'w3m' +Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', +\&'off', 'sixel', 'tycat', 'w3m' .TP \fB\-\-source\fR source Which image or ascii file to use. @@ -233,6 +233,9 @@ NEW: neofetch \fB\-\-ascii\fR "$(fortune | cowsay \fB\-W\fR 30)" \fB\-\-caca\fR source Shortcut to use 'caca' backend. .TP +\fB\-\-chafa\fR source +Shortcut to use 'chafa' backend. +.TP \fB\-\-iterm2\fR source Shortcut to use 'iterm2' backend. .TP From e2e98a6c7c60808e1dcdc6e4c1585155215cc794 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 17:36:27 +0200 Subject: [PATCH 055/550] general: Fixed bug with line_break alternative. Closes #1157 --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 60741189..1c5cf2ca 100755 --- a/neofetch +++ b/neofetch @@ -3388,9 +3388,9 @@ get_cols() { cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" # Add block height to info height. - ((info_height+=block_range[1]>7?block_height+2:block_height+1)) + ((info_height+=block_range[1]>7?block_height+3:block_height+2)) - printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" + printf '\n\e[%bC%b\n\n' "$text_padding" "${zws}${cols}" fi unset -v blocks blocks2 cols @@ -3953,7 +3953,7 @@ prin() { string="${subtitle_color}${bold}${string}" # Print the info. - printf '%b\n' "${text_padding:+\e[${text_padding}C}${zws}${string}${reset} " + printf '%b\n' "${text_padding:+\e[${text_padding}C}${zws}${string//\\n}${reset} " # Calculate info height. ((++info_height)) From 32a44b4d62240348e2260126081dcf14bfe3b257 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 17:54:42 +0200 Subject: [PATCH 056/550] ascii: Fixed gobo linux ascii bug --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 1c5cf2ca..8c3103cf 100755 --- a/neofetch +++ b/neofetch @@ -6246,8 +6246,8 @@ EOF "GoboLinux"*) set_colors 5 4 6 2 read -rd '' ascii_data <<'EOF' -${c1}_____ _ -/ ____| | | +${c1} _____ _ + / ____| | | | | __ ___ | |__ ___ | | |_ |/ _ \| '_ \ / _ \ | |__| | (_) | |_) | (_) | From 12d9f93750713a07dfcad02fa239a28373f7b85f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 17:55:22 +0200 Subject: [PATCH 057/550] ascii: Fixed debian linux ascii bug --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8c3103cf..51899228 100755 --- a/neofetch +++ b/neofetch @@ -5738,7 +5738,7 @@ EOF "debian_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c1}_____ +${c1} _____ / __ \\ | / | | \\___- From c1da5eb09a1eaac52a66bd5c6d1e189d135b63bc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 18:00:54 +0200 Subject: [PATCH 058/550] ascii: Fixed void linux ascii bug --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 51899228..ebaf2660 100755 --- a/neofetch +++ b/neofetch @@ -8522,12 +8522,12 @@ EOF set_colors 2 8 read -rd '' ascii_data <<'EOF' ${c1} _______ - _ \______ - -| \ ___ \ | + _ \\______ - +| \\ ___ \\ | | | / \ | | | | \___/ | | -| \______ \_| - -_______\ +| \\______ \\_| + -_______\\ EOF ;; From c6bd0461a09290315e32c855e8455316ba8367a4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 18:23:38 +0200 Subject: [PATCH 059/550] image: Added support for Chafa. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ebaf2660..cd3ca28d 100755 --- a/neofetch +++ b/neofetch @@ -4435,7 +4435,7 @@ IMAGE BACKEND: NEW: neofetch --ascii \"\$(fortune | cowsay -W 30)\" --caca source Shortcut to use 'caca' backend. - --chafa source Shortcut to use 'chafa' backend. + --chafa source Shortcut to use 'chafa' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. --kitty source Shortcut to use 'kitty' backend. From c9d6ef5c408eb1e6d710b511f4b77aaaef5e4e67 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 18:32:04 +0200 Subject: [PATCH 060/550] version: bump --- neofetch | 2 +- neofetch.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index cd3ca28d..ae32366f 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version="5.1.0" +version="6.0.0" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" diff --git a/neofetch.1 b/neofetch.1 index 925ac354..5a4ddc3a 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. -.TH NEOFETCH "1" "January 2019" "Neofetch 5.1.0" "User Commands" +.TH NEOFETCH "1" "January 2019" "Neofetch 6.0.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 7a64ce22a829cc782e9a43ffb8a4e26f65250dcf Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 18:39:59 +0200 Subject: [PATCH 061/550] docs: update --- CHANGELOG.md | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cfcad06..f0d231d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,30 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [6.0.0] - 2019-01-08 logo +This release fixes a wide range of bugs and adds some neat new features. +Scroll down to "highlights" to see the bigger changes from this release. +A big thank you to @konimex, @iandrewt and the contributors below who +kept development going during my absence. + +Expect a minor bug fix release sometime this week as I'm sure new bugs +will come up. I've done extensive testing but things always slip through. + **Contributors** -[**@konimex**](https://github.com/konimex), [**@iandrewt**](https://github.com/iandrewt), [**@arisinfenix**](https://github.com/arisinfenix), [**@xPMo**](https://github.com/xPMo), [**@nero**](https://github.com/nero), [**@alyssais**](https://github.com/alyssais), [**@plgruener**](https://github.com/plgruener), [**@StarryTony**](https://github.com/StarryTony), [**@julianaito**](https://github.com/julianaito), [**@HolyStephano**](https://github.com/HolyStephano), [**@nikitenich**](https://github.com/nikitenich), [**@Appadeia**](https://github.com/Appadeia), [**@marlonn**](https://github.com/marlonn), [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle), [**@Phuurl**](https://github.com/Phuurl), [**@erikdubois**](https://github.com/erikdubois) +[**@konimex**](https://github.com/konimex), [**@iandrewt**](https://github.com/iandrewt), [**@arisinfenix**](https://github.com/arisinfenix), [**@xPMo**](https://github.com/xPMo), [**@nero**](https://github.com/nero), [**@alyssais**](https://github.com/alyssais), +[**@plgruener**](https://github.com/plgruener), [**@StarryTony**](https://github.com/StarryTony), [**@julianaito**](https://github.com/julianaito), [**@HolyStephano**](https://github.com/HolyStephano), +[**@nikitenich**](https://github.com/nikitenich), [**@Appadeia**](https://github.com/Appadeia), [**@marlonn**](https://github.com/marlonn), [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle), [**@Phuurl**](https://github.com/Phuurl), [**@erikdubois**](https://github.com/erikdubois) + + +**Breaking Changes** + +- **Config**: Removed `get_line_break()`. + - Alternative: `prin '\n'` + - Rationale: fix a bug that's been lingering for a couple of years now. **OS** @@ -26,7 +43,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **Highlights** -- [ASCII] Added support for command output. You can now use whatever terminal commands you like as the ASCII art. +[ASCII] Added support for command output. You can now use whatever +terminal commands you like as the ASCII art. ```sh # Use fortune and cowsay as ascii art. @@ -38,7 +56,8 @@ neofetch --ascii "$(figlet -w 30 hello world)" scrot -- Added a new "simple" mode. You can now use neofetch for scripting by getting it to output individual info functions in plain text. +Added a new "simple" mode. You can now use neofetch for scripting +by getting it to output individual info functions in plain text. ```sh # Example: @@ -61,8 +80,20 @@ IFS=$'\n' read -d "" -ra info < <(neofetch memory uptime wm) info=("${info[@]##*: }") ``` +Added new image backend [chafa](https://hpjansson.org/chafa/) (`--chafa`) +which displays images in the terminal using unicode characters. + +```sh +neofetch --chafa ~/Pictures/meow.jpg +``` + +scrot + + **Info** +- **Color Blocks**: Fixed issue where disabling blocks caused an extra newline to appear. +- **Color Blocks**: Color blocks now have their padding built in. No more need for `get_line_break()`. - **Song**: Added snippet to display music player. - `[[ $player ]] && prin "Music Player" "$player"` - NOTE: Must have `info "Song" song` enabled. @@ -82,6 +113,7 @@ info=("${info[@]##*: }") - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) - **Terminal Font** [Kitty]: Use `kitty --debug-config` to get font information. - **Memory** [Solaris]: Updated memory detection to use pages. [**@konimex**](https://github.com/konimex) +- **Memory**: Added option to show memory percentage (`--memory_percent`). - **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito) - **Model** [macOS]: Added VirtualSMC as a new FakeSMC alternative for Hackintosh. [**@nikitenich**](https://github.com/nikitenich) - **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito) @@ -89,9 +121,12 @@ info=("${info[@]##*: }") - **Disk** [OpenBSD]: Added a separate disk array creation using `awk` since one cannot directly use `/dev/...` unless being root or in the `operator` group. [**@julianaito**](https://github.com/julianaito) - **Battery** [OpenBSD]: Improve charge `%` and add status. **Charlène** - **GPU** [AMD]: Remove unnecessary check. +- **Public IP**: Added configurable timeout to requests. +- **Resolution**: If resolution is not found, don't print anything. **ASCII** +- Fixed issues with various ASCII arts (namely the `_small` ones). - Added support for command output. - `neofetch --ascii "$(fortune|cowsay -W 30)"` - `neofetch --ascii "$(figlet -w 30 hello world)"` @@ -103,9 +138,14 @@ info=("${info[@]##*: }") **Image** +- Added new image backend [chafa](https://hpjansson.org/chafa/) (`--chafa`). +- **w3m**: Fixed issues with URxvt and internal borders. +- **w3m**: Fixed issues with URxvt and cursor position. +- **w3m**: Fixed issue with `bash 3`. - **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) - **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) - **Kitty**: Update docs. [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) +- Thumbnails are high quality again. - Cached thumbnails are now stored with PATH to prevent collision issues. ## [5.0.0] - 2018-06-18 From ca9d161bc91c86e586d3fb114aad896be683c03e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 18:40:32 +0200 Subject: [PATCH 062/550] version: bump --- neofetch | 2 +- neofetch.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index ae32366f..2af20d8b 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version="6.0.0" +version="6.0.1" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" diff --git a/neofetch.1 b/neofetch.1 index 5a4ddc3a..269638e0 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. -.TH NEOFETCH "1" "January 2019" "Neofetch 6.0.0" "User Commands" +.TH NEOFETCH "1" "January 2019" "Neofetch 6.0.1" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From b49ecb68f8ca736dd1a1ed0940f8d6f676e0ffc2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 20:53:00 +0200 Subject: [PATCH 063/550] term_font [kitty]: Fix bug with empty config --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 2af20d8b..553ea324 100755 --- a/neofetch +++ b/neofetch @@ -2921,6 +2921,8 @@ END "kitty"*) kitty_config="$(kitty --debug-config)" + [[ $kitty_config != *font_family* ]] && return + term_font_size="${kitty_config/*font_size}" term_font_size="${term_font_size/$'\n'*}" term_font="${kitty_config/*font_family}" From b6b320a75ad7abe2567240a0fd8d7e980bfb7ae5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 21:39:07 +0200 Subject: [PATCH 064/550] docs: update --- README.md | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/README.md b/README.md index 3e61cfe5..58b2a859 100644 --- a/README.md +++ b/README.md @@ -26,37 +26,3 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, ### More: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] - -## Articles - -- https://lamiradadelreplicante.com/2016/05/15/la-informacion-de-tu-sistema-en-la-terminal-con-neofetch/ -- https://linuxconfig.org/how-to-display-system-information-with-neofetch -- https://www.2daygeek.com/neofetch-display-linux-systems-information-ascii-distribution-logo-terminal/ -- https://www.cyberciti.biz/howto/neofetch-awesome-system-info-bash-script-for-linux-unix-macos/ -- https://www.lffl.org/2016/11/neofetch-le-informazioni-sistema-sul-terminale-stile.html -- https://www.maketecheasier.com/display-system-information-neofetch-linux/ -- https://www.omgubuntu.co.uk/2016/11/neofetch-terminal-system-info-app -- https://www.omgubuntu.co.uk/2016/12/cli-system-tool-neofetch-2-0-released -- https://www.omgubuntu.co.uk/2017/01/neofetch-3-0-released -- https://www.ostechnix.com/neofetch-display-linux-systems-information/ -- https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/ -- https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ -- https://www.youtube.com/watch?v=bgepGW858fc -- https://www.linuxuprising.com/2018/05/display-system-information-on-linux.html -- https://esgeeks.com/neofetch-informacion-sistema-linux/ - - -## Thanks - -- [Contributors](https://github.com/dylanaraps/neofetch/contributors) -- [Packagers](https://github.com/dylanaraps/neofetch/issues/115) -- [Screenfetch](https://github.com/KittyKatt/screenFetch) -- [ufetch](https://github.com/jschx/ufetch) - - -## Donate - -Donations allow me to spend more time working on `neofetch` and my other Open Source projects. If you like `neofetch` and want to give back in some way you can donate at the links below. - - - From 2ecd8102d02086277313a3171bf5e8acda342043 Mon Sep 17 00:00:00 2001 From: Andres Santamaria Artigas Date: Tue, 8 Jan 2019 20:32:34 -0500 Subject: [PATCH 065/550] Made variables local in get_cols function The variables blocks, blocks2, and cols were not set as local in the get_cols function, which made neofetch print whatever value they had before showing the colorblocks. This commit makes these variables local so the output doesn't get affected if they are set beforehand. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 553ea324..647e4283 100755 --- a/neofetch +++ b/neofetch @@ -3359,6 +3359,7 @@ get_gpu_driver() { } get_cols() { + local blocks blocks2 cols if [[ "$color_blocks" == "on" ]]; then # Convert the width to space chars. printf -v block_width "%${block_width}s" From 661d003be26f56802e4ceb2a82fb9fe545c7b122 Mon Sep 17 00:00:00 2001 From: xPMo Date: Tue, 8 Jan 2019 19:47:31 -0600 Subject: [PATCH 066/550] order options "on, tiny, off" --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 553ea324..5a3bd2cb 100755 --- a/neofetch +++ b/neofetch @@ -108,7 +108,7 @@ kernel_shorthand="on" # Shorten the output of the distro function # # Default: 'off' -# Values: 'on', 'off', 'tiny' +# Values: 'on', 'tiny', 'off' # Flag: --distro_shorthand # Supports: Everything except Windows and Haiku distro_shorthand="off" @@ -132,13 +132,13 @@ os_arch="on" # Shorten the output of the uptime function # # Default: 'on' -# Values: 'on', 'off', 'tiny' +# Values: 'on', 'tiny', 'off' # Flag: --uptime_shorthand # # Example: # on: '2 days, 10 hours, 3 mins' -# off: '2 days, 10 hours, 3 minutes' # tiny: '2d 10h 3m' +# off: '2 days, 10 hours, 3 minutes' uptime_shorthand="on" @@ -4324,7 +4324,7 @@ INFO: NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - --package_managers on/off Hide/Show Package Manager names . (tiny, on, off) + --package_managers on/off Hide/Show Package Manager names . (on, tiny, off) --os_arch on/off Hide/Show OS architecture. --speed_type type Change the type of cpu speed to display. Possible values: current, min, max, bios, @@ -4351,7 +4351,7 @@ INFO: NOTE: For FreeBSD and NetBSD-based systems, you need to enable coretemp kernel module. This only supports newer Intel processors. - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + --distro_shorthand on/off Shorten the output of distro (on, tiny, off) NOTE: This option won't work in Windows (Cygwin) @@ -4359,7 +4359,7 @@ INFO: NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --uptime_shorthand on/off Shorten the output of uptime (on, tiny, off) --refresh_rate on/off Whether to display the refresh rate of each monitor Unsupported on Windows --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) From 766113a0c2e51646ad7ba67e9fc3103fb09dddb6 Mon Sep 17 00:00:00 2001 From: xPMo Date: Tue, 8 Jan 2019 19:49:07 -0600 Subject: [PATCH 067/550] manpage: add "tiny" where supported --- neofetch.1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 269638e0..e5733d41 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -40,8 +40,8 @@ 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\-\-package_managers\fR on/off -Hide/Show Package Manager names . (tiny, on, off) +\fB\-\-package_managers\fR on/tiny/off +Hide/Show Package Manager names . (on, tiny, off) .TP \fB\-\-os_arch\fR on/off Hide/Show OS architecture. @@ -79,8 +79,8 @@ NOTE: This only works on Linux and BSD. 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 (tiny, on, off) +\fB\-\-distro_shorthand\fR on/tiny/off +Shorten the output of distro (on, tiny, off) .IP NOTE: This option won't work in Windows (Cygwin) .TP @@ -89,8 +89,8 @@ 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 (tiny, on, off) +\fB\-\-uptime_shorthand\fR on/tiny/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 From 7df1d0e3ef6b7e8fd5ed3a2b55f4cf78ca0a2c30 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 07:50:44 +0200 Subject: [PATCH 068/550] misc: cleanup --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 8cf4d888..0c1cd782 100755 --- a/neofetch +++ b/neofetch @@ -3360,6 +3360,7 @@ get_gpu_driver() { get_cols() { local blocks blocks2 cols + if [[ "$color_blocks" == "on" ]]; then # Convert the width to space chars. printf -v block_width "%${block_width}s" From 23fc5aff3d08675160685a3caceb93bc4c5fe489 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 08:00:16 +0200 Subject: [PATCH 069/550] docs: update --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0d231d1..dc3aa35c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). + +## [6.0.1] - N/A + +- **term_font** [kitty]: Fixed bug with empty config. +- **get_cols**: Variables are now local. [**@asantam**](https://github.com/asantam) +- **man_page**: More consistent arg documentation. [**@xPMo**](https://github.com/xPMo) + + ## [6.0.0] - 2019-01-08 logo From 9431a593f6ce3e6501635fbb11e54084c6c52df9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 08:48:07 +0200 Subject: [PATCH 070/550] ascii: Fixed bug causing ascii files to not work. --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 0c1cd782..857c7401 100755 --- a/neofetch +++ b/neofetch @@ -3454,12 +3454,13 @@ image_backend() { } get_ascii() { - [[ ! "$image_source" =~ (ascii|auto) ]] && - if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then - ascii_data="$(< "$image_source")" - else - ascii_data="$image_source" - fi + if [[ -f $image_source && ! $image_source =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then + ascii_data="$(< "$image_source")" + elif [[ $image_source == ascii || $image_source == auto ]]; then + : + else + ascii_data="$image_source" + fi # Set locale to get correct padding. LC_ALL="$sys_locale" From 64188697b85a26fb522fc5fa7edca019493e9a53 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 08:50:01 +0200 Subject: [PATCH 071/550] ascii: Fixed bug causing files named ascii to not work. --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 857c7401..240ed4f0 100755 --- a/neofetch +++ b/neofetch @@ -3414,7 +3414,7 @@ image_backend() { { image_backend="ascii"; err "Image: Imagemagick not found, falling back to ascii mode."; } case "${image_backend:-off}" in - "ascii") get_ascii ;; + "ascii") print_ascii ;; "off") image_backend="off" ;; "caca" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ @@ -3445,7 +3445,7 @@ image_backend() { err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty', 'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')" err "Image: Falling back to ascii mode." - get_ascii + print_ascii ;; esac @@ -3453,7 +3453,7 @@ image_backend() { [[ "$image_backend" != "off" ]] && printf '\e[%sA\e[9999999D' "${lines:-0}" } -get_ascii() { +print_ascii() { if [[ -f $image_source && ! $image_source =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then ascii_data="$(< "$image_source")" elif [[ $image_source == ascii || $image_source == auto ]]; then @@ -3472,7 +3472,7 @@ get_ascii() { done <<< "${ascii_data//\$\{??\}}" # Fallback if file not found. - ((lines==1)) && { lines=; ascii_len=; image_source="auto"; get_distro_ascii; get_ascii; return; } + ((lines==1)) && { lines=; ascii_len=; image_source="auto"; get_distro_ascii; print_ascii; return; } # Colors. ascii_data="${ascii_data//\$\{c1\}/$c1}" @@ -3891,7 +3891,7 @@ display_image() { to_ascii() { err "$1" image_backend="ascii" - get_ascii + print_ascii # Set cursor position next image/ascii. printf '\e[%sA\e[9999999D' "${lines:-0}" From 78e0fa3212d134ec8c679a596100b737bf579ac6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 08:50:57 +0200 Subject: [PATCH 072/550] docs: update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc3aa35c..6835f367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [6.0.1] - N/A +- **ascii**: Fixed bug causing files to not work. +- **ascii**: Fixed bug causing files named `ascii` to not load. - **term_font** [kitty]: Fixed bug with empty config. - **get_cols**: Variables are now local. [**@asantam**](https://github.com/asantam) - **man_page**: More consistent arg documentation. [**@xPMo**](https://github.com/xPMo) From acc8103dde1b6df361d0d430b11b8777b10cabf7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 08:59:23 +0200 Subject: [PATCH 073/550] fixed travis --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 240ed4f0..0cbab5f1 100755 --- a/neofetch +++ b/neofetch @@ -3472,7 +3472,7 @@ print_ascii() { done <<< "${ascii_data//\$\{??\}}" # Fallback if file not found. - ((lines==1)) && { lines=; ascii_len=; image_source="auto"; get_distro_ascii; print_ascii; return; } + ((lines==1)) && { lines=; ascii_len=; image_source=auto; get_distro_ascii; print_ascii; return; } # Colors. ascii_data="${ascii_data//\$\{c1\}/$c1}" From 415ef5d4aeb1cced7afcf9fd1223dd09c3306b9c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 10:43:22 +0200 Subject: [PATCH 074/550] misc: Quote all the things --- neofetch | 69 ++++++++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/neofetch b/neofetch index 0cbab5f1..64c75f6e 100755 --- a/neofetch +++ b/neofetch @@ -76,7 +76,7 @@ print_info() { # info "Battery" battery # info "Font" font # info "Song" song - # [[ $player ]] && prin "Music Player" "$player" + # [[ "$player" ]] && prin "Music Player" "$player" # info "Local IP" local_ip # info "Public IP" public_ip # info "Users" users @@ -849,7 +849,7 @@ get_distro() { case "$os" in "Linux" | "BSD" | "MINIX") - if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then + if [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]]; then case "$distro_shorthand" in "on" | "tiny") distro="Bedrock Linux" ;; *) distro="$(< /bedrock/etc/bedrock-release)" @@ -906,7 +906,7 @@ get_distro() { # Chrome OS doesn't conform to the /etc/*-release standard. # While the file is a series of variables they can't be sourced # by the shell since the values aren't quoted. - elif [[ -f /etc/lsb-release && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then + elif [[ -f "/etc/lsb-release" && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)" elif [[ -f "/etc/os-release" || \ @@ -938,7 +938,7 @@ get_distro() { distro="${distro/DragonFly/DragonFlyBSD}" # Workarounds for FreeBSD based distros. - [[ -f "/etc/pcbsd-lang" ]] && distro="PCBSD" + [[ -f "/etc/pcbsd-lang" ]] && distro="PCBSD" [[ -f "/etc/trueos-lang" ]] && distro="TrueOS" # /etc/pacbsd-release is an empty file @@ -946,15 +946,14 @@ get_distro() { fi fi - if [[ "$(< /proc/version)" == *"Microsoft"* || - "$kernel_version" == *"Microsoft"* ]]; then + if [[ "$(< /proc/version)" == *Microsoft* || "$kernel_version" == *Microsoft* ]]; then case "$distro_shorthand" in "on") distro+=" [Windows 10]" ;; "tiny") distro="Windows 10" ;; *) distro+=" on Windows 10" ;; esac - elif [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then + elif [[ "$(< /proc/version)" == *chrome-bot* || -f "/dev/cros_ec" ]]; then case "$distro_shorthand" in "on") distro+=" [Chrome OS]" ;; "tiny") distro="Chrome OS" ;; @@ -1059,15 +1058,15 @@ get_model() { if [[ -d "/system/app/" && -d "/system/priv-app" ]]; then model="$(getprop ro.product.brand) $(getprop ro.product.model)" - elif [[ -f /sys/devices/virtual/dmi/id/product_name || - -f /sys/devices/virtual/dmi/id/product_version ]]; then + elif [[ -f "/sys/devices/virtual/dmi/id/product_name" || + -f "/sys/devices/virtual/dmi/id/product_version" ]]; then model="$(< /sys/devices/virtual/dmi/id/product_name)" model+=" $(< /sys/devices/virtual/dmi/id/product_version)" - elif [[ -f /sys/firmware/devicetree/base/model ]]; then + elif [[ -f "/sys/firmware/devicetree/base/model" ]]; then model="$(< /sys/firmware/devicetree/base/model)" - elif [[ -f /tmp/sysinfo/model ]]; then + elif [[ -f "/tmp/sysinfo/model" ]]; then model="$(< /tmp/sysinfo/model)" fi ;; @@ -1293,7 +1292,7 @@ get_packages() { tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } # Redefine tot() for Bedrock Linux. - [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { + [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]] && { tot() { IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done) ((packages+="${#pkgs[@]}")) @@ -1839,8 +1838,7 @@ get_cpu() { fi # Get CPU temp. - [[ -f "$temp_dir" ]] && \ - deg="$(($(< "$temp_dir") * 100 / 10000))" + [[ -f "$temp_dir" ]] && deg="$(($(< "$temp_dir") * 100 / 10000))" # Get CPU cores. case "$cpu_cores" in @@ -2103,9 +2101,7 @@ get_gpu() { # Checking the first two array elements should # be safe since there won't be 2 intel outputs if # there's a dedicated GPU in play. - [[ "${gpus[0]}" == *Intel* && \ - "${gpus[1]}" == *Intel* ]] && \ - unset -v "gpus[0]" + [[ "${gpus[0]}" == *Intel* && "${gpus[1]}" == *Intel* ]] && unset -v "gpus[0]" for gpu in "${gpus[@]}"; do # GPU shorthand tests. @@ -2355,7 +2351,7 @@ get_memory() { esac - [[ $memory_percent == on ]] && ((mem_perc=mem_used * 100 / mem_total)) + [[ "$memory_percent" == "on" ]] && ((mem_perc=mem_used * 100 / mem_total)) memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}" @@ -2409,8 +2405,7 @@ get_song() { player="$(ps aux | awk -v pattern="(${players:1})" \ '!/ awk / && !/iTunesHelper/ && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')" - [[ "$music_player" && "$music_player" != "auto" ]] && \ - player="$music_player" + [[ "$music_player" && "$music_player" != "auto" ]] && player="$music_player" get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. @@ -2618,7 +2613,7 @@ get_resolution() { esac resolution="${resolution%,*}" - [[ -z ${resolution/x} ]] && resolution= + [[ -z "${resolution/x}" ]] && resolution= } get_style() { @@ -2797,11 +2792,8 @@ get_term() { esac # Most likely TosWin2 on FreeMiNT - quick check - [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && \ - term="TosWin2" - - [[ "$SSH_CONNECTION" ]] && \ - term="$SSH_TTY" + [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && term="TosWin2" + [[ "$SSH_CONNECTION" ]] && term="$SSH_TTY" # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do @@ -2921,7 +2913,7 @@ END "kitty"*) kitty_config="$(kitty --debug-config)" - [[ $kitty_config != *font_family* ]] && return + [[ "$kitty_config" != *font_family* ]] && return term_font_size="${kitty_config/*font_size}" term_font_size="${term_font_size/$'\n'*}" @@ -2967,7 +2959,7 @@ END mateterm_config="/tmp/mateterm.cfg" # Ensure /tmp exists and we do not overwrite anything. - if [[ -d /tmp && ! -f "$mateterm_config" ]]; then + if [[ -d "/tmp" && ! -f "$mateterm_config" ]]; then mate-terminal --save-config="$mateterm_config" role="$(xprop -id "${WINDOWID}" WM_WINDOW_ROLE)" @@ -3032,7 +3024,7 @@ END # On Linux we can get the exact path to the running binary through the procfs # (in case `st` is launched from outside of $PATH) on other systems we just # have to guess and assume `st` is invoked from somewhere in the users $PATH - [[ -L /proc/$parent/exe ]] && binary="/proc/$parent/exe" || binary="$(type -p st)" + [[ -L "/proc/$parent/exe" ]] && binary="/proc/$parent/exe" || binary="$(type -p st)" # Grep the output of strings on the `st` binary for anything that looks vaguely # like a font definition. NOTE: There is a slight limitation in this approach. @@ -3085,8 +3077,7 @@ END term_font="$(trim "${term_font/*"faceName:"}")" # xft: isn't required at the beginning so we prepend it if it's missing - [[ "${term_font:0:1}" != "-" && \ - "${term_font:0:4}" != "xft:" ]] && \ + [[ "${term_font:0:1}" != "-" && "${term_font:0:4}" != "xft:" ]] && \ term_font="xft:$term_font" # Xresources has two different font formats, this checks which @@ -3454,9 +3445,9 @@ image_backend() { } print_ascii() { - if [[ -f $image_source && ! $image_source =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then + if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then ascii_data="$(< "$image_source")" - elif [[ $image_source == ascii || $image_source == auto ]]; then + elif [[ "$image_source" == "ascii" || $image_source == auto ]]; then : else ascii_data="$image_source" @@ -3732,7 +3723,7 @@ get_image_size() { esac # Check for terminal padding. - [[ $image_backend == w3m ]] && term_padding + [[ "$image_backend" == "w3m" ]] && term_padding width="${width:-$image_size}" height="${height:-$image_size}" @@ -4201,7 +4192,7 @@ kde_config_dir() { term_padding() { # Get terminal padding to properly align cursor. - [[ -z $term ]] && get_term + [[ -z "$term" ]] && get_term case "$term" in urxvt*|"rxvt-unicode") @@ -4213,9 +4204,9 @@ term_padding() { } dynamic_prompt() { - [[ $image_backend == off ]] && { printf '\n'; return; } - [[ $image_backend != ascii ]] && ((lines=(height + yoffset) / font_height + 1)) - [[ $image_backend == w3m ]] && ((lines=lines + padding / font_height + 1)) + [[ "$image_backend" == "off" ]] && { printf '\n'; return; } + [[ "$image_backend" != "ascii" ]] && ((lines=(height + yoffset) / font_height + 1)) + [[ "$image_backend" == "w3m" ]] && ((lines=lines + padding / font_height + 1)) # If the ascii art is taller than the info. ((lines=lines>info_height?lines-info_height+1:1)) @@ -4771,7 +4762,7 @@ get_args() { get_simple() { while [[ "$1" ]]; do - [[ $(type -t "get_$1") == function ]] && { + [[ "$(type -t "get_$1")" == "function" ]] && { get_distro stdout simple=1 From 68645339d33e52197cf99201375e0411d5c33b33 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 15 Jan 2019 19:56:37 +0200 Subject: [PATCH 075/550] general: fix image sizing in VTE terminals. --- neofetch | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/neofetch b/neofetch index 64c75f6e..75304a11 100755 --- a/neofetch +++ b/neofetch @@ -3599,49 +3599,10 @@ get_w3m_img_path() { get_window_size() { # This functions gets the current window size in # pixels. - # - # We first try to use the escape sequence "\033[14t" - # to get the terminal window size in pixels. If this - # fails we then fallback to using "xdotool" or other - # programs. - - # Tmux has a special way of reading escape sequences - # so we have to use a slightly different sequence to - # get the terminal size. - if [[ "$image_backend" == "tycat" ]]; then - printf '%b' '\e}qs\000' - - else - case "${TMUX:-null}" in - "null") printf '%b' '\e[14t' ;; - *) printf '%b' '\ePtmux;\e\e[14t\e\\ ' ;; - esac - fi - - # The escape codes above print the desired output as - # user input so we have to use read to store the out - # -put as a variable. - # The 1 second timeout is required for older bash - case "${BASH_VERSINFO[0]}" in - 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; - *) IFS=';t' read -d t -t 1 -sra term_size ;; - esac - unset IFS - - # Split the string into height/width. - if [[ "$image_backend" == "tycat" ]]; then - term_width="$((term_size[2] * term_size[0]))" - term_height="$((term_size[3] * term_size[1]))" - - else - term_height="${term_size[1]}" - term_width="${term_size[2]}" - fi - - [[ "$image_backend" == "kitty" ]] && \ + [[ "$image_backend" == "kitty" ]] && IFS=x read -r term_width term_height < <(kitty +kitten icat --print-window-size) - # Get terminal width/height if \e[14t is unsupported. + # Get terminal width/heigh. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool &>/dev/null; then IFS=$'\n' read -d "" -ra win < <(xdotool getactivewindow getwindowgeometry --shell %1) From 5b301c773bf52ff5a27802ff2cce268e51aa341c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 15 Jan 2019 19:58:32 +0200 Subject: [PATCH 076/550] docs: update --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 75304a11..208aea4b 100755 --- a/neofetch +++ b/neofetch @@ -3602,7 +3602,7 @@ get_window_size() { [[ "$image_backend" == "kitty" ]] && IFS=x read -r term_width term_height < <(kitty +kitten icat --print-window-size) - # Get terminal width/heigh. + # Get terminal width/height. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool &>/dev/null; then IFS=$'\n' read -d "" -ra win < <(xdotool getactivewindow getwindowgeometry --shell %1) From 91f8510ef3f3be19da51dd113b844adfceeda737 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 19 Jan 2019 17:40:49 +0700 Subject: [PATCH 077/550] Memory [AIX]: Detect memory based on pages (like Solaris) for more accuracy --- neofetch | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 64c75f6e..dfeb57a9 100755 --- a/neofetch +++ b/neofetch @@ -2307,10 +2307,20 @@ get_memory() { esac ;; - "Solaris") + "Solaris" | "AIX") hw_pagesize="$(pagesize)" - pages_total="$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')" - pages_free="$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')" + case "$os" in + "Solaris") + pages_total="$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')" + pages_free="$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')" + ;; + + "AIX") + IFS=$'\n'"| " read -d "" -ra mem_stat <<< "$(svmon -G -O unit=page)" + pages_total="${mem_stat[11]}" + pages_free="${mem_stat[16]}" + ;; + esac mem_total="$((pages_total * hw_pagesize / 1024 / 1024))" mem_free="$((pages_free * hw_pagesize / 1024 / 1024))" mem_used="$((mem_total - mem_free))" @@ -2322,15 +2332,6 @@ get_memory() { mem_used="$((${mem_used/max} / 1024 / 1024))" ;; - "AIX") - IFS=$'\n'"| " read -d "" -ra mem_stat <<< "$(svmon -G -O unit=MB)" - - mem_total="${mem_stat[11]/.*}" - mem_free="${mem_stat[16]/.*}" - mem_used="$((mem_total - mem_free))" - mem_label="MB" - ;; - "IRIX") IFS=$'\n' read -d "" -ra mem_cmd <<< "$(pmem)" IFS=" " read -ra mem_stat <<< "${mem_cmd[0]}" From 0b812fbc5dd2102ea5481a30c3fb254ba22cb313 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 20 Jan 2019 05:36:25 +0200 Subject: [PATCH 078/550] general: Fix issue with URxvt and no internal border. Closes #1174 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 64c75f6e..fbc983a5 100755 --- a/neofetch +++ b/neofetch @@ -4197,6 +4197,7 @@ term_padding() { case "$term" in urxvt*|"rxvt-unicode") [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)" + [[ $xrdb != *.internalBorder:* ]] && return padding="${xrdb/*.internalBorder:}" ((padding=${padding/$'\n'*})) ;; From cb6e78efecebc64f698e2a978194c636a70fff15 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Thu, 17 Jan 2019 12:19:00 -0600 Subject: [PATCH 079/550] postmarketOS: Replace ASCII logo --- neofetch | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 0ed8c0ab..96dc7259 100755 --- a/neofetch +++ b/neofetch @@ -7587,23 +7587,24 @@ EOF "PostMarketOS"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ +${c1} /\\ + / \\ + / \\ + / \\ + / \\ + / \\ + \\ \\ + /\\ \\____ \\ + / \\____ \\ \\ + / / \\ \\ + / / \\ ___\\ + / / \\ / ____ + / / \\/ / \\ + / / __________/ \\ + / \\ \\ \\ + / \\ \\ \\ + / / / \\ +/___________/ /____________________\\ EOF ;; From c8d2a0442cec35226cb4d0f13d70dcc3252c9286 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Fri, 25 Jan 2019 16:46:18 -0600 Subject: [PATCH 080/550] postmarketOS: Add small ASCII logo --- neofetch | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 96dc7259..67f7c184 100755 --- a/neofetch +++ b/neofetch @@ -4461,7 +4461,7 @@ ASCII: 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. + OpenBSD, postmarketOS, and Void have a smaller logo variant. NOTE: Use '{distro name}_small' to use the small variants. @@ -7584,6 +7584,21 @@ s: yNm+` .smNd+. EOF ;; + "postmarketos_small") + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} /\\ + / \\ + / \\ + \\__ \\ + /\\__ \\ _\\ + / / \\/ __ + / / ____/ \\ + / \\ \\ \\ +/_____/ /________\\ +EOF + ;; + "PostMarketOS"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' From 78aed92b39b21e4b0ea535d9dd2674a06ebe70e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Wed, 30 Jan 2019 21:44:16 +0100 Subject: [PATCH 081/550] Fix big Puffy ascii logo --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 67f7c184..4b662f59 100755 --- a/neofetch +++ b/neofetch @@ -7199,7 +7199,7 @@ ${c1} `-|.' /_. ${c4}\_| ${c1} F |/`. `-. `._) / .-.\\ \\ ( `\\ - `.\ + `.\\ EOF ;; From 95fb38e73fd974d3a89ec38762407ade7d26e4e2 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 3 Feb 2019 09:50:44 +0100 Subject: [PATCH 082/550] term_font: fix issue with konsole font detection Closes #1186 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 67f7c184..9d90d852 100755 --- a/neofetch +++ b/neofetch @@ -2926,7 +2926,8 @@ END # Get Process ID of current konsole window / tab child="$(get_ppid "$$")" - IFS=$'\n' read -d "" -ra konsole_instances < <(qdbus | grep -F 'org.kde.konsole') + IFS=$'\n' read -d "" -ra konsole_instances \ + < <(qdbus | awk '/org.kde.konsole/ {print $1}') for i in "${konsole_instances[@]}"; do IFS=$'\n' read -d "" -ra konsole_sessions < <(qdbus "$i" | grep -F '/Sessions/') From 60d3aa3f10f8f17ef25d2adab91cb60f5cc65a49 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 3 Feb 2019 18:40:00 +0700 Subject: [PATCH 083/550] CPU [Linux/ARM]: Use Hardware field directly --- neofetch | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index de798e88..70866b99 100755 --- a/neofetch +++ b/neofetch @@ -1805,13 +1805,9 @@ get_cpu() { ;; *) - cpu="$(awk -F ': | @' '/model name|Processor|^cpu model|chip type|^cpu type/ { - printf $2; - exit - }' "$cpu_file")" - - [[ "$cpu" == *"processor rev"* ]] && \ - cpu="$(awk -F':' '/Hardware/ {print $2; exit}' "$cpu_file")" + cpu="$(awk -F ': | @' \ + '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ { + printf $2; exit}' "$cpu_file")" ;; esac From 6e9f00445ff731a20b47acb0f253fa0302b6f09c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Feb 2019 08:53:06 +0200 Subject: [PATCH 084/550] os: Added support for Radix Linux --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 70866b99..eeb70f23 100755 --- a/neofetch +++ b/neofetch @@ -7689,6 +7689,30 @@ ${c1} `..--..` EOF ;; + "Radix"*) + set_colors 1 2 + read -rd '' ascii_data <<'EOF' +${c2} .:oyhdmNo + `/yhyoosdms` + -o+/ohmmho- + ..`.:/:-` + `.--:::-.``${c1} + .+ydNMMMMMMNmhs:` +`omMMMMMMMMMMMMMMNh- +oNMMMNmddhhyyhhhddmy. +mMMMMNmmddhhysoo+/:-` +yMMMMMMMMMMMMMMMMNNh. +-dmmmmmNNMMMMMMMMMMs` + -+oossyhmMMMMMMMMd- + `sNMMMMMMMMMMMMMm: + `yMMMMMMNmdhhhh: + `sNMMMMMNmmho. + `+mMMMMMMMy. + .yNMMMm+` + `:yd+. +EOF + ;; + "Raspbian"*) set_colors 2 1 read -rd '' ascii_data <<'EOF' From c7c1cf59ecbe3a27b16331fad9596a339554f34b Mon Sep 17 00:00:00 2001 From: Crestwave Date: Wed, 6 Feb 2019 08:02:49 +0000 Subject: [PATCH 085/550] packages: Specify Haiku's pkgman --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index eeb70f23..fe1cc368 100755 --- a/neofetch +++ b/neofetch @@ -1389,7 +1389,7 @@ get_packages() { ;; "Haiku") - dir /boot/system/package-links/* + has "pkgman" && dir /boot/system/package-links/* ;; "IRIX") From 6f423e3970183dcb86c64a7803ad97cb304538fe Mon Sep 17 00:00:00 2001 From: Sibren Vasse Date: Thu, 7 Feb 2019 23:48:09 +0100 Subject: [PATCH 086/550] Robuster kitty font parsing --- neofetch | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neofetch b/neofetch index fe1cc368..27e320c7 100755 --- a/neofetch +++ b/neofetch @@ -2912,10 +2912,7 @@ END kitty_config="$(kitty --debug-config)" [[ "$kitty_config" != *font_family* ]] && return - term_font_size="${kitty_config/*font_size}" - term_font_size="${term_font_size/$'\n'*}" - term_font="${kitty_config/*font_family}" - term_font="${term_font/$'\n'*} $term_font_size" + term_font="$(awk '/^font_family|^font_size/ {printf $2 " "}' <<< "$kitty_config")" ;; "konsole" | "yakuake") From 7fd9ff75a35ed3394530d645227c59ad2eab6184 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 11 Feb 2019 17:12:31 +0200 Subject: [PATCH 087/550] term_font: Fix crash when parsing Xresources. Closes #1195 --- neofetch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index eeb70f23..95026c6c 100755 --- a/neofetch +++ b/neofetch @@ -4194,10 +4194,17 @@ term_padding() { case "$term" in urxvt*|"rxvt-unicode") - [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)" - [[ $xrdb != *.internalBorder:* ]] && return + [[ -z "$xrdb" ]] && + xrdb="$(xrdb -query)" + + [[ $xrdb != *".internalBorder:"* ]] && + return + padding="${xrdb/*.internalBorder:}" - ((padding=${padding/$'\n'*})) + padding="${padding/$'\n'*}" + + [[ $padding =~ ^[0-9]+$ ]] || + padding= ;; esac } From 1abc2ada772cd21cc8228b43df34f4e1236f020d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 12 Feb 2019 18:36:18 +0200 Subject: [PATCH 088/550] docs: update --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 58b2a859..8532bd86 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ Packaging status -

neofetch From 1b756083041bdce745c9d515baaaa7d9f639cb88 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 14 Feb 2019 08:19:51 +0200 Subject: [PATCH 089/550] general: fixed gnome shell mutter issue Closes #1194 --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 60ec9161..04566726 100755 --- a/neofetch +++ b/neofetch @@ -1574,8 +1574,10 @@ get_wm() { wm="${wm/\"*}" fi - # Window Maker does not set _NET_WM_NAME + # Rename window managers to their proper values. [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker" + [[ "$wm" =~ "GNOME Shell" ]] && wm="Mutter" + # Fallback for non-EWMH WMs. [[ -z "$wm" ]] && \ wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ From 2fccec783e6822aaa7ce67c93d05857d2962eb8c Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 16 Feb 2019 21:53:03 +0700 Subject: [PATCH 090/550] ASCII: Updated Artix ASCII with new logo --- neofetch | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index 04566726..79653f1d 100755 --- a/neofetch +++ b/neofetch @@ -5197,27 +5197,24 @@ EOF ;; "Artix"*) - set_colors 6 4 2 7 + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... +${c1} .' + .cc' + .cccc. + cccccc. + :ccccccc. + ;ccccccccc + .;cccccc: + .. .;cccc; + 'cccc;.. .,cc; + 'ccccccccc:'. '' + .cccccccccccccc:;. + .cccccccccccccc:,. . + ccccccccccc;'. .;cc. + cccccccc,.. ':cccccc. + :ccc:'. .';ccccc +;;.. .';: EOF ;; From fcca6982299dd9f54758e4fd15fdd05512e4f1f3 Mon Sep 17 00:00:00 2001 From: chrisweeksnz Date: Mon, 18 Feb 2019 17:47:04 +1300 Subject: [PATCH 091/550] Add ascii art for Clear Linux --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 79653f1d..90454dd0 100755 --- a/neofetch +++ b/neofetch @@ -5582,6 +5582,32 @@ ${c1} `.--::::::--.` EOF ;; + "Clear Linux OS"*) + set_colors 4 3 7 6 + read -rd '' ascii_data <<'EOF' +${c1} BBB + BBBBBBBBB + BBBBBBBBBBBBBBB + BBBBBBBBBBBBBBBBBBBB + BBBBBBBBBBB BBB + BBBBBBBB${c2}YYYYY +${c1} BBBBBBBB${c2}YYYYYY +${c1} BBBBBBBB${c2}YYYYYYY +${c1} BBBBBBBBB${c2}YYYYY${c3}W +${c4} GG${c1}BBBBBBBY${c2}YYYY${c3}WWW +${c4} GGG${c1}BBBBBBB${c2}YY${c3}WWWWWWWW +${c4} GGGGGG${c1}BBBBBB${c3}WWWWWWWW +${c4} GGGGGGGG${c1}BBBB${c3}WWWWWWWW +${c4}GGGGGGGGGGG${c1}BBB${c3}WWWWWWW +${c4}GGGGGGGGGGGGG${c1}B${c3}WWWWWW +${c4}GGGGGGGG${c3}WWWWWWWWWWW +${c4}GG${c3}WWWWWWWWWWWWWWWW + WWWWWWWWWWWWWWWW + WWWWWWWWWW + WWW +EOF + ;; + "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' From 3dc7720c5265bc9d0df2b38e7c48e4db0495656f Mon Sep 17 00:00:00 2001 From: nee-san Date: Sat, 23 Feb 2019 22:52:28 +0900 Subject: [PATCH 092/550] new logo for janus Signed-off-by: nee-san --- neofetch | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index 90454dd0..577e281c 100755 --- a/neofetch +++ b/neofetch @@ -6348,21 +6348,25 @@ WW W EOF ;; - "januslinux"*) - set_colors 7 + "januslinux"*|"janus"*) + set_colors 4 7 4 read -rd '' ascii_data <<'EOF' -${c1} ________________ -|\ \ -| \ \ -| \ \ -| \ ______________\ -| | | -| | | -| | | - \ | januslinux | - \ | | - \ | | - \|______________| +${c1}oooooooooooooooooooooooooooooooo +oooooooooooooooooooooooooooooooo +oooooooooooooooooooooooooooooooo +ooooooooooooo${c2}dOWWOd${c1}ooooooooooooo +oooooooooood${c2}0WMMMMWkd${c1}ooooooooooo +oooooooood${c2}0WMMMMMX0KN0d${c1}oooolllll +ooooooo${c2}xKWMMMMWKxKWMMMWKx${c3}lllllll +ooooo${c2}xXMMMMMW0doooOWMMMMMXx${c3}lllll +ooooo${c2}xXMMMMMW0doloONMMMMMXx${c3}lllll +ooooooo${c2}xKWMMMWXO0WMMMMMKx${c3}lllllll +ooooooooo${c2}d0NX0KWMMMMW0d${c3}lllllllll +oooooooooooo${c2}xWMMMMW0o${c3}llllllccccc +oooooooooooll${c2}o0WW0o${c3}lllllcccccccc +ooooooooooollll${c2}oo${c3}llllllccccccccc +oooooooooollllllllllllcccccccccc +oooooooooollllllllllllcccccccccc EOF ;; From 288a81a9e213eeb37c877edd74134e58e141c480 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 26 Feb 2019 08:22:01 +0700 Subject: [PATCH 093/550] ASCII: Update Artix logo --- neofetch | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index 577e281c..9b4df0e9 100755 --- a/neofetch +++ b/neofetch @@ -5199,22 +5199,26 @@ EOF "Artix"*) set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} .' - .cc' - .cccc. - cccccc. - :ccccccc. - ;ccccccccc - .;cccccc: - .. .;cccc; - 'cccc;.. .,cc; - 'ccccccccc:'. '' - .cccccccccccccc:;. - .cccccccccccccc:,. . - ccccccccccc;'. .;cc. - cccccccc,.. ':cccccc. - :ccc:'. .';ccccc -;;.. .';: +${c1} ' + 'o' + 'ooo' + 'ooxoo' + 'ooxxxoo' + 'oookkxxoo' + 'oiioxkkxxoo' + ':;:iiiioxxxoo' + `'.;::ioxxoo' + '-. `':;jiooo' + 'oooio-.. `'i:io' + 'ooooxxxxoio:,. `'-;' + 'ooooxxxxxkkxoooIi:-. `' + 'ooooxxxxxkkkkxoiiiiiji' + 'ooooxxxxxkxxoiiii:'` .i' + 'ooooxxxxxoi:::'` .;ioxo' + 'ooooxooi::'` .:iiixkxxo' + 'ooooi:'` `'';ioxxo' + 'i:'` '':io' +'` `' EOF ;; From 625fdcf7c4b8796691d4efd9ff0207049ce4259d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 11 Mar 2019 14:19:57 +0200 Subject: [PATCH 094/550] packages: Show IRIX package manager name --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 577e281c..4f228f78 100755 --- a/neofetch +++ b/neofetch @@ -1393,6 +1393,7 @@ get_packages() { ;; "IRIX") + manager="swpkg" tot versions -b && ((packages-=3)) ;; esac From c690118884615b756f5649a0e426aecf98635297 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 11 Mar 2019 22:18:33 +0200 Subject: [PATCH 095/550] general: Added --no_config to disable config file creation. --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index c1271e0e..19a5f8b2 100755 --- a/neofetch +++ b/neofetch @@ -4067,8 +4067,6 @@ get_full_path() { } get_user_config() { - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - # --config /path/to/config.conf if [[ -f "$config_file" ]]; then source "$config_file" @@ -4083,10 +4081,11 @@ get_user_config() { source "${XDG_CONFIG_HOME}/neofetch/config" err "Config: Sourced user config. (${XDG_CONFIG_HOME}/neofetch/config)" - else + elif [[ -z "$no_config" ]]; then config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" # The config file doesn't exist, create it. + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" printf '%s\n' "$config" > "$config_file" fi } @@ -4460,6 +4459,7 @@ IMAGE: OTHER: --config /path/to/config Specify a path to a custom config file --config none Launch the script without a config file + --no_config Don't create the user config file. --print_config Print the default config file to stdout. --stdout Turn off all colors and disables any ASCII/image backend. --help Print this text and exit @@ -4479,7 +4479,7 @@ exit 1 get_args() { # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config + [[ "$*" != *--config* && "$*" != *--no_config* ]] && get_user_config while [[ "$1" ]]; do case "$1" in @@ -4640,6 +4640,7 @@ get_args() { ;; esac ;; + "--no_config") no_config="on" ;; "--stdout") stdout="on" ;; "-v") verbose="on" ;; "--print_config") printf '%s\n' "$config"; exit ;; From 3b713ca92f6fec2f2d3a75d49671cef260c3af62 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 12 Mar 2019 17:32:43 +1100 Subject: [PATCH 096/550] WM Theme: update for Mojave --- neofetch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 19a5f8b2..6e1950f6 100755 --- a/neofetch +++ b/neofetch @@ -1753,15 +1753,23 @@ get_wm_theme() { "Quartz Compositor") global_preferences="${HOME}/Library/Preferences/.GlobalPreferences.plist" wm_theme="$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences")" - wm_theme_color="$(PlistBuddy -c "Print AppleAquaColorVariant" "$global_preferences")" + wm_theme_color="$(PlistBuddy -c "Print AppleAccentColor" "$global_preferences")" [[ -z "$wm_theme" ]] && \ wm_theme="Light" - [[ -z "$wm_theme_color" ]] || ((wm_theme_color == 1)) && \ - wm_theme_color="Blue" + case "$wm_theme_color" in + "-1") wm_theme_color="Graphite" ;; + "0") wm_theme_color="Red" ;; + "1") wm_theme_color="Orange" ;; + "2") wm_theme_color="Yellow" ;; + "3") wm_theme_color="Green" ;; + "5") wm_theme_color="Purple" ;; + "6") wm_theme_color="Pink" ;; + *) wm_theme_color="Blue" ;; + esac - wm_theme="${wm_theme_color:-Graphite} ($wm_theme)" + wm_theme="${wm_theme_color} ($wm_theme)" ;; *"Explorer") From 3132d0a0902f161e10526c6f930a3ece87370f8d Mon Sep 17 00:00:00 2001 From: zyg812 Date: Tue, 12 Mar 2019 12:38:54 +0100 Subject: [PATCH 097/550] ASCII: Add fedora_small --- neofetch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/neofetch b/neofetch index 6e1950f6..00749c55 100755 --- a/neofetch +++ b/neofetch @@ -5987,6 +5987,21 @@ KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... EOF ;; + "fedora_small") + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} _____ + / __)${c1}\\${c2} + | / ${c1}\\ \\${c2} + ${c1}__${c2}_| |_${c1}_/ /${c2} + ${c1}/ ${c2}(_ _)${c1}_/${c2} +${c1}/ /${c2} | | +${c1}\\ \\${c2}__/ | + ${c1}\\${c2}(_____/ +EOF + ;; + + "Fedora"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From a3ce498f856fc660997c8e55d645cffbefed9473 Mon Sep 17 00:00:00 2001 From: zyg812 <46135240+zyg812@users.noreply.github.com> Date: Tue, 12 Mar 2019 12:53:47 +0100 Subject: [PATCH 098/550] Update neofetch Fix my mistake --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 00749c55..55e53238 100755 --- a/neofetch +++ b/neofetch @@ -6001,7 +6001,6 @@ ${c1}\\ \\${c2}__/ | EOF ;; - "Fedora"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From d0cd21c01e3e73dc4af5026d8b25d31c11d3eb81 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Wed, 13 Mar 2019 19:02:18 +0100 Subject: [PATCH 099/550] cache_uname: improve reading from 'SystemVersion.plist' on macOS and iOS and thus fix neofetch for iOS 11.3+ --- neofetch | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 55e53238..1063a950 100755 --- a/neofetch +++ b/neofetch @@ -4199,11 +4199,16 @@ cache_uname() { kernel_machine="${uname[2]}" if [[ "$kernel_name" == "Darwin" ]]; then - IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/string/ {print $3}' \ + IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/key|string/ {print $3}' \ "/System/Library/CoreServices/SystemVersion.plist") - darwin_name="${sw_vers[2]}" - osx_version="${sw_vers[3]}" - osx_build="${sw_vers[0]}" + for i in "${!sw_vers[@]}"; do + local value="${sw_vers[(( $i + 1 ))]}" + case "${sw_vers[$i]}" in + "ProductName") darwin_name="$value" ;; + "ProductVersion") osx_version="$value" ;; + "ProductBuildVersion") osx_build="$value" ;; + esac + done fi } From b7ffa9e9bfbd4496377acb4c551f749a1bccd054 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Fri, 22 Mar 2019 18:45:57 +0100 Subject: [PATCH 100/550] cache_uname: change reading variables from 'SystemVersion.plist' as suggested in review --- neofetch | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 1063a950..ff5b551d 100755 --- a/neofetch +++ b/neofetch @@ -4201,14 +4201,13 @@ cache_uname() { if [[ "$kernel_name" == "Darwin" ]]; then IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/key|string/ {print $3}' \ "/System/Library/CoreServices/SystemVersion.plist") - for i in "${!sw_vers[@]}"; do - local value="${sw_vers[(( $i + 1 ))]}" - case "${sw_vers[$i]}" in - "ProductName") darwin_name="$value" ;; - "ProductVersion") osx_version="$value" ;; - "ProductBuildVersion") osx_build="$value" ;; + for ((i=0;i<${#sw_vers[@]};i+=2)) { + case ${sw_vers[i]} in + ProductName) darwin_name=${sw_vers[i+1]} ;; + ProductVersion) osx_version=${sw_vers[i+1]} ;; + ProductBuildVersion) osx_build=${sw_vers[i+1]} ;; esac - done + } fi } From 66f3a07a42390653204dbbb21ad2d1a589ed4b98 Mon Sep 17 00:00:00 2001 From: chrissx Date: Sun, 24 Mar 2019 22:06:06 +0100 Subject: [PATCH 101/550] Added a case for displaying the Ubuntu logo for i3buntu. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 55e53238..a176d558 100755 --- a/neofetch +++ b/neofetch @@ -8549,7 +8549,7 @@ ${c1} ..-::::::-.` EOF ;; - "Ubuntu"*) + "Ubuntu"* | "i3buntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' ${c1} .-/+oossssoo+/-. From 6f1ae617ff60bb9251b0b8c14aa763d829639158 Mon Sep 17 00:00:00 2001 From: edward-p Date: Mon, 1 Apr 2019 00:03:02 +0800 Subject: [PATCH 102/550] Handle ${GTK2_RC_FILES} with multiple values --- neofetch | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 55e53238..27ce9b0b 100755 --- a/neofetch +++ b/neofetch @@ -2683,8 +2683,15 @@ get_style() { # Check for general GTK2 Theme. if [[ -z "$gtk2_theme" ]]; then - if [[ -f "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}" ]]; then - gtk2_theme="$(grep "^[^#]*${name}" "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}")" + if [[ -n "${GTK2_RC_FILES}" ]]; then + for gtkrc in ${GTK2_RC_FILES//:/ }; do + _gtk2_theme="$(grep "^[^#]*${name}" "${gtkrc}")" + [[ -n "${_gtk2_theme}" ]] && gtk2_theme="${_gtk2_theme}" + done + unset _gtk2_theme + + elif [[ -f "${HOME}/.gtkrc-2.0" ]]; then + gtk2_theme="$(grep "^[^#]*${name}" "${HOME}/.gtkrc-2.0")" elif [[ -f "/etc/gtk-2.0/gtkrc" ]]; then gtk2_theme="$(grep "^[^#]*${name}" /etc/gtk-2.0/gtkrc)" From cdd447f95afc45dfedf3633cb06e97c94af32236 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 3 Apr 2019 16:37:09 +0200 Subject: [PATCH 103/550] song: add strawberry player --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 55e53238..9c7790c1 100755 --- a/neofetch +++ b/neofetch @@ -465,6 +465,7 @@ disk_subtitle="mount" # sayonara # smplayer # spotify +# strawberry # tomahawk # vlc # xmms2d @@ -2403,6 +2404,7 @@ get_song() { "smplayer" "spotify" "Spotify" + "strawberry" "tomahawk" "vlc" "xmms2d" @@ -2452,6 +2454,7 @@ get_song() { "dragon"*) get_song_dbus "dragonplayer" ;; "smplayer"*) get_song_dbus "smplayer" ;; "rhythmbox"*) get_song_dbus "rhythmbox" ;; + "strawberry"*) get_song_dbus "strawberry" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "cmus"*) From fa3684b3953ac9f0b30628c5769a6878ba76dfa3 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Tue, 16 Apr 2019 03:35:51 +0200 Subject: [PATCH 104/550] add device information for latest ios devices - iPhone9,[1-4] (gpu) - iPhone10,[1-6] (cpu) - iPhone11,2 iPhone11,4 iPhone11,6 iPhone11,8 (model, cpu, gpu) - iPad6,11 iPad6,12 (cpu, gpu) - iPad7,[1-4] (cpu) - iPad7,[5-6] (model, cpu, gpu) - iPad8,[1-8] (model, cpu) - iPad11,[1-4] (model, cpu) source: https://en.wikipedia.org/wiki/List_of_iOS_devices --- neofetch | 57 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index ff5b551d..30d7408b 100755 --- a/neofetch +++ b/neofetch @@ -1081,20 +1081,25 @@ get_model() { "iPhone OS") case "$kernel_machine" in - "iPad1,1"): "iPad" ;; - "iPad2,"[1-4]): "iPad 2" ;; - "iPad3,"[1-3]): "iPad 3" ;; - "iPad3,"[4-6]): "iPad 4" ;; - "iPad4,"[1-3]): "iPad Air" ;; - "iPad5,"[3-4]): "iPad Air 2" ;; - "iPad6,"[7-8]): "iPad Pro (12.9 Inch)" ;; - "iPad6,"[3-4]): "iPad Pro (9.7 Inch)" ;; - "iPad7,"[1-2]): "iPad Pro 2 (12.9 Inch)" ;; - "iPad7,"[3-4]): "iPad Pro (10.5 Inch)" ;; - "iPad2,"[5-7]): "iPad mini" ;; - "iPad4,"[4-6]): "iPad mini 2" ;; - "iPad4,"[7-9]): "iPad mini 3" ;; - "iPad5,"[1-2]): "iPad mini 4" ;; + "iPad1,1"): "iPad" ;; + "iPad2,"[1-4]): "iPad 2" ;; + "iPad3,"[1-3]): "iPad 3" ;; + "iPad3,"[4-6]): "iPad 4" ;; + "iPad7,"[5-6]): "iPad 6" ;; + "iPad4,"[1-3]): "iPad Air" ;; + "iPad5,"[3-4]): "iPad Air 2" ;; + "iPad11,"[3-4]): "iPad Air 3" ;; + "iPad6,"[7-8]): "iPad Pro (12.9 Inch)" ;; + "iPad6,"[3-4]): "iPad Pro (9.7 Inch)" ;; + "iPad7,"[1-2]): "iPad Pro 2 (12.9 Inch)" ;; + "iPad7,"[3-4]): "iPad Pro (10.5 Inch)" ;; + "iPad8,"[1-4]): "iPad Pro (11 Inch)" ;; + "iPad8,"[5-8]): "iPad Pro 3 (12.9 Inch)" ;; + "iPad2,"[5-7]): "iPad mini" ;; + "iPad4,"[4-6]): "iPad mini 2" ;; + "iPad4,"[7-9]): "iPad mini 3" ;; + "iPad5,"[1-2]): "iPad mini 4" ;; + "iPad11,"[1-2]): "iPad mini 5" ;; "iPad6,11" | "iPad 6,12") : "iPad 5" @@ -1113,12 +1118,15 @@ get_model() { "iPhone8,1"): "iPhone 6s" ;; "iPhone8,2"): "iPhone 6s Plus" ;; "iPhone8,4"): "iPhone SE" ;; + "iPhone11,2"): "iPhone XS" ;; + "iPhone11,8"): "iPhone XR" ;; "iPhone9,1" | "iPhone9,3"): "iPhone 7" ;; "iPhone9,2" | "iPhone9,4"): "iPhone 7 Plus" ;; "iPhone10,1" | "iPhone10,4"): "iPhone 8" ;; "iPhone10,2" | "iPhone10,5"): "iPhone 8 Plus" ;; "iPhone10,3" | "iPhone10,6"): "iPhone X" ;; + "iPhone11,4" | "iPhone11,6"): "iPhone XS Max" ;; "iPod1,1"): "iPod touch" ;; "ipod2,1"): "iPod touch 2G" ;; @@ -1873,8 +1881,10 @@ get_cpu() { "iPhone5,"[1-4]): "Apple A6 (2) @ 1.3GHz" ;; "iPhone6,"[1-2]): "Apple A7 (2) @ 1.3GHz" ;; "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;; - "iPhone8,"[1-4]): "Apple A9 (2) @ 1.85GHz" ;; - "iPhone9,"[1-4]): "Apple A10 Fusion (4) @ 2.34GHz" ;; + "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12"): "Apple A9 (2) @ 1.85GHz" ;; + "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;; + "iPhone10,"[1-6]): "Apple A11 (6) @ 2.39GHz" ;; + "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4]): "Apple A12 (6) @ 2.49GHz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; "iPod7,1"): "Apple A8 (2) @ 1.1GHz" ;; @@ -1888,6 +1898,8 @@ get_cpu() { "iPad5,"[3-4]): "Apple A8X (3) @ 1.5GHz" ;; "iPad6,"[3-4]): "Apple A9X (2) @ 2.16GHz" ;; "iPad6,"[7-8]): "Apple A9X (2) @ 2.26GHz" ;; + "iPad7,"[1-4]): "Apple A10X (6) @ 2.39GHz" ;; + "iPad8,"[1-8]): "Apple A12X (8) @ 2.49GHz" ;; esac cpu="$_" ;; @@ -2183,7 +2195,6 @@ get_gpu() { case "$kernel_machine" in "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; - "iPhone8,"[1-4]): "PowerVR GT7600" ;; "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; "iPad5,"[3-4]): "PowerVR GXA6850" ;; @@ -2205,6 +2216,18 @@ get_gpu() { : "PowerVR GX6450" ;; + "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12") + : "PowerVR GT7600" + ;; + + "iPhone9,"[1-4] | "iPad7,"[5-6]) + : "PowerVR GT7600 Plus" + ;; + + "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8") + : "G11P" + ;; + "iPod1,1" | "iPod2,1") : "PowerVR MBX Lite" ;; From c17173a93bf29cd9058a81d5bb3e5e33d5a137cd Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Tue, 16 Apr 2019 04:13:34 +0200 Subject: [PATCH 105/550] shorten too long line --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 30d7408b..8c8fcd46 100755 --- a/neofetch +++ b/neofetch @@ -1884,7 +1884,11 @@ get_cpu() { "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12"): "Apple A9 (2) @ 1.85GHz" ;; "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;; "iPhone10,"[1-6]): "Apple A11 (6) @ 2.39GHz" ;; - "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4]): "Apple A12 (6) @ 2.49GHz" ;; + + "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4]) + : "Apple A12 (6) @ 2.49GHz" + ;; + "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; "iPod7,1"): "Apple A8 (2) @ 1.1GHz" ;; From 3cdcfc2d45ebb9a454c375f533225ee7b3e66b45 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Tue, 16 Apr 2019 15:12:18 +0200 Subject: [PATCH 106/550] include Fusion/Bionic in iDevice processor names --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 8c8fcd46..7ac63ed5 100755 --- a/neofetch +++ b/neofetch @@ -1883,10 +1883,10 @@ get_cpu() { "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;; "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12"): "Apple A9 (2) @ 1.85GHz" ;; "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;; - "iPhone10,"[1-6]): "Apple A11 (6) @ 2.39GHz" ;; + "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4]) - : "Apple A12 (6) @ 2.49GHz" + : "Apple A12 Bionic (6) @ 2.49GHz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; @@ -1902,8 +1902,8 @@ get_cpu() { "iPad5,"[3-4]): "Apple A8X (3) @ 1.5GHz" ;; "iPad6,"[3-4]): "Apple A9X (2) @ 2.16GHz" ;; "iPad6,"[7-8]): "Apple A9X (2) @ 2.26GHz" ;; - "iPad7,"[1-4]): "Apple A10X (6) @ 2.39GHz" ;; - "iPad8,"[1-8]): "Apple A12X (8) @ 2.49GHz" ;; + "iPad7,"[1-4]): "Apple A10X Fusion (6) @ 2.39GHz" ;; + "iPad8,"[1-8]): "Apple A12X Bionic (8) @ 2.49GHz" ;; esac cpu="$_" ;; From ff53d8d30bc752e853f53ed476e5b89e329ca107 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Wed, 17 Apr 2019 13:03:36 +0200 Subject: [PATCH 107/550] get_cpu, get_gpu, get_model: shorten iPhone OS cases --- neofetch | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/neofetch b/neofetch index 7ac63ed5..2daf4e04 100755 --- a/neofetch +++ b/neofetch @@ -1085,6 +1085,7 @@ get_model() { "iPad2,"[1-4]): "iPad 2" ;; "iPad3,"[1-3]): "iPad 3" ;; "iPad3,"[4-6]): "iPad 4" ;; + "iPad6,1"[12]): "iPad 5" ;; "iPad7,"[5-6]): "iPad 6" ;; "iPad4,"[1-3]): "iPad Air" ;; "iPad5,"[3-4]): "iPad Air 2" ;; @@ -1101,10 +1102,6 @@ get_model() { "iPad5,"[1-2]): "iPad mini 4" ;; "iPad11,"[1-2]): "iPad mini 5" ;; - "iPad6,11" | "iPad 6,12") - : "iPad 5" - ;; - "iPhone1,1"): "iPhone" ;; "iPhone1,2"): "iPhone 3G" ;; "iPhone2,1"): "iPhone 3GS" ;; @@ -1118,16 +1115,15 @@ get_model() { "iPhone8,1"): "iPhone 6s" ;; "iPhone8,2"): "iPhone 6s Plus" ;; "iPhone8,4"): "iPhone SE" ;; + "iPhone9,"[13]): "iPhone 7" ;; + "iPhone9,"[24]): "iPhone 7 Plus" ;; + "iPhone10,"[14]): "iPhone 8" ;; + "iPhone10,"[25]): "iPhone 8 Plus" ;; + "iPhone10,"[36]): "iPhone X" ;; "iPhone11,2"): "iPhone XS" ;; + "iPhone11,"[46]): "iPhone XS Max" ;; "iPhone11,8"): "iPhone XR" ;; - "iPhone9,1" | "iPhone9,3"): "iPhone 7" ;; - "iPhone9,2" | "iPhone9,4"): "iPhone 7 Plus" ;; - "iPhone10,1" | "iPhone10,4"): "iPhone 8" ;; - "iPhone10,2" | "iPhone10,5"): "iPhone 8 Plus" ;; - "iPhone10,3" | "iPhone10,6"): "iPhone X" ;; - "iPhone11,4" | "iPhone11,6"): "iPhone XS Max" ;; - "iPod1,1"): "iPod touch" ;; "ipod2,1"): "iPod touch 2G" ;; "ipod3,1"): "iPod touch 3G" ;; @@ -1881,11 +1877,11 @@ get_cpu() { "iPhone5,"[1-4]): "Apple A6 (2) @ 1.3GHz" ;; "iPhone6,"[1-2]): "Apple A7 (2) @ 1.3GHz" ;; "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;; - "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12"): "Apple A9 (2) @ 1.85GHz" ;; + "iPhone8,"[1-4] | "iPad6,1"[12]): "Apple A9 (2) @ 1.85GHz" ;; "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;; "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; - "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4]) + "iPhone11,"[2468] | "iPad11,"[1-4]) : "Apple A12 Bionic (6) @ 2.49GHz" ;; @@ -2197,12 +2193,13 @@ get_gpu() { "iPhone OS") case "$kernel_machine" in - "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; - "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; - "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; - "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; - "iPad5,"[3-4]): "PowerVR GXA6850" ;; - "iPad6,"[3-8]): "PowerVR 7XT" ;; + "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; + "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; + "iPhone11,"[2468]): "G11P" ;; + "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; + "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; + "iPad5,"[3-4]): "PowerVR GXA6850" ;; + "iPad6,"[3-8]): "PowerVR 7XT" ;; "iPhone2,1" | "iPhone3,"[1-3] | "iPod3,1" | "iPod4,1" | "iPad1,1") : "PowerVR SGX535" @@ -2220,7 +2217,7 @@ get_gpu() { : "PowerVR GX6450" ;; - "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12") + "iPhone8,"[1-4] | "iPad6,1"[12]) : "PowerVR GT7600" ;; @@ -2228,10 +2225,6 @@ get_gpu() { : "PowerVR GT7600 Plus" ;; - "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8") - : "G11P" - ;; - "iPod1,1" | "iPod2,1") : "PowerVR MBX Lite" ;; From 78b9d3e16093971a690ce6d951646d0edb494185 Mon Sep 17 00:00:00 2001 From: Ciriaco Garcia de Celis Date: Fri, 26 Apr 2019 01:31:58 +0200 Subject: [PATCH 108/550] support uptime from Android 9+ --- neofetch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 55e53238..9b40412d 100755 --- a/neofetch +++ b/neofetch @@ -1211,8 +1211,14 @@ get_uptime() { # Get uptime in seconds. case "$os" in "Linux" | "Windows" | "MINIX") - seconds="$(< /proc/uptime)" - seconds="${seconds/.*}" + if [ -f /proc/uptime ]; then + seconds="$(< /proc/uptime)" + seconds="${seconds/.*}" + else # Android >= 9 denies /proc/uptime access + boot=$(date -d"$(uptime -s)" +%s) \ + && now="$(date +%s)" \ + && seconds="$((now - boot))" + fi ;; "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") From c5f3f7626a9b1d9b663cd19c994245f8674c77f1 Mon Sep 17 00:00:00 2001 From: Ciriaco Garcia de Celis Date: Fri, 26 Apr 2019 01:47:05 +0200 Subject: [PATCH 109/550] give precedence to "Hardware" entry in /proc/cpuinfo --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 55e53238..bb4dd2a4 100755 --- a/neofetch +++ b/neofetch @@ -1816,9 +1816,9 @@ get_cpu() { ;; *) - cpu="$(awk -F ': | @' \ + cpu="$(awk -F '\\s*: | @' \ '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ { - printf $2; exit}' "$cpu_file")" + cpu=$2; if ($1 == "Hardware") exit } END { print cpu }' "$cpu_file")" ;; esac From 7c976754e18daf15642ac1414449ff932eebd133 Mon Sep 17 00:00:00 2001 From: Mark Greaves Date: Tue, 30 Apr 2019 14:56:37 +0100 Subject: [PATCH 110/550] New Peppermint Logo Edited ASCII artwork for Peppermint with our new logo --- neofetch | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index b1ae7f4b..6e7c60c5 100755 --- a/neofetch +++ b/neofetch @@ -7551,27 +7551,29 @@ EOF ;; "Peppermint"*) - set_colors 1 7 3 + set_colors 1 15 3 read -rd '' ascii_data <<'EOF' -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) +${c1} PPPPPPPPPPPPPP +${c1} PPPP${c2}MMMMMMM${c1}PPPPPPPPPPP +${c1} PPPP${c2}MMMMMMMMMM${c1}PPPPPPPP${c2}MM${c1}PP +${c1} PPPPPPPP${c2}MMMMMMM${c1}PPPPPPPP${c2}MMMMM${c1}PP +${c1} PPPPPPPPPPPP${c2}MMMMMM${c1}PPPPPPP${c2}MMMMMMM${c1}PP +${c1} PPPPPPPPPPPP${c2}MMMMMMM${c1}PPPP${c2}M${c1}P${c2}MMMMMMMMM${c1}PP +${c1} PP${c2}MMMM${c1}PPPPPPPPPP${c2}MMM${c1}PPPPP${c2}MMMMMMM${c1}P${c2}MM${c1}PPPP +${c1} P${c2}MMMMMMMMMM${c1}PPPPPP${c2}MM${c1}PPPPP${c2}MMMMMM${c1}PPPPPPPP +${c1} P${c2}MMMMMMMMMMMM${c1}PPPPP${c2}MM${c1}PP${c2}M${c1}P${c2}MM${c1}P${c2}MM${c1}PPPPPPPPPPP +${c1} P${c2}MMMMMMMMMMMMMMMM${c1}PP${c2}M${c1}P${c2}MMM${c1}PPPPPPPPPPPPPPPP +${c1} P${c2}MMM${c1}PPPPPPPPPPPPPPPPPPPPPPPPPPPPPP${c2}MMMMM${c1}P +${c1} PPPPPPPPPPPPPPPP${c2}MMM${c1}P${c2}M${c1}P${c2}MMMMMMMMMMMMMMMM${c1}PP +${c1} PPPPPPPPPPP${c2}MM${c1}P${c2}MM${c1}PPPP${c2}MM${c1}PPPPP${c2}MMMMMMMMMMM${c1}PP +${c1} PPPPPPPP${c2}MMMMMM${c1}PPPPP${c2}MM${c1}PPPPPP${c2}MMMMMMMMM${c1}PP +${c1} PPPP${c2}MM${c1}P${c2}MMMMMMM${c1}PPPPPP${c2}MM${c1}PPPPPPPPPP${c2}MMMM${c1}PP +${c1} PP${c2}MMMMMMMMM${c1}P${c2}M${c1}PPPP${c2}MMMMMM${c1}PPPPPPPPPPPPP +${c1} PP${c2}MMMMMMM${c1}PPPPPPP${c2}MMMMMM${c1}PPPPPPPPPPPP +${c1} PP${c2}MMMM${c1}PPPPPPPPP${c2}MMMMMMM${c1}PPPPPPPP +${c1} PP${c2}MM${c1}PPPPPPPP${c2}MMMMMMMMMM${c1}PPPP +${c1} PPPPPPPPPP${c2}MMMMMMMM${c1}PPPP +${c1} PPPPPPPPPPPPPP EOF ;; From 83925702fc26785f27e5b2b6bf49cdfbabb86838 Mon Sep 17 00:00:00 2001 From: spacelike Date: Tue, 30 Apr 2019 07:38:14 -0600 Subject: [PATCH 111/550] Use guix directly to report package count instead of counting directories --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6e7c60c5..b9719687 100755 --- a/neofetch +++ b/neofetch @@ -1331,7 +1331,6 @@ get_packages() { { has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ has "nix-env" && dir ${br_prefix}/nix/store/*/ - has "guix" && dir ${br_prefix}/gnu/store/*/ has "Compile" && dir ${br_prefix}/Programs/*/ has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* has "crew" && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist @@ -1342,6 +1341,7 @@ get_packages() { # Other (Needs complex command) has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) + has "guix" && ( manager="guix-system" && tot guix package -p /run/current-system/profile -I ; manager="guix-user" && tot guix package -I ) # pkginfo is also the name of a python package manager which is painfully slow. # TODO: Fix this somehow. From 619ebdacd6a1f4c9dfb9e5643716374cb65afbee Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Wed, 1 May 2019 07:26:04 +0700 Subject: [PATCH 112/550] Packages [Guix/Nix]: Use if for detecting system and user packages --- neofetch | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index b9719687..92a38a69 100755 --- a/neofetch +++ b/neofetch @@ -1330,7 +1330,6 @@ get_packages() { # shellcheck disable=SC2086 { has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ - has "nix-env" && dir ${br_prefix}/nix/store/*/ has "Compile" && dir ${br_prefix}/Programs/*/ has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* has "crew" && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist @@ -1341,7 +1340,16 @@ get_packages() { # Other (Needs complex command) has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) - has "guix" && ( manager="guix-system" && tot guix package -p /run/current-system/profile -I ; manager="guix-user" && tot guix package -I ) + + if has "guix"; then + manager="guix-system" && tot guix package -p "/run/current-system/profile" -I + manager="guix-user" && tot guix package -I + fi + + if has "nix-store"; then + manager="nix-system" && tot nix-store -q --requisites "/run/current-system/sw" + manager="nix-user" && tot nix-store -q --requisites "$HOME/.nix-profile" + fi # pkginfo is also the name of a python package manager which is painfully slow. # TODO: Fix this somehow. @@ -1371,7 +1379,11 @@ get_packages() { has "port" && tot port installed && ((packages-=1)) has "brew" && dir /usr/local/Cellar/* has "pkgin" && tot pkgin list - has "nix-env" && dir /nix/store/*/ + + if has "nix-store"; then + manager="nix-system" && tot nix-store -q --requisites "/run/current-system/sw" + manager="nix-user" && tot nix-store -q --requisites "$HOME/.nix-profile" + fi ;; "AIX"| "FreeMiNT") @@ -1415,7 +1427,6 @@ get_packages() { fi packages="${packages/pacman-key/pacman}" - packages="${packages/nix-env/nix}" } get_shell() { From c1ddea8edd8077ba85728735fe94cd3b5936fec1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 1 May 2019 10:08:34 +0300 Subject: [PATCH 113/550] ascii: Fix void. Closes #1244 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 92a38a69..4742870a 100755 --- a/neofetch +++ b/neofetch @@ -8638,7 +8638,7 @@ ${c1} __.;=====;.__ _vi, ` --+=++++: .uvnvi. _._ -==+==+. .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQm. ${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE ${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' ${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! From c7685b4cfb993702e8dca52cf58a549e0136fdc1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 1 May 2019 10:46:34 +0300 Subject: [PATCH 114/550] config: Show 15 color blocks by default. Closes #1224 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 4742870a..d00a6ce7 100755 --- a/neofetch +++ b/neofetch @@ -564,7 +564,7 @@ separator=":" # Color block range # The range of colors to print. # -# Default: '0', '7' +# Default: '0', '15' # Values: 'num' # Flag: --block_range # @@ -575,7 +575,7 @@ separator=":" # # Display colors 0-15 in the blocks. (16 colors) # neofetch --block_range 0 15 -block_range=(0 7) +block_range=(0 15) # Toggle color blocks # From c86413c18ada1655ec4131f493254ee71e06530c Mon Sep 17 00:00:00 2001 From: Ciriaco Garcia de Celis Date: Wed, 1 May 2019 12:04:44 +0200 Subject: [PATCH 115/550] uptime for Android 9+ (refactorized) --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 9b40412d..496af946 100755 --- a/neofetch +++ b/neofetch @@ -1211,13 +1211,13 @@ get_uptime() { # Get uptime in seconds. case "$os" in "Linux" | "Windows" | "MINIX") - if [ -f /proc/uptime ]; then + if [[ -r /proc/uptime ]]; then seconds="$(< /proc/uptime)" seconds="${seconds/.*}" - else # Android >= 9 denies /proc/uptime access - boot=$(date -d"$(uptime -s)" +%s) \ - && now="$(date +%s)" \ - && seconds="$((now - boot))" + else + boot="$(date -d"$(uptime -s)" +%s)" + now="$(date +%s)" + seconds="$((now - boot))" fi ;; From ad16b5925c7eae850d8324417a9a6e1d873f8b35 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 1 May 2019 13:34:42 +0300 Subject: [PATCH 116/550] song: Added support for plasma-browser-integration --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d00a6ce7..9cf0d249 100755 --- a/neofetch +++ b/neofetch @@ -2426,6 +2426,7 @@ get_song() { "mopidy" "mpd" "netease-cloud-music" + "plasma-browser-integration" "pogo" "pragha" "qmmp" @@ -2486,7 +2487,8 @@ get_song() { "smplayer"*) get_song_dbus "smplayer" ;; "rhythmbox"*) get_song_dbus "rhythmbox" ;; "strawberry"*) get_song_dbus "strawberry" ;; - "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; + "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; + "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; From 3f13df386c0ae426e15e2b75358b3da1c7f412b7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 2 May 2019 16:22:41 +0300 Subject: [PATCH 117/550] underline: Fix bugs with incorrect lengths --- neofetch | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 9cf0d249..7af1b3b7 100755 --- a/neofetch +++ b/neofetch @@ -3939,13 +3939,10 @@ prin() { string="${2:-$1}" local subtitle_color="$info_color" fi - string="$(trim "${string//$'\e[0m'}")" - # Log length if it doesn't exist. - if [[ -z "$length" ]]; then - length="$(strip_sequences "$string")" - length="${#length}" - fi + string="$(trim "${string//$'\e[0m'}")" + length="$(strip_sequences "$string")" + length="${#length}" # Format the output. string="${string/:/${reset}${colon_color}${separator:=:}${info_color}}" @@ -3962,14 +3959,14 @@ prin() { } get_underline() { - if [[ "$underline_enabled" == "on" ]]; then + [[ "$underline_enabled" == "on" ]] && { printf -v underline "%${length}s" printf '%b%b\n' "${text_padding:+\e[${text_padding}C}${zws}${underline_color}" \ "${underline// /$underline_char}${reset} " - unset -v length - fi + } ((++info_height)) + length= prin=1 } @@ -4001,6 +3998,8 @@ trim_quotes() { strip_sequences() { strip="${1//$'\e['3[0-9]m}" + strip="${strip//$'\e['[0-9]m}" + strip="${strip//\\e\[[0-9]m}" strip="${strip//$'\e['38\;5\;[0-9]m}" strip="${strip//$'\e['38\;5\;[0-9][0-9]m}" strip="${strip//$'\e['38\;5\;[0-9][0-9][0-9]m}" From 836197fc2e24ee0b7d63b358c77100eea80c42af Mon Sep 17 00:00:00 2001 From: edward-p Date: Fri, 3 May 2019 02:27:59 +0800 Subject: [PATCH 118/550] make some changes --- neofetch | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 27ce9b0b..fb94116f 100755 --- a/neofetch +++ b/neofetch @@ -2684,12 +2684,8 @@ get_style() { # Check for general GTK2 Theme. if [[ -z "$gtk2_theme" ]]; then if [[ -n "${GTK2_RC_FILES}" ]]; then - for gtkrc in ${GTK2_RC_FILES//:/ }; do - _gtk2_theme="$(grep "^[^#]*${name}" "${gtkrc}")" - [[ -n "${_gtk2_theme}" ]] && gtk2_theme="${_gtk2_theme}" - done - unset _gtk2_theme - + IFS=: read -ra rc_files <<< "$GTK2_RC_FILES" + gtk2_theme="$(grep "^[^#]*${name}" "${rc_files[@]}")" elif [[ -f "${HOME}/.gtkrc-2.0" ]]; then gtk2_theme="$(grep "^[^#]*${name}" "${HOME}/.gtkrc-2.0")" @@ -2701,7 +2697,7 @@ get_style() { fi - gtk2_theme="${gtk2_theme/${name}*=}" + gtk2_theme="${gtk2_theme/*${name}*=}" fi # Check for general GTK3 Theme. From d128f1cf1e95b06d89a0a43328e582e05c456313 Mon Sep 17 00:00:00 2001 From: edward-p Date: Fri, 3 May 2019 16:28:22 +0800 Subject: [PATCH 119/550] use "$GTK2_RC_FILES" --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fb94116f..60c5cbe2 100755 --- a/neofetch +++ b/neofetch @@ -2683,7 +2683,7 @@ get_style() { # Check for general GTK2 Theme. if [[ -z "$gtk2_theme" ]]; then - if [[ -n "${GTK2_RC_FILES}" ]]; then + if [[ -n "$GTK2_RC_FILES" ]]; then IFS=: read -ra rc_files <<< "$GTK2_RC_FILES" gtk2_theme="$(grep "^[^#]*${name}" "${rc_files[@]}")" elif [[ -f "${HOME}/.gtkrc-2.0" ]]; then From 77c4e7d799994b7d973a1b0d583db9cf91103a15 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 4 May 2019 16:56:36 +0200 Subject: [PATCH 120/550] song: add gogglesmm --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 776167d6..50350aed 100755 --- a/neofetch +++ b/neofetch @@ -449,6 +449,7 @@ disk_subtitle="mount" # exaile # gnome-music # gmusicbrowser +# gogglesmm # guayadeque # iTunes # juk @@ -2424,6 +2425,7 @@ get_song() { "exaile" "gnome-music" "gmusicbrowser" + "gogglesmm" "guayadeque" "iTunes" "juk" @@ -2493,6 +2495,7 @@ get_song() { "smplayer"*) get_song_dbus "smplayer" ;; "rhythmbox"*) get_song_dbus "rhythmbox" ;; "strawberry"*) get_song_dbus "strawberry" ;; + "gogglesmm"*) get_song_dbus "gogglesmm" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; From 497dd4303ec3fb484620a265b365df665c566942 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 4 May 2019 17:00:49 +0200 Subject: [PATCH 121/550] song: add xnoise --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 50350aed..fbc28733 100755 --- a/neofetch +++ b/neofetch @@ -470,6 +470,7 @@ disk_subtitle="mount" # tomahawk # vlc # xmms2d +# xnoise # yarock music_player="auto" @@ -2448,6 +2449,7 @@ get_song() { "tomahawk" "vlc" "xmms2d" + "xnoise" "yarock" ) @@ -2496,6 +2498,7 @@ get_song() { "rhythmbox"*) get_song_dbus "rhythmbox" ;; "strawberry"*) get_song_dbus "strawberry" ;; "gogglesmm"*) get_song_dbus "gogglesmm" ;; + "xnoise"*) get_song_dbus "xnoise" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; From de99d9b0e458ffe776f7fc39678f1c721a499bfa Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 May 2019 19:48:13 +0300 Subject: [PATCH 122/550] os: Fix HAIKU issues --- neofetch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/neofetch b/neofetch index 3d5f1d51..2331d93f 100755 --- a/neofetch +++ b/neofetch @@ -1189,6 +1189,12 @@ get_kernel() { # Since these OS are integrated systems, it's better to skip this function altogether [[ "$os" =~ (AIX|IRIX) ]] && return + # Haiku uses 'uname -v' and not - 'uname -r'. + [[ "$os" == HAIKU ]] && { + kernel=$(uname -v) + return + } + case "$kernel_shorthand" in "on") kernel="$kernel_version" ;; "off") kernel="$kernel_name $kernel_version" ;; @@ -1413,6 +1419,7 @@ get_packages() { "Haiku") has "pkgman" && dir /boot/system/package-links/* + packages=${packages/pkgman/depot} ;; "IRIX") From bbc492aac157b14960899b1c56d6cb053e9cf5ac Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 May 2019 19:48:37 +0300 Subject: [PATCH 123/550] os: Fix HAIKU issues --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2331d93f..ec48eff6 100755 --- a/neofetch +++ b/neofetch @@ -1190,7 +1190,7 @@ get_kernel() { [[ "$os" =~ (AIX|IRIX) ]] && return # Haiku uses 'uname -v' and not - 'uname -r'. - [[ "$os" == HAIKU ]] && { + [[ "$os" == Haiku ]] && { kernel=$(uname -v) return } From 7fc0b07cc4d8a874c6d60f470f4d82b8f51d110b Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Wed, 8 May 2019 11:23:47 -0400 Subject: [PATCH 124/550] update Red Hat with new 2019 logo --- neofetch | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 250ad171..8f84afe1 100755 --- a/neofetch +++ b/neofetch @@ -7898,24 +7898,26 @@ EOF ;; "Redhat"* | "Red Hat"* | "rhel"*) - set_colors 1 7 3 + set_colors 1 read -rd '' ascii_data <<'EOF' -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM +${c1} .MMM..:MMMMMMM + MMMMMMMMMMMMMMMMMM + MMMMMMMMMMMMMMMMMMMM. + MMMMMMMMMMMMMMMMMMMMMM + ,MMMMMMMMMMMMMMMMMMMMMM: + MMMMMMMMMMMMMMMMMMMMMMMM + .MMMM' MMMMMMMMMMMMMMMMMMMMMM + MMMMMM `MMMMMMMMMMMMMMMMMMMM. +MMMMMMMM MMMMMMMMMMMMMMMMMM . +MMMMMMMMM. `MMMMMMMMMMMMM' MM. +MMMMMMMMMMM. MMMM +`MMMMMMMMMMMMM. ,MMMMM. + `MMMMMMMMMMMMMMMMM. ,MMMMMMMM. + MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM + MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM: + MMMMMMMMMMMMMMMMMMMMMMMMMMMMMM + `MMMMMMMMMMMMMMMMMMMMMMMM: + ``MMMMMMMMMMMMMMMMM' EOF ;; From 757a673252b75de10ec2afc89dea4fc24a7df3be Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 8 May 2019 21:25:30 +0300 Subject: [PATCH 125/550] ascii: Add back old redhat logo (--ascii_distro redhat_old). --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 8f84afe1..0c7d24fb 100755 --- a/neofetch +++ b/neofetch @@ -7897,6 +7897,28 @@ RRRR RRRRRRRRRRRRRRRRRRR R RRRR EOF ;; + "redhat_old") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM +EOF + ;; + "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 read -rd '' ascii_data <<'EOF' From 4b399f06a2e200eccce60414a0fc8c40dbbef290 Mon Sep 17 00:00:00 2001 From: Ishimoto Shinobu Date: Fri, 10 May 2019 21:59:38 +0900 Subject: [PATCH 126/550] januslinux is ataraxia linux! Signed-off-by: Ishimoto Shinobu --- neofetch | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index 250ad171..c70a20fe 100755 --- a/neofetch +++ b/neofetch @@ -6437,25 +6437,33 @@ WW W EOF ;; - "januslinux"*|"janus"*) - set_colors 4 7 4 + "januslinux"*|"janus"*|"Ataraxia Linux"*|"Ataraxia"*) + set_colors 4 5 6 2 read -rd '' ascii_data <<'EOF' -${c1}oooooooooooooooooooooooooooooooo -oooooooooooooooooooooooooooooooo -oooooooooooooooooooooooooooooooo -ooooooooooooo${c2}dOWWOd${c1}ooooooooooooo -oooooooooood${c2}0WMMMMWkd${c1}ooooooooooo -oooooooood${c2}0WMMMMMX0KN0d${c1}oooolllll -ooooooo${c2}xKWMMMMWKxKWMMMWKx${c3}lllllll -ooooo${c2}xXMMMMMW0doooOWMMMMMXx${c3}lllll -ooooo${c2}xXMMMMMW0doloONMMMMMXx${c3}lllll -ooooooo${c2}xKWMMMWXO0WMMMMMKx${c3}lllllll -ooooooooo${c2}d0NX0KWMMMMW0d${c3}lllllllll -oooooooooooo${c2}xWMMMMW0o${c3}llllllccccc -oooooooooooll${c2}o0WW0o${c3}lllllcccccccc -ooooooooooollll${c2}oo${c3}llllllccccccccc -oooooooooollllllllllllcccccccccc -oooooooooollllllllllllcccccccccc +${c1} 'l: + loooooo + loooo coooool + looooooooooooooooooool + looooooooooooooooo + lool cooo + coooooooloooooooo + clooooo ;lood cloooo + :loooocooo cloo loooo + loooo :ooooool loooo +looo cooooo cooooo +looooooooooooo ;loooooo ${c2}looooooc +${c1}looooooooo loo cloooooool ${c2}looooc +${c1} cooo cooooooooooo ${c2}looolooooool +${c1} cooo: ${c2}coooooooooooooooooool + loooooooooooolc: loooc; + cooo: loooooooooooc + ;oool looooooo: + coool olc, + looooc ,, + coooooc loc + :oooool, coool:, looool:, + looool: ooooooooooooooo: + cooolc .ooooooooooool EOF ;; From 85c6a5dd16ac54b350255acdbf3b3122b2bd358a Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Tue, 14 May 2019 06:33:24 +0000 Subject: [PATCH 127/550] Retrieve public IP info via drill --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index 2064d9d0..3bd821fe 100755 --- a/neofetch +++ b/neofetch @@ -3371,6 +3371,11 @@ get_public_ip() { [[ "$public_ip" =~ ^\; ]] && unset public_ip fi + if [[ -z "$public_ip" ]] && type -p drill >/dev/null; then + public_ip="$(drill myip.opendns.com @resolver1.opendns.com | \ + awk '/^myip\./ && $3 == "IN" {print $5}')" + fi + if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then public_ip="$(curl --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")" fi From accccca8e9039d7bfbcf1d8871d64049d3e1f4cb Mon Sep 17 00:00:00 2001 From: Lucius Hu Date: Mon, 3 Jun 2019 00:23:05 -0400 Subject: [PATCH 128/550] kitty font parsing where font name has whitespaces --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3bd821fe..cb4b9fe4 100755 --- a/neofetch +++ b/neofetch @@ -2981,7 +2981,7 @@ END kitty_config="$(kitty --debug-config)" [[ "$kitty_config" != *font_family* ]] && return - term_font="$(awk '/^font_family|^font_size/ {printf $2 " "}' <<< "$kitty_config")" + term_font="$(awk '/^font_family|^font_size/ {$1="";gsub("^ *","",$0);print $0}' <<< "$kitty_config")" ;; "konsole" | "yakuake") From b58942d6c6229c5dcac7c3914b1f9b161b8721bc Mon Sep 17 00:00:00 2001 From: Lucius Hu Date: Mon, 3 Jun 2019 03:38:30 -0400 Subject: [PATCH 129/550] Work for multiple GPUs now 1. Replace `\\"` with `\"`, otherwise awk warns `\"' is not a known regexp operator 2. Use the slot number of `lspci -mm` return value to determine whether two video cards are in different PCI slots, and therefore are two different GPUS. --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 3bd821fe..2ca10880 100755 --- a/neofetch +++ b/neofetch @@ -2135,9 +2135,9 @@ get_gpu() { case "$os" in "Linux") # Read GPUs into array. - gpu_cmd="$(lspci -mm | awk -F '\\"|\\" \\"|\\(' \ - '/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END {for(i in a) - {if(!seen[a[i]]++) print a[i]}}')" + gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ + '/"Display|"3D|"VGA/ {a[$0] = $1 " " $3 " " $4} + END {for(i in a) {if(!seen[a[i]]++) print a[i]}}')" IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd" # Remove duplicate Intel Graphics outputs. From f3dbd54a6b0ddb9364008073baf1ddade14bf3b7 Mon Sep 17 00:00:00 2001 From: Lucius Hu Date: Fri, 7 Jun 2019 02:56:57 -0400 Subject: [PATCH 130/550] make line below 100 columns --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index cb4b9fe4..6058b2e0 100755 --- a/neofetch +++ b/neofetch @@ -2981,7 +2981,8 @@ END kitty_config="$(kitty --debug-config)" [[ "$kitty_config" != *font_family* ]] && return - term_font="$(awk '/^font_family|^font_size/ {$1="";gsub("^ *","",$0);print $0}' <<< "$kitty_config")" + term_font="$(awk '/^font_family|^font_size/ {$1="";gsub("^ *","",$0);print $0}' \ + <<< "$kitty_config")" ;; "konsole" | "yakuake") From 9320275a6e06c0c5c1fcd6055b831f55a3ff70e7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 7 Jun 2019 20:02:18 +0300 Subject: [PATCH 131/550] packages: Fix DragonFlyBSD. Thanks pornguy --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0c7d24fb..a3c30eca 100755 --- a/neofetch +++ b/neofetch @@ -1370,7 +1370,7 @@ get_packages() { has pkginfo && tot pkginfo -i case "$kernel_name" in - "FreeBSD") has "pkg" && tot pkg info ;; + "FreeBSD"|"DragonFly") has "pkg" && tot pkg info ;; *) has "pkg" && dir /var/db/pkg/* From 3e92b3b202657a6c259863e8bc19f86526edb210 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 20:29:21 +0300 Subject: [PATCH 132/550] term: Fix wrapper scripts in NixOS. Thanks Tdeo. --- neofetch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d02c0191..62a420f1 100755 --- a/neofetch +++ b/neofetch @@ -2882,7 +2882,16 @@ get_term() { "urxvtd") term="urxvt" ;; *"nvim") term="Neovim Terminal" ;; *"NeoVimServer"*) term="VimR Terminal" ;; - *) term="${name##*/}" ;; + + *) + term="${name##*/}" + + # Fix wrapper names in NixOS. + [[ "$term" == .*-wrapped ]] && { + term="${term#.}" + term="${term%-wrapped}" + } + ;; esac done From 2caec13bf3f66d516d839e01f57cf706a13440fc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 20:35:04 +0300 Subject: [PATCH 133/550] term: Fix wrapper scripts in NixOS. Thanks Tdeo. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 62a420f1..34a3020b 100755 --- a/neofetch +++ b/neofetch @@ -2887,9 +2887,9 @@ get_term() { term="${name##*/}" # Fix wrapper names in NixOS. - [[ "$term" == .*-wrapped ]] && { + [[ "$term" == .*-wrap* ]] && { term="${term#.}" - term="${term%-wrapped}" + term="${term%-wrap*}" } ;; esac From 4f727b1de3e9f42fefef4a4d77801e90156b43a8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 20:41:12 +0300 Subject: [PATCH 134/550] term: Fix wrapper scripts in NixOS. Thanks Tdeo. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 34a3020b..f888a745 100755 --- a/neofetch +++ b/neofetch @@ -2887,9 +2887,9 @@ get_term() { term="${name##*/}" # Fix wrapper names in NixOS. - [[ "$term" == .*-wrap* ]] && { + [[ "$distro" == NixOS* && $term == .*-* ]] && { term="${term#.}" - term="${term%-wrap*}" + term="${term%-*}" } ;; esac From c0cfcb3b36e2f265054d30977214c0aff318e070 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 20:50:04 +0300 Subject: [PATCH 135/550] term: Fix wrapper scripts in NixOS. Thanks Tdeo. --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f888a745..6efa8bff 100755 --- a/neofetch +++ b/neofetch @@ -2884,12 +2884,15 @@ get_term() { *"NeoVimServer"*) term="VimR Terminal" ;; *) + # Fix issues with long process names on Linux. + [[ $os == Linux ]] && term=$(realpath "/proc/$parent/exe") + term="${name##*/}" # Fix wrapper names in NixOS. - [[ "$distro" == NixOS* && $term == .*-* ]] && { + [[ $term == .*-wrapped ]] && { term="${term#.}" - term="${term%-*}" + term="${term%-wrapped}" } ;; esac From 4ac452cc64910a7b1e93eb4e7791519664574b24 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 20:51:56 +0300 Subject: [PATCH 136/550] docs: update --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6efa8bff..f20701c9 100755 --- a/neofetch +++ b/neofetch @@ -2889,7 +2889,7 @@ get_term() { term="${name##*/}" - # Fix wrapper names in NixOS. + # Fix wrapper names in Nix. [[ $term == .*-wrapped ]] && { term="${term#.}" term="${term%-wrapped}" From 0f718d41b9a519c1c4a5dbb84fd833e83fd3853a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 13 Jun 2019 09:27:35 +0300 Subject: [PATCH 137/550] docs: update --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8532bd86..581520e8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@

- Packaging status From 2f2540bc2ebdae88bd9be104fb366781f1eeb647 Mon Sep 17 00:00:00 2001 From: Willem Mulder Date: Wed, 19 Jun 2019 19:49:55 +0200 Subject: [PATCH 138/550] Set nullglob for package counting This prevents package managers showing up as having installed 1 package, while it's actually 0. --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index f20701c9..042a2414 100755 --- a/neofetch +++ b/neofetch @@ -1343,6 +1343,7 @@ get_packages() { # $br_prefix is fixed and won't change based on user input so this is safe either way. # shellcheck disable=SC2086 { + shopt -s nullglob has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ has "Compile" && dir ${br_prefix}/Programs/*/ has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* @@ -1350,6 +1351,7 @@ get_packages() { has "pkgtool" && dir ${br_prefix}/var/log/packages/* has "cave" && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ ${br_prefix}/var/db/paludis/repositories/installed/data/*/ + shopt -u nullglob } # Other (Needs complex command) From 1316df5df843fabeca511ba26188ddc7b59d7be3 Mon Sep 17 00:00:00 2001 From: Renzix Date: Thu, 20 Jun 2019 13:19:55 -0400 Subject: [PATCH 139/550] Moved guix check below /etc/os-release check --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 042a2414..efcac0d2 100755 --- a/neofetch +++ b/neofetch @@ -883,12 +883,6 @@ get_distro() { *) distro="GoboLinux $(< /etc/GoboLinuxVersion)" esac - elif type -p guix >/dev/null; then - case "$distro_shorthand" in - "on" | "tiny") distro="GuixSD" ;; - *) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')" - esac - elif type -p crux >/dev/null; then distro="$(crux)" case "$distro_shorthand" in @@ -928,6 +922,13 @@ get_distro() { "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; esac + + elif type -p guix >/dev/null; then + case "$distro_shorthand" in + "on" | "tiny") distro="GuixSD" ;; + *) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')" + esac + else for release_file in /etc/*-release; do distro+="$(< "$release_file")" From 177644c18e31f1b0d6de0c193841aa8e9223226d Mon Sep 17 00:00:00 2001 From: Weslly Date: Sun, 23 Jun 2019 14:31:31 -0300 Subject: [PATCH 140/550] WM: Add support for yabai on macOS --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index efcac0d2..311838c8 100755 --- a/neofetch +++ b/neofetch @@ -1626,11 +1626,12 @@ get_wm() { else case "$os" in "Mac OS X") - ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm')" + ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai')" case "$ps_line" in *"chunkwm"*) wm="chunkwm" ;; *"kwm"*) wm="Kwm" ;; + *"yabai"*) wm="yabai" ;; *"Amethyst"*) wm="Amethyst" ;; *"Spectacle"*) wm="Spectacle" ;; *) wm="Quartz Compositor" ;; From 5e55c4dd1dcd1d233d04317b60ec41d7030a4e43 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 28 Jun 2019 14:53:34 +0300 Subject: [PATCH 141/550] simple: Hide stderr by default. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f20701c9..68cdbd0b 100755 --- a/neofetch +++ b/neofetch @@ -8972,8 +8972,8 @@ main() { eval "$config" get_args "$@" - get_simple "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null + get_simple "$@" get_distro get_bold get_distro_ascii From 2da18caf958104df0f38c3e27459f09c15afd1f4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 18 Jul 2019 01:52:13 +0300 Subject: [PATCH 142/550] packages: Added package support for kiss --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 4c464c25..756fa6d0 100755 --- a/neofetch +++ b/neofetch @@ -1324,6 +1324,7 @@ get_packages() { case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") # Package Manager Programs. + has "kiss" && tot kiss l has "pacman-key" && tot pacman -Qq --color never has "dpkg" && tot dpkg-query -f '.\n' -W has "rpm" && tot rpm -qa From 9d4855a18fd4dcbfbb334e50e31626a9d39bf1f3 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 18 Jul 2019 14:07:26 +0700 Subject: [PATCH 143/550] ASCII: Added Feren OS --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 756fa6d0..814f1cea 100755 --- a/neofetch +++ b/neofetch @@ -6108,6 +6108,28 @@ ${c1} /:-------------:\\ EOF ;; + "Feren"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `----------` + :+ooooooooo+. +-o+oooooooooo+- +..`/+++++++++++/...````````````````` + .++++++++++++++++++++++++++/////- + ++++++++++++++++++++++++++++++++//:` + -++++++++++++++++++++++++++++++/-` + ++++++++++++++++++++++++++++:. + -++++++++++++++++++++++++/. + +++++++++++++++++++++/-` + -++++++++++++++++++//-` + .:+++++++++++++//////- + .:++++++++//////////- + `-++++++---:::://///. + `.:///+++. ` + `......... +EOF + ;; + "freebsd_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From f4cfdfa47cb519a1db825f00857ad4f21d414e20 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 18 Jul 2019 15:18:29 +0700 Subject: [PATCH 144/550] Linux: Move /etc/os-release directly below lsb_release We are assuming that people's /etc/os-release are standard, and any distro without it will use the "fallback" methods they have. --- neofetch | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 814f1cea..0b050758 100755 --- a/neofetch +++ b/neofetch @@ -877,6 +877,23 @@ get_distro() { esac distro="$(lsb_release "$lsb_flags")" + elif [[ -f "/etc/os-release" || \ + -f "/usr/lib/os-release" || \ + -f "/etc/openwrt_release" ]]; then + files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release") + + # Source the os-release file + for file in "${files[@]}"; do + source "$file" && break + done + + # Format the distro name. + case "$distro_shorthand" in + "on") distro="${NAME:-${DISTRIB_ID}} ${VERSION_ID:-${DISTRIB_RELEASE}}" ;; + "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; + "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; + esac + elif [[ -f "/etc/GoboLinuxVersion" ]]; then case "$distro_shorthand" in "on" | "tiny") distro="GoboLinux" ;; @@ -906,23 +923,6 @@ get_distro() { elif [[ -f "/etc/lsb-release" && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)" - elif [[ -f "/etc/os-release" || \ - -f "/usr/lib/os-release" || \ - -f "/etc/openwrt_release" ]]; then - files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release") - - # Source the os-release file - for file in "${files[@]}"; do - source "$file" && break - done - - # Format the distro name. - case "$distro_shorthand" in - "on") distro="${NAME:-${DISTRIB_ID}} ${VERSION_ID:-${DISTRIB_RELEASE}}" ;; - "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; - "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; - esac - elif type -p guix >/dev/null; then case "$distro_shorthand" in "on" | "tiny") distro="GuixSD" ;; From 3a19c430261eed1423db229d15a56a5c75aa5589 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 18 Jul 2019 15:25:14 +0700 Subject: [PATCH 145/550] Linux: Update ASCII for Sailfish OS --- neofetch | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index 0b050758..31614b93 100755 --- a/neofetch +++ b/neofetch @@ -8116,24 +8116,19 @@ EOF "SailfishOS"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e + _a@b + _#b (b + _@@ @_ _, + _#^@ _#*^^*gg,aa@^^ + #- @@^ _a@^^ + @_ *g#b + ^@_ ^@_ + ^@_ @ + @(b (b + #b(b#^ + _@_#@^ + _a@a*^ + ,a@*^ EOF ;; From ac610bd79b899c889eff9b1df5a05d6cb7a75d60 Mon Sep 17 00:00:00 2001 From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com> Date: Thu, 18 Jul 2019 18:50:32 +0900 Subject: [PATCH 146/550] add support for kagami package manager --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 31614b93..d328fca3 100755 --- a/neofetch +++ b/neofetch @@ -1351,6 +1351,7 @@ get_packages() { has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* has "crew" && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist has "pkgtool" && dir ${br_prefix}/var/log/packages/* + has "kagami" && dir ${br_prefix}/var/lib/kagami/pkgs/* has "cave" && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ ${br_prefix}/var/db/paludis/repositories/installed/data/*/ shopt -u nullglob From 40dcf541de8de8a9815719e987a470497a0da0ff Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 18 Jul 2019 17:51:12 +0700 Subject: [PATCH 147/550] ASCII: Detect all of Sailfish instead of SailfishOS To maintain backward compatibility with older SailfishOS version. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d328fca3..c5ef4d29 100755 --- a/neofetch +++ b/neofetch @@ -8114,7 +8114,7 @@ ${c1} ........... EOF ;; - "SailfishOS"*) + "Sailfish"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' _a@b From 6cd7a8b1f2d0c5237067652c1792d78835fcdbde Mon Sep 17 00:00:00 2001 From: Michal-Szczepaniak Date: Thu, 18 Jul 2019 13:29:32 +0200 Subject: [PATCH 148/550] Linux: Fix ASCII for Sailfish OS --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c5ef4d29..df208368 100755 --- a/neofetch +++ b/neofetch @@ -8117,7 +8117,7 @@ EOF "Sailfish"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - _a@b +${c1} _a@b _#b (b _@@ @_ _, _#^@ _#*^^*gg,aa@^^ From 74a25bd377860454a274c03f461bddeea2b66668 Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Thu, 18 Jul 2019 20:21:06 +0100 Subject: [PATCH 149/550] Small tweak to the colours used for the Feren OS Logo Changed the blue used in the Feren OS logo as most colour schemes make the logo appear to be teal instead of blue. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index df208368..91aebf7c 100755 --- a/neofetch +++ b/neofetch @@ -6110,7 +6110,7 @@ EOF ;; "Feren"*) - set_colors 6 6 7 1 + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} `----------` :+ooooooooo+. From e4dffc46736cf06c641146db33d3a6e3a6d73182 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 22 Jul 2019 00:18:04 +0200 Subject: [PATCH 150/550] The K Desktop Environment was renamed to Plasma --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 91aebf7c..38cf4ded 100755 --- a/neofetch +++ b/neofetch @@ -1516,6 +1516,7 @@ get_de() { de="${XDG_CURRENT_DESKTOP/X\-}" de="${de/Budgie:GNOME/Budgie}" de="${de/:Unity7:ubuntu}" + de="${de/KDE/Plasma}" elif [[ "$DESKTOP_SESSION" ]]; then de="${DESKTOP_SESSION##*/}" @@ -1544,7 +1545,7 @@ get_de() { # Format strings. case "$de" in - "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; + "KDE_SESSION_VERSION"*) de="Plasma${de/* = }" ;; *"xfce4"*) de="Xfce4" ;; *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; From 11dfe8d0163841931fc08944879ec35a780cfde5 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 22 Jul 2019 13:12:33 +0200 Subject: [PATCH 151/550] Only use Plasma instead of KDE, if KDE version is greater equal 4 --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 38cf4ded..0e799a4b 100755 --- a/neofetch +++ b/neofetch @@ -1516,7 +1516,6 @@ get_de() { de="${XDG_CURRENT_DESKTOP/X\-}" de="${de/Budgie:GNOME/Budgie}" de="${de/:Unity7:ubuntu}" - de="${de/KDE/Plasma}" elif [[ "$DESKTOP_SESSION" ]]; then de="${DESKTOP_SESSION##*/}" @@ -1531,6 +1530,10 @@ get_de() { de="Trinity" fi + if [ "$KDE_SESSION_VERSION" -ge "4" ]; then + de="${de/KDE/Plasma}" + fi + # When a window manager is started from a display manager # the desktop variables are sometimes also set to the # window manager name. This checks to see if WM == DE From cc491fc59303501187d8ef6d94ee56322bc0902e Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 22 Jul 2019 15:15:31 +0200 Subject: [PATCH 152/550] Move check plasma >= 4 after de to KDE and revert some change --- neofetch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 0e799a4b..c2ac8c22 100755 --- a/neofetch +++ b/neofetch @@ -1530,10 +1530,6 @@ get_de() { de="Trinity" fi - if [ "$KDE_SESSION_VERSION" -ge "4" ]; then - de="${de/KDE/Plasma}" - fi - # When a window manager is started from a display manager # the desktop variables are sometimes also set to the # window manager name. This checks to see if WM == DE @@ -1548,7 +1544,7 @@ get_de() { # Format strings. case "$de" in - "KDE_SESSION_VERSION"*) de="Plasma${de/* = }" ;; + "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; *"xfce4"*) de="Xfce4" ;; *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; @@ -1564,6 +1560,9 @@ get_de() { ;; esac + if [ "$KDE_SESSION_VERSION" -ge "4" ]; then + de="${de/KDE/Plasma}" + fi # Log that the function was run. de_run=1 } From 1daac57e979c200d5cca3952c07c2ab522d3b265 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 23 Jul 2019 10:53:10 +0200 Subject: [PATCH 153/550] Use bash syntax --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c2ac8c22..a22bacca 100755 --- a/neofetch +++ b/neofetch @@ -1560,9 +1560,10 @@ get_de() { ;; esac - if [ "$KDE_SESSION_VERSION" -ge "4" ]; then + if (( "$KDE_SESSION_VERSION" >= "4" )); then de="${de/KDE/Plasma}" fi + # Log that the function was run. de_run=1 } From af6160fbce990c9e9a2a09a05023aa1ce2cc60d2 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 23 Jul 2019 10:56:10 +0200 Subject: [PATCH 154/550] Use && --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index a22bacca..4eb6db0b 100755 --- a/neofetch +++ b/neofetch @@ -1560,9 +1560,7 @@ get_de() { ;; esac - if (( "$KDE_SESSION_VERSION" >= "4" )); then - de="${de/KDE/Plasma}" - fi + (( "$KDE_SESSION_VERSION" >= "4" )) && de="${de/KDE/Plasma}" # Log that the function was run. de_run=1 From 4120ad49404f5d916653ba4862d702e73d4473d2 Mon Sep 17 00:00:00 2001 From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com> Date: Thu, 25 Jul 2019 23:40:59 -0500 Subject: [PATCH 155/550] support other versions of ksh --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4eb6db0b..6d53d1ce 100755 --- a/neofetch +++ b/neofetch @@ -1460,7 +1460,7 @@ get_shell() { "bash") shell+="${BASH_VERSION/-*}" ;; "sh" | "ash" | "dash") ;; - "mksh" | "ksh") + *"ksh") shell+="$("$SHELL" -c "printf %s \"\$KSH_VERSION\"")" shell="${shell/ * KSH}" shell="${shell/version}" From 247512baf5ff3942d40e4603bc910c46851673a3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 28 Jul 2019 09:57:36 +0300 Subject: [PATCH 156/550] general: Make neofetch compatible with libedit. --- neofetch | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 4eb6db0b..0cbaca03 100755 --- a/neofetch +++ b/neofetch @@ -1021,7 +1021,7 @@ get_distro() { ;; "Haiku") - read -r name version _ < <(uname -sv) + read -r name version _ <<< "$(uname -sv)" distro="$name $version" ;; @@ -1309,12 +1309,12 @@ get_packages() { has() { type -p "$1" >/dev/null && manager="$_"; } dir() { ((packages+=$#)); pac "$#"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } - tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } + tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } # Redefine tot() for Bedrock Linux. [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]] && { tot() { - IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done) + IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) pac "${#pkgs[@]}" } @@ -2674,7 +2674,7 @@ get_resolution() { elif type -p xwininfo >/dev/null; then read -r w h \ - < <(xwininfo -root | awk -F':' '/Width|Height/ {printf $2}') + <<< "$(xwininfo -root | awk -F':' '/Width|Height/ {printf $2}')" resolution="${w}x${h}" elif type -p xdpyinfo >/dev/null; then @@ -3010,10 +3010,10 @@ END child="$(get_ppid "$$")" IFS=$'\n' read -d "" -ra konsole_instances \ - < <(qdbus | awk '/org.kde.konsole/ {print $1}') + <<< "$(qdbus | awk '/org.kde.konsole/ {print $1}')" for i in "${konsole_instances[@]}"; do - IFS=$'\n' read -d "" -ra konsole_sessions < <(qdbus "$i" | grep -F '/Sessions/') + IFS=$'\n' read -d "" -ra konsole_sessions <<< "$(qdbus "$i" | grep -F '/Sessions/')" for session in "${konsole_sessions[@]}"; do if ((child == "$(qdbus "$i" "$session" processId)")); then @@ -3690,12 +3690,13 @@ get_window_size() { # This functions gets the current window size in # pixels. [[ "$image_backend" == "kitty" ]] && - IFS=x read -r term_width term_height < <(kitty +kitten icat --print-window-size) + IFS=x read -r term_width term_height <<< "$(kitty +kitten icat --print-window-size)" # Get terminal width/height. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool &>/dev/null; then - IFS=$'\n' read -d "" -ra win < <(xdotool getactivewindow getwindowgeometry --shell %1) + IFS=$'\n' read -d "" -ra win \ + <<< "$(xdotool getactivewindow getwindowgeometry --shell %1)" term_width="${win[3]/WIDTH=}" term_height="${win[4]/HEIGHT=}" @@ -3731,7 +3732,7 @@ get_window_size() { get_term_size() { # Get the terminal size in cells. - read -r lines columns < <(stty size) + read -r lines columns <<< "$(stty size)" # Calculate font size. font_width="$((term_width / columns))" @@ -4282,8 +4283,8 @@ cache_uname() { kernel_machine="${uname[2]}" if [[ "$kernel_name" == "Darwin" ]]; then - IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/key|string/ {print $3}' \ - "/System/Library/CoreServices/SystemVersion.plist") + IFS=$'\n' read -d "" -ra sw_vers <<< "$(awk -F'<|>' '/key|string/ {print $3}' \ + "/System/Library/CoreServices/SystemVersion.plist")" for ((i=0;i<${#sw_vers[@]};i+=2)) { case ${sw_vers[i]} in ProductName) darwin_name=${sw_vers[i+1]} ;; From ff420471577386da4f5179e9b7b35abec6b07908 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 28 Jul 2019 10:06:31 +0300 Subject: [PATCH 157/550] general: Fix travis. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d3c747aa..357f0fce 100755 --- a/neofetch +++ b/neofetch @@ -1309,7 +1309,7 @@ get_packages() { has() { type -p "$1" >/dev/null && manager="$_"; } dir() { ((packages+=$#)); pac "$#"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } - tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } + tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+=${#pkgs[@]}));pac "${#pkgs[@]}";} # Redefine tot() for Bedrock Linux. [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]] && { From 42bed8b60e49246c355a09c87f9faffb088ebde5 Mon Sep 17 00:00:00 2001 From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com> Date: Sun, 28 Jul 2019 07:48:55 -0500 Subject: [PATCH 158/550] add bonsai linux support add packages support --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index 357f0fce..ff5b1bee 100755 --- a/neofetch +++ b/neofetch @@ -1339,6 +1339,7 @@ get_packages() { has "sorcery" && tot gaze installed has "alps" && tot alps showinstalled has "butch" && tot butch list + has "bonsai" && tot bonsai list # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. @@ -5458,6 +5459,28 @@ ${c1} oMMNMMMMMMMMMMMMMMMMMMMMMM EOF ;; + "bonsai"*) + set_colors 6 2 3 + read -rd '' ascii_data <<'EOF' +${c2} ,####, + ${c2}#######, ${c2},#####, + ${c2}#####',# ${c2}'###### + ${c2}''###'${c3}';,,,'${c2}###' + ${c3} ,; '''' + ${c3} ;;; ${c2},#####, + ${c3} ;;;' ,,;${c2};;### + ${c3} ';;;;''${c2}'####' + ${c3} ;;; + ${c3} ,.;;';'',,, + ${c3} ' ' +${c1} # + # O + ##, ,##,',##, ,## ,#, , + # # # # #''# #,, # # # + '#' '##' # # ,,# '##;, # +EOF + ;; + "BSD") set_colors 1 7 4 3 6 read -rd '' ascii_data <<'EOF' From 22aaed4d92fc2dc95ef116cd44332067ce6ca47e Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Wed, 31 Jul 2019 20:11:25 +0200 Subject: [PATCH 159/550] display_image: Allow Chafa backend to stretch image to desired size Fixes issue #1295. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ff5b1bee..f95b4e39 100755 --- a/neofetch +++ b/neofetch @@ -3864,7 +3864,7 @@ display_image() { ;; "chafa") - chafa --size="$((width / font_width))x$((height / font_height))" "$image" + chafa --stretch --size="$((width / font_width))x$((height / font_height))" "$image" ;; "jp2a") From 8dca949e87ee2cbc986f37f7e25f346db3f9dbc8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 5 Aug 2019 11:05:43 +0300 Subject: [PATCH 160/550] Ascii: Make KISS use crux_small --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 357f0fce..7107f9f1 100755 --- a/neofetch +++ b/neofetch @@ -5785,7 +5785,7 @@ ${c1} ..... EOF ;; - "crux_small") + "crux_small"|"KISS"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' ${c1} ___ From ca3291133646ce18155cfc5840385f1df9ee2710 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 5 Aug 2019 18:04:24 +0200 Subject: [PATCH 161/550] packages: Check brew on Linux --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f95b4e39..aace00e0 100755 --- a/neofetch +++ b/neofetch @@ -1347,6 +1347,7 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob + has "brew" && dir $(brew --cellar)/* has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ has "Compile" && dir ${br_prefix}/Programs/*/ has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* From 296fb68564df0e96bf9a1278a8b01d88def243c9 Mon Sep 17 00:00:00 2001 From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com> Date: Mon, 5 Aug 2019 21:19:24 -0400 Subject: [PATCH 162/550] WM: Add support for Rectangle on macOS Rectangle is a Swift rewrite of the Spectacle application. --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f95b4e39..6a21314d 100755 --- a/neofetch +++ b/neofetch @@ -1631,7 +1631,7 @@ get_wm() { else case "$os" in "Mac OS X") - ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai')" + ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai\|[R]ectangle')" case "$ps_line" in *"chunkwm"*) wm="chunkwm" ;; @@ -1639,6 +1639,7 @@ get_wm() { *"yabai"*) wm="yabai" ;; *"Amethyst"*) wm="Amethyst" ;; *"Spectacle"*) wm="Spectacle" ;; + *"Rectangle"*) wm="Rectangle" ;; *) wm="Quartz Compositor" ;; esac ;; From 4548c56ee7f95dbfb61c312b228af47d55a092b5 Mon Sep 17 00:00:00 2001 From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com> Date: Wed, 7 Aug 2019 09:34:03 -0400 Subject: [PATCH 163/550] Refactored grep for macOS window manager detection Co-Authored-By: nibblonian --- neofetch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6a21314d..376da939 100755 --- a/neofetch +++ b/neofetch @@ -1631,7 +1631,18 @@ get_wm() { else case "$os" in "Mac OS X") - ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai\|[R]ectangle')" + wm_names=( + "[S]pectacle" + "[A]methyst" + "[k]wm" + "[c]chun[k]wm" + "[y]abai" + "[R]ectangle" + ) + + regex_part=$( IFS='|'; echo "${wm_names[*]}" ) + + ps_line=$(ps -e | grep -Eio "$regex_part") case "$ps_line" in *"chunkwm"*) wm="chunkwm" ;; From eb5cf17fdb43c64a78614328136d00996f60ef5e Mon Sep 17 00:00:00 2001 From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com> Date: Wed, 7 Aug 2019 09:46:32 -0400 Subject: [PATCH 164/550] Remove unnecessary -i grep flag from wm ps --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 376da939..8e8ca7e1 100755 --- a/neofetch +++ b/neofetch @@ -1642,7 +1642,7 @@ get_wm() { regex_part=$( IFS='|'; echo "${wm_names[*]}" ) - ps_line=$(ps -e | grep -Eio "$regex_part") + ps_line=$(ps -e | grep -Eo "$regex_part") case "$ps_line" in *"chunkwm"*) wm="chunkwm" ;; From a5c4a020c065623dc706985d83986e0103b1bf83 Mon Sep 17 00:00:00 2001 From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com> Date: Wed, 7 Aug 2019 18:12:40 -0400 Subject: [PATCH 165/550] Removed extraneous c from chunkwm match --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8e8ca7e1..2d3adf8b 100755 --- a/neofetch +++ b/neofetch @@ -1635,7 +1635,7 @@ get_wm() { "[S]pectacle" "[A]methyst" "[k]wm" - "[c]chun[k]wm" + "[c]hun[k]wm" "[y]abai" "[R]ectangle" ) From f9fc22eef0409147855860a3082ad4db9241f5d4 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Fri, 9 Aug 2019 14:59:10 +0200 Subject: [PATCH 166/550] packages: Quote --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index aace00e0..ef7ac1fa 100755 --- a/neofetch +++ b/neofetch @@ -1347,7 +1347,7 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob - has "brew" && dir $(brew --cellar)/* + has "brew" && dir "$(brew --cellar)"/* has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ has "Compile" && dir ${br_prefix}/Programs/*/ has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* From a476419d22093515f7bdc34a861efd65a1b478ec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 9 Aug 2019 15:09:37 +0000 Subject: [PATCH 167/550] neofetch: add kiss --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 7107f9f1..57c0ef3c 100755 --- a/neofetch +++ b/neofetch @@ -5785,7 +5785,7 @@ ${c1} ..... EOF ;; - "crux_small"|"KISS"*) + "crux_small"|KISS*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' ${c1} ___ From 5dc00cba146dd34ce9385344c729ccd0451f5449 Mon Sep 17 00:00:00 2001 From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com> Date: Sat, 10 Aug 2019 17:41:21 -0400 Subject: [PATCH 168/550] Removed subshell from ps grep for macOS wm --- neofetch | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 2d3adf8b..4b3d9fd0 100755 --- a/neofetch +++ b/neofetch @@ -1631,18 +1631,13 @@ get_wm() { else case "$os" in "Mac OS X") - wm_names=( - "[S]pectacle" - "[A]methyst" - "[k]wm" - "[c]hun[k]wm" - "[y]abai" - "[R]ectangle" - ) - - regex_part=$( IFS='|'; echo "${wm_names[*]}" ) - - ps_line=$(ps -e | grep -Eo "$regex_part") + ps_line="$(ps -e | grep -o \ + -e "[S]pectacle" \ + -e "[A]methyst" \ + -e "[k]wm" \ + -e "[c]hun[k]wm" \ + -e "[y]abai" \ + -e "[R]ectangle")" case "$ps_line" in *"chunkwm"*) wm="chunkwm" ;; From 87de174aef3e92049e771ddd11c69d55e51143df Mon Sep 17 00:00:00 2001 From: Alva Date: Tue, 27 Aug 2019 15:25:28 +0200 Subject: [PATCH 169/550] Rename GuixSD to Guix System --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index e9bc5743..f9a1a58a 100755 --- a/neofetch +++ b/neofetch @@ -925,8 +925,8 @@ get_distro() { elif type -p guix >/dev/null; then case "$distro_shorthand" in - "on" | "tiny") distro="GuixSD" ;; - *) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')" + "on" | "tiny") distro="Guix System" ;; + *) distro="Guix System $(guix system -V | awk 'NR==1{printf $5}')" esac else From 940382fb97747d5547965713c60f58c0b41335be Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 28 Aug 2019 10:08:51 +0000 Subject: [PATCH 170/550] neofetch: Fix GPU parsing. Closes #1306 --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 57c0ef3c..ee6cc8fd 100755 --- a/neofetch +++ b/neofetch @@ -2198,6 +2198,8 @@ get_gpu() { *"virtualbox"*) gpu="VirtualBox Graphics Adapter" ;; + + *) continue ;; esac if [[ "$gpu_brand" == "off" ]]; then From 7cbd1b6d1782d3af5cc57ba81b2c4001c2065501 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 31 Aug 2019 07:38:41 +0000 Subject: [PATCH 171/550] neofetch: bump to 6.1.0 --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 33ed4277..64ec01c8 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version="6.0.1" +version="6.1.0" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" @@ -5472,7 +5472,7 @@ EOF "bonsai"*) set_colors 6 2 3 read -rd '' ascii_data <<'EOF' -${c2} ,####, +${c2} ,####, ${c2}#######, ${c2},#####, ${c2}#####',# ${c2}'###### ${c2}''###'${c3}';,,,'${c2}###' @@ -5480,10 +5480,10 @@ ${c2} ,####, ${c3} ;;; ${c2},#####, ${c3} ;;;' ,,;${c2};;### ${c3} ';;;;''${c2}'####' - ${c3} ;;; + ${c3} ;;; ${c3} ,.;;';'',,, ${c3} ' ' -${c1} # +${c1} # # O ##, ,##,',##, ,## ,#, , # # # # #''# #,, # # # From c37332e42ba086f324d0e0a86d46ad7eab20ecd4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 31 Aug 2019 08:16:06 +0000 Subject: [PATCH 172/550] docs: update --- CHANGELOG.md | 128 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 122 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6835f367..5053fbd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,129 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [6.0.1] - N/A +## [6.1.0] - 2019-31-08 -- **ascii**: Fixed bug causing files to not work. -- **ascii**: Fixed bug causing files named `ascii` to not load. -- **term_font** [kitty]: Fixed bug with empty config. -- **get_cols**: Variables are now local. [**@asantam**](https://github.com/asantam) -- **man_page**: More consistent arg documentation. [**@xPMo**](https://github.com/xPMo) +logo + +**Contributors**: + +**Charlène**, **Michael Straube**, @14mRh4X0r, @Crestwave, @GrantM11235, @Mark-Peppermint, @Michal-Szczepaniak, @Renzix, @SibrenVasse, @asantam, @chrissxYT, @chrisweeksnz, @dawidd6, @edward-p, @feren, @fjallarefur, @hpjansson, @iandrewt, @infinitewarp, @jkhsjdhjs, @konimex, @lebensterben, @lightful, @mitchweaver, @ognarb, @protonesso, @rxhanson, @spacelike, @vaygr, @weslly, @xPMo, @zyg812 + + +**OS**: + +- Added support for [KISS Linux](https://getkiss.org). +- Added support for [Bonsai Linux](bonsai-linux.org). @mitchweaver +- Added support for [Radix Linux](http://www.radixsystems.com/software.php). +- os: Fix HAIKU issues + +**ASCII**: + +- ascii: Fixed bug causing ascii files to not work. +- postmarketOS: Replace ASCII logo. @GrantM11235 +- postmarketOS: Add small ASCII logo. @GrantM11235 +- Fix big Puffy ascii logo. **Charlène** +- ASCII: Updated Artix ASCII with new logo. @konimex +- Add ascii art for Clear Linux. @chrisweeksnz +- new logo for Ataraxia Linux. @protonesso +- ASCII: Add fedora_small. @zyg812 +- Added a case for displaying the Ubuntu logo for i3buntu. @chrissxYT +- New Peppermint Logo. @Mark-Peppermint +- ascii: Fix void. +- update Red Hat with new 2019 logo. @infinitewarp +- ascii: Add back old redhat logo (--ascii_distro redhat_old). +- ASCII: Added Feren OS. @konimex +- Linux: Update ASCII for Sailfish OS. @konimex +- Linux: Fix ASCII for Sailfish OS. @Michal-Szczepaniak +- Small tweak to the colours used for the Feren OS Logo. @feren + +**Images**: + +- general: fix image sizing in VTE terminals. +- general: Fix issue with URxvt and no internal border. +- display_image: Allow Chafa backend to stretch image to desired size. @hpjansson + +**Terminal**: + +- term_font [kitty]: Fix bug with empty config. +- term_font: fix issue with konsole font detection. **Michael Straube** +- Robuster kitty font parsing. @SibrenVasse +- term_font: Fix crash when parsing Xresources. +- kitty font parsing where font name has whitespaces. @lebensterben +- term: Fix wrapper scripts in NixOS. Thanks Tdeo. + +**Memory**: + +- Memory [AIX]: Detect memory based on pages (like Solaris) for more accuracy. @konimex + +**CPU**: + +- CPU [Linux/ARM]: Use Hardware field directly. @konimex + +**GPU**: + +- Properly work with multiple GPUs. @lebensterben +- Fix GPU parsing. + +**Packages**: + +- packages: Specify Haiku's pkgman. @Crestwave +- packages: Show IRIX package manager name. +- Use guix directly to report package count instead of counting directories. @spacelike +- Packages [Guix/Nix]: Use if for detecting system and user packages. @konimex +- packages: Fix DragonFlyBSD. Thanks pornguy. +- Set nullglob for package counting. @14mRh4X0r +- packages: Check brew on Linux. @dawidd6 + +**Theme**: + +- WM Theme: update for Mojave. @iandrewt +- Handle ${GTK2_RC_FILES} with multiple values. @edward-p +- use "$GTK2_RC_FILES". @edward-p + +**Song**: + +- song: add strawberry player. **Michael Straube** +- song: Added support for plasma-browser-integration. +- song: add gogglesmm. **Michael Straube** +- song: add xnoise. **Michael Straube** + +**Uptime**: + +- support uptime from Android 9+. @lightful + +**IP**: + +- Retrieve public IP info via drill. @vaygr + +**WM**: + +- WM: Add support for yabai on macOS. @weslly +- WM: Add support for Rectangle on macOS. @rxhanson +- Removed subshell from ps grep for macOS wm. @rxhanson + +**Shell**: + +- support other versions of ksh. @mitchweaver + +**Misc**: + +- Make neofetch compatible with `libedit`. +- general: Added `--no_config` to disable config file creation. +- Made variables local in get_cols function. @asantam +- Fixed option documentation. @xPMo +- Fixed gnome shell mutter issues. +- cache_uname: improve reading from 'SystemVersion.plist' on macOS and iOS. @jkhsjdhjs +- add device information for latest ios devices. @jkhsjdhjs +- include Fusion/Bionic in iDevice processor names. @jkhsjdhjs +- give precedence to "Hardware" entry in /proc/cpuinfo. @lightful +- config: Show 15 color blocks by default. +- underline: Fix bugs with incorrect lengths. +- Moved guix check below /etc/os-release check. @Renzix +- simple mode: Hide stderr by default. +- Linux: Move /etc/os-release directly below lsb_release. @konimex +- The K Desktop Environment was renamed to Plasma. @ognarb +- Rename GuixSD to Guix System. @fjallarefur ## [6.0.0] - 2019-01-08 From 4b9589a9363444fef1ae798c4967a471448eaa15 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 31 Aug 2019 08:16:26 +0000 Subject: [PATCH 173/550] docs: update --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index e5733d41..525291a9 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. -.TH NEOFETCH "1" "January 2019" "Neofetch 6.0.1" "User Commands" +.TH NEOFETCH "1" "August 2019" "Neofetch 6.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 92c07e2d31da32973e01cc6729afdded33f5483d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 31 Aug 2019 08:16:54 +0000 Subject: [PATCH 174/550] docs: update --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 64ec01c8..1a682475 100755 --- a/neofetch +++ b/neofetch @@ -8,7 +8,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2016-2018 Dylan Araps +# Copyright (c) 2015-2019 Dylan Araps # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal From 1d17b4dfdb18066f866efe94b7ba58313af3f957 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 10 Sep 2019 08:44:30 +0300 Subject: [PATCH 175/550] docs: update --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 581520e8..6bfa7403 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@

A command-line system information tool written in bash 3.2+

- Packaging status From bb82bf83436109814b226fcd448c13b5f3a1d20d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 10 Sep 2019 16:07:25 +0300 Subject: [PATCH 176/550] neofetch: fix wm' --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 1a682475..d8254255 100755 --- a/neofetch +++ b/neofetch @@ -1621,13 +1621,13 @@ get_wm() { # Fallback for non-EWMH WMs. [[ -z "$wm" ]] && \ - wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ - -e "catwm" \ - -e "fvwm" \ - -e "dwm" \ - -e "2bwm" \ - -e "monsterwm" \ - -e "tinywm")" + wm="$(ps "${ps_flags[@]}" | grep -m 1 -o \ + -e "[c]atwm" \ + -e "[f]vwm" \ + -e "[d]wm" \ + -e "[2]bwm" \ + -e "[m]onsterwm" \ + -e "[t]inywm")" else case "$os" in From 3614099fd59c9cfeb842c10a3da9ab99db317e1a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 10 Sep 2019 23:49:09 +0300 Subject: [PATCH 177/550] image: fix terminal size issues. Closes #1314 --- neofetch | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/neofetch b/neofetch index d8254255..d6112c13 100755 --- a/neofetch +++ b/neofetch @@ -3700,6 +3700,45 @@ get_w3m_img_path() { get_window_size() { # This functions gets the current window size in # pixels. + # + # We first try to use the escape sequence "\033[14t" + # to get the terminal window size in pixels. If this + # fails we then fallback to using "xdotool" or other + # programs. + + # Tmux has a special way of reading escape sequences + # so we have to use a slightly different sequence to + # get the terminal size. + if [[ "$image_backend" == "tycat" ]]; then + printf '%b' '\e}qs\000' + + elif [[ -z $VTE_VERSION ]]; then + case "${TMUX:-null}" in + "null") printf '%b' '\e[14t' ;; + *) printf '%b' '\ePtmux;\e\e[14t\e\\ ' ;; + esac + fi + + # The escape codes above print the desired output as + # user input so we have to use read to store the out + # -put as a variable. + # The 1 second timeout is required for older bash + case "${BASH_VERSINFO[0]}" in + 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; + *) IFS=';t' read -d t -t 1 -sra term_size ;; + esac + unset IFS + + # Split the string into height/width. + if [[ "$image_backend" == "tycat" ]]; then + term_width="$((term_size[2] * term_size[0]))" + term_height="$((term_size[3] * term_size[1]))" + + else + term_height="${term_size[1]}" + term_width="${term_size[2]}" + fi + [[ "$image_backend" == "kitty" ]] && IFS=x read -r term_width term_height <<< "$(kitty +kitten icat --print-window-size)" From d233fcd2d1663d5828290c8b8600d1ec83ad3cf4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 11 Sep 2019 00:16:50 +0300 Subject: [PATCH 178/550] neofetch: fix travis --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index d6112c13..107301be 100755 --- a/neofetch +++ b/neofetch @@ -3767,10 +3767,10 @@ get_window_size() { # If the ID was found get the window size. if [[ "$current_window" ]]; then - term_size="$(xwininfo -id "$current_window")" - term_width="${term_size#*Width: }" + term_size=("$(xwininfo -id "$current_window")") + term_width="${term_size[0]#*Width: }" term_width="${term_width/$'\n'*}" - term_height="${term_size/*Height: }" + term_height="${term_size[0]/*Height: }" term_height="${term_height/$'\n'*}" fi fi From 0d85283bdf2490c50178350c34b4ad43eda060c7 Mon Sep 17 00:00:00 2001 From: Hummenix <36206434+Hummenix@users.noreply.github.com> Date: Sat, 14 Sep 2019 05:27:49 +0200 Subject: [PATCH 179/550] Added BlackArch Added ASCII art for BlackArch as mentioned in #1311 As BlackArch has two logos - one is a red Arch logo with a black medieval sword (as seen here https://www.blackarch.org/blackarch-guide-en.pdf) and the other a neon blue version with a japanese katana (seen here https://www.blackarch.org/) - I did go with a middle thing. --- neofetch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/neofetch b/neofetch index 107301be..a2bbc2a0 100755 --- a/neofetch +++ b/neofetch @@ -5437,6 +5437,33 @@ sm/ /ms EOF ;; + "BlackArch"*) + set_colors 1 1 0 1 + read -rd '' ascii_data <<'EOF' +${c3} 00 + 11 + ====${c1} + .${c3}//${c1} + `o${c3}//${c1}: + `+o${c3}//${c1}o: + `+oo${c3}//${c1}oo: + -+oo${c3}//${c1}oo+: + `/:-:+${c3}//${c1}ooo+: + `/+++++${c3}//${c1}+++++: + `/++++++${c3}//${c1}++++++: + `/+++o${c2}ooo${c3}//${c2}ooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso${c3}//${c2}osssssso${c1}+` +${c2} .oossssso-`${c3}//${c1}`/ossssss+` + -osssssso. ${c3}//${c1} :ssssssso. + :osssssss/ ${c3}//${c1} osssso+++. + /ossssssss/ ${c3}//${c1} +ssssooo/- + `/ossssso+/:- ${c3}//${c1} -:/+osssso+- + `+sso+:-` ${c3}//${c1} `.-/+oso: + `++:. ${c3}//${c1} `-/+/ + .` ${c3}/${c1} `/ +EOF + ;; + "BLAG"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' From 15153f78d7d7efb7402c431aaa48c9ddf519a1d0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 17 Sep 2019 14:30:24 +0300 Subject: [PATCH 180/550] docs: update --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 835c1789..6867a5b2 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2018 Dylan Araps +Copyright (c) 2016-2019 Dylan Araps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From da08c03310d66287c83e8ba9444c9c3a42718b8b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Sep 2019 09:27:33 +0200 Subject: [PATCH 181/550] OS: Add Neptune --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index a2bbc2a0..e3a6b8ff 100755 --- a/neofetch +++ b/neofetch @@ -7208,6 +7208,29 @@ sd yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy ds EOF ;; + "Neptune"*) + set_colors 7 + read -rd '' ascii_data <<'EOF' +${c1} ./+sydddddddys/-. + .+ymNNdyooo/:+oooymNNmy/` + `/hNNh/.` `-+dNNy:` + /mMd/. .++.:oy/ .+mMd- + `sMN/ oMMmdy+. `oNNo + `hMd. `/ymy/. :NMo + oMN- `/dMd: /MM- +`mMy -dMN+` mMs +.MMo -NMM/ yMs + dMh mMMMo:` `NMo + /MM/ /ymMMMm- sMN. + +Mm: .hMMd` oMN/ + +mNs. `yNd/` -dMm- + .yMNs: `/.` `/yNNo` + .odNNy+-` .:ohNNd/. + -+ymNNmdyyyyyyydmNNmy+. + `-//sssssss//. +EOF + ;; + "NetBSD"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' From f481d9f59cfa4cab4cbd081e6c64e492d72becce Mon Sep 17 00:00:00 2001 From: Steve Forget Date: Sun, 22 Sep 2019 16:58:51 +0200 Subject: [PATCH 182/550] Added font detection for ConEmu --- neofetch | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/neofetch b/neofetch index a2bbc2a0..66968b21 100755 --- a/neofetch +++ b/neofetch @@ -3202,6 +3202,49 @@ END # Default fallback font hardcoded in terminal-preferences.c [[ -z "$term_font" ]] && term_font="Monospace 12" ;; + + "conemu-"*) + local ce_arg_list + local ce_arg_idx + local ce_conf + + # Could have used `eval set -- "$ConEmuArgs"` instead for arg parsing but eval is evil... + readarray -t ce_arg_list < <(xargs -n1 printf "%s\n" <<< "${ConEmuArgs-}") + + for ce_arg_idx in "${!ce_arg_list[@]}"; do + # Search for "-LoadCfgFile" arg + [[ "${ce_arg_list[$ce_arg_idx]}" != -LoadCfgFile ]] && continue + + # Conf path is the next arg + ((++ce_arg_idx)) + ce_conf="${ce_arg_list[$ce_arg_idx]}" + break + done + + # https://conemu.github.io/en/ConEmuXml.html#search-sequence + local ce_seq=( + "$ce_conf" + "$ConEmuDir\ConEmu.xml" + "$ConEmuDir\.ConEmu.xml" + "$ConEmuBaseDir\ConEmu.xml" + "$ConEmuBaseDir\.ConEmu.xml" + "$APPDATA\ConEmu.xml" + "$APPDATA\.ConEmu.xml" + ) + + for ce_conf in "${ce_seq[@]}"; do + # Search for first conf file available + [[ ! -f "$ce_conf" ]] && continue + + # Very basic XML parsing + term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) {print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" + break + done + + # Null-terminated contents in /proc/registry files triggers a Bash warning. Use read instead + [[ -z "$term_font" ]] && \ + read -r term_font < /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName + ;; esac } From aaf4a5497e823b3a5d6af5c6479f6ff91c27837d Mon Sep 17 00:00:00 2001 From: Steve Forget Date: Sun, 22 Sep 2019 19:33:28 +0200 Subject: [PATCH 183/550] Fixed line length compliance --- neofetch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 66968b21..cc193efb 100755 --- a/neofetch +++ b/neofetch @@ -3208,7 +3208,7 @@ END local ce_arg_idx local ce_conf - # Could have used `eval set -- "$ConEmuArgs"` instead for arg parsing but eval is evil... + # Could have used `eval set -- "$ConEmuArgs"` instead for arg parsing readarray -t ce_arg_list < <(xargs -n1 printf "%s\n" <<< "${ConEmuArgs-}") for ce_arg_idx in "${!ce_arg_list[@]}"; do @@ -3237,13 +3237,14 @@ END [[ ! -f "$ce_conf" ]] && continue # Very basic XML parsing - term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) {print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" + term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) \ + {print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" break done - # Null-terminated contents in /proc/registry files triggers a Bash warning. Use read instead - [[ -z "$term_font" ]] && \ - read -r term_font < /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName + # Null-terminated contents in /proc/registry files triggers a Bash warning + [[ -z "$term_font" ]] && read -r term_font < \ + /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName ;; esac } From 9b9ea1b9773fc0bf89f4b779ea6a0b21de581d95 Mon Sep 17 00:00:00 2001 From: Steve Forget Date: Sun, 22 Sep 2019 21:12:30 +0200 Subject: [PATCH 184/550] Refactoring according to reviews --- neofetch | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/neofetch b/neofetch index cc193efb..41665860 100755 --- a/neofetch +++ b/neofetch @@ -3203,7 +3203,7 @@ END [[ -z "$term_font" ]] && term_font="Monospace 12" ;; - "conemu-"*) + conemu-*) local ce_arg_list local ce_arg_idx local ce_conf @@ -3213,37 +3213,28 @@ END for ce_arg_idx in "${!ce_arg_list[@]}"; do # Search for "-LoadCfgFile" arg - [[ "${ce_arg_list[$ce_arg_idx]}" != -LoadCfgFile ]] && continue - - # Conf path is the next arg - ((++ce_arg_idx)) - ce_conf="${ce_arg_list[$ce_arg_idx]}" - break + [[ "${ce_arg_list[$ce_arg_idx]}" == -LoadCfgFile ]] && { + # Conf path is the next arg + ce_conf=${ce_arg_list[++ce_arg_idx]} + break + } done # https://conemu.github.io/en/ConEmuXml.html#search-sequence - local ce_seq=( - "$ce_conf" - "$ConEmuDir\ConEmu.xml" - "$ConEmuDir\.ConEmu.xml" - "$ConEmuBaseDir\ConEmu.xml" - "$ConEmuBaseDir\.ConEmu.xml" - "$APPDATA\ConEmu.xml" - "$APPDATA\.ConEmu.xml" - ) - - for ce_conf in "${ce_seq[@]}"; do + for ce_conf in "$ce_conf" "${ConEmuDir-}\ConEmu.xml" "${ConEmuDir-}\.ConEmu.xml" \ + "${ConEmuBaseDir-}\ConEmu.xml" "${ConEmuBaseDir-}\.ConEmu.xml" \ + "$APPDATA\ConEmu.xml" "$APPDATA\.ConEmu.xml"; do # Search for first conf file available - [[ ! -f "$ce_conf" ]] && continue - - # Very basic XML parsing - term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) \ - {print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" - break + [[ -f "$ce_conf" ]] && { + # Very basic XML parsing + term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) { + print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" + break + } done # Null-terminated contents in /proc/registry files triggers a Bash warning - [[ -z "$term_font" ]] && read -r term_font < \ + [[ "$term_font" ]] || read -r term_font < \ /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName ;; esac From a0a7f3ec547052791d6a5e693ee498049f546af2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 26 Sep 2019 09:50:02 +0300 Subject: [PATCH 185/550] uptime: [haiku] Fix uptime --- neofetch | 107 ++++++++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 57 deletions(-) diff --git a/neofetch b/neofetch index 107301be..ef4c3da8 100755 --- a/neofetch +++ b/neofetch @@ -1213,73 +1213,66 @@ get_kernel() { } get_uptime() { - # Since Haiku's uptime cannot be fetched in seconds, a case outside - # the usual case is needed. + # Get uptime in seconds. case "$os" in - "Haiku") - uptime="$(uptime -u)" - uptime="${uptime/up }" + "Linux" | "Windows" | "MINIX") + if [[ -r /proc/uptime ]]; then + seconds="$(< /proc/uptime)" + seconds="${seconds/.*}" + else + boot="$(date -d"$(uptime -s)" +%s)" + now="$(date +%s)" + seconds="$((now - boot))" + fi ;; - *) - # Get uptime in seconds. - case "$os" in - "Linux" | "Windows" | "MINIX") - if [[ -r /proc/uptime ]]; then - seconds="$(< /proc/uptime)" - seconds="${seconds/.*}" - else - boot="$(date -d"$(uptime -s)" +%s)" - now="$(date +%s)" - seconds="$((now - boot))" - fi - ;; + "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") + boot="$(sysctl -n kern.boottime)" + boot="${boot/\{ sec = }" + boot="${boot/,*}" - "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") - boot="$(sysctl -n kern.boottime)" - boot="${boot/\{ sec = }" - boot="${boot/,*}" + # Get current date in seconds. + now="$(date +%s)" + seconds="$((now - boot))" + ;; - # Get current date in seconds. - now="$(date +%s)" - seconds="$((now - boot))" - ;; + "Solaris") + seconds="$(kstat -p unix:0:system_misc:snaptime | awk '{print $2}')" + seconds="${seconds/.*}" + ;; - "Solaris") - seconds="$(kstat -p unix:0:system_misc:snaptime | awk '{print $2}')" - seconds="${seconds/.*}" - ;; + "AIX" | "IRIX") + t="$(LC_ALL=POSIX ps -o etime= -p 1)" + d="0" h="0" + case "$t" in *"-"*) d="${t%%-*}"; t="${t#*-}";; esac + case "$t" in *":"*":"*) h="${t%%:*}"; t="${t#*:}";; esac + h="${h#0}" t="${t#0}" + seconds="$((d*86400 + h*3600 + ${t%%:*}*60 + ${t#*:}))" + ;; - "AIX" | "IRIX") - t="$(LC_ALL=POSIX ps -o etime= -p 1)" - d="0" h="0" - case "$t" in *"-"*) d="${t%%-*}"; t="${t#*-}";; esac - case "$t" in *":"*":"*) h="${t%%:*}"; t="${t#*:}";; esac - h="${h#0}" t="${t#0}" - seconds="$((d*86400 + h*3600 + ${t%%:*}*60 + ${t#*:}))" - ;; - esac - - days="$((seconds / 60 / 60 / 24)) days" - hours="$((seconds / 60 / 60 % 24)) hours" - mins="$((seconds / 60 % 60)) minutes" - - # Remove plural if < 2. - ((${days/ *} == 1)) && days="${days/s}" - ((${hours/ *} == 1)) && hours="${hours/s}" - ((${mins/ *} == 1)) && mins="${mins/s}" - - # Hide empty fields. - ((${days/ *} == 0)) && unset days - ((${hours/ *} == 0)) && unset hours - ((${mins/ *} == 0)) && unset mins - - uptime="${days:+$days, }${hours:+$hours, }${mins}" - uptime="${uptime%', '}" - uptime="${uptime:-${seconds} seconds}" + "Haiku") + seconds=$(($(system_time) / 1000000)) ;; esac + days="$((seconds / 60 / 60 / 24)) days" + hours="$((seconds / 60 / 60 % 24)) hours" + mins="$((seconds / 60 % 60)) minutes" + + # Remove plural if < 2. + ((${days/ *} == 1)) && days="${days/s}" + ((${hours/ *} == 1)) && hours="${hours/s}" + ((${mins/ *} == 1)) && mins="${mins/s}" + + # Hide empty fields. + ((${days/ *} == 0)) && unset days + ((${hours/ *} == 0)) && unset hours + ((${mins/ *} == 0)) && unset mins + + uptime="${days:+$days, }${hours:+$hours, }${mins}" + uptime="${uptime%', '}" + uptime="${uptime:-${seconds} seconds}" + # Make the output of uptime smaller. case "$uptime_shorthand" in "on") From eee523f06a18fcae6c7eb559cdf208f0c4ff2344 Mon Sep 17 00:00:00 2001 From: Bruno d'Arcangeli Date: Thu, 26 Sep 2019 10:37:36 +0200 Subject: [PATCH 186/550] [PATCH] Obarun added Signed-off-by: Bruno d'Arcangeli --- neofetch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/neofetch b/neofetch index 971b8305..a1da4000 100755 --- a/neofetch +++ b/neofetch @@ -8843,6 +8843,31 @@ ${c1} -1vvnvv. `~+++` ++|+++ EOF ;; + "Obarun"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ,;::::; + ;cooolc;, + ,coool; + ,loool, + loooo; + :ooool + cooooc ,:ccc; + looooc :oooooool + cooooo ;oooooooooo, + :ooooo; :ooooooooooo + oooooo oooooooooooc + :oooooo :ooooooooool + loooooo ;oooooooool + looooooc .coooooooc + cooooooo: ,;co; + ,ooooooool; ,:loc + cooooooooooooloooooc + ;ooooooooooooool; + ;looooooolc; +EOF + ;; + *"[Windows 10]"*|*"on Windows 10"*|"Windows 8"*|\ "Windows 10"* |"windows10"|"windows8") set_colors 6 7 From 0ab8a2303f5f3d63d7c69e28a651f63a5a9c6141 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Sep 2019 11:40:39 +0300 Subject: [PATCH 187/550] haiku: fix various issues --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 971b8305..ef745c35 100755 --- a/neofetch +++ b/neofetch @@ -1021,7 +1021,7 @@ get_distro() { ;; "Haiku") - read -r name version _ <<< "$(uname -sv)" + read -r name version _ <<< "$(uname -s)" distro="$name $version" ;; @@ -2653,7 +2653,7 @@ get_resolution() { ;; "Haiku") - resolution="$(screenmode | awk -F ' |, ' '{printf $2 "x" $3 " @ " $6 $7}')" + resolution="$(screenmode | awk -F ' |, ' 'END{printf $2 "x" $3 " @ " $6 $7}')" [[ "$refresh_rate" == "off" ]] && resolution="${resolution/ @*}" ;; From efb2042fa66569f7998af0e0010b1471b0a75fac Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Sep 2019 11:48:28 +0300 Subject: [PATCH 188/550] distro: simpler haiku --- neofetch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 9319210c..0895866b 100755 --- a/neofetch +++ b/neofetch @@ -1021,8 +1021,7 @@ get_distro() { ;; "Haiku") - read -r name version _ <<< "$(uname -s)" - distro="$name $version" + distro=Haiku ;; "AIX") From 205a04477055e0b13a480b84e160bab324c4c56a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 Oct 2019 01:10:01 +0300 Subject: [PATCH 189/550] os: added support for Drauger OS --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 0895866b..57c610e7 100755 --- a/neofetch +++ b/neofetch @@ -6089,6 +6089,28 @@ ${c1} | | EOF ;; + "Drauger"*) + set_colors 1 7 + read -rd '' ascii_data <<'EOF' +${c1} -``- + `:+``+:` + `/++``++/. + .++/. ./++. + :++/` `/++: + `/++: :++/` + ./+/- -/+/. + -++/. ./++- + :++:` `:++: + `/++- -++/` + ./++. ./+/. + -++/` `/++- + :++:` `:++: + `/++- -++/` +.:-.`..............................`.-:. +`.-/++++++++++++++++++++++++++++++++/-.` +EOF + ;; + "Elementary"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 2302825dbca8118bd710ef2c2eb21af6d4afbc4a Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 3 Oct 2019 14:43:57 +0200 Subject: [PATCH 190/550] song: add comment about cmus mpris support --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 57e59577..aaaf43ce 100755 --- a/neofetch +++ b/neofetch @@ -2521,6 +2521,7 @@ get_song() { "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "cmus"*) + # NOTE: cmus >= 2.8.0 supports mpris2 song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; /tag artist/ { $1=$2=""; sub(" ", ""); a=$0 From 1faac662f9028d28a0a06509316d65b95381871e Mon Sep 17 00:00:00 2001 From: zyg812 Date: Sat, 5 Oct 2019 23:16:40 +0200 Subject: [PATCH 191/550] ASCII: Added and updated few small logos --- neofetch | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 274 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index aaaf43ce..6434fc3a 100755 --- a/neofetch +++ b/neofetch @@ -5013,6 +5013,18 @@ EOF EOF ;; + "android_small"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} ;, ,; + ';,.-----.,;' + ,' ', + / O O \\ +| | +'-----------------' +EOF + ;; + "Android"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -5177,13 +5189,13 @@ EOF "arch_small") set_colors 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\\ +${c1} /\\ + / \\ + /\\ \\ +${c2} / \\ + / ,, \\ + / | | -\\ +/_-'' ''-_\\ EOF ;; @@ -5337,6 +5349,19 @@ ${c2} .oossssso-````/ossssss+` EOF ;; + "artix_small"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} /\\ + / \\ + /`'.,\\ + / ', + / ,`\\ + / ,.'`. \\ +/.,'` `'.\\ +EOF + ;; + "Artix"*) set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' @@ -5627,6 +5652,19 @@ ${c1} ...... EOF ;; + "centos_small"*) + set_colors 3 2 4 5 7 + read -rd '' ascii_data <<'EOF' +${c2} ____${c1}^${c4}____ +${c2} |\\ ${c1}|${c4} /| +${c2} | \\ ${c1}|${c4} / | +${c4}<---- ${c3}----> +${c3} | / ${c2}|${c1} \\ | +${c3} |/__${c2}|${c1}__\\| +${c2} v +EOF + ;; + "CentOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' @@ -6062,10 +6100,13 @@ EOF "dragonfly_small"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | +${c2} ,${c1}_${c2}, +('-_${c1}|${c2}_-') + >--${c1}|${c2}--< +(_-'${c1}|${c2}'-_) + ${c1}| + | + | EOF ;; @@ -6112,6 +6153,18 @@ ${c1} -``- EOF ;; + "elementary_small"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} _______ + / ____ \\ +/ | / /\\ +|__\\ / / | +\\ /__/ / + \\_______/ +EOF + ;; + "Elementary"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' @@ -6251,13 +6304,12 @@ EOF "freebsd_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} /\\ _____ /\\ - \\_) (_/ - / \ +${c1}/\\,-'''''-,/\\ +\\_) (_/ | | | | - \ / - --_____-- + ; ; + '-_____-' EOF ;; @@ -6516,6 +6568,19 @@ eee ${c2}// \\ooo/ \\\ ${c1}eee EOF ;; + "guixsd_small"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1}|.__ __.| +|__ \\ / __| + \\ \\ / / + \\ \\ / / + \\ \\ / / + \\ \\/ / + \\__/ +EOF + ;; + "GuixSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' @@ -6532,6 +6597,20 @@ ${c1} .. `. EOF ;; + "haiku_small"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c1} ,^, + / \\ +*--_ ; ; _--* +\\ '" "' / + '. .' +.-'" "'-. + '-.__. .__.-' + |_| +EOF + ;; + "Haiku"*) set_colors 2 8 read -rd '' ascii_data <<'EOF' @@ -6578,6 +6657,19 @@ ${c2} ` EOF ;; + "hyperbola_small"*) + set_colors 8 + read -rd '' ascii_data <<'EOF' +${c1} |`__.`/ + \____/ + .--. + / \\ + / ___ \\ + / .` `.\\ +/.` `.\\ +EOF + ;; + "Hyperbola"*) set_colors 8 read -rd '' ascii_data <<'EOF' @@ -6847,8 +6939,21 @@ ${c3} #####${c2}#######${c3}##### EOF ;; + "linuxlite_small"*) + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} /\\ + / \\ + / ${c2}/ ${c1}/ +> ${c2}/ ${c1}/ +\\ ${c2}\\ ${c1}\\ + \\_${c2}\\${c1}_\\ +${c2} \\ +EOF + ;; + "Linux Lite"*) - set_colors 2 7 + set_colors 3 7 read -rd '' ascii_data <<'EOF' ${c1} ,xXc .l0MMMMMO @@ -6978,6 +7083,19 @@ ${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. EOF ;; + "mageia_small"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} * + * + ** +${c2} /\\__/\\ +/ \\ +\\ / + \\____/ +EOF + ;; + "Mageia"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' @@ -7050,6 +7168,19 @@ ${c1} -/+ooo+/-. ${c2}` EOF ;; + "manjaro_small"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}||||||||| |||| +||||||||| |||| +|||| |||| +|||| |||| |||| +|||| |||| |||| +|||| |||| |||| +|||| |||| |||| +EOF + ;; + "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -7152,6 +7283,19 @@ ${c2} -sdhyo+:-` -/syymm: EOF ;; + "linuxmint_small"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} ___________ +|_ \\ + | ${c2}| _____ ${c1}| + | ${c2}| | | | ${c1}| + | ${c2}| | | | ${c1}| + | ${c2}\\__${c2}___/ ${c1}| + \\_________/ +EOF + ;; + "Linux Mint"* | "LinuxMint"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -7174,6 +7318,19 @@ ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm EOF ;; + "mx_small"*) + set_colors 4 6 7 + read -rd '' ascii_data <<'EOF' +${c3} \\\\ / + \\\\/ + \\\\ + /\\/ \\\\ + / \\ /\\ + / \\/ \\ +/__________\\ +EOF + ;; + "MX"*) set_colors 4 6 7 read -rd '' ascii_data <<'EOF' @@ -7246,6 +7403,19 @@ ${c1} ./+sydddddddys/-. EOF ;; + "netbsd_small"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c2}\\\\${c1}\`-______,----__ +${c2} \\\\ ${c1}__,---\`_ +${c2} \\\\ ${c1}\`.____ +${c2} \\\\${c1}-______,----\`- +${c2} \\\\ + \\\\ + \\\\ +EOF + ;; + "NetBSD"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' @@ -7617,6 +7787,18 @@ ${c1} :+sMs. EOF ;; + "parabola_small"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} __ __ __ _ +.`_//_//_/ / `. + / .` + / .` + /.` + /` +EOF + ;; + "Parabola"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' @@ -7805,6 +7987,20 @@ ${c1} PPPPPPPPPPPPPP EOF ;; + "popos_small"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1}______ +\\ _ \\ __ + \\ \\ \\ \\ / / + \\ \\_\\ \\ / / + \\ ___\\ /_/ + \\ \\ _ + __\\_\\__(_)_ + (___________)` +EOF + ;; + "Pop!_OS"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' @@ -7923,6 +8119,18 @@ ${c1} `-/osyyyysosyhhhhhyys+- EOF ;; + "pureos_small"*) + set_colors 2 7 7 + read -rd '' ascii_data <<'EOF' +${c1} _____________ +| _________ | +| | | | +| | | | +| |_________| | +|_____________| +EOF + ;; + "PureOS"*) set_colors 2 7 7 read -rd '' ascii_data <<'EOF' @@ -8372,6 +8580,19 @@ _Qh;.nm .QWc. {QL ]QQp;..vmQ/ EOF ;; + "slackware_small"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ________ + / ______| + | |______ + \\______ \\ + ______| | +| |________/ +|____________ +EOF + ;; + "Slackware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' @@ -8574,6 +8795,17 @@ ${c2},',. '; ,+##############' EOF ;; + "sunos_small" | "solaris_small") + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} . .; . + . :; :: ;: . + .;. .. .. .;. +.. .. .. .. + .;, ,;. +EOF + ;; + "SunOS" | "Solaris") set_colors 3 7 read -rd '' ascii_data <<'EOF' @@ -8607,6 +8839,19 @@ ${c2} ...... EOF ;; + "opensuse_small" | "suse_small"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} _______ +__| __ \\ + / .\\ \\ + \\__/ | + _______| + \\_______ +__________/ +EOF + ;; + "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -8825,6 +9070,18 @@ ${c1} ..-::::::-.` EOF ;; + "ubuntu_small") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} _ + ---(_) + _/ --- \\ +(_) | | + \\ --- _/ + ---(_) +EOF + ;; + "Ubuntu"* | "i3buntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From b404559cee077c23b2af6970a1726588d0b08b85 Mon Sep 17 00:00:00 2001 From: Michael Beasley Date: Wed, 9 Oct 2019 11:10:45 -0500 Subject: [PATCH 192/550] Add macOS Catalina --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 6434fc3a..c8874b37 100755 --- a/neofetch +++ b/neofetch @@ -982,6 +982,7 @@ get_distro() { "10.12"*) codename="macOS Sierra" ;; "10.13"*) codename="macOS High Sierra" ;; "10.14"*) codename="macOS Mojave" ;; + "10.15"*) codename="macOS Catalina" ;; *) codename="macOS" ;; esac distro="$codename $osx_version $osx_build" From 4d5bef9a4283af994e6546a982571e055f1d6475 Mon Sep 17 00:00:00 2001 From: Tommy Chak Date: Wed, 16 Oct 2019 02:28:31 +1100 Subject: [PATCH 193/550] Add ArcheStrike ASCII --- neofetch | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/neofetch b/neofetch index c8874b37..4abf7440 100755 --- a/neofetch +++ b/neofetch @@ -5274,6 +5274,42 @@ ${c1} 'c' EOF ;; + "ArchStrike"*) + set_colors 6 + read -rd '' ascii_data <<'EOF' +${c1} ,#b + ,# b + # b + # b + # b + # p + # p + "@ b + m `@ b + # #W, "# b + ,# @###@ Q + ,# # , + ] #M"^##tommy##^"7@@` / + { @#` ,# #mQ '" ,## + @ #b ,## #" "@ #p + # b ;# #b` ,###Q 7@ #p + # b @ #M^ ;# #p^# b + ,# b @ @#" "@ \ # ! N + ]# # j@ #" .7 \ b @ # + { # @ ##pG "%# # @ # + # # j | `*G ,# b @ #p + # pt@ | ,# Chak# bj##Q" #--p + ,# #p^# | ;# *^ | b @ @#m + ,# #p@ |.# I^ |#b # !##m + @ ##__" I^ \-;# #w + # #W"` .##I^ #O^ ""W# # + # #"^ sl" #$#y#mot#-#@@sw##*' `"%# #p + ,# #M" ." "%# b + ;##W^ `"@ N +*` `* +EOF + ;; + *"XFerience"*) set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' From c16af3a3fd194e25027c3f78bc37479d9f23d1de Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 15 Oct 2019 18:00:24 +0200 Subject: [PATCH 194/550] OS: Add support for Cucumber Linux --- neofetch | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index c8874b37..8695b4d7 100755 --- a/neofetch +++ b/neofetch @@ -879,8 +879,12 @@ get_distro() { elif [[ -f "/etc/os-release" || \ -f "/usr/lib/os-release" || \ - -f "/etc/openwrt_release" ]]; then - files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release") + -f "/etc/openwrt_release" || \ + -f "/etc/lsb-release" ]]; then + files=("/etc/os-release" + "/usr/lib/os-release" + "/etc/openwrt_release" + "/etc/lsb-release") # Source the os-release file for file in "${files[@]}"; do @@ -5953,6 +5957,32 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; + *"Cucumber"*) + set_colors 2 3 + read -rd '' ascii_data <<'EOF' +${c1} `.-://++++++//:-.` + `:/+//${c2}::--------${c1}:://+/:` + -++/:${c2}----..........----${c1}:/++- + .++:${c2}---...........-......---${c1}:++. + /+:${c2}---....-::/:/--//:::-....---${c1}:+/ + `++:${c2}--.....:---::/--/::---:.....--${c1}:++` + /+:${c2}--.....--.--::::-/::--.--.....--${c1}:+/ +-o:${c2}--.......-:::://--/:::::-.......--${c1}:o- +/+:${c2}--...-:-::---:::..:::---:--:-...--${c1}:+/ +o/:${c2}-...-:.:.-/:::......::/:.--.:-...-${c1}:/o +o/${c2}--...::-:/::/:-......-::::::-/-...-${c1}:/o +/+:${c2}--..-/:/:::--:::..:::--::////-..--${c1}:+/ +-o:${c2}--...----::/:::/--/:::::-----...--${c1}:o- + /+:${c2}--....://:::.:/--/:.::://:....--${c1}:+/ + `++:${c2}--...-:::.--.:..:.--.:/:-...--${c1}:++` + /+:${c2}---....----:-..-:----....---${c1}:+/ + .++:${c2}---..................---${c1}:++. + -/+/:${c2}----..........----${c1}:/+/- + `:/+//${c2}::--------:::${c1}/+/:` + `.-://++++++//:-.` +EOF + ;; + "debian_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From c77859685ec091bf3cccce873ce533f07a271c36 Mon Sep 17 00:00:00 2001 From: Tommy Chak Date: Wed, 16 Oct 2019 05:33:22 +1100 Subject: [PATCH 195/550] Resize ArchStrike ASCII, no more signature ): --- neofetch | 53 ++++++++++++++++++++--------------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/neofetch b/neofetch index 4abf7440..72937311 100755 --- a/neofetch +++ b/neofetch @@ -5274,39 +5274,26 @@ ${c1} 'c' EOF ;; - "ArchStrike"*) - set_colors 6 - read -rd '' ascii_data <<'EOF' -${c1} ,#b - ,# b - # b - # b - # b - # p - # p - "@ b - m `@ b - # #W, "# b - ,# @###@ Q - ,# # , - ] #M"^##tommy##^"7@@` / - { @#` ,# #mQ '" ,## - @ #b ,## #" "@ #p - # b ;# #b` ,###Q 7@ #p - # b @ #M^ ;# #p^# b - ,# b @ @#" "@ \ # ! N - ]# # j@ #" .7 \ b @ # - { # @ ##pG "%# # @ # - # # j | `*G ,# b @ #p - # pt@ | ,# Chak# bj##Q" #--p - ,# #p^# | ;# *^ | b @ @#m - ,# #p@ |.# I^ |#b # !##m - @ ##__" I^ \-;# #w - # #W"` .##I^ #O^ ""W# # - # #"^ sl" #$#y#mot#-#@@sw##*' `"%# #p - ,# #M" ." "%# b - ;##W^ `"@ N -*` `* + "ArchStrike"*) + set_colors 0 6 + read -rd '' ascii_data <<'EOF' +${c1}                   *    +                  **. +                 **** +                ****** +                ******* +              ** ******* +             **** ******* +            ${c1}****${c2}_____${c1}***${c2}/${c1}* +           ***${c2}/${c1}*******${c2}//${c1}*** +          **${c2}/${c1}********${c2}///${c1}*${c2}/${c1}** +         **${c2}/${c1}*******${c2}////${c1}***${c2}/${c1}** +        **${c2}/${c1}****${c2}//////.,${c1}****${c2}/${c1}** +       ***${c2}/${c1}*****${c2}/////////${c1}**${c2}/${c1}*** +      ****${c2}/${c1}****    ${c2}/////${c1}***${c2}/${c1}**** +     ******${c2}/${c1}*** ${c2}////   ${c1}**${c2}/${c1}****** +    ********${c2}/${c1}* ${c2}///      ${c1}*${c2}/${c1}******** +  ,******     ${c2}// ______ /    ${c1}******, EOF ;; From 3801345b72a6b41129c31e86a08023bc195ff8bc Mon Sep 17 00:00:00 2001 From: Tommy Chak Date: Wed, 16 Oct 2019 05:38:57 +1100 Subject: [PATCH 196/550] Change of "A" symbol colour. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 72937311..86c703a1 100755 --- a/neofetch +++ b/neofetch @@ -5275,7 +5275,7 @@ EOF ;; "ArchStrike"*) - set_colors 0 6 + set_colors 8 6 read -rd '' ascii_data <<'EOF' ${c1}                   *                      **. From a9dd750734e91e3098a63869615ee0ae2b6a4507 Mon Sep 17 00:00:00 2001 From: Alex Baranowski Date: Tue, 15 Oct 2019 21:35:04 +0200 Subject: [PATCH 197/550] Add support for EuroLinux --- neofetch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/neofetch b/neofetch index 2406d87a..b85e2d5b 100755 --- a/neofetch +++ b/neofetch @@ -6268,6 +6268,37 @@ dMm `/++/-``/yNNh+/sdNMNddMm- mMd EOF ;; + "EuroLinux"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} + DZZZZZZZZZZZZZ + ZZZZZZZZZZZZZZZZZZZ + ZZZZZZZZZZZZZZZZZZZZ + OZZZZZZZZZZZZZZZZZZZZ + ${c2}E${c1} ZZZ 8ZZZZZZZZZZZZ + Z${c2}U${c1}Z ZZZZZZZZZZ + ZZ${c2}R${c1}ZZN ZZZZZZZZZ + ZZ${c2}O${c1}ZZZZ ZZZZZZZZ +ZZE${c2}L${c1}ZZZZ OZZZZZZZ +ZZZ${c2}I${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZ${c2}N${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZ${c2}U${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZ${c2}X${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZZZZZZ + ZZZZZZZZ + OZZZZZZZZO + ZZZZZZZZZZZ + OZZZZZZZZZZZZZZZN + ZZZZZZZZZZZZZZZZ + DZZZZZZZZZZZZZZZ + ZZZZZZZZZZZZZ + NZZZZZZZZ + +EOF + ;; + "Exherbo"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 40a85fa3c9b306e38a5e2aeaebdd9157ab3501d2 Mon Sep 17 00:00:00 2001 From: Alex Baranowski Date: Wed, 16 Oct 2019 12:16:14 +0200 Subject: [PATCH 198/550] Make EuroLinux logo smaller --- neofetch | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/neofetch b/neofetch index b85e2d5b..394bf31b 100755 --- a/neofetch +++ b/neofetch @@ -6271,31 +6271,26 @@ EOF "EuroLinux"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' -${c1} - DZZZZZZZZZZZZZ - ZZZZZZZZZZZZZZZZZZZ - ZZZZZZZZZZZZZZZZZZZZ - OZZZZZZZZZZZZZZZZZZZZ - ${c2}E${c1} ZZZ 8ZZZZZZZZZZZZ - Z${c2}U${c1}Z ZZZZZZZZZZ - ZZ${c2}R${c1}ZZN ZZZZZZZZZ - ZZ${c2}O${c1}ZZZZ ZZZZZZZZ -ZZE${c2}L${c1}ZZZZ OZZZZZZZ -ZZZ${c2}I${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -ZZZ${c2}N${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -ZZZ${c2}U${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -ZZZ${c2}X${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -ZZZZZZZZ - ZZZZZZZZ - OZZZZZZZZO - ZZZZZZZZZZZ - OZZZZZZZZZZZZZZZN - ZZZZZZZZZZZZZZZZ - DZZZZZZZZZZZZZZZ - ZZZZZZZZZZZZZ - NZZZZZZZZ +${c1} + __ + -wwwWWWWWWWWWwww- + -WWWWWWWWWWWWWWWWWWw- + \WWWWWWWWWWWWWWWWWWW- + _Ww `WWWWWWWWWWWWWWWWWWWw + -W${c2}E${c1}Www -WWWWWWWWW- +_WW${c2}U${c1}WWWW- _WWWWWWWW +_WW${c2}R${c1}WWWWWWWWWWWWWWWWWWWWWWWWWWWWWW- +wWW${c2}O${c1}WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW +WWW${c2}L${c1}WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWw +WWW${c2}I${c1}WWWWWWWWWWWWWWWWWWWWWWWWWWWWww- +wWW${c2}N${c1}WWWWw + WW${c2}U${c1}WWWWWWw + wW${c2}X${c1}WWWWWWWWww + wWWWWWWWWWWWWWWWw + wWWWWWWWWWWWWWWWw + WWWWWWWWWWWWWw + wWWWWWWWw EOF ;; From 8fc1dfb996fe0383cd2c98c3e94f76e19e3cbd43 Mon Sep 17 00:00:00 2001 From: Alex Baranowski Date: Wed, 16 Oct 2019 12:32:04 +0200 Subject: [PATCH 199/550] Fix empty line --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 394bf31b..366650fe 100755 --- a/neofetch +++ b/neofetch @@ -6271,9 +6271,7 @@ EOF "EuroLinux"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' - -${c1} - __ +${c1} __ -wwwWWWWWWWWWwww- -WWWWWWWWWWWWWWWWWWw- \WWWWWWWWWWWWWWWWWWW- From 6758bfb7656f7e16a7b7fd4b88b16040c05c4812 Mon Sep 17 00:00:00 2001 From: Zhang Boyu <34395339+Zhboyu-BUAA@users.noreply.github.com> Date: Sat, 19 Oct 2019 16:11:59 +0800 Subject: [PATCH 200/550] Update neofetch --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 4274be07..1bbe09cd 100755 --- a/neofetch +++ b/neofetch @@ -1210,6 +1210,12 @@ get_kernel() { return } + # In Windows 'uname -r' under MSYS returns a "virtual" kernel version, so use wmic + [[ "$os" == Windows ]] && { + kernel_version=$(wmic os get Version) + kernel_version="${kernel_version/Version}" + } + case "$kernel_shorthand" in "on") kernel="$kernel_version" ;; "off") kernel="$kernel_name $kernel_version" ;; From 2c3faf9469de01f7e74d397e05b68f8cd9e9d4c0 Mon Sep 17 00:00:00 2001 From: Zhang Boyu <34395339+Zhboyu-BUAA@users.noreply.github.com> Date: Sat, 19 Oct 2019 16:30:40 +0800 Subject: [PATCH 201/550] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 1bbe09cd..eecc1469 100755 --- a/neofetch +++ b/neofetch @@ -1210,7 +1210,7 @@ get_kernel() { return } - # In Windows 'uname -r' under MSYS returns a "virtual" kernel version, so use wmic + # In Windows 'uname -r' under MSYS returns version of MSYS, so use wmic [[ "$os" == Windows ]] && { kernel_version=$(wmic os get Version) kernel_version="${kernel_version/Version}" From 480b62edec8ed6cf189994d4e5ac82403bd7021a Mon Sep 17 00:00:00 2001 From: Zhang Boyu <34395339+Zhboyu-BUAA@users.noreply.github.com> Date: Sun, 20 Oct 2019 00:19:10 +0800 Subject: [PATCH 202/550] fix per suggestion --- neofetch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index eecc1469..c26dc98f 100755 --- a/neofetch +++ b/neofetch @@ -1210,10 +1210,11 @@ get_kernel() { return } - # In Windows 'uname -r' under MSYS returns version of MSYS, so use wmic + # In Windows 'uname' may return the info of GNUenv thus use wmic for OS kernel [[ "$os" == Windows ]] && { - kernel_version=$(wmic os get Version) - kernel_version="${kernel_version/Version}" + kernel=$(wmic os get Version) + kernel="${kernel/Version}" + return } case "$kernel_shorthand" in From cdce44255a903301d7c2d69239713805621e3814 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 19 Oct 2019 20:29:44 +0200 Subject: [PATCH 203/550] song: add muine player --- neofetch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/neofetch b/neofetch index 4274be07..efb6b464 100755 --- a/neofetch +++ b/neofetch @@ -457,6 +457,7 @@ disk_subtitle="mount" # mocp # mopidy # mpd +# muine # netease-cloud-music # pogo # pragha @@ -2465,6 +2466,7 @@ get_song() { "mocp" "mopidy" "mpd" + "muine" "netease-cloud-music" "plasma-browser-integration" "pogo" @@ -2579,6 +2581,13 @@ get_song() { awk -F':|,' '{if ($6 && $8 && $4) printf $6 "\n" $8 "\n" $4}')" ;; + "muine"*) + song="$(dbus-send --print-reply --dest=org.gnome.Muine /org/gnome/Muine/Player \ + org.gnome.Muine.Player.GetCurrentSong | + awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} + END {print a "\n" b "\n" t}')" + ;; + "quodlibet"*) song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ From 25896145c26e69e20f0932e5786858239053606f Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 20 Oct 2019 11:43:50 +0200 Subject: [PATCH 204/550] song: add elementary music player --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index efb6b464..35ce677f 100755 --- a/neofetch +++ b/neofetch @@ -451,6 +451,7 @@ disk_subtitle="mount" # gmusicbrowser # gogglesmm # guayadeque +# io.elementary.music # iTunes # juk # lollypop @@ -2460,6 +2461,7 @@ get_song() { "gmusicbrowser" "gogglesmm" "guayadeque" + "io.elementary.music" "iTunes" "juk" "lollypop" @@ -2534,6 +2536,7 @@ get_song() { "xnoise"*) get_song_dbus "xnoise" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; + "io.elementary.music"*) get_song_dbus "Music" ;; "cmus"*) # NOTE: cmus >= 2.8.0 supports mpris2 From 78f788704e04478f66b0ca00bca0502e5459470d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 20 Oct 2019 17:57:32 +0200 Subject: [PATCH 205/550] Add kitty to the list of available backends --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 35ce677f..16ce10c4 100755 --- a/neofetch +++ b/neofetch @@ -4551,7 +4551,7 @@ BARS: IMAGE BACKEND: --backend backend Which image backend to use. Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', - 'off', 'sixel', 'tycat', 'w3m' + 'off', 'sixel', 'tycat', 'w3m', 'kitty' --source 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] From a9eeae8969cbdebefee15d1ec5d86511dc63b039 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 20 Oct 2019 22:04:25 +0200 Subject: [PATCH 206/550] Regenerate man page --- neofetch.1 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 525291a9..3db17b78 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. -.TH NEOFETCH "1" "August 2019" "Neofetch 6.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. +.TH NEOFETCH "1" "October 2019" "Neofetch 6.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -40,7 +40,7 @@ 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\-\-package_managers\fR on/tiny/off +\fB\-\-package_managers\fR on/off Hide/Show Package Manager names . (on, tiny, off) .TP \fB\-\-os_arch\fR on/off @@ -79,7 +79,7 @@ NOTE: This only works on Linux and BSD. 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/tiny/off +\fB\-\-distro_shorthand\fR on/off Shorten the output of distro (on, tiny, off) .IP NOTE: This option won't work in Windows (Cygwin) @@ -89,7 +89,7 @@ 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/tiny/off +\fB\-\-uptime_shorthand\fR on/off Shorten the output of uptime (on, tiny, off) .TP \fB\-\-refresh_rate\fR on/off @@ -218,7 +218,7 @@ Possible values: bar, infobar, barinfo, off \fB\-\-backend\fR backend Which image backend to use. Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', -\&'off', 'sixel', 'tycat', 'w3m' +\&'off', 'sixel', 'tycat', 'w3m', 'kitty' .TP \fB\-\-source\fR source Which image or ascii file to use. @@ -283,7 +283,7 @@ NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu\-GNOME', \&'Ubuntu\-Studio' or 'Ubuntu\-Budgie' to use the flavors. .TP NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, -OpenBSD, and Void have a smaller logo variant. +OpenBSD, postmarketOS, and Void have a smaller logo variant. .IP NOTE: Use '{distro name}_small' to use the small variants. .TP @@ -339,6 +339,9 @@ Specify a path to a custom config file \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 From 5ada1e6c4e43ca122c37fa427bd24a92c28aed09 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 26 Oct 2019 21:54:37 +0200 Subject: [PATCH 207/550] ascii: fix Guix logo --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 16ce10c4..3bce1a6c 100755 --- a/neofetch +++ b/neofetch @@ -6679,7 +6679,7 @@ ${c1}|.__ __.| EOF ;; - "GuixSD"*) + "Guix"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' ${c1} .. `. From c0d5508f0374fcc7b83f539c0981042a7649e106 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 26 Oct 2019 21:56:45 +0200 Subject: [PATCH 208/550] ascii: rename small Guix logo too --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3bce1a6c..292093bb 100755 --- a/neofetch +++ b/neofetch @@ -6666,7 +6666,7 @@ eee ${c2}// \\ooo/ \\\ ${c1}eee EOF ;; - "guixsd_small"*) + "guix_small"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' ${c1}|.__ __.| From 3be3b93634165918d524be6846346a83f471ce98 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 27 Oct 2019 09:30:28 +0100 Subject: [PATCH 209/550] style: fix Plasma themes --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 292093bb..952ab7d6 100755 --- a/neofetch +++ b/neofetch @@ -2726,7 +2726,7 @@ get_style() { # Check for DE Theme. case "$de" in - "KDE"*) + "KDE"* | "Plasma"*) kde_config_dir if [[ -f "${kde_config_dir}/kdeglobals" ]]; then @@ -2739,7 +2739,7 @@ get_style() { kde_font_size="${kde_font_size/,*}" kde_theme="${kde_theme/,*} ${kde_theme/*,} ${kde_font_size}" fi - kde_theme="$kde_theme [KDE], " + kde_theme="$kde_theme ["$de"], " else err "Theme: KDE config files not found, skipping." fi @@ -2845,6 +2845,7 @@ get_style() { theme="${theme// '[GTK'[0-9]']'}" theme="${theme/ '[GTK2/3]'}" theme="${theme/ '[KDE]'}" + theme="${theme/ '[Plasma]'}" fi fi } From 5fa7446fe05218ed81d68bafd1b414aadde3195b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 27 Oct 2019 09:56:16 +0100 Subject: [PATCH 210/550] Remove quotes (shellcheck) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 952ab7d6..6d1dc586 100755 --- a/neofetch +++ b/neofetch @@ -2739,7 +2739,7 @@ get_style() { kde_font_size="${kde_font_size/,*}" kde_theme="${kde_theme/,*} ${kde_theme/*,} ${kde_font_size}" fi - kde_theme="$kde_theme ["$de"], " + kde_theme="$kde_theme [$de], " else err "Theme: KDE config files not found, skipping." fi From b81b69009e318ada5bead8c4256cb6a5cb6de6e4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 09:00:04 +0200 Subject: [PATCH 211/550] neofetch: remove uneeded quotes --- neofetch | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 6d1dc586..93b0116f 100755 --- a/neofetch +++ b/neofetch @@ -28,12 +28,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version="6.1.0" +version=6.1.0 -bash_version="${BASH_VERSION/.*}" -sys_locale="${LANG:-C}" -XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}" -PATH="${PATH}:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec" +bash_version=${BASH_VERSION/.*} +sys_locale=${LANG:-C} +XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config} +PATH=$PATH:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec reset='\e[0m' shopt -s nocasematch @@ -42,7 +42,7 @@ LC_ALL=C LANG=C # Fix issues with gsettings. -export GIO_EXTRA_MODULES="/usr/lib/x86_64-linux-gnu/gio/modules/" +export GIO_EXTRA_MODULES=/usr/lib/x86_64-linux-gnu/gio/modules/ # Neofetch default config. read -rd '' config <<'EOF' @@ -819,25 +819,25 @@ EOF get_os() { # $kernel_name is set in a function called cache_uname and is # just the output of "uname -s". - case "$kernel_name" in - "Darwin"): "$darwin_name" ;; - "SunOS"): "Solaris" ;; - "Haiku"): "Haiku" ;; - "MINIX"): "MINIX" ;; - "AIX"): "AIX" ;; - "IRIX"*): "IRIX" ;; - "FreeMiNT"): "FreeMiNT" ;; + case $kernel_name in + Darwin): "$darwin_name" ;; + SunOS): Solaris ;; + Haiku): Haiku ;; + MINIX): MINIX ;; + AIX): AIX ;; + IRIX*): IRIX ;; + FreeMiNT): FreeMiNT ;; - "Linux" | "GNU"*) - : "Linux" + Linux|GNU*) + : Linux ;; - *"BSD" | "DragonFly" | "Bitrig") - : "BSD" + *BSD|DragonFly|Bitrig) + : BSD ;; - "CYGWIN"* | "MSYS"* | "MINGW"*) - : "Windows" + CYGWIN*|MSYS*|MINGW*) + : Windows ;; *) @@ -846,7 +846,8 @@ get_os() { exit 1 ;; esac - os="$_" + + os=$_ } get_distro() { From c154aebc402548af2e4269d69fd7f758d7801deb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 09:13:17 +0200 Subject: [PATCH 212/550] neofetch: remove uneeded quotes --- neofetch | 236 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 119 insertions(+), 117 deletions(-) diff --git a/neofetch b/neofetch index 93b0116f..a1c80e6e 100755 --- a/neofetch +++ b/neofetch @@ -851,75 +851,74 @@ get_os() { } get_distro() { - [[ "$distro" ]] && return + [[ $distro ]] && return - case "$os" in - "Linux" | "BSD" | "MINIX") - if [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]]; then - case "$distro_shorthand" in - "on" | "tiny") distro="Bedrock Linux" ;; - *) distro="$(< /bedrock/etc/bedrock-release)" + case $os in + Linux|BSD|MINIX) + if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then + case $distro_shorthand in + on|tiny) distro="Bedrock Linux" ;; + *) distro=$(< /bedrock/etc/bedrock-release) esac - elif [[ -f "/etc/redstar-release" ]]; then - case "$distro_shorthand" in - "on" | "tiny") distro="Red Star OS" ;; + + elif [[ -f /etc/redstar-release ]]; then + case $distro_shorthand in + on|tiny) distro="Red Star OS" ;; *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)" esac - elif [[ -f "/etc/siduction-version" ]]; then - case "$distro_shorthand" in - "on" | "tiny") distro="Siduction" ;; + elif [[ -f /etc/siduction-version ]]; then + case $distro_shorthand in + on|tiny) distro=Siduction ;; *) distro="Siduction ($(lsb_release -sic))" esac + elif type -p pveversion >/dev/null; then - case "$distro_shorthand" in - "on" | "tiny") distro="Proxmox VE" ;; + case $distro_shorthand in + on|tiny) distro="Proxmox VE" ;; *) - distro="$(pveversion)" - distro="${distro#pve-manager/}" + distro=$(pveversion) + distro=${distro#pve-manager/} distro="Proxmox VE ${distro%/*}" esac elif type -p lsb_release >/dev/null; then - case "$distro_shorthand" in - "on") lsb_flags="-sir" ;; - "tiny") lsb_flags="-si" ;; - *) lsb_flags="-sd" ;; + case $distro_shorthand in + on) lsb_flags=-si ;; + tiny) lsb_flags=-si ;; + *) lsb_flags=-sd ;; esac - distro="$(lsb_release "$lsb_flags")" + distro=$(lsb_release "$lsb_flags") - elif [[ -f "/etc/os-release" || \ - -f "/usr/lib/os-release" || \ - -f "/etc/openwrt_release" || \ - -f "/etc/lsb-release" ]]; then - files=("/etc/os-release" - "/usr/lib/os-release" - "/etc/openwrt_release" - "/etc/lsb-release") + elif [[ -f /etc/os-release || \ + -f /usr/lib/os-release || \ + -f /etc/openwrt_release || \ + -f /etc/lsb-release ]]; then # Source the os-release file - for file in "${files[@]}"; do + for file in /usr/lib/os-release /etc/os-release \ + /etc/openwrt_release /etc/lsb-release; do source "$file" && break done # Format the distro name. - case "$distro_shorthand" in - "on") distro="${NAME:-${DISTRIB_ID}} ${VERSION_ID:-${DISTRIB_RELEASE}}" ;; - "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; - "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; + case $distro_shorthand in + on) distro="${NAME:-${DISTRIB_ID}} ${VERSION_ID:-${DISTRIB_RELEASE}}" ;; + tiny) distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; + off) distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; esac - elif [[ -f "/etc/GoboLinuxVersion" ]]; then - case "$distro_shorthand" in - "on" | "tiny") distro="GoboLinux" ;; + elif [[ -f /etc/GoboLinuxVersion ]]; then + case $distro_shorthand in + on|tiny) distro=GoboLinux ;; *) distro="GoboLinux $(< /etc/GoboLinuxVersion)" esac elif type -p crux >/dev/null; then - distro="$(crux)" - case "$distro_shorthand" in - "on") distro="${distro//version}" ;; - "tiny") distro="${distro//version*}" ;; + distro=$(crux) + case $distro_shorthand in + on) distro=${distro//version} ;; + tiny) distro=${distro//version*} esac elif type -p tazpkg >/dev/null; then @@ -927,90 +926,91 @@ get_distro() { elif type -p kpt >/dev/null && \ type -p kpm >/dev/null; then - distro="KSLinux" + distro=KSLinux - elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then + elif [[ -d /system/app/ && -d /system/priv-app ]]; then distro="Android $(getprop ro.build.version.release)" # Chrome OS doesn't conform to the /etc/*-release standard. # While the file is a series of variables they can't be sourced # by the shell since the values aren't quoted. - elif [[ -f "/etc/lsb-release" && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then - distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)" + elif [[ -f /etc/lsb-release && $(< /etc/lsb-release) == *CHROMEOS* ]]; then + distro=$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release) elif type -p guix >/dev/null; then - case "$distro_shorthand" in - "on" | "tiny") distro="Guix System" ;; + case $distro_shorthand in + on|tiny) distro="Guix System" ;; *) distro="Guix System $(guix system -V | awk 'NR==1{printf $5}')" esac else for release_file in /etc/*-release; do - distro+="$(< "$release_file")" + distro+=$(< "$release_file") done - if [[ -z "$distro" ]]; then - case "$distro_shorthand" in - "on" | "tiny") distro="$kernel_name" ;; + if [[ -z $distro ]]; then + case $distro_shorthand in + on|tiny) distro=$kernel_name ;; *) distro="$kernel_name $kernel_version" ;; esac - distro="${distro/DragonFly/DragonFlyBSD}" - # Workarounds for FreeBSD based distros. - [[ -f "/etc/pcbsd-lang" ]] && distro="PCBSD" - [[ -f "/etc/trueos-lang" ]] && distro="TrueOS" + distro=${distro/DragonFly/DragonFlyBSD} - # /etc/pacbsd-release is an empty file - [[ -f "/etc/pacbsd-release" ]] && distro="PacBSD" + # Workarounds for some BSD based distros. + [[ -f /etc/pcbsd-lang ]] && distro=PCBSD + [[ -f /etc/trueos-lang ]] && distro=TrueOS + [[ -f /etc/pacbsd-release ]] && distro=PacBSD fi fi - if [[ "$(< /proc/version)" == *Microsoft* || "$kernel_version" == *Microsoft* ]]; then - case "$distro_shorthand" in - "on") distro+=" [Windows 10]" ;; - "tiny") distro="Windows 10" ;; - *) distro+=" on Windows 10" ;; + if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then + case $distro_shorthand in + on) distro+=" [Windows 10]" ;; + tiny) distro="Windows 10" ;; + *) distro+=" on Windows 10" ;; esac - elif [[ "$(< /proc/version)" == *chrome-bot* || -f "/dev/cros_ec" ]]; then - case "$distro_shorthand" in - "on") distro+=" [Chrome OS]" ;; - "tiny") distro="Chrome OS" ;; - *) distro+=" on Chrome OS" ;; + elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then + case $distro_shorthand in + on) distro+=" [Chrome OS]" ;; + tiny) distro="Chrome OS" ;; + *) distro+=" on Chrome OS" ;; esac fi - distro="$(trim_quotes "$distro")" - distro="${distro/NAME=}" + distro=$(trim_quotes "$distro") + distro=${distro/NAME=} ;; "Mac OS X") - case "$osx_version" in - "10.4"*) codename="Mac OS X Tiger" ;; - "10.5"*) codename="Mac OS X Leopard" ;; - "10.6"*) codename="Mac OS X Snow Leopard" ;; - "10.7"*) codename="Mac OS X Lion" ;; - "10.8"*) codename="OS X Mountain Lion" ;; - "10.9"*) codename="OS X Mavericks" ;; - "10.10"*) codename="OS X Yosemite" ;; - "10.11"*) codename="OS X El Capitan" ;; - "10.12"*) codename="macOS Sierra" ;; - "10.13"*) codename="macOS High Sierra" ;; - "10.14"*) codename="macOS Mojave" ;; - "10.15"*) codename="macOS Catalina" ;; - *) codename="macOS" ;; + case $osx_version in + 10.4*) codename="Mac OS X Tiger" ;; + 10.5*) codename="Mac OS X Leopard" ;; + 10.6*) codename="Mac OS X Snow Leopard" ;; + 10.7*) codename="Mac OS X Lion" ;; + 10.8*) codename="OS X Mountain Lion" ;; + 10.9*) codename="OS X Mavericks" ;; + 10.10*) codename="OS X Yosemite" ;; + 10.11*) codename="OS X El Capitan" ;; + 10.12*) codename="macOS Sierra" ;; + 10.13*) codename="macOS High Sierra" ;; + 10.14*) codename="macOS Mojave" ;; + 10.15*) codename="macOS Catalina" ;; + *) codename=macOS ;; esac + distro="$codename $osx_version $osx_build" - case "$distro_shorthand" in - "on") distro="${distro/ ${osx_build}}" ;; - "tiny") - case "$osx_version" in - "10."[4-7]*) distro="${distro/${codename}/Mac OS X}" ;; - "10."[8-9]* | "10.1"[0-1]*) distro="${distro/${codename}/OS X}" ;; - "10.1"[2-4]*) distro="${distro/${codename}/macOS}" ;; + case $distro_shorthand in + on) distro=${distro/ ${osx_build}} ;; + + tiny) + case $osx_version in + 10.[4-7]*) distro=${distro/${codename}/Mac OS X} ;; + 10.[8-9]*|10.1[0-1]*) distro=${distro/${codename}/OS X} ;; + 10.1[2-4]*) distro=${distro/${codename}/macOS} ;; esac - distro="${distro/ ${osx_build}}" + distro=${distro/ ${osx_build}} ;; esac ;; @@ -1018,57 +1018,59 @@ get_distro() { "iPhone OS") distro="iOS $osx_version" - # "uname -m" doesn't print architecture on iOS so we force it off. - os_arch="off" + # "uname -m" doesn't print architecture on iOS. + os_arch=off ;; - "Windows") - distro="$(wmic os get Caption)" - distro="${distro/Caption}" - distro="${distro/Microsoft }" + Windows) + distro=$(wmic os get Caption) + distro=${distro/Caption} + distro=${distro/Microsoft } ;; - "Solaris") - case "$distro_shorthand" in - "on" | "tiny") distro="$(awk 'NR==1 {print $1,$3}' /etc/release)" ;; - *) distro="$(awk 'NR==1 {print $1,$2,$3}' /etc/release)" ;; + Solaris) + case $distro_shorthand in + on|tiny) distro=$(awk 'NR==1 {print $1,$3}' /etc/release) ;; + *) distro=$(awk 'NR==1 {print $1,$2,$3}' /etc/release) ;; esac - distro="${distro/\(*}" + distro=${distro/\(*} ;; - "Haiku") + Haiku) distro=Haiku ;; - "AIX") + AIX) distro="AIX $(oslevel)" ;; - "IRIX") + IRIX) distro="IRIX ${kernel_version}" ;; - "FreeMiNT") - distro="FreeMiNT" + FreeMiNT) + distro=FreeMiNT ;; esac - distro="${distro//Enterprise Server}" + distro=${distro//Enterprise Server} - [[ -z "$distro" ]] && distro="$os (Unknown)" + [[ $distro ]] || distro="$os (Unknown)" # Get OS architecture. - case "$os" in - "Solaris" | "AIX" | "Haiku" | "IRIX" | "FreeMiNT") - machine_arch="$(uname -p)" ;; - *) machine_arch="$kernel_machine" ;; + case $os in + Solaris|AIX|Haiku|IRIX|FreeMiNT) + machine_arch=$(uname -p) + ;; + + *) machine_arch=$kernel_machine ;; esac - [[ "$os_arch" == "on" ]] && \ + [[ $os_arch == on ]] && \ distro+=" $machine_arch" - [[ "${ascii_distro:-auto}" == "auto" ]] && \ - ascii_distro="$(trim "$distro")" + [[ ${ascii_distro:-auto} == auto ]] && \ + ascii_distro=$(trim "$distro") } get_model() { From 85f7b7852a60bbcdc9976d3ce4d98781c262ba5c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 09:28:23 +0200 Subject: [PATCH 213/550] neofetch: remove uneeded quotes --- neofetch | 303 +++++++++++++++++++++++++++---------------------------- 1 file changed, 151 insertions(+), 152 deletions(-) diff --git a/neofetch b/neofetch index a1c80e6e..fe431be5 100755 --- a/neofetch +++ b/neofetch @@ -1074,239 +1074,238 @@ get_distro() { } get_model() { - case "$os" in - "Linux") - if [[ -d "/system/app/" && -d "/system/priv-app" ]]; then + case $os in + Linux) + if [[ -d /system/app/ && -d /system/priv-app ]]; then model="$(getprop ro.product.brand) $(getprop ro.product.model)" - elif [[ -f "/sys/devices/virtual/dmi/id/product_name" || - -f "/sys/devices/virtual/dmi/id/product_version" ]]; then - model="$(< /sys/devices/virtual/dmi/id/product_name)" + elif [[ -f /sys/devices/virtual/dmi/id/product_name || + -f /sys/devices/virtual/dmi/id/product_version ]]; then + model=$(< /sys/devices/virtual/dmi/id/product_name) model+=" $(< /sys/devices/virtual/dmi/id/product_version)" - elif [[ -f "/sys/firmware/devicetree/base/model" ]]; then - model="$(< /sys/firmware/devicetree/base/model)" + elif [[ -f /sys/firmware/devicetree/base/model ]]; then + model=$(< /sys/firmware/devicetree/base/model) - elif [[ -f "/tmp/sysinfo/model" ]]; then - model="$(< /tmp/sysinfo/model)" + elif [[ -f /tmp/sysinfo/model ]]; then + model=$(< /tmp/sysinfo/model) fi ;; "Mac OS X") - if [[ "$(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC")" != "" ]]; then + if [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC") != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else - model="$(sysctl -n hw.model)" + model=$(sysctl -n hw.model) fi ;; "iPhone OS") - case "$kernel_machine" in - "iPad1,1"): "iPad" ;; - "iPad2,"[1-4]): "iPad 2" ;; - "iPad3,"[1-3]): "iPad 3" ;; - "iPad3,"[4-6]): "iPad 4" ;; - "iPad6,1"[12]): "iPad 5" ;; - "iPad7,"[5-6]): "iPad 6" ;; - "iPad4,"[1-3]): "iPad Air" ;; - "iPad5,"[3-4]): "iPad Air 2" ;; - "iPad11,"[3-4]): "iPad Air 3" ;; - "iPad6,"[7-8]): "iPad Pro (12.9 Inch)" ;; - "iPad6,"[3-4]): "iPad Pro (9.7 Inch)" ;; - "iPad7,"[1-2]): "iPad Pro 2 (12.9 Inch)" ;; - "iPad7,"[3-4]): "iPad Pro (10.5 Inch)" ;; - "iPad8,"[1-4]): "iPad Pro (11 Inch)" ;; - "iPad8,"[5-8]): "iPad Pro 3 (12.9 Inch)" ;; - "iPad2,"[5-7]): "iPad mini" ;; - "iPad4,"[4-6]): "iPad mini 2" ;; - "iPad4,"[7-9]): "iPad mini 3" ;; - "iPad5,"[1-2]): "iPad mini 4" ;; - "iPad11,"[1-2]): "iPad mini 5" ;; + case $kernel_machine in + iPad1,1): "iPad" ;; + iPad2,[1-4]): "iPad 2" ;; + iPad3,[1-3]): "iPad 3" ;; + iPad3,[4-6]): "iPad 4" ;; + iPad6,1[12]): "iPad 5" ;; + iPad7,[5-6]): "iPad 6" ;; + iPad4,[1-3]): "iPad Air" ;; + iPad5,[3-4]): "iPad Air 2" ;; + iPad11,[3-4]): "iPad Air 3" ;; + iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; + iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; + iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; + iPad7,[3-4]): "iPad Pro (10.5 Inch)" ;; + iPad8,[1-4]): "iPad Pro (11 Inch)" ;; + iPad8,[5-8]): "iPad Pro 3 (12.9 Inch)" ;; + iPad2,[5-7]): "iPad mini" ;; + iPad4,[4-6]): "iPad mini 2" ;; + iPad4,[7-9]): "iPad mini 3" ;; + iPad5,[1-2]): "iPad mini 4" ;; + iPad11,[1-2]): "iPad mini 5" ;; - "iPhone1,1"): "iPhone" ;; - "iPhone1,2"): "iPhone 3G" ;; - "iPhone2,1"): "iPhone 3GS" ;; - "iPhone3,"[1-3]): "iPhone 4" ;; - "iPhone4,1"): "iPhone 4S" ;; - "iPhone5,"[1-2]): "iPhone 5" ;; - "iPhone5,"[3-4]): "iPhone 5c" ;; - "iPhone6,"[1-2]): "iPhone 5s" ;; - "iPhone7,2"): "iPhone 6" ;; - "iPhone7,1"): "iPhone 6 Plus" ;; - "iPhone8,1"): "iPhone 6s" ;; - "iPhone8,2"): "iPhone 6s Plus" ;; - "iPhone8,4"): "iPhone SE" ;; - "iPhone9,"[13]): "iPhone 7" ;; - "iPhone9,"[24]): "iPhone 7 Plus" ;; - "iPhone10,"[14]): "iPhone 8" ;; - "iPhone10,"[25]): "iPhone 8 Plus" ;; - "iPhone10,"[36]): "iPhone X" ;; - "iPhone11,2"): "iPhone XS" ;; - "iPhone11,"[46]): "iPhone XS Max" ;; - "iPhone11,8"): "iPhone XR" ;; + iPhone1,1): "iPhone" ;; + iPhone1,2): "iPhone 3G" ;; + iPhone2,1): "iPhone 3GS" ;; + iPhone3,[1-3]): "iPhone 4" ;; + iPhone4,1): "iPhone 4S" ;; + iPhone5,[1-2]): "iPhone 5" ;; + iPhone5,[3-4]): "iPhone 5c" ;; + iPhone6,[1-2]): "iPhone 5s" ;; + iPhone7,2): "iPhone 6" ;; + iPhone7,1): "iPhone 6 Plus" ;; + iPhone8,1): "iPhone 6s" ;; + iPhone8,2): "iPhone 6s Plus" ;; + iPhone8,4): "iPhone SE" ;; + iPhone9,[13]): "iPhone 7" ;; + iPhone9,[24]): "iPhone 7 Plus" ;; + iPhone10,[14]): "iPhone 8" ;; + iPhone10,[25]): "iPhone 8 Plus" ;; + iPhone10,[36]): "iPhone X" ;; + iPhone11,2): "iPhone XS" ;; + iPhone11,[46]): "iPhone XS Max" ;; + iPhone11,8): "iPhone XR" ;; - "iPod1,1"): "iPod touch" ;; - "ipod2,1"): "iPod touch 2G" ;; - "ipod3,1"): "iPod touch 3G" ;; - "ipod4,1"): "iPod touch 4G" ;; - "ipod5,1"): "iPod touch 5G" ;; - "ipod7,1"): "iPod touch 6G" ;; + iPod1,1): "iPod touch" ;; + ipod2,1): "iPod touch 2G" ;; + ipod3,1): "iPod touch 3G" ;; + ipod4,1): "iPod touch 4G" ;; + ipod5,1): "iPod touch 5G" ;; + ipod7,1): "iPod touch 6G" ;; esac - model="$_" + + model=$_ ;; - "BSD" | "MINIX") - model="$(sysctl -n hw.vendor hw.product)" + BSD|MINIX) + model=$(sysctl -n hw.vendor hw.product) ;; - "Windows") - model="$(wmic computersystem get manufacturer,model)" - model="${model/Manufacturer}" - model="${model/Model}" + Windows) + model=$(wmic computersystem get manufacturer,model) + model=${model/Manufacturer} + model=${model/Model} ;; - "Solaris") - model="$(prtconf -b | awk -F':' '/banner-name/ {printf $2}')" + Solaris) + model=$(prtconf -b | awk -F':' '/banner-name/ {printf $2}') ;; - "AIX") - model="$(/usr/bin/uname -M)" + AIX) + model=$(/usr/bin/uname -M) ;; - "FreeMiNT") - model="$(sysctl -n hw.model)" + FreeMiNT) + model=$(sysctl -n hw.model) ;; esac # Remove dummy OEM info. - model="${model//To be filled by O.E.M.}" - model="${model//To Be Filled*}" - model="${model//OEM*}" - model="${model//Not Applicable}" - model="${model//System Product Name}" - model="${model//System Version}" - model="${model//Undefined}" - model="${model//Default string}" - model="${model//Not Specified}" - model="${model//Type1ProductConfigId}" - model="${model//INVALID}" - model="${model//�}" + model=${model//To be filled by O.E.M.} + model=${model//To Be Filled*} + model=${model//OEM*} + model=${model//Not Applicable} + model=${model//System Product Name} + model=${model//System Version} + model=${model//Undefined} + model=${model//Default string} + model=${model//Not Specified} + model=${model//Type1ProductConfigId} + model=${model//INVALID} + model=${model//�} - case "$model" in + case $model in "Standard PC"*) model="KVM/QEMU (${model})" ;; "OpenBSD"*) model="vmm ($model)" ;; esac } get_title() { - user="${USER:-$(whoami || printf "%s" "${HOME/*\/}")}" - hostname="${HOSTNAME:-$(hostname)}" - title="${title_color}${bold}${user}${at_color}@${title_color}${bold}${hostname}" - length="$((${#user} + ${#hostname} + 1))" + user=${USER:-$(id -un || printf %s "${HOME/*\/}")} + hostname=${HOSTNAME:-$(hostname)} + title=${title_color}${bold}${user}${at_color}@${title_color}${bold}${hostname} + length=$((${#user} + ${#hostname} + 1)) } get_kernel() { # Since these OS are integrated systems, it's better to skip this function altogether - [[ "$os" =~ (AIX|IRIX) ]] && return + [[ $os =~ (AIX|IRIX) ]] && return # Haiku uses 'uname -v' and not - 'uname -r'. - [[ "$os" == Haiku ]] && { + [[ $os == Haiku ]] && { kernel=$(uname -v) return } - case "$kernel_shorthand" in - "on") kernel="$kernel_version" ;; - "off") kernel="$kernel_name $kernel_version" ;; + case $kernel_shorthand in + on) kernel=$kernel_version ;; + off) kernel="$kernel_name $kernel_version" ;; esac # Hide kernel info if it's identical to the distro info. - if [[ "$os" =~ (BSD|MINIX) && "$distro" == *"$kernel_name"* ]]; then - case "$distro_shorthand" in - "on" | "tiny") kernel="$kernel_version" ;; - *) unset kernel ;; + [[ $os =~ (BSD|MINIX) && $distro == *"$kernel_name"* ]] && + case $distro_shorthand in + on|tiny) kernel=$kernel_version ;; + *) unset kernel ;; esac - fi } get_uptime() { # Get uptime in seconds. - case "$os" in - "Linux" | "Windows" | "MINIX") + case $os in + Linux|Windows|MINIX) if [[ -r /proc/uptime ]]; then - seconds="$(< /proc/uptime)" - seconds="${seconds/.*}" + s=$(< /proc/uptime) + s=${s/.*} else - boot="$(date -d"$(uptime -s)" +%s)" - now="$(date +%s)" - seconds="$((now - boot))" + boot=$(date -d"$(uptime -s)" +%s) + now=$(date +%s) + s=$((now - boot)) fi ;; - "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") - boot="$(sysctl -n kern.boottime)" - boot="${boot/\{ sec = }" - boot="${boot/,*}" + "Mac OS X"|"iPhone OS"|BSD|FreeMiNT) + boot=$(sysctl -n kern.boottime) + boot=${boot/\{ sec = } + boot=${boot/,*} # Get current date in seconds. - now="$(date +%s)" - seconds="$((now - boot))" + now=$(date +%s) + s=$((now - boot)) ;; - "Solaris") - seconds="$(kstat -p unix:0:system_misc:snaptime | awk '{print $2}')" - seconds="${seconds/.*}" + Solaris) + s=$(kstat -p unix:0:system_misc:snaptime | awk '{print $2}') + s=${s/.*} ;; - "AIX" | "IRIX") - t="$(LC_ALL=POSIX ps -o etime= -p 1)" - d="0" h="0" - case "$t" in *"-"*) d="${t%%-*}"; t="${t#*-}";; esac - case "$t" in *":"*":"*) h="${t%%:*}"; t="${t#*:}";; esac - h="${h#0}" t="${t#0}" - seconds="$((d*86400 + h*3600 + ${t%%:*}*60 + ${t#*:}))" + AIX|IRIX) + t=$(LC_ALL=POSIX ps -o etime= -p 1) + + [[ $t == *-* ]] && { d=${t%%-*}; t=${t#*-}; } + [[ $t == *:*:* ]] && { h=${t%%:*}; t=${t#*:}; } + + h=${h#0} + t=${t#0} + + s=$((${d:-0}*86400 + ${h:-0}*3600 + ${t%%:*}*60 + ${t#*:})) ;; - "Haiku") - seconds=$(($(system_time) / 1000000)) + Haiku) + s=$(($(system_time) / 1000000)) ;; esac - days="$((seconds / 60 / 60 / 24)) days" - hours="$((seconds / 60 / 60 % 24)) hours" - mins="$((seconds / 60 % 60)) minutes" + d="$((s / 60 / 60 / 24)) days" + h="$((s / 60 / 60 % 24)) hours" + m="$((s / 60 % 60)) mins" # Remove plural if < 2. - ((${days/ *} == 1)) && days="${days/s}" - ((${hours/ *} == 1)) && hours="${hours/s}" - ((${mins/ *} == 1)) && mins="${mins/s}" + ((${d/ *} == 1)) && d=${d/s} + ((${h/ *} == 1)) && h=${h/s} + ((${m/ *} == 1)) && m=${m/s} # Hide empty fields. - ((${days/ *} == 0)) && unset days - ((${hours/ *} == 0)) && unset hours - ((${mins/ *} == 0)) && unset mins + ((${d/ *} == 0)) && unset days + ((${h/ *} == 0)) && unset hours + ((${m/ *} == 0)) && unset mins - uptime="${days:+$days, }${hours:+$hours, }${mins}" - uptime="${uptime%', '}" - uptime="${uptime:-${seconds} seconds}" + uptime=${d:+$d, }${h:+$h, }$m + uptime=${uptime%', '} + uptime=${uptime:-$seconds secs} # Make the output of uptime smaller. - case "$uptime_shorthand" in - "on") - uptime="${uptime/minutes/mins}" - uptime="${uptime/minute/min}" - uptime="${uptime/seconds/secs}" - ;; + case $uptime_shorthand in + on) ;; - "tiny") - uptime="${uptime/ days/d}" - uptime="${uptime/ day/d}" - uptime="${uptime/ hours/h}" - uptime="${uptime/ hour/h}" - uptime="${uptime/ minutes/m}" - uptime="${uptime/ minute/m}" - uptime="${uptime/ seconds/s}" - uptime="${uptime//,}" + tiny) + uptime=${uptime/ days/d} + uptime=${uptime/ day/d} + uptime=${uptime/ hours/h} + uptime=${uptime/ hour/h} + uptime=${uptime/ mins/m} + uptime=${uptime/ min/m} + uptime=${uptime/ secs/s} + uptime=${uptime//,} ;; esac } From 93600efc6ae07fec1f8ea32cca1a863db3b357d9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 09:40:04 +0200 Subject: [PATCH 214/550] neofetch: remove uneeded quotes --- neofetch | 282 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 143 insertions(+), 139 deletions(-) diff --git a/neofetch b/neofetch index fe431be5..be6ddcbe 100755 --- a/neofetch +++ b/neofetch @@ -1315,13 +1315,13 @@ get_packages() { # dir: Count files or dirs in a glob. # pac: If packages > 0, log package manager name. # tot: Count lines in command output. - has() { type -p "$1" >/dev/null && manager="$_"; } + has() { type -p "$1" >/dev/null && manager=$_; } dir() { ((packages+=$#)); pac "$#"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+=${#pkgs[@]}));pac "${#pkgs[@]}";} # Redefine tot() for Bedrock Linux. - [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]] && { + [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) @@ -1330,25 +1330,25 @@ get_packages() { br_prefix="/bedrock/strata/*" } - case "$os" in - "Linux" | "BSD" | "iPhone OS" | "Solaris") + case $os in + Linux|BSD|"iPhone OS"|Solaris) # Package Manager Programs. - has "kiss" && tot kiss l - has "pacman-key" && tot pacman -Qq --color never - has "dpkg" && tot dpkg-query -f '.\n' -W - has "rpm" && tot rpm -qa - has "xbps-query" && tot xbps-query -l - has "apk" && tot apk info - has "opkg" && tot opkg list-installed - has "pacman-g2" && tot pacman-g2 -Q - has "lvu" && tot lvu installed - has "tce-status" && tot tce-status -i - has "pkg_info" && tot pkg_info - has "tazpkg" && tot tazpkg list && ((packages-=6)) - has "sorcery" && tot gaze installed - has "alps" && tot alps showinstalled - has "butch" && tot butch list - has "bonsai" && tot bonsai list + has kiss && tot kiss l + has pacman-key && tot pacman -Qq --color never + has dpkg && tot dpkg-query -f '.\n' -W + has rpm && tot rpm -qa + has xbps-query && tot xbps-query -l + has apk && tot apk info + has opkg && tot opkg list-installed + has pacman-g2 && tot pacman-g2 -Q + has lvu && tot lvu installed + has tce-status && tot tce-status -i + has pkg_info && tot pkg_info + has tazpkg && tot tazpkg list && ((packages-=6)) + has sorcery && tot gaze installed + has alps && tot alps showinstalled + has butch && tot butch list + has bonsai && tot bonsai list # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. @@ -1356,92 +1356,93 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob - has "brew" && dir "$(brew --cellar)"/* - has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ - has "Compile" && dir ${br_prefix}/Programs/*/ - has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* - has "crew" && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist - has "pkgtool" && dir ${br_prefix}/var/log/packages/* - has "kagami" && dir ${br_prefix}/var/lib/kagami/pkgs/* - has "cave" && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ - ${br_prefix}/var/db/paludis/repositories/installed/data/*/ + has brew && dir "$(brew --cellar)"/* + has emerge && dir ${br_prefix}/var/db/pkg/*/*/ + has Compile && dir ${br_prefix}/Programs/*/ + has eopkg && dir ${br_prefix}/var/lib/eopkg/package/* + has crew && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist + has pkgtool && dir ${br_prefix}/var/log/packages/* + has kagami && dir ${br_prefix}/var/lib/kagami/pkgs/* + has cave && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ + ${br_prefix}/var/db/paludis/repositories/installed/data/*/ shopt -u nullglob } # Other (Needs complex command) - has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) + has kpm-pkg && ((packages+=$(kpm --get-selections | grep -cv deinstall$))) - if has "guix"; then - manager="guix-system" && tot guix package -p "/run/current-system/profile" -I - manager="guix-user" && tot guix package -I - fi + has guix && { + manager=guix-system && tot guix package -p "/run/current-system/profile" -I + manager=guix-user && tot guix package -I + } - if has "nix-store"; then - manager="nix-system" && tot nix-store -q --requisites "/run/current-system/sw" - manager="nix-user" && tot nix-store -q --requisites "$HOME/.nix-profile" - fi + has nix-store && { + manager=nix-system && tot nix-store -q --requisites "/run/current-system/sw" + manager=nix-user && tot nix-store -q --requisites "$HOME/.nix-profile" + } # pkginfo is also the name of a python package manager which is painfully slow. # TODO: Fix this somehow. has pkginfo && tot pkginfo -i - case "$kernel_name" in - "FreeBSD"|"DragonFly") has "pkg" && tot pkg info ;; + case $kernel_name in + FreeBSD|DragonFly) has pkg && tot pkg info ;; + *) - has "pkg" && dir /var/db/pkg/* + has pkg && dir /var/db/pkg/* ((packages == 0)) && \ - has "pkg" && tot pkg list + has pkg && tot pkg list ;; esac # List these last as they accompany regular package managers. - has "flatpak" && tot flatpak list - has "spm" && tot spm list -i - has "puyo" && dir ~/.puyo/installed + has flatpak && tot flatpak list + has spm && tot spm list -i + has puyo && dir ~/.puyo/installed # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. - has "snap" && ps -e | grep -qFm 1 "snapd" >/dev/null && tot snap list && ((packages-=1)) + has snap && ps -e | grep -qFm 1 snapd >/dev/null && tot snap list && ((packages-=1)) ;; - "Mac OS X" | "MINIX") - has "port" && tot port installed && ((packages-=1)) - has "brew" && dir /usr/local/Cellar/* - has "pkgin" && tot pkgin list + "Mac OS X"|MINIX) + has port && tot port installed && ((packages-=1)) + has brew && dir /usr/local/Cellar/* + has pkgin && tot pkgin list - if has "nix-store"; then - manager="nix-system" && tot nix-store -q --requisites "/run/current-system/sw" - manager="nix-user" && tot nix-store -q --requisites "$HOME/.nix-profile" - fi + has nix-store && { + manager=nix-system && tot nix-store -q --requisites "/run/current-system/sw" + manager=nix-user && tot nix-store -q --requisites "$HOME/.nix-profile" + } ;; - "AIX"| "FreeMiNT") - has "lslpp" && ((packages+="$(lslpp -J -l -q | grep -cv '^#')")) - has "rpm" && tot rpm -qa + AIX|FreeMiNT) + has lslpp && ((packages+=$(lslpp -J -l -q | grep -cv '^#'))) + has rpm && tot rpm -qa ;; - "Windows") - case "$kernel_name" in - "CYGWIN"*) has "cygcheck" && tot cygcheck -cd ;; - "MSYS"*) has "pacman" && tot pacman -Qq --color never ;; + Windows) + case $kernel_name in + CYGWIN*) has cygcheck && tot cygcheck -cd ;; + MSYS*) has pacman && tot pacman -Qq --color never ;; esac # Scoop environment throws errors if `tot scoop list` is used - has "scoop" && dir ~/scoop/apps/* && ((packages-=1)) + has scoop && dir ~/scoop/apps/* && ((packages-=1)) # Count chocolatey packages. - [[ -d "/cygdrive/c/ProgramData/chocolatey/lib" ]] && \ + [[ -d /cygdrive/c/ProgramData/chocolatey/lib ]] && \ dir /cygdrive/c/ProgramData/chocolatey/lib/* ;; - "Haiku") - has "pkgman" && dir /boot/system/package-links/* + Haiku) + has pkgman && dir /boot/system/package-links/* packages=${packages/pkgman/depot} ;; - "IRIX") - manager="swpkg" + IRIX) + manager=swpkg tot versions -b && ((packages-=3)) ;; esac @@ -1449,131 +1450,134 @@ get_packages() { if ((packages == 0)); then unset packages - elif [[ "$package_managers" == "on" ]]; then + elif [[ $package_managers == on ]]; then printf -v packages '%s, ' "${managers[@]}" - packages="${packages%,*}" + packages=${packages%,*} - elif [[ "$package_managers" == "tiny" ]]; then + elif [[ $package_managers == tiny ]]; then packages+=" (${manager_string%,*})" fi - packages="${packages/pacman-key/pacman}" + packages=${packages/pacman-key/pacman} } get_shell() { - case "$shell_path" in - "on") shell="$SHELL " ;; - "off") shell="${SHELL##*/} " ;; + case $shell_path in + on) shell="$SHELL " ;; + off) shell="${SHELL##*/} " ;; esac - if [[ "$shell_version" == "on" ]]; then - case "${shell_name:=${SHELL##*/}}" in - "bash") shell+="${BASH_VERSION/-*}" ;; - "sh" | "ash" | "dash") ;; + [[ $shell_version != on ]] && return - *"ksh") - shell+="$("$SHELL" -c "printf %s \"\$KSH_VERSION\"")" - shell="${shell/ * KSH}" - shell="${shell/version}" - ;; + case ${shell_name:=${SHELL##*/}} in + bash) shell+=${BASH_VERSION/-*} ;; - "tcsh") - shell+="$("$SHELL" -c "printf %s \$tcsh")" - ;; + sh|ash|dash) ;; - *) - shell+="$("$SHELL" --version 2>&1)" - shell="${shell/ "${shell_name}"}" - ;; - esac + *ksh) + shell+=$("$SHELL" -c "printf %s \"\$KSH_VERSION\"") + shell=${shell/ * KSH} + shell=${shell/version} + ;; - # Remove unwanted info. - shell="${shell/, version}" - shell="${shell/xonsh\//xonsh }" - shell="${shell/options*}" - shell="${shell/\(*\)}" - fi + tcsh) + shell+=$("$SHELL" -c "printf %s \$tcsh") + ;; + + *) + shell+=$("$SHELL" --version 2>&1) + shell=${shell/ $shell_name} + ;; + esac + + # Remove unwanted info. + shell=${shell/, version} + shell=${shell/xonsh\//xonsh } + shell=${shell/options*} + shell=${shell/\(*\)} } get_de() { # If function was run, stop here. ((de_run == 1)) && return - case "$os" in - "Mac OS X") de="Aqua" ;; - "Windows") - case "$distro" in - "Windows 8"* | "Windows 10"*) de="Modern UI/Metro" ;; - *) de="Aero" ;; + case $os in + "Mac OS X") de=Aqua ;; + + Windows) + case $distro in + "Windows 8"*|"Windows 10"*) de="Modern UI/Metro" ;; + *) de=Aero esac ;; - "FreeMiNT") + FreeMiNT) freemint_wm=(/proc/*) - case "${freemint_wm[*]}" in - *thing*) de="Thing" ;; - *jinnee*) de="Jinnee" ;; - *tera*) de="Teradesk" ;; - *neod*) de="NeoDesk" ;; - *zdesk*) de="zDesk" ;; - *mdesk*) de="mDesk" ;; + + case ${freemint_wm[*]} in + *thing*) de=Thing ;; + *jinnee*) de=Jinnee ;; + *tera*) de=Teradesk ;; + *neod*) de=NeoDesk ;; + *zdesk*) de=zDesk ;; + *mdesk*) de=mDesk ;; esac ;; *) ((wm_run != 1)) && get_wm - if [[ "$XDG_CURRENT_DESKTOP" ]]; then - de="${XDG_CURRENT_DESKTOP/X\-}" - de="${de/Budgie:GNOME/Budgie}" - de="${de/:Unity7:ubuntu}" + if [[ $XDG_CURRENT_DESKTOP ]]; then + de=${XDG_CURRENT_DESKTOP/X\-} + de=${de/Budgie:GNOME/Budgie} + de=${de/:Unity7:ubuntu} - elif [[ "$DESKTOP_SESSION" ]]; then - de="${DESKTOP_SESSION##*/}" + elif [[ $DESKTOP_SESSION ]]; then + de=${DESKTOP_SESSION##*/} - elif [[ "$GNOME_DESKTOP_SESSION_ID" ]]; then - de="GNOME" + elif [[ $GNOME_DESKTOP_SESSION_ID ]]; then + de=GNOME - elif [[ "$MATE_DESKTOP_SESSION_ID" ]]; then - de="MATE" + elif [[ $MATE_DESKTOP_SESSION_ID ]]; then + de=MATE - elif [[ "$TDE_FULL_SESSION" ]]; then - de="Trinity" + elif [[ $TDE_FULL_SESSION ]]; then + de=Trinity fi # When a window manager is started from a display manager # the desktop variables are sometimes also set to the # window manager name. This checks to see if WM == DE # and dicards the DE value. - [[ "$de" == "$wm" ]] && { unset -v de; return; } + [[ $de == "$wm" ]] && { unset -v de; return; } ;; esac # Fallback to using xprop. - [[ "$DISPLAY" && -z "$de" ]] && type -p xprop &>/dev/null && \ - de="$(xprop -root | awk '/KDE_SESSION_VERSION|^_MUFFIN|xfce4|xfce5/')" + [[ $DISPLAY && -z $de ]] && type -p xprop &>/dev/null && \ + de=$(xprop -root | awk '/KDE_SESSION_VERSION|^_MUFFIN|xfce4|xfce5/') # Format strings. - case "$de" in - "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; - *"xfce4"*) de="Xfce4" ;; - *"xfce5"*) de="Xfce5" ;; - *"xfce"*) de="Xfce" ;; - *"mate"*) de="MATE" ;; + case $de in + KDE_SESSION_VERSION*) de=KDE${de/* = } ;; + *xfce4*) de=Xfce4 ;; + *xfce5*) de=Xfce5 ;; + *xfce*) de=Xfce ;; + *mate*) de=MATE ;; - *"MUFFIN"* | "Cinnamon") - de="$(cinnamon --version)"; de="${de:-Cinnamon}" + *MUFFIN*|Cinnamon) + de=$(cinnamon --version) + de=${de:-Cinnamon} ;; - *"GNOME"*) - de="$(gnome-shell --version)" - de="${de/Shell }" + *GNOME*) + de=$(gnome-shell --version) + de=${de/Shell } ;; esac - (( "$KDE_SESSION_VERSION" >= "4" )) && de="${de/KDE/Plasma}" + ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} - # Log that the function was run. de_run=1 } From 1f035379ff19b46195ee25b2b4274ba7519d59b3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 09:48:08 +0200 Subject: [PATCH 215/550] neofetch: remove uneeded quotes --- neofetch | 143 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 72 insertions(+), 71 deletions(-) diff --git a/neofetch b/neofetch index be6ddcbe..2a93a1e2 100755 --- a/neofetch +++ b/neofetch @@ -1585,111 +1585,112 @@ get_wm() { # If function was run, stop here. ((wm_run == 1)) && return - case "$uname" in - *"OpenBSD"*) ps_flags=(x -c) ;; - *) ps_flags=(-e) ;; + case $uname in + *OpenBSD*) ps_flags=(x -c) ;; + *) ps_flags=(-e) ;; esac - if [[ "$WAYLAND_DISPLAY" ]]; then - wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ - -e "arcan" \ - -e "asc" \ - -e "clayland" \ - -e "dwc" \ - -e "fireplace" \ - -e "greenfield" \ - -e "grefsen" \ - -e "lipstick" \ - -e "maynard" \ - -e "mazecompositor" \ - -e "motorcar" \ - -e "orbital" \ - -e "orbment" \ - -e "perceptia" \ - -e "rustland" \ - -e "sway" \ - -e "ulubis" \ - -e "velox" \ - -e "wavy" \ - -e "way-cooler" \ - -e "wayfire" \ - -e "wayhouse" \ - -e "westeros" \ - -e "westford" \ - -e "weston")" + if [[ $WAYLAND_DISPLAY ]]; then + wm=$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ + -e arcan \ + -e asc \ + -e clayland \ + -e dwc \ + -e fireplace \ + -e greenfield \ + -e grefsen \ + -e lipstick \ + -e maynard \ + -e mazecompositor \ + -e motorcar \ + -e orbital \ + -e orbment \ + -e perceptia \ + -e rustland \ + -e sway \ + -e ulubis \ + -e velox \ + -e wavy \ + -e way-cooler \ + -e wayfire \ + -e wayhouse \ + -e westeros \ + -e westford \ + -e weston) - elif [[ "$DISPLAY" && "$os" != "Mac OS X" && "$os" != "FreeMiNT" ]]; then - if type -p xprop &>/dev/null; then - id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" - id="${id##* }" - wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" - wm="${wm/*WM_NAME = }" - wm="${wm/\"}" - wm="${wm/\"*}" - fi + elif [[ $DISPLAY && $os != "Mac OS X" && $os != FreeMiNT ]]; then + type -p xprop &>/dev/null && { + id=$(xprop -root -notype _NET_SUPPORTING_WM_CHECK) + id=${id##* } + wm=$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t) + wm=${wm/*WM_NAME = } + wm=${wm/\"} + wm=${wm/\"*} + } # Rename window managers to their proper values. - [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker" - [[ "$wm" =~ "GNOME Shell" ]] && wm="Mutter" + [[ $wm == *WINDOWMAKER* ]] && wm=wmaker + [[ $wm == *"GNOME Shell"* ]] && wm=Mutter # Fallback for non-EWMH WMs. - [[ -z "$wm" ]] && \ - wm="$(ps "${ps_flags[@]}" | grep -m 1 -o \ + [[ $wm ]] || + wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \ + -e "[s]owm" \ -e "[c]atwm" \ -e "[f]vwm" \ -e "[d]wm" \ -e "[2]bwm" \ -e "[m]onsterwm" \ - -e "[t]inywm")" + -e "[t]inywm") else - case "$os" in + case $os in "Mac OS X") - ps_line="$(ps -e | grep -o \ + ps_line=$(ps -e | grep -o \ -e "[S]pectacle" \ -e "[A]methyst" \ -e "[k]wm" \ -e "[c]hun[k]wm" \ -e "[y]abai" \ - -e "[R]ectangle")" + -e "[R]ectangle") - case "$ps_line" in - *"chunkwm"*) wm="chunkwm" ;; - *"kwm"*) wm="Kwm" ;; - *"yabai"*) wm="yabai" ;; - *"Amethyst"*) wm="Amethyst" ;; - *"Spectacle"*) wm="Spectacle" ;; - *"Rectangle"*) wm="Rectangle" ;; - *) wm="Quartz Compositor" ;; + case $ps_line in + *chunkwm*) wm=chunkwm ;; + *kwm*) wm=Kwm ;; + *yabai*) wm=yabai ;; + *Amethyst*) wm=Amethyst ;; + *Spectacle*) wm=Spectacle ;; + *Rectangle*) wm=Rectangle ;; + *) wm="Quartz Compositor" ;; esac ;; - "Windows") - wm="$(tasklist | grep -m 1 -o -F \ - -e "bugn" \ - -e "Windawesome" \ - -e "blackbox" \ - -e "emerge" \ - -e "litestep")" + Windows) + wm=$(tasklist | grep -m 1 -o -F \ + -e bugn \ + -e Windawesome \ + -e blackbox \ + -e emerge \ + -e litestep) - [[ "$wm" == "blackbox" ]] && wm="bbLean (Blackbox)" - wm="${wm:+$wm, }Explorer" + [[ $wm == blackbox ]] && wm="bbLean (Blackbox)" + wm=${wm:+$wm, }Explorer ;; - "FreeMiNT") + FreeMiNT) freemint_wm=(/proc/*) - case "${freemint_wm[*]}" in - *xaaes*) wm="XaAES" ;; - *myaes*) wm="MyAES" ;; - *naes*) wm="N.AES" ;; - geneva) wm="Geneva" ;; + + case ${freemint_wm[*]} in + *xaaes*) wm=XaAES ;; + *myaes*) wm=MyAES ;; + *naes*) wm=N.AES ;; + geneva) wm=Geneva ;; *) wm="Atari AES" ;; esac ;; esac fi - # Log that the function was run. wm_run=1 } From acdfbe2063d0a4f64c558b4dcd996b2f1fc95be4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 13:14:06 +0200 Subject: [PATCH 216/550] uptime: fix bug --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 2a93a1e2..a304cfad 100755 --- a/neofetch +++ b/neofetch @@ -1285,9 +1285,9 @@ get_uptime() { ((${m/ *} == 1)) && m=${m/s} # Hide empty fields. - ((${d/ *} == 0)) && unset days - ((${h/ *} == 0)) && unset hours - ((${m/ *} == 0)) && unset mins + ((${d/ *} == 0)) && unset d + ((${h/ *} == 0)) && unset h + ((${m/ *} == 0)) && unset m uptime=${d:+$d, }${h:+$h, }$m uptime=${uptime%', '} From 9f25f34fa1d939634430bb7a72018932cb4778a6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 22:15:57 +0000 Subject: [PATCH 217/550] neofetch: remove unneeded quotes --- neofetch | 152 +++++++++++++++++++++++++++---------------------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/neofetch b/neofetch index a304cfad..4984ffaf 100755 --- a/neofetch +++ b/neofetch @@ -1698,7 +1698,7 @@ get_wm_theme() { ((wm_run != 1)) && get_wm ((de_run != 1)) && get_de - case "$wm" in + case $wm in "E16") wm_theme="$(awk -F "= " '/theme.name/ {print $2}' "${HOME}/.e16/e_config--0.0.cfg")" ;; @@ -1820,7 +1820,7 @@ get_wm_theme() { [[ -z "$wm_theme" ]] && \ wm_theme="Light" - case "$wm_theme_color" in + case $wm_theme_color in "-1") wm_theme_color="Graphite" ;; "0") wm_theme_color="Red" ;; "1") wm_theme_color="Orange" ;; @@ -1858,12 +1858,12 @@ get_wm_theme() { } get_cpu() { - case "$os" in + case $os in "Linux" | "MINIX" | "Windows") # Get CPU name. cpu_file="/proc/cpuinfo" - case "$kernel_machine" in + case $kernel_machine in "frv" | "hppa" | "m68k" | "openrisc" | "or"* | "powerpc" | "ppc"* | "sparc"*) cpu="$(awk -F':' '/^cpu\t|^CPU/ {printf $2; exit}' "$cpu_file")" ;; @@ -1910,7 +1910,7 @@ get_cpu() { [[ -f "$temp_dir" ]] && deg="$(($(< "$temp_dir") * 100 / 10000))" # Get CPU cores. - case "$cpu_cores" in + case $cpu_cores in "logical" | "on") cores="$(grep -c "^processor" "$cpu_file")" ;; "physical") cores="$(awk '/^core id/&&!a[$0]++{++i} END {print i}' "$cpu_file")" ;; esac @@ -1920,14 +1920,14 @@ get_cpu() { cpu="$(sysctl -n machdep.cpu.brand_string)" # Get CPU cores. - case "$cpu_cores" in + case $cpu_cores in "logical" | "on") cores="$(sysctl -n hw.logicalcpu_max)" ;; "physical") cores="$(sysctl -n hw.physicalcpu_max)" ;; esac ;; "iPhone OS") - case "$kernel_machine" in + case $kernel_machine in "iPhone1,"[1-2] | "iPod1,1"): "Samsung S5L8900 (1) @ 412MHz" ;; "iPhone2,1"): "Samsung S5PC100 (1) @ 600MHz" ;; "iPhone3,"[1-3] | "iPod4,1"): "Apple A4 (1) @ 800MHz" ;; @@ -1976,7 +1976,7 @@ get_cpu() { cores="$(sysctl -n hw.ncpu)" # Get CPU temp. - case "$kernel_name" in + case $kernel_name in "FreeBSD"* | "DragonFly"* | "NetBSD"*) deg="$(sysctl -n dev.cpu.0.temperature)" deg="${deg/C}" @@ -2001,7 +2001,7 @@ get_cpu() { speed="$(psrinfo -v | awk '/operates at/ {print $6; exit}')" # Get CPU cores. - case "$cpu_cores" in + case $cpu_cores in "logical" | "on") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; "physical") cores="$(psrinfo -p)" ;; esac @@ -2029,7 +2029,7 @@ get_cpu() { speed="${speed/MHz}" # Get CPU cores. - case "$cpu_cores" in + case $cpu_cores in "logical" | "on") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; @@ -2092,7 +2092,7 @@ get_cpu() { # Add CPU cores to the output. [[ "$cpu_cores" != "off" && "$cores" ]] && \ - case "$os" in + case $os in "Mac OS X") cpu="${cpu/@/(${cores}) @}" ;; *) cpu="$cpu ($cores)" ;; esac @@ -2122,7 +2122,7 @@ get_cpu() { } get_cpu_usage() { - case "$os" in + case $os in "Windows") cpu_usage="$(wmic cpu get loadpercentage)" cpu_usage="${cpu_usage/LoadPercentage}" @@ -2132,7 +2132,7 @@ get_cpu_usage() { *) # Get CPU cores if unset. if [[ "$cpu_cores" != "logical" ]]; then - case "$os" in + case $os in "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; "Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;; "BSD") cores="$(sysctl -n hw.ncpu)" ;; @@ -2154,7 +2154,7 @@ get_cpu_usage() { esac # Print the bar. - case "$cpu_display" in + case $cpu_display in "bar") cpu_usage="$(bar "$cpu_usage" 100)" ;; "infobar") cpu_usage="${cpu_usage}% $(bar "$cpu_usage" 100)" ;; "barinfo") cpu_usage="$(bar "$cpu_usage" 100)${info_color} ${cpu_usage}%" ;; @@ -2163,7 +2163,7 @@ get_cpu_usage() { } get_gpu() { - case "$os" in + case $os in "Linux") # Read GPUs into array. gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ @@ -2186,7 +2186,7 @@ get_gpu() { [[ "$gpu_type" == "integrated" && ! "$gpu" == *Intel* ]] && \ { unset -v gpu; continue; } - case "$gpu" in + case $gpu in *"advanced"*) brand="${gpu/*AMD*ATI*/AMD ATI}" brand="${brand:-${gpu/*AMD*/AMD}}" @@ -2252,7 +2252,7 @@ get_gpu() { ;; "iPhone OS") - case "$kernel_machine" in + case $kernel_machine in "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; "iPhone11,"[2468]): "G11P" ;; @@ -2303,7 +2303,7 @@ get_gpu() { ;; *) - case "$kernel_name" in + case $kernel_name in "FreeBSD"* | "DragonFly"*) gpu="$(pciconf -lv | grep -B 4 -F "VGA" | grep -F "device")" gpu="${gpu/*device*= }" @@ -2326,12 +2326,12 @@ get_gpu() { } get_memory() { - case "$os" in + case $os in "Linux" | "Windows") # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable # Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 while IFS=":" read -r a b; do - case "$a" in + case $a in "MemTotal") ((mem_used+=${b/kB})); mem_total="${b/kB}" ;; "Shmem") ((mem_used+=${b/kB})) ;; "MemFree" | "Buffers" | "Cached" | "SReclaimable") @@ -2355,13 +2355,13 @@ get_memory() { "BSD" | "MINIX") # Mem total. - case "$kernel_name" in + case $kernel_name in "NetBSD"*) mem_total="$(($(sysctl -n hw.physmem64) / 1024 / 1024))" ;; *) mem_total="$(($(sysctl -n hw.physmem) / 1024 / 1024))" ;; esac # Mem free. - case "$kernel_name" in + case $kernel_name in "NetBSD"*) mem_free="$(($(awk -F ':|kB' '/MemFree:/ {printf $2}' /proc/meminfo) / 1024))" ;; @@ -2384,7 +2384,7 @@ get_memory() { esac # Mem used. - case "$kernel_name" in + case $kernel_name in "OpenBSD"*) mem_used="$(vmstat | awk 'END {printf $3}')" mem_used="${mem_used/M}" @@ -2396,7 +2396,7 @@ get_memory() { "Solaris" | "AIX") hw_pagesize="$(pagesize)" - case "$os" in + case $os in "Solaris") pages_total="$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')" pages_free="$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')" @@ -2444,7 +2444,7 @@ get_memory() { memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}" # Bars. - case "$memory_display" in + case $memory_display in "bar") memory="$(bar "${mem_used}" "${mem_total}")" ;; "infobar") memory="${memory} $(bar "${mem_used}" "${mem_total}")" ;; "barinfo") memory="$(bar "${mem_used}" "${mem_total}")${info_color} ${memory}" ;; @@ -2513,7 +2513,7 @@ get_song() { )" } - case "${player/*\/}" in + case ${player/*\/} in "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; "mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; @@ -2561,7 +2561,7 @@ get_song() { ;; "spotify"*) - case "$os" in + case $os in "Linux") get_song_dbus "spotify" ;; "Mac OS X") @@ -2638,7 +2638,7 @@ get_song() { } get_resolution() { - case "$os" in + case $os in "Mac OS X") if type -p screenresolution >/dev/null; then resolution="$(screenresolution get 2>&1 | awk '/Display/ {printf $6 "Hz, "}')" @@ -2692,7 +2692,7 @@ get_resolution() { *) if type -p xrandr >/dev/null; then - case "$refresh_rate" in + case $refresh_rate in "on") resolution="$(xrandr --nograb --current |\ awk 'match($0,/[0-9]*\.[0-9]*\*/) { @@ -2732,7 +2732,7 @@ get_style() { ((de_run != 1)) && get_de # Check for DE Theme. - case "$de" in + case $de in "KDE"* | "Plasma"*) kde_config_dir @@ -2895,7 +2895,7 @@ get_term() { # Workaround for macOS systems that # don't support the block below. - case "$TERM_PROGRAM" in + case $TERM_PROGRAM in "iTerm.app") term="iTerm2" ;; "Terminal.app") term="Apple Terminal" ;; "Hyper") term="HyperTerm" ;; @@ -2912,7 +2912,7 @@ get_term() { [[ -z "$parent" ]] && break name="$(get_process_name "$parent")" - case "${name// }" in + case ${name// } in "${SHELL/*\/}"|*"sh"|"screen"|"su"*) ;; "login"*|*"Login"*|"init"|"(init)") @@ -2950,7 +2950,7 @@ get_term() { get_term_font() { ((term_run != 1)) && get_term - case "$term" in + case $term in "alacritty"*) shopt -s nullglob confs=({$XDG_CONFIG_HOME,$HOME}/{alacritty,}/{.,}alacritty.ym?) @@ -3204,7 +3204,7 @@ END # Xresources has two different font formats, this checks which # one is in use and formats it accordingly. - case "$term_font" in + case $term_font in *"xft:"*) term_font="${term_font/xft:}" term_font="${term_font/:*}" @@ -3237,7 +3237,7 @@ get_disk() { df_version="$(df --version 2>&1)" - case "$df_version" in + case $df_version in *"IMitv"*) df_flags=(-P -g) ;; # AIX *"befhikm"*) df_flags=(-P -k) ;; # IRIX *"hiklnP"*) df_flags=(-h) ;; # OpenBSD @@ -3266,7 +3266,7 @@ get_disk() { IFS=" " read -ra disk_info <<< "$disk" disk_perc="${disk_info[4]/\%}" - case "$df_version" in + case $df_version in *"befhikm"*) disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G (${disk_perc}%)" ;; @@ -3277,7 +3277,7 @@ get_disk() { esac # Subtitle. - case "$disk_subtitle" in + case $disk_subtitle in "name") disk_sub="${disk_info[0]}" ;; @@ -3293,7 +3293,7 @@ get_disk() { esac # Bar. - case "$disk_display" in + case $disk_display in "bar") disk="$(bar "$disk_perc" "100")" ;; "infobar") disk+=" $(bar "$disk_perc" "100")" ;; "barinfo") disk="$(bar "$disk_perc" "100")${info_color} $disk" ;; @@ -3310,7 +3310,7 @@ get_disk() { } get_battery() { - case "$os" in + case $os in "Linux") # We use 'prin' here so that we can do multi battery support # with a single battery per line. @@ -3321,7 +3321,7 @@ get_battery() { if [[ "$capacity" ]]; then battery="${capacity}% [${status}]" - case "$battery_display" in + case $battery_display in "bar") battery="$(bar "$capacity" 100)" ;; "infobar") battery+=" $(bar "$capacity" 100)" ;; "barinfo") battery="$(bar "$capacity" 100)${info_color} ${battery}" ;; @@ -3335,7 +3335,7 @@ get_battery() { ;; "BSD") - case "$kernel_name" in + case $kernel_name in "FreeBSD"* | "DragonFly"*) battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}')" battery_state="$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}')" @@ -3387,7 +3387,7 @@ get_battery() { [[ "$battery_state" ]] && battery+=" Charging" - case "$battery_display" in + case $battery_display in "bar") battery="$(bar "${battery/\%*}" 100)" ;; "infobar") battery="${battery} $(bar "${battery/\%*}" 100)" ;; "barinfo") battery="$(bar "${battery/\%*}" 100)${info_color} ${battery}" ;; @@ -3395,7 +3395,7 @@ get_battery() { } get_local_ip() { - case "$os" in + case $os in "Linux" | "BSD" | "Solaris" | "AIX" | "IRIX") local_ip="$(ip route get 1 | awk -F'src' '{print $2; exit}')" local_ip="${local_ip/uid*}" @@ -3453,7 +3453,7 @@ get_locale() { } get_gpu_driver() { - case "$os" in + case $os in "Linux") gpu_driver="$(lspci -nnk | awk -F ': ' \ '/Display|3D|VGA/{nr[NR+2]}; NR in nr {printf $2 ", "}')" @@ -3485,7 +3485,7 @@ get_cols() { # Generate the string. for ((block_range[0]; block_range[0]<=block_range[1]; block_range[0]++)); do - case "${block_range[0]}" in + case ${block_range[0]} in [0-7]) printf -v blocks '%b\e[3%bm\e[4%bm%b' \ "$blocks" "${block_range[0]}" "${block_range[0]}" "$block_width" @@ -3531,7 +3531,7 @@ image_backend() { [[ "$image_backend" != "off" ]] && ! type -p convert &>/dev/null && \ { image_backend="ascii"; err "Image: Imagemagick not found, falling back to ascii mode."; } - case "${image_backend:-off}" in + case ${image_backend:-off} in "ascii") print_ascii ;; "off") image_backend="off" ;; @@ -3606,7 +3606,7 @@ print_ascii() { } get_image_source() { - case "$image_source" in + case $image_source in "auto" | "wall" | "wallpaper") get_wallpaper ;; @@ -3631,7 +3631,7 @@ get_image_source() { } get_wallpaper() { - case "$os" in + case $os in "Mac OS X") image="$(osascript </dev/null && [[ -f "${HOME}/.cache/wal/wal" ]] && \ { image="$(< "${HOME}/.cache/wal/wal")"; return; } - case "$de" in + case $de in "MATE"*) image="$(gsettings get org.mate.background picture-filename)" ;; @@ -3739,7 +3739,7 @@ get_window_size() { printf '%b' '\e}qs\000' elif [[ -z $VTE_VERSION ]]; then - case "${TMUX:-null}" in + case ${TMUX:-null} in "null") printf '%b' '\e[14t' ;; *) printf '%b' '\ePtmux;\e\e[14t\e\\ ' ;; esac @@ -3749,7 +3749,7 @@ get_window_size() { # user input so we have to use read to store the out # -put as a variable. # The 1 second timeout is required for older bash - case "${BASH_VERSINFO[0]}" in + case ${BASH_VERSINFO[0]} in 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; *) IFS=';t' read -d t -t 1 -sra term_size ;; esac @@ -3819,7 +3819,7 @@ get_image_size() { # This functions determines the size to make the thumbnail image. get_term_size - case "$image_size" in + case $image_size in "auto") image_size="$((columns * font_width / 2))" term_height="$((term_height - term_height / 4))" @@ -3864,7 +3864,7 @@ make_thumbnail() { image_name="${crop_mode}-${crop_offset}-${width}-${height}-${image//\/}" # Handle file extensions. - case "${image##*.}" in + case ${image##*.} in "eps"|"pdf"|"svg"|"gif"|"png") image_name+=".png" ;; *) image_name+=".jpg" ;; @@ -3880,7 +3880,7 @@ make_thumbnail() { ((og_height > og_width)) && size="$og_width" || size="$og_height" } - case "$crop_mode" in + case $crop_mode in "fit") c="$(convert "$image" \ -colorspace srgb \ @@ -3929,7 +3929,7 @@ make_thumbnail() { } display_image() { - case "$image_backend" in + case $image_backend in "caca") img2txt \ -W "$((width / font_width))" \ @@ -4096,12 +4096,12 @@ get_underline() { } get_bold() { - case "$ascii_bold" in + case $ascii_bold in "on") ascii_bold='\e[1m' ;; "off") ascii_bold="" ;; esac - case "$bold" in + case $bold in "on") bold='\e[1m' ;; "off") bold="" ;; esac @@ -4177,15 +4177,15 @@ set_text_colors() { bar_color_elapsed="$(color "$bar_color_elapsed")" fi - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; + case ${bar_color_total}${1} in + distro[736]) bar_color_total=$(color "$1") ;; + distro[0-9]) bar_color_total=$(color "$2") ;; + *) bar_color_total=$(color "$bar_color_total") ;; esac } color() { - case "$1" in + case $1 in [0-6]) printf '%b\e[3%sm' "$reset" "$1" ;; 7 | "fg") printf '\e[37m%b' "$reset" ;; *) printf '\e[38;5;%bm' "$1" ;; @@ -4285,7 +4285,7 @@ cache() { } get_cache_dir() { - case "$os" in + case $os in "Mac OS X") cache_dir="/Library/Caches" ;; *) cache_dir="/tmp" ;; esac @@ -4320,7 +4320,7 @@ term_padding() { # Get terminal padding to properly align cursor. [[ -z "$term" ]] && get_term - case "$term" in + case $term in urxvt*|"rxvt-unicode") [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)" @@ -4373,7 +4373,7 @@ cache_uname() { get_ppid() { # Get parent process ID of PID. - case "$os" in + case $os in "Windows") ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" ppid="${ppid/PPID}" @@ -4394,7 +4394,7 @@ get_ppid() { get_process_name() { # Get PID name. - case "$os" in + case $os in "Windows") name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" name="${name/COMMAND}" @@ -4654,7 +4654,7 @@ get_args() { [[ "$*" != *--config* && "$*" != *--no_config* ]] && get_user_config while [[ "$1" ]]; do - case "$1" in + case $1 in # Info "--package_managers") package_managers="$2" ;; "--os_arch") os_arch="$2" ;; @@ -4689,7 +4689,7 @@ get_args() { "--disk_show") unset disk_show for arg in "$@"; do - case "$arg" in + case $arg in "--disk_show") ;; "-"*) break ;; *) disk_show+=("$arg") ;; @@ -4699,7 +4699,7 @@ get_args() { "--disable") for func in "$@"; do - case "$func" in + case $func in "--disable") continue ;; "-"*) break ;; *) @@ -4714,7 +4714,7 @@ get_args() { "--colors") unset colors for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in + case $arg in "-"*) break ;; *) colors+=("$arg") ;; esac @@ -4758,7 +4758,7 @@ get_args() { "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" - case "$2" in + case $2 in "-"* | "") ;; *) image_source="$2" ;; esac @@ -4783,7 +4783,7 @@ get_args() { "--ascii_colors") unset ascii_colors for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in + case $arg in "-"*) break ;; *) ascii_colors+=("$arg") esac @@ -4804,7 +4804,7 @@ get_args() { # Other "--config") - case "$2" in + case $2 in "none" | "off" | "") ;; *) config_file="$(get_full_path "$2")" @@ -4922,7 +4922,7 @@ get_distro_ascii() { # This function gets the distro ascii art and colors. # # $ascii_distro is the same as $distro. - case "$(trim "$ascii_distro")" in + case $(trim "$ascii_distro") in "AIX"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -9400,7 +9400,7 @@ EOF ;; *) - case "$kernel_name" in + case $kernel_name in *"BSD") set_colors 1 7 4 3 6 read -rd '' ascii_data <<'EOF' From 13f2d3a1732e5c33b3238462a2f68972c5b0f11e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:11:10 +0000 Subject: [PATCH 218/550] neofetch: Added initial support for HardenedBSD. Closes #1050 --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 4984ffaf..ef83acdc 100755 --- a/neofetch +++ b/neofetch @@ -957,9 +957,10 @@ get_distro() { distro=${distro/DragonFly/DragonFlyBSD} # Workarounds for some BSD based distros. - [[ -f /etc/pcbsd-lang ]] && distro=PCBSD - [[ -f /etc/trueos-lang ]] && distro=TrueOS - [[ -f /etc/pacbsd-release ]] && distro=PacBSD + [[ -f /etc/pcbsd-lang ]] && distro=PCBSD + [[ -f /etc/trueos-lang ]] && distro=TrueOS + [[ -f /etc/pacbsd-release ]] && distro=PacBSD + [[ -f /etc/hbsd-update.conf ]] && distro=HardenedBSD fi fi @@ -6419,7 +6420,7 @@ ${c1}/\\,-'''''-,/\\ EOF ;; - "FreeBSD"*) + "FreeBSD"*|HardenedBSD*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' ${c2}``` ${c1}` From 96f3aa948dc0eea20a317fe447f154b6f9bc3ec3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:13:42 +0000 Subject: [PATCH 219/550] ascii: fix Manjaro gap. Closes #1175 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ef83acdc..5b3d7840 100755 --- a/neofetch +++ b/neofetch @@ -3586,7 +3586,8 @@ print_ascii() { # Calculate size of ascii file in line length / line count. while IFS=$'\n' read -r line; do - line="${line//\\\\/\\}" + line=${line//\\\\/\\} + line=${line//█/ } ((++lines,${#line}>ascii_len)) && ascii_len="${#line}" done <<< "${ascii_data//\$\{??\}}" From 1c9db4af1ac876fdc28fc974dbc668ae8ccf60bd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:20:16 +0000 Subject: [PATCH 220/550] neofetch: fix #1279 --- neofetch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 5b3d7840..b20f90b4 100755 --- a/neofetch +++ b/neofetch @@ -4323,15 +4323,14 @@ term_padding() { [[ -z "$term" ]] && get_term case $term in - urxvt*|"rxvt-unicode") - [[ -z "$xrdb" ]] && - xrdb="$(xrdb -query)" + urxvt*|rxvt-unicode) + [[ $xrdb ]] || xrdb=$(xrdb -query) - [[ $xrdb != *".internalBorder:"* ]] && + [[ $xrdb != *internalBorder:* ]] && return - padding="${xrdb/*.internalBorder:}" - padding="${padding/$'\n'*}" + padding=${xrdb/*internalBorder:} + padding=${padding/$'\n'*} [[ $padding =~ ^[0-9]+$ ]] || padding= From 9bb236eb4b8d1cf0353b8dc454b1e7030a97e006 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:25:33 +0000 Subject: [PATCH 221/550] neofetch: Fix urxvt font, closes #1253 --- neofetch | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index b20f90b4..742349b4 100755 --- a/neofetch +++ b/neofetch @@ -3186,32 +3186,32 @@ END "$termite_config")" ;; - "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm") - xrdb="$(xrdb -query)" - term_font="$(grep -im 1 -e "^${term/d}"'\**\.*font' -e '^\*font' <<< "$xrdb")" - term_font="${term_font/*"*font:"}" - term_font="${term_font/*".font:"}" - term_font="${term_font/*"*.font:"}" - term_font="$(trim "$term_font")" + urxvt|urxvtd|rxvt-unicode|xterm) + xrdb=$(xrdb -query) + term_font=$(grep -im 1 -e "^${term/d}"'\**\.*font:' -e '^\*font:' <<< "$xrdb") + term_font=${term_font/*"*font:"} + term_font=${term_font/*".font:"} + term_font=${term_font/*"*.font:"} + term_font=$(trim "$term_font") - [[ -z "$term_font" && "$term" == "xterm" ]] && \ - term_font="$(grep '^XTerm.vt100.faceName' <<< "$xrdb")" + [[ -z $term_font && $term == xterm ]] && \ + term_font=$(grep '^XTerm.vt100.faceName' <<< "$xrdb") - term_font="$(trim "${term_font/*"faceName:"}")" + term_font=$(trim "${term_font/*"faceName:"}") # xft: isn't required at the beginning so we prepend it if it's missing - [[ "${term_font:0:1}" != "-" && "${term_font:0:4}" != "xft:" ]] && \ - term_font="xft:$term_font" + [[ ${term_font:0:1} != '-' && ${term_font:0:4} != xft: ]] && \ + term_font=xft:$term_font # Xresources has two different font formats, this checks which # one is in use and formats it accordingly. case $term_font in - *"xft:"*) - term_font="${term_font/xft:}" - term_font="${term_font/:*}" + *xft:*) + term_font=${term_font/xft:} + term_font=${term_font/:*} ;; - "-"*) + -*) IFS=- read -r _ _ term_font _ <<< "$term_font" ;; esac From efc289463ca1f54191061e0ee7d2c9fe0136894d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:31:55 +0000 Subject: [PATCH 222/550] neofetch: nitpicks --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 0b2358b3..e051622e 100755 --- a/neofetch +++ b/neofetch @@ -1217,10 +1217,10 @@ get_kernel() { return } - # In Windows 'uname' may return the info of GNUenv thus use wmic for OS kernel - [[ "$os" == Windows ]] && { + # In Windows 'uname' may return the info of GNUenv thus use wmic for OS kernel. + [[ $os == Windows ]] && { kernel=$(wmic os get Version) - kernel="${kernel/Version}" + kernel=${kernel/Version} return } From e8763c9009b53bbc396e16a9fe0c552101c6db8f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:39:26 +0000 Subject: [PATCH 223/550] neofetch: remove unneeded quotes --- neofetch | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index e051622e..f42c31d2 100755 --- a/neofetch +++ b/neofetch @@ -9543,10 +9543,10 @@ EOF # Overwrite distro colors if '$ascii_colors' doesn't # equal 'distro'. - if [[ "${ascii_colors[0]}" != "distro" ]]; then - color_text="off" + [[ ${ascii_colors[0]} != distro ]] && { + color_text=off set_colors "${ascii_colors[@]}" - fi + } } main() { @@ -9557,21 +9557,21 @@ main() { eval "$config" get_args "$@" - [[ "$verbose" != "on" ]] && exec 2>/dev/null + [[ $verbose != on ]] && exec 2>/dev/null get_simple "$@" get_distro get_bold get_distro_ascii - [[ "$stdout" == "on" ]] && stdout + [[ $stdout == on ]] && stdout # Minix doesn't support these sequences. - if [[ "$TERM" != "minix" && "$stdout" != "on" ]]; then + [[ $TERM != minix && $stdout != on ]] && { # If the script exits for any reason, unhide the cursor. trap 'printf "\e[?25h\e[?7h"' EXIT # Hide the cursor and disable line wrap. printf '\e[?25l\e[?7l' - fi + } image_backend get_cache_dir @@ -9581,17 +9581,19 @@ main() { # w3m-img: Draw the image a second time to fix # rendering issues in specific terminal emulators. - [[ "$image_backend" == *w3m* ]] && display_image + [[ $image_backend == *w3m* ]] && display_image # Add neofetch info to verbose output. err "Neofetch command: $0 $*" err "Neofetch version: $version" - # Show error messages. - [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 + [[ $verbose == on ]] && printf %b "$err" >&2 # If `--loop` was used, constantly redraw the image. - while [[ "$image_loop" == "on" && "$image_backend" == "w3m" ]]; do display_image; sleep 1; done + while [[ $image_loop == on && $image_backend == w3m ]]; do + display_image + sleep 1 + done return 0 } From a0c05b57f0747e7dea78bc9e342d6985cf8a21ec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 17:07:09 +0000 Subject: [PATCH 224/550] neofetch: Add colors for hardenedBSD --- neofetch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f42c31d2..eca616ed 100755 --- a/neofetch +++ b/neofetch @@ -6427,8 +6427,12 @@ ${c1}/\\,-'''''-,/\\ EOF ;; - "FreeBSD"*|HardenedBSD*) - set_colors 1 7 3 + FreeBSD*|HardenedBSD*) + case $ascii_distro in + *HardenedBSD*) set_colors 4 7 3 ;; + *) set_colors 1 7 3 + esac + read -rd '' ascii_data <<'EOF' ${c2}``` ${c1}` ${c2}` `.....---...${c1}....--.``` -/ From b7153ce65816c551550fe294b04ae9601cb5a494 Mon Sep 17 00:00:00 2001 From: Yorper Date: Mon, 4 Nov 2019 13:58:21 +1100 Subject: [PATCH 225/550] Add Cleanjaro Logo --- neofetch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/neofetch b/neofetch index eca616ed..fd7528be 100755 --- a/neofetch +++ b/neofetch @@ -5852,6 +5852,37 @@ ${c1} ..,:${c3}dOkxl:. EOF ;; + "cleanjaro_small"*) + set_colors 7 7 + read -rd '' ascii_data <<'EOF' +${c1}█████ ██████████ +█████ ██████████ +█████ +█████ +█████ +████████████████ +████████████████ +EOF + ;; + + "Cleanjaro"*) + set_colors 7 7 + read -rd '' ascii_data <<'EOF' +${c1}███████▌ ████████████████ +███████▌ ████████████████ +███████▌ ████████████████ +███████▌ +███████▌ +███████▌ +███████▌ +███████▌ +█████████████████████████ +█████████████████████████ +█████████████████████████ +▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ +EOF + ;; + "ClearOS"*) set_colors 2 read -rd '' ascii_data <<'EOF' From c7136162d950d5fa4baf9d5d7da293f840f28947 Mon Sep 17 00:00:00 2001 From: Zach Pearson Date: Wed, 27 Nov 2019 18:01:57 -0600 Subject: [PATCH 226/550] Add option to arbitrarily position color columns --- neofetch | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4c464c25..5f437c8f 100755 --- a/neofetch +++ b/neofetch @@ -600,6 +600,19 @@ block_width=3 # Flag: --block_height block_height=1 +# Color Alignment +# +# Default: 'auto' +# Values: 'auto', 'num' +# Flag: --col_offset +# +# Number specifies how far from the left side of the terminal (in spaces) to +# begin printing the columns, in case you want to e.g. center them under your +# text. +# Example: +# col_offset="auto" - Default behavior of neofetch +# col_offset=7 - Leave 7 spaces then print the colors +col_offset="auto" # Progress Bars @@ -3471,7 +3484,10 @@ get_cols() { # Add block height to info height. ((info_height+=block_range[1]>7?block_height+3:block_height+2)) - printf '\n\e[%bC%b\n\n' "$text_padding" "${zws}${cols}" + case $col_offset in + "auto") printf '\n\e[%bC%b\n\n' "$text_padding" "${zws}${cols}" ;; + *) printf '\n\e[%bC%b\n\n' "$col_offset" "${zws}${cols}" ;; + esac fi unset -v blocks blocks2 cols @@ -4455,6 +4471,7 @@ TEXT FORMATTING: COLOR BLOCKS: --color_blocks on/off Enable/Disable the color blocks + --col_offset auto/num Left-padding of color blocks --block_width num Width of color blocks in spaces --block_height num Height of color blocks in lines --block_range num num Range of colors to print as blocks @@ -4652,6 +4669,7 @@ get_args() { "--block_range") block_range=("$2" "$3") ;; "--block_width") block_width="$2" ;; "--block_height") block_height="$2" ;; + "--col_offset") col_offset="$2" ;; # Bars "--bar_char") From 6b251e7a0c38ef5ff25c9afb1d53b4685f558e2c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 29 Nov 2019 19:21:21 +0000 Subject: [PATCH 227/550] ascii: Added raspbian_small + misc. Closes #1355 --- neofetch | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index eca616ed..978ab2e2 100755 --- a/neofetch +++ b/neofetch @@ -1061,7 +1061,7 @@ get_distro() { # Get OS architecture. case $os in Solaris|AIX|Haiku|IRIX|FreeMiNT) - machine_arch=$(uname -p) + machine_arch=$(uname -p) ;; *) machine_arch=$kernel_machine ;; @@ -1216,7 +1216,7 @@ get_kernel() { kernel=$(uname -v) return } - + # In Windows 'uname' may return the info of GNUenv thus use wmic for OS kernel. [[ $os == Windows ]] && { kernel=$(wmic os get Version) @@ -1272,7 +1272,7 @@ get_uptime() { [[ $t == *-* ]] && { d=${t%%-*}; t=${t#*-}; } [[ $t == *:*:* ]] && { h=${t%%:*}; t=${t#*:}; } - h=${h#0} + h=${h#0} t=${t#0} s=$((${d:-0}*86400 + ${h:-0}*3600 + ${t%%:*}*60 + ${t#*:})) @@ -8344,6 +8344,22 @@ yMMMMMMMMMMMMMMMMNNh. EOF ;; + "Raspbian_small"*) + set_colors 2 1 + read -rd '' ascii_data <<'EOF' +${c1} .~~. .~~. + '. \\ ' ' / .' +${c2} .~ .~~~..~. + : .~.'~'.~. : + ~ ( ) ( ) ~ +( : '~'.~.'~' : ) + ~ .~ ( ) ~. ~ + ( : '~' : ) + '~ .~~~. ~' + '~' +EOF + ;; + "Raspbian"*) set_colors 2 1 read -rd '' ascii_data <<'EOF' @@ -9594,7 +9610,7 @@ main() { [[ $verbose == on ]] && printf %b "$err" >&2 # If `--loop` was used, constantly redraw the image. - while [[ $image_loop == on && $image_backend == w3m ]]; do + while [[ $image_loop == on && $image_backend == w3m ]]; do display_image sleep 1 done From b408dd4487ec854f12fb2c7bab84dc0b8f839da5 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 1 Dec 2019 14:36:36 +0100 Subject: [PATCH 228/550] ascii: add septor linux logo --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index fac9bbb9..852b0a50 100755 --- a/neofetch +++ b/neofetch @@ -8742,6 +8742,32 @@ M- ,=;;;#:, ,:#;;:=, ,@ EOF ;; + "Septor"*) + set_colors 4 7 4 + read -rd '' ascii_data <<'EOF' +${c1}ssssssssssssssssssssssssssssssssssssssss +ssssssssssssssssssssssssssssssssssssssss +ssssssssssssssssssssssssssssssssssssssss +ssssssssssssssssssssssssssssssssssssssss +ssssssssss${c2};okOOOOOOOOOOOOOOko;${c1}ssssssssss +sssssssss${c2}oNWWWWWWWWWWWWWWWWWWNo${c1}sssssssss +ssssssss${c2}:WWWWWWWWWWWWWWWWWWWWWW:${c1}ssssssss +ssssssss${c2}lWWWWWk${c1}ssssssssss${c2}lddddd:${c1}ssssssss +ssssssss${c2}cWWWWWNKKKKKKKKKKKKOx:${c1}ssssssssss +${c3}yy${c1}sssssss${c2}OWWWWWWWWWWWWWWWWWWWWx${c1}sssssss${c3}yy +yyyyyyyyyy${c2}:kKNNNNNNNNNNNNWWWWWW:${c3}yyyyyyyy +yyyyyyyy${c2}sccccc;${c3}yyyyyyyyyy${c2}kWWWWW:${c3}yyyyyyyy +yyyyyyyy${c2}:WWWWWWNNNNNNNNNNWWWWWW;${c3}yyyyyyyy +yyyyyyyy${c2}.dWWWWWWWWWWWWWWWWWWWNd${c3}yyyyyyyyy +yyyyyyyyyy${c2}sdO0KKKKKKKKKKKK0Od;${c3}yyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +EOF + ;; + "SharkLinux"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' From 8eb7944dcf3f5b4782708d51960c368081a1df30 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 16:57:11 -0500 Subject: [PATCH 229/550] Update neofetch --- neofetch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 852b0a50..9a508b39 100755 --- a/neofetch +++ b/neofetch @@ -4612,17 +4612,18 @@ ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - NOTE: Arch and Ubuntu have 'old' logo variants. + NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + NOTE: Use '{distro name}_old' to use the old logos. NOTE: Ubuntu has flavor variants. - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + NOTE: Change this to 'Lubuntu', 'Kubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio', 'Ubuntu-Mate' or 'Ubuntu-Budgie' to use the flavors. - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, postmarketOS, and Void have a smaller logo variant. + NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, + CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, + postmarketOS, and Void have a smaller logo variant. NOTE: Use '{distro name}_small' to use the small variants. @@ -6215,8 +6216,7 @@ EOF "dragonfly_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c1} | - .-. + ${c1} .-. ${c3} ()${c1}I${c3}() ${c1} "==.__:-:__.==" "==.__/~|~\__.==" @@ -8154,7 +8154,7 @@ ${c1} PPPPPPPPPPPPPP EOF ;; - "popos_small"*) + "popos_small"* | "pop_os_small"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' ${c1}______ @@ -8168,7 +8168,7 @@ ${c1}______ EOF ;; - "Pop!_OS"*) + "Pop!_OS"* | "popos"* | "pop_os"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' ${c1} ///////////// @@ -8508,7 +8508,7 @@ RRRR RRRRRRRRRRRRRRRRRRR R RRRR EOF ;; - "redhat_old") + "redhat_old" | "rhel_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' ${c1} `.-..........` From d163dffa2425fcd72efa9602e9247bbc441fa837 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 16:59:29 -0500 Subject: [PATCH 230/550] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9a508b39..efae9dc4 100755 --- a/neofetch +++ b/neofetch @@ -6216,7 +6216,7 @@ EOF "dragonfly_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c1} .-. + ${c1} .-. ${c3} ()${c1}I${c3}() ${c1} "==.__:-:__.==" "==.__/~|~\__.==" From 244e889f13c6b57f9676053035f5af26f49afa12 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 17:00:06 -0500 Subject: [PATCH 231/550] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index efae9dc4..cf8d59a0 100755 --- a/neofetch +++ b/neofetch @@ -6216,7 +6216,7 @@ EOF "dragonfly_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c1} .-. + ${c1} .-. ${c3} ()${c1}I${c3}() ${c1} "==.__:-:__.==" "==.__/~|~\__.==" From c18e705b97fb74c79afbfc7cac7ed6f166f268f6 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 17:10:51 -0500 Subject: [PATCH 232/550] Update neofetch --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index cf8d59a0..2e6a8926 100755 --- a/neofetch +++ b/neofetch @@ -4621,8 +4621,11 @@ ASCII: NOTE: Change this to 'Lubuntu', 'Kubuntu', 'Xubuntu', 'Ubuntu-GNOME', 'Ubuntu-Studio', 'Ubuntu-Mate' or 'Ubuntu-Budgie' to use the flavors. - NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, - CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, + NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, + CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, + Antrix, 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. NOTE: Use '{distro name}_small' to use the small variants. From 4e96742d4c3e25b9a89f42acfd86b63e6d49c319 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 21:39:14 -0500 Subject: [PATCH 233/550] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2e6a8926..1d504648 100755 --- a/neofetch +++ b/neofetch @@ -4619,7 +4619,7 @@ ASCII: NOTE: Ubuntu has flavor variants. NOTE: Change this to 'Lubuntu', 'Kubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio', 'Ubuntu-Mate' or 'Ubuntu-Budgie' to use the flavors. + 'Ubuntu-Studio', 'Ubuntu-Mate' or 'Ubuntu-Budgie' to use the flavors. NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, From 46b18469d91c65a2bff5eea8a500276433f2efbb Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 21:42:20 -0500 Subject: [PATCH 234/550] Update neofetch --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 1d504648..3d6ca32a 100755 --- a/neofetch +++ b/neofetch @@ -4618,8 +4618,8 @@ ASCII: NOTE: Ubuntu has flavor variants. - NOTE: Change this to 'Lubuntu', 'Kubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio', 'Ubuntu-Mate' or 'Ubuntu-Budgie' to use the flavors. + NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, + Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, From 39783d2594b8614db47141b29058667accdf5601 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sat, 7 Dec 2019 00:47:20 -0500 Subject: [PATCH 235/550] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3d6ca32a..799d68d0 100755 --- a/neofetch +++ b/neofetch @@ -8930,7 +8930,7 @@ ${c2} -``````````` EOF ;; - "Source Mage"*) + "Source Mage"* | "Source_Mage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c2} :ymNMNho. From fc08d090c1b4bc2053ba211314f6577e15e1f07c Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sat, 7 Dec 2019 00:50:23 -0500 Subject: [PATCH 236/550] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 799d68d0..bc15cf0e 100755 --- a/neofetch +++ b/neofetch @@ -8557,7 +8557,7 @@ MMMMMMMMMMM. MMMM EOF ;; - "Refracted Devuan"*) + "Refracted Devuan"* | "Refracted_Devuan"*) set_colors 8 7 read -rd '' ascii_data <<'EOF' ${c2} A From 8c99d4c4b26f9cdeaadb9a0591797c2d179a4c5b Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sat, 7 Dec 2019 00:56:39 -0500 Subject: [PATCH 237/550] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bc15cf0e..c31cf47e 100755 --- a/neofetch +++ b/neofetch @@ -7122,7 +7122,7 @@ ${c2} \\ EOF ;; - "Linux Lite"*) + "Linux Lite"* | "Linux_Lite"*) set_colors 3 7 read -rd '' ascii_data <<'EOF' ${c1} ,xXc From 9f188a31f37052cfee8a1e59f820584a85f26efa Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sat, 7 Dec 2019 01:02:06 -0500 Subject: [PATCH 238/550] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c31cf47e..9758f135 100755 --- a/neofetch +++ b/neofetch @@ -6006,7 +6006,7 @@ ${c2}:sssssssssssso++${c1}${c3}`:/:--------.```````` EOF ;; - "Container Linux by CoreOS"*) + "Container Linux by CoreOS"* | "Container_Linux"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} ..... From 4cc220eae7594ca41d1b4e273d3cba17fed577f4 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sat, 7 Dec 2019 01:03:06 -0500 Subject: [PATCH 239/550] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9758f135..76668543 100755 --- a/neofetch +++ b/neofetch @@ -5931,7 +5931,7 @@ ${c1} `.--::::::--.` EOF ;; - "Clear Linux OS"*) + "Clear Linux OS"* | "Clear_Linux"*) set_colors 4 3 7 6 read -rd '' ascii_data <<'EOF' ${c1} BBB From b49130be62d1860d9482070ed50d53f1553f4a1a Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 7 Dec 2019 08:54:38 +0100 Subject: [PATCH 240/550] Update man page --- neofetch.1 | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 3db17b78..292d092e 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. -.TH NEOFETCH "1" "October 2019" "Neofetch 6.1.0" "User Commands" +.TH NEOFETCH "1" "December 2019" "Neofetch 6.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -175,6 +175,9 @@ Changes the default ':' separator to the specified string. \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 @@ -273,17 +276,21 @@ Colors to print the ascii art \fB\-\-ascii_distro\fR distro Which Distro's ascii art to print .IP -NOTE: Arch and Ubuntu have 'old' logo variants. +NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP -NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. +NOTE: Use '{distro name}_old' to use the old logos. .IP NOTE: Ubuntu has flavor variants. .TP -NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu\-GNOME', -\&'Ubuntu\-Studio' or 'Ubuntu\-Budgie' to use the flavors. +NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu\-GNOME, +Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors. .TP -NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, -OpenBSD, postmarketOS, and Void have a smaller logo variant. +NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, +CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, +Antrix, 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. .TP From cfe1014d1a6633e53975d6fd808f40a9dd4c63b0 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 7 Dec 2019 18:00:58 +0100 Subject: [PATCH 241/550] Add initial support for DE version --- neofetch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/neofetch b/neofetch index 76668543..e6a45c8a 100755 --- a/neofetch +++ b/neofetch @@ -383,6 +383,17 @@ public_ip_host="http://ident.me" public_ip_timeout=2 +# Desktop Environment + + +# Show Desktop Environment version +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --de_version +de_version="off" + + # Disk @@ -1599,6 +1610,17 @@ get_de() { ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} + if [[ $de_version == on && $de ]]; then + case $de in + "Plasma"*) + de_ver=$(plasmashell --version) + de_ver=${de_ver/* } + ;; + # TODO: Add other DEs + esac + de="$de $de_ver" + fi + de_run=1 } @@ -2752,6 +2774,9 @@ get_style() { # Get DE if user has disabled the function. ((de_run != 1)) && get_de + # remove version from $de + [[ $de_version == on ]] && de=${de/ *} + # Check for DE Theme. case $de in "KDE"* | "Plasma"*) @@ -4523,6 +4548,7 @@ INFO: NOTE: This only supports Linux. + --de_version on/off Show/Hide Desktop Environment version --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output @@ -4698,6 +4724,7 @@ get_args() { "--gpu_brand") gpu_brand="$2" ;; "--gpu_type") gpu_type="$2" ;; "--refresh_rate") refresh_rate="$2" ;; + "--de_version") de_version="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk2") gtk2="$2" ;; "--gtk3") gtk3="$2" ;; From 5ef4772bf02a48c9eeeab976aad37ceafd03e28f Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 15:30:16 +0100 Subject: [PATCH 242/550] de_version: Add MATE --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index e6a45c8a..d1fa01a0 100755 --- a/neofetch +++ b/neofetch @@ -1616,6 +1616,10 @@ get_de() { de_ver=$(plasmashell --version) de_ver=${de_ver/* } ;; + "MATE"*) + de_ver=$(mate-session --version) + de_ver=${de_ver/* } + ;; # TODO: Add other DEs esac de="$de $de_ver" From 2d4ea78f7fd30ebaaedfdbcea77361b3c6bb0f93 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 15:36:15 +0100 Subject: [PATCH 243/550] de_version: Add Xfce --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index d1fa01a0..813ae5c3 100755 --- a/neofetch +++ b/neofetch @@ -1620,6 +1620,11 @@ get_de() { de_ver=$(mate-session --version) de_ver=${de_ver/* } ;; + "Xfce"*) + de_ver=$(xfce4-session --version) + de_ver=${de_ver/)*} + de_ver=${de_ver/* } + ;; # TODO: Add other DEs esac de="$de $de_ver" From 3c0d86bb59d5003c99c785e0ea00322e83efb32b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 16:05:06 +0100 Subject: [PATCH 244/550] de_version: Add GNOME --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 813ae5c3..6c484dbf 100755 --- a/neofetch +++ b/neofetch @@ -1596,16 +1596,12 @@ get_de() { *xfce5*) de=Xfce5 ;; *xfce*) de=Xfce ;; *mate*) de=MATE ;; + *GNOME*) de=GNOME ;; *MUFFIN*|Cinnamon) de=$(cinnamon --version) de=${de:-Cinnamon} ;; - - *GNOME*) - de=$(gnome-shell --version) - de=${de/Shell } - ;; esac ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} @@ -1625,6 +1621,10 @@ get_de() { de_ver=${de_ver/)*} de_ver=${de_ver/* } ;; + "GNOME"*) + de_ver=$(gnome-shell --version) + de_ver=${de_ver/* } + ;; # TODO: Add other DEs esac de="$de $de_ver" From 22d1071d570dabc8326205c0c90d6dccf2a508b1 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 16:17:39 +0100 Subject: [PATCH 245/550] de_version: simplify --- neofetch | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 6c484dbf..14cf0d55 100755 --- a/neofetch +++ b/neofetch @@ -1608,25 +1608,15 @@ get_de() { if [[ $de_version == on && $de ]]; then case $de in - "Plasma"*) - de_ver=$(plasmashell --version) - de_ver=${de_ver/* } - ;; - "MATE"*) - de_ver=$(mate-session --version) - de_ver=${de_ver/* } - ;; - "Xfce"*) - de_ver=$(xfce4-session --version) - de_ver=${de_ver/)*} - de_ver=${de_ver/* } - ;; - "GNOME"*) - de_ver=$(gnome-shell --version) - de_ver=${de_ver/* } - ;; + "Plasma"*) de_ver=$(plasmashell --version) ;; + "MATE"*) de_ver=$(mate-session --version) ;; + "Xfce"*) de_ver=$(xfce4-session --version) ;; + "GNOME"*) de_ver=$(gnome-shell --version) ;; # TODO: Add other DEs esac + de_ver=${de_ver/)*} + de_ver=${de_ver/* } + de="$de $de_ver" fi From cfde63b5f4fd296390077814a4b743fc2c664aac Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 18:33:50 +0100 Subject: [PATCH 246/550] de_version: Add Cinnamon --- neofetch | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 14cf0d55..64ca40a3 100755 --- a/neofetch +++ b/neofetch @@ -1597,21 +1597,18 @@ get_de() { *xfce*) de=Xfce ;; *mate*) de=MATE ;; *GNOME*) de=GNOME ;; - - *MUFFIN*|Cinnamon) - de=$(cinnamon --version) - de=${de:-Cinnamon} - ;; + *MUFFIN*|Cinnamon) de=Cinnamon ;; esac ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} if [[ $de_version == on && $de ]]; then case $de in - "Plasma"*) de_ver=$(plasmashell --version) ;; - "MATE"*) de_ver=$(mate-session --version) ;; - "Xfce"*) de_ver=$(xfce4-session --version) ;; - "GNOME"*) de_ver=$(gnome-shell --version) ;; + "Plasma"*) de_ver=$(plasmashell --version) ;; + "MATE"*) de_ver=$(mate-session --version) ;; + "Xfce"*) de_ver=$(xfce4-session --version) ;; + "GNOME"*) de_ver=$(gnome-shell --version) ;; + "Cinnamon"*) de_ver=$(cinnamon --version) ;; # TODO: Add other DEs esac de_ver=${de_ver/)*} From 9303077f0e6ba7f586832f31e342bd22989d9494 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 19:19:28 +0100 Subject: [PATCH 247/550] de_version: Add Deepin --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 64ca40a3..5edab4d9 100755 --- a/neofetch +++ b/neofetch @@ -1609,6 +1609,7 @@ get_de() { "Xfce"*) de_ver=$(xfce4-session --version) ;; "GNOME"*) de_ver=$(gnome-shell --version) ;; "Cinnamon"*) de_ver=$(cinnamon --version) ;; + "Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; # TODO: Add other DEs esac de_ver=${de_ver/)*} From 02fe4815407eaf20330841201abf403d5a40112b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 19:47:58 +0100 Subject: [PATCH 248/550] de_version: Add Budgie --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 5edab4d9..e1536f8d 100755 --- a/neofetch +++ b/neofetch @@ -1610,8 +1610,10 @@ get_de() { "GNOME"*) de_ver=$(gnome-shell --version) ;; "Cinnamon"*) de_ver=$(cinnamon --version) ;; "Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; + "Budgie"*) de_ver=$(budgie-desktop --version) ;; # TODO: Add other DEs esac + de_ver=${de_ver/Copyright*} de_ver=${de_ver/)*} de_ver=${de_ver/* } From 96199eab1c58f88383250ec7073bea1982f2f61d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 17:21:12 +0100 Subject: [PATCH 249/550] de_version: Add LXQt --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index e1536f8d..98db37e8 100755 --- a/neofetch +++ b/neofetch @@ -1611,8 +1611,10 @@ get_de() { "Cinnamon"*) de_ver=$(cinnamon --version) ;; "Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; "Budgie"*) de_ver=$(budgie-desktop --version) ;; + "LXQt"*) de_ver=$(lxqt-session --version) ;; # TODO: Add other DEs esac + de_ver=${de_ver/liblxqt*} de_ver=${de_ver/Copyright*} de_ver=${de_ver/)*} de_ver=${de_ver/* } From 5070c39595c4f10214c8432b71564d4be4040bfc Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 17:27:03 +0100 Subject: [PATCH 250/550] de_version: Add Lumina --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 98db37e8..efd85648 100755 --- a/neofetch +++ b/neofetch @@ -1612,12 +1612,14 @@ get_de() { "Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; "Budgie"*) de_ver=$(budgie-desktop --version) ;; "LXQt"*) de_ver=$(lxqt-session --version) ;; + "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; # TODO: Add other DEs esac de_ver=${de_ver/liblxqt*} de_ver=${de_ver/Copyright*} de_ver=${de_ver/)*} de_ver=${de_ver/* } + de_ver=${de_ver//\"} de="$de $de_ver" fi From 8c2ab8e4436b0f707fe7b7240b4d9fdcb684404f Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 17:54:42 +0100 Subject: [PATCH 251/550] de_version: Add Trinity --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index efd85648..d8049310 100755 --- a/neofetch +++ b/neofetch @@ -1613,6 +1613,7 @@ get_de() { "Budgie"*) de_ver=$(budgie-desktop --version) ;; "LXQt"*) de_ver=$(lxqt-session --version) ;; "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; + "Trinity"*) de_ver=$(tde-config --version | awk '/TDE:/ {print $2}') ;; # TODO: Add other DEs esac de_ver=${de_ver/liblxqt*} From 9f75eaece23a3d41a0993755473e93a03487221c Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 18:17:10 +0100 Subject: [PATCH 252/550] de_version: Avoid awk --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d8049310..ab84ee06 100755 --- a/neofetch +++ b/neofetch @@ -1613,9 +1613,11 @@ get_de() { "Budgie"*) de_ver=$(budgie-desktop --version) ;; "LXQt"*) de_ver=$(lxqt-session --version) ;; "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; - "Trinity"*) de_ver=$(tde-config --version | awk '/TDE:/ {print $2}') ;; + "Trinity"*) de_ver=$(tde-config --version) ;; # TODO: Add other DEs esac + de_ver=${de_ver/*TDE:} + de_ver=${de_ver/tde-config*} de_ver=${de_ver/liblxqt*} de_ver=${de_ver/Copyright*} de_ver=${de_ver/)*} From 3192036f324bf7e82ea6c28e47dc735c061437f6 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 18:36:49 +0100 Subject: [PATCH 253/550] de_version: Remove comment --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index ab84ee06..b896ce1f 100755 --- a/neofetch +++ b/neofetch @@ -1614,7 +1614,6 @@ get_de() { "LXQt"*) de_ver=$(lxqt-session --version) ;; "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; "Trinity"*) de_ver=$(tde-config --version) ;; - # TODO: Add other DEs esac de_ver=${de_ver/*TDE:} de_ver=${de_ver/tde-config*} From 1ac90be01d44c3869cea67c3ba556a6f9a549b91 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 19:07:05 +0100 Subject: [PATCH 254/550] de_version: apply review comments --- neofetch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index b896ce1f..a0339c2b 100755 --- a/neofetch +++ b/neofetch @@ -1592,12 +1592,12 @@ get_de() { # Format strings. case $de in KDE_SESSION_VERSION*) de=KDE${de/* = } ;; - *xfce4*) de=Xfce4 ;; - *xfce5*) de=Xfce5 ;; - *xfce*) de=Xfce ;; - *mate*) de=MATE ;; - *GNOME*) de=GNOME ;; - *MUFFIN*|Cinnamon) de=Cinnamon ;; + *xfce4*) de=Xfce4 ;; + *xfce5*) de=Xfce5 ;; + *xfce*) de=Xfce ;; + *mate*) de=MATE ;; + *GNOME*) de=GNOME ;; + *MUFFIN*) de=Cinnamon ;; esac ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} @@ -1615,6 +1615,7 @@ get_de() { "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; "Trinity"*) de_ver=$(tde-config --version) ;; esac + de_ver=${de_ver/*TDE:} de_ver=${de_ver/tde-config*} de_ver=${de_ver/liblxqt*} @@ -2779,7 +2780,7 @@ get_style() { # Get DE if user has disabled the function. ((de_run != 1)) && get_de - # remove version from $de + # Remove version from '$de'. [[ $de_version == on ]] && de=${de/ *} # Check for DE Theme. From ba93e1bb0db8405b55ee5202045ccb69ae38c91e Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 19:22:24 +0100 Subject: [PATCH 255/550] Update man page --- neofetch.1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch.1 b/neofetch.1 index 292d092e..bd953323 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -104,6 +104,9 @@ 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 From 5bbf221b4789ed1131d33d1d48533932462d23ea Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 10 Dec 2019 01:51:03 +0000 Subject: [PATCH 256/550] neofetch: Remove bonsai package detection. Need input from upstream. Closes #1351 --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index fac9bbb9..762aa76f 100755 --- a/neofetch +++ b/neofetch @@ -1369,7 +1369,6 @@ get_packages() { has sorcery && tot gaze installed has alps && tot alps showinstalled has butch && tot butch list - has bonsai && tot bonsai list # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. From cd4b34a385551b584a888d8b1f1bd3da2d6a22ca Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 10 Dec 2019 10:19:21 +0100 Subject: [PATCH 257/550] de_version: Add Unity --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f763eeb7..12c2d76f 100755 --- a/neofetch +++ b/neofetch @@ -1613,6 +1613,7 @@ get_de() { "LXQt"*) de_ver=$(lxqt-session --version) ;; "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; "Trinity"*) de_ver=$(tde-config --version) ;; + "Unity"*) de_ver=$(unity --version) ;; esac de_ver=${de_ver/*TDE:} From 0fc6e33060cc0427ea00a893fc8a4101f4bbc50c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 10 Dec 2019 10:31:28 +0000 Subject: [PATCH 258/550] neofetch: Fix #1364 --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 63e4b133..f763eeb7 100755 --- a/neofetch +++ b/neofetch @@ -1599,7 +1599,7 @@ get_de() { *MUFFIN*) de=Cinnamon ;; esac - ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} + ((${KDE_SESSION_VERSION:-0} >= 4)) && de=${de/KDE/Plasma} if [[ $de_version == on && $de ]]; then case $de in @@ -4652,10 +4652,10 @@ ASCII: NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. - NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, - CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, + NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, + CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, - Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, + Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, postmarketOS, and Void have a smaller logo variant. From 1413533aa39c4429bdfc7effe5a5b392d022ad02 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Tue, 10 Dec 2019 15:14:46 +0300 Subject: [PATCH 259/550] add Carbs Linux logo --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index 12c2d76f..b65edbb3 100755 --- a/neofetch +++ b/neofetch @@ -5768,6 +5768,29 @@ ${c1} ...... ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} +EOF + ;; + "Carbs"*) + set_colors 4 5 4 4 4 4 + read -rd '' ascii_data <<'EOF' +${c2} .......... + ..,;:ccccccc:;'.. + ..,clllc:;;;;;:cllc,. + .,cllc,... ..';;'. + .;lol;.. .. + .,lol;. + .coo:. + .'lol,. + .,lol,. + .,lol,. + 'col;. + .:ooc'. + .'col:. + .'cllc'.. .''. + ..:lolc,'.......',cll,. + ..;cllllccccclllc;'. + ...',;;;;;;,,... + ..... EOF ;; From 18f3d0c486321d177512749980037ff662a366bf Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 11 Dec 2019 18:46:14 +0100 Subject: [PATCH 260/550] wm: detect kwin on wayland --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index b65edbb3..9e94c28a 100755 --- a/neofetch +++ b/neofetch @@ -1648,6 +1648,7 @@ get_wm() { -e fireplace \ -e greenfield \ -e grefsen \ + -e kwin \ -e lipstick \ -e maynard \ -e mazecompositor \ From 95223a6a11cbea7cd3fe69b4a95a4c4ad8ff9797 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 12 Dec 2019 10:59:42 +0100 Subject: [PATCH 261/550] wm: Detect Mutter on GNOME Wayland --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 9e94c28a..585e4f8c 100755 --- a/neofetch +++ b/neofetch @@ -1646,6 +1646,7 @@ get_wm() { -e clayland \ -e dwc \ -e fireplace \ + -e gnome-shell \ -e greenfield \ -e grefsen \ -e kwin \ @@ -1678,10 +1679,6 @@ get_wm() { wm=${wm/\"*} } - # Rename window managers to their proper values. - [[ $wm == *WINDOWMAKER* ]] && wm=wmaker - [[ $wm == *"GNOME Shell"* ]] && wm=Mutter - # Fallback for non-EWMH WMs. [[ $wm ]] || wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \ @@ -1741,6 +1738,10 @@ get_wm() { esac fi + # Rename window managers to their proper values. + [[ $wm == *WINDOWMAKER* ]] && wm=wmaker + [[ $wm == *GNOME*Shell* ]] && wm=Mutter + wm_run=1 } From 5eafef80dc488f22bc0a06c6f0a0dbc9af646a4e Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 12 Dec 2019 11:03:06 +0100 Subject: [PATCH 262/550] wm_theme: Remove 'GNOME Shell' from wm case --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 585e4f8c..b2ddd97e 100755 --- a/neofetch +++ b/neofetch @@ -1765,7 +1765,7 @@ get_wm_theme() { wm_theme="$detheme (${wm_theme})" ;; - "Compiz" | "Mutter" | "GNOME Shell" | "Gala") + "Compiz" | "Mutter" | "Gala") if type -p gsettings >/dev/null; then wm_theme="$(gsettings get org.gnome.shell.extensions.user-theme name)" From 4204f79e5d050fd17400d00d61e99197c1d33c53 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 12 Dec 2019 11:10:49 +0100 Subject: [PATCH 263/550] wm_theme: Make Openbox config file parsing more robust --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b2ddd97e..e611308e 100755 --- a/neofetch +++ b/neofetch @@ -1816,7 +1816,8 @@ get_wm_theme() { ob_file="rc" fi - wm_theme="$(awk -F "[<,>]" '/]"); print a[3]}' \ "${XDG_CONFIG_HOME}/openbox/${ob_file}.xml")"; ;; From 5c740aa4f2b8549eabffc019184ac723cf8e8ae4 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 12 Dec 2019 11:14:35 +0100 Subject: [PATCH 264/550] wm_theme: Add support for Openbox on LXQt --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index e611308e..28ddb0ed 100755 --- a/neofetch +++ b/neofetch @@ -1812,6 +1812,9 @@ get_wm_theme() { if [[ "$de" == "LXDE" && -f "${HOME}/.config/openbox/lxde-rc.xml" ]]; then ob_file="lxde-rc" + elif [[ "$de" == "LXQt" && -f "${HOME}/.config/openbox/lxqt-rc.xml" ]]; then + ob_file="lxqt-rc" + elif [[ -f "${HOME}/.config/openbox/rc.xml" ]]; then ob_file="rc" fi From 00f1dadb85e1917d963307e534720f951fae707c Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 12 Dec 2019 11:54:24 +0100 Subject: [PATCH 265/550] wm_theme: Refactor Openbox theme detection --- neofetch | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 28ddb0ed..efcea319 100755 --- a/neofetch +++ b/neofetch @@ -1809,19 +1809,17 @@ get_wm_theme() { ;; "Openbox") - if [[ "$de" == "LXDE" && -f "${HOME}/.config/openbox/lxde-rc.xml" ]]; then - ob_file="lxde-rc" + case $de in + "LXDE"*) ob_file="lxde-rc" ;; + "LXQt"*) ob_file="lxqt-rc" ;; + *) ob_file="rc" ;; + esac - elif [[ "$de" == "LXQt" && -f "${HOME}/.config/openbox/lxqt-rc.xml" ]]; then - ob_file="lxqt-rc" + ob_file="${XDG_CONFIG_HOME}/openbox/${ob_file}.xml" - elif [[ -f "${HOME}/.config/openbox/rc.xml" ]]; then - ob_file="rc" - fi - - wm_theme="$(awk '// {while (getline n) {if (match(n, //)) {l=n; exit}}} - END {split(l, a, "[<>]"); print a[3]}' \ - "${XDG_CONFIG_HOME}/openbox/${ob_file}.xml")"; + [[ -f "$ob_file" ]] && \ + wm_theme="$(awk '// {while (getline n) {if (match(n, //)) + {l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file")" ;; "PekWM") From 07c3233d69d63d241ede109471aaf9d63591c502 Mon Sep 17 00:00:00 2001 From: Kid Date: Wed, 18 Dec 2019 18:47:31 +0800 Subject: [PATCH 266/550] get wallpaper for Plasma desktop --- neofetch | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index efcea319..43313703 100755 --- a/neofetch +++ b/neofetch @@ -3741,6 +3741,10 @@ END image="$(decode_url "$image")" ;; + "Plasma"*) + image="$(cat ${HOME}/.config/plasma-org.kde.plasma.desktop-appletsrc | grep --fixed-strings --after-context 1 "[Wallpaper][org.kde.image][General]" | grep --extended-regexp --only-matching "file.+")" + ;; + *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" @@ -5777,23 +5781,23 @@ EOF "Carbs"*) set_colors 4 5 4 4 4 4 read -rd '' ascii_data <<'EOF' -${c2} .......... - ..,;:ccccccc:;'.. - ..,clllc:;;;;;:cllc,. - .,cllc,... ..';;'. - .;lol;.. .. - .,lol;. - .coo:. - .'lol,. - .,lol,. - .,lol,. - 'col;. - .:ooc'. - .'col:. - .'cllc'.. .''. - ..:lolc,'.......',cll,. - ..;cllllccccclllc;'. - ...',;;;;;;,,... +${c2} .......... + ..,;:ccccccc:;'.. + ..,clllc:;;;;;:cllc,. + .,cllc,... ..';;'. + .;lol;.. .. + .,lol;. + .coo:. + .'lol,. + .,lol,. + .,lol,. + 'col;. + .:ooc'. + .'col:. + .'cllc'.. .''. + ..:lolc,'.......',cll,. + ..;cllllccccclllc;'. + ...',;;;;;;,,... ..... EOF ;; From c18965133876464a376fec6653c5bfb513e914ac Mon Sep 17 00:00:00 2001 From: Kid Date: Wed, 18 Dec 2019 18:51:45 +0800 Subject: [PATCH 267/550] revert spaces --- neofetch | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 43313703..142dae93 100755 --- a/neofetch +++ b/neofetch @@ -5781,23 +5781,23 @@ EOF "Carbs"*) set_colors 4 5 4 4 4 4 read -rd '' ascii_data <<'EOF' -${c2} .......... - ..,;:ccccccc:;'.. - ..,clllc:;;;;;:cllc,. - .,cllc,... ..';;'. - .;lol;.. .. - .,lol;. - .coo:. - .'lol,. - .,lol,. - .,lol,. - 'col;. - .:ooc'. - .'col:. - .'cllc'.. .''. - ..:lolc,'.......',cll,. - ..;cllllccccclllc;'. - ...',;;;;;;,,... +${c2} .......... + ..,;:ccccccc:;'.. + ..,clllc:;;;;;:cllc,. + .,cllc,... ..';;'. + .;lol;.. .. + .,lol;. + .coo:. + .'lol,. + .,lol,. + .,lol,. + 'col;. + .:ooc'. + .'col:. + .'cllc'.. .''. + ..:lolc,'.......',cll,. + ..;cllllccccclllc;'. + ...',;;;;;;,,... ..... EOF ;; From 090c4e4e5b1d0eeae4c37f1b858201f9a6084d2b Mon Sep 17 00:00:00 2001 From: Kid Date: Wed, 18 Dec 2019 19:57:07 +0800 Subject: [PATCH 268/550] fix format --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 142dae93..15f7277e 100755 --- a/neofetch +++ b/neofetch @@ -3742,7 +3742,8 @@ END ;; "Plasma"*) - image="$(cat ${HOME}/.config/plasma-org.kde.plasma.desktop-appletsrc | grep --fixed-strings --after-context 1 "[Wallpaper][org.kde.image][General]" | grep --extended-regexp --only-matching "file.+")" + image="${XDG_CONFIG_HOME}/plasma-org.kde.plasma.desktop-appletsrc" + image="$(awk -F '=' '$1 == "Image" { print $2 }' $image)" ;; *) From 1b99df310d86c898ebd346626f0042bacb19c170 Mon Sep 17 00:00:00 2001 From: Kid Date: Wed, 18 Dec 2019 20:11:41 +0800 Subject: [PATCH 269/550] fix quotes --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 15f7277e..f660f299 100755 --- a/neofetch +++ b/neofetch @@ -3743,7 +3743,7 @@ END "Plasma"*) image="${XDG_CONFIG_HOME}/plasma-org.kde.plasma.desktop-appletsrc" - image="$(awk -F '=' '$1 == "Image" { print $2 }' $image)" + image="$(awk -F '=' '$1 == "Image" { print $2 }' "$image")" ;; *) From 84d76a7ff3cb251d7a40c3f465fb9919e841c3c1 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Dec 2019 13:38:20 +0100 Subject: [PATCH 270/550] term_font: Fix font detection for Konsole >= 19.12.0 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index efcea319..1f977cc0 100755 --- a/neofetch +++ b/neofetch @@ -3112,6 +3112,7 @@ END if ((child == "$(qdbus "$i" "$session" processId)")); then profile="$(qdbus "$i" "$session" environment |\ awk -F '=' '/KONSOLE_PROFILE_NAME/ {print $2}')" + [[ ! $profile ]] && profile="$(qdbus "$i" "$session" profile)" break fi done From 618d5b23473c88cf787ccabbe8263aabb279f5a0 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Dec 2019 13:39:38 +0100 Subject: [PATCH 271/550] term_font: konsole: Avoid wrong font info --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 1f977cc0..e9c0cc31 100755 --- a/neofetch +++ b/neofetch @@ -3119,6 +3119,8 @@ END [[ "$profile" ]] && break done + [[ ! $profile ]] && return + # We could have two profile files for the same profile name, take first match profile_filename="$(grep -l "Name=${profile}" "$HOME"/.local/share/konsole/*.profile)" profile_filename="${profile_filename/$'\n'*}" From 7ed49d57220ce693f3b47e6f4b91ffb5fb4b2491 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Dec 2019 13:40:40 +0100 Subject: [PATCH 272/550] Remove quotes --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index e9c0cc31..b772a790 100755 --- a/neofetch +++ b/neofetch @@ -3116,7 +3116,7 @@ END break fi done - [[ "$profile" ]] && break + [[ $profile ]] && break done [[ ! $profile ]] && return @@ -3125,7 +3125,7 @@ END profile_filename="$(grep -l "Name=${profile}" "$HOME"/.local/share/konsole/*.profile)" profile_filename="${profile_filename/$'\n'*}" - [[ "$profile_filename" ]] && \ + [[ $profile_filename ]] && \ term_font="$(awk -F '=|,' '/Font=/ {print $2,$3}' "$profile_filename")" ;; From 9ad01bfe182799f53c537431a1b4c1b394b28d87 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Dec 2019 14:15:37 +0100 Subject: [PATCH 273/550] Invert test logic --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index b772a790..2c5465ce 100755 --- a/neofetch +++ b/neofetch @@ -3112,14 +3112,14 @@ END if ((child == "$(qdbus "$i" "$session" processId)")); then profile="$(qdbus "$i" "$session" environment |\ awk -F '=' '/KONSOLE_PROFILE_NAME/ {print $2}')" - [[ ! $profile ]] && profile="$(qdbus "$i" "$session" profile)" + [[ $profile ]] || profile="$(qdbus "$i" "$session" profile)" break fi done [[ $profile ]] && break done - [[ ! $profile ]] && return + [[ $profile ]] || return # We could have two profile files for the same profile name, take first match profile_filename="$(grep -l "Name=${profile}" "$HOME"/.local/share/konsole/*.profile)" From 6e69a7183da9ffd3ec040b89a28e8eadd143a830 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Dec 2019 20:08:24 +0100 Subject: [PATCH 274/550] term_font: Fix Konsole font on openSUSE --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 2c5465ce..cac3540d 100755 --- a/neofetch +++ b/neofetch @@ -3102,6 +3102,8 @@ END # Get Process ID of current konsole window / tab child="$(get_ppid "$$")" + QT_BINDIR="$(qtpaths --binaries-dir)" && PATH+=":$QT_BINDIR" + IFS=$'\n' read -d "" -ra konsole_instances \ <<< "$(qdbus | awk '/org.kde.konsole/ {print $1}')" From ce39f1bdbd4c75c1afa60c05e0a8b354ab66678c Mon Sep 17 00:00:00 2001 From: Kid Date: Mon, 23 Dec 2019 10:39:42 +0800 Subject: [PATCH 275/550] Update neofetch --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f660f299..077fac5e 100755 --- a/neofetch +++ b/neofetch @@ -3742,8 +3742,8 @@ END ;; "Plasma"*) - image="${XDG_CONFIG_HOME}/plasma-org.kde.plasma.desktop-appletsrc" - image="$(awk -F '=' '$1 == "Image" { print $2 }' "$image")" + image="${XDG_CONFIG_HOME}/plasmarc" + image="$(awk -F '=' '$1 == "usersWallpapers" { print $2 }' "$image")" ;; *) From 9b8a38bc0e8094679090eefe18767b5327b2fcb4 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sun, 22 Dec 2019 23:26:26 -0500 Subject: [PATCH 276/550] Update neofetch --- neofetch | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index cac3540d..be07dbfc 100755 --- a/neofetch +++ b/neofetch @@ -4652,7 +4652,35 @@ IMAGE BACKEND: ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - + + NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, + Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, + XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, + BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, + BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, + Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, + Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, + DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, + Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, + FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, + gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, + Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, + Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, + LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, + Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, + Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, + NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, + OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, + Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, + PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, + Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, + Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, + SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, + Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, + openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, + Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, + Windows7, Xubuntu, and Zorin have ascii logos + NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. NOTE: Use '{distro name}_old' to use the old logos. @@ -7295,7 +7323,7 @@ ${c5} `._.-._.' EOF ;; - "mac" | "Darwin") + "mac"* | "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' ${c1} 'c. @@ -9123,7 +9151,7 @@ ${c1} `- ` EOF ;; - "openSUSE Tumbleweed"*) + "openSUSE Tumbleweed"* | "openSUSE_Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' ${c2} ...... From bd30e19ad895b29a778dff77ff6d711a30487f91 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sun, 22 Dec 2019 23:42:18 -0500 Subject: [PATCH 277/550] Update neofetch --- neofetch | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index be07dbfc..77e08be5 100755 --- a/neofetch +++ b/neofetch @@ -727,13 +727,45 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# -# NOTE: Arch and Ubuntu have 'old' logo variants. -# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. +# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, +# Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +# XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, +# BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, +# BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, +# Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, +# Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, +# DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, +# Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +# FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, +# gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, +# Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, +# LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, +# Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, +# Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, +# NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, +# OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, +# Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +# PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, +# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, +# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, +# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, +# openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, +# Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, +# Windows7, Xubuntu, and Zorin have ascii logos +# NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. +# Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. -# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. -# NOTE: Arch, Crux and Gentoo have a smaller logo variant. -# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. +# Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, +# Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. +# NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, +# CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, +# Antrix, 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. +# Use '{distro name}_small' to use the small variants. ascii_distro="auto" # Ascii Colors From 6fb1a22dfe820423268b303dd85e5e531bf9b3ed Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:03:13 -0500 Subject: [PATCH 278/550] Update neofetch --- neofetch | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 77e08be5..089320ca 100755 --- a/neofetch +++ b/neofetch @@ -753,7 +753,7 @@ image_source="auto" # Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, # openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, # Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, -# Windows7, Xubuntu, and Zorin have ascii logos +# Windows7, Xubuntu, Zorin, and IRIX have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -4711,7 +4711,7 @@ ASCII: Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, - Windows7, Xubuntu, and Zorin have ascii logos + Windows7, Xubuntu, Zorin, and IRIX have ascii logos NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. @@ -9606,7 +9606,30 @@ sddddddy ydddddds `-/osyhddddhyso/-` EOF ;; - + "IRIX"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. +EOF + ;; "Zorin"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' From 53b02a16d6fd559d6c8bb938d6e299841c73996d Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:24:04 -0500 Subject: [PATCH 279/550] Add files via upload --- neofetch.1 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/neofetch.1 b/neofetch.1 index bd953323..f2a95e0d 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -278,6 +278,34 @@ Colors to print the ascii art .TP \fB\-\-ascii_distro\fR distro Which Distro's ascii art to print +.TP +NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, +Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, +BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, +BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, +Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, +Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, +DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, +Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, +gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, +Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, +LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, +Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, +Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, +NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, +OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, +Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, +Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, +Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, +Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, +openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, +Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, Void, Obarun, windows10, +Windows7, Xubuntu, Zorin, and IRIX have ascii logos .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP From d8a3ae5fed32e9d26db32490004873e446497310 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 23 Dec 2019 23:24:44 +0000 Subject: [PATCH 280/550] wallpaper: Fix #1379 --- neofetch | 67 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/neofetch b/neofetch index 9d636c04..606a1b60 100755 --- a/neofetch +++ b/neofetch @@ -727,15 +727,15 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, -# Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, +# Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, # XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, # BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, # BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, # DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, -# Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +# Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, # gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, @@ -745,14 +745,14 @@ image_source="auto" # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, # NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, # OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, -# Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +# Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, # Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, +# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, # openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, -# Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, +# Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, # Windows7, Xubuntu, Zorin, and IRIX have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. @@ -3779,8 +3779,9 @@ END ;; "Plasma"*) - image="${XDG_CONFIG_HOME}/plasmarc" - image="$(awk -F '=' '$1 == "usersWallpapers" { print $2 }' "$image")" + image=$XDG_CONFIG_HOME/plasma-org.kde.plasma.desktop-appletsrc + image=$(awk -F '=' '$1 == "Image" { print $2 }' "$image") + image=${image##file://} ;; *) @@ -4689,16 +4690,16 @@ IMAGE BACKEND: ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - - NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, - Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, + + NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, + Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, - Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, + Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, @@ -4708,16 +4709,16 @@ ASCII: Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, - Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, + Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, - Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, + Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, - Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, + Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos - + NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. NOTE: Use '{distro name}_old' to use the old logos. @@ -5847,23 +5848,23 @@ EOF "Carbs"*) set_colors 4 5 4 4 4 4 read -rd '' ascii_data <<'EOF' -${c2} .......... - ..,;:ccccccc:;'.. - ..,clllc:;;;;;:cllc,. - .,cllc,... ..';;'. - .;lol;.. .. - .,lol;. - .coo:. - .'lol,. - .,lol,. - .,lol,. - 'col;. - .:ooc'. - .'col:. - .'cllc'.. .''. - ..:lolc,'.......',cll,. - ..;cllllccccclllc;'. - ...',;;;;;;,,... +${c2} .......... + ..,;:ccccccc:;'.. + ..,clllc:;;;;;:cllc,. + .,cllc,... ..';;'. + .;lol;.. .. + .,lol;. + .coo:. + .'lol,. + .,lol,. + .,lol,. + 'col;. + .:ooc'. + .'col:. + .'cllc'.. .''. + ..:lolc,'.......',cll,. + ..;cllllccccclllc;'. + ...',;;;;;;,,... ..... EOF ;; From eb48e77595d7be31dd7fe9dc0a8eb5c5a4a4c75a Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 24 Dec 2019 16:23:17 +0100 Subject: [PATCH 281/550] ascii: Add openSUSE Leap logo --- neofetch | 40 ++++++++++++++++++++++++++++++++-------- neofetch.1 | 9 +++++---- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 606a1b60..f73a1809 100755 --- a/neofetch +++ b/neofetch @@ -750,10 +750,11 @@ image_source="auto" # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, # Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, -# openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, -# Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, -# Windows7, Xubuntu, Zorin, and IRIX have ascii logos +# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +# Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, +# Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX +# have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -4714,10 +4715,11 @@ ASCII: Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, - Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, - openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, - Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, - Windows7, Xubuntu, Zorin, and IRIX have ascii logos + Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, + openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, + Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, + Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX + have ascii logos NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. @@ -9189,6 +9191,28 @@ ${c1} `- ` EOF ;; + "openSUSE Leap"* | "openSUSE_Leap"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c2} `-++:` + ./oooooo/- + `:oooooooooooo:. + -+oooooooooooooooo+-` + ./oooooooooooooooooooooo/- + :oooooooooooooooooooooooooo: + ` `-+oooooooooooooooooooo/- ` + `:oo/- .:ooooooooooooooo+:` `-+oo/. +`/oooooo:. -/oooooooooo/. ./oooooo/. + `:+ooooo+-` `:+oooo+- `:oooooo+:` + .:oooooo/. .::` -+oooooo/. + -/oooooo:. ./oooooo+- + `:+ooooo+-:+oooooo:` + ./oooooooooo/. + -/oooo+:` + `:/. +EOF + ;; + "openSUSE Tumbleweed"* | "openSUSE_Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index f2a95e0d..0737c78b 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -302,10 +302,11 @@ PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, -openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, -Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, Void, Obarun, windows10, -Windows7, Xubuntu, Zorin, and IRIX have ascii logos +Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, +Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX +have ascii logos .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP From 684d4e881a8cc2b3f962b50e4b00cc9ae97de7f1 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 25 Dec 2019 17:42:37 +0100 Subject: [PATCH 282/550] Remove redundant trim --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index f73a1809..a7984a58 100755 --- a/neofetch +++ b/neofetch @@ -3782,7 +3782,6 @@ END "Plasma"*) image=$XDG_CONFIG_HOME/plasma-org.kde.plasma.desktop-appletsrc image=$(awk -F '=' '$1 == "Image" { print $2 }' "$image") - image=${image##file://} ;; *) From 408d3ae5eaa1d4fe3b1e2f455379ef00fb4433cd Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 25 Dec 2019 17:43:12 +0100 Subject: [PATCH 283/550] song: Fix Exaile --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index a7984a58..1144c33e 100755 --- a/neofetch +++ b/neofetch @@ -2672,9 +2672,12 @@ get_song() { "exaile"*) # NOTE: Exaile >= 4.0.0 will support mpris2. - song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ - org.exaile.Exaile.Query | - awk -F':|,' '{if ($6 && $8 && $4) printf $6 "\n" $8 "\n" $4}')" + song="$(dbus-send --print-reply --dest=org.exaile.Exaile \ + /org/exaile/Exaile org.exaile.Exaile.Query | + awk -F ':' '{sub(",[^,]*$", "", $3); t=$3; + sub(",[^,]*$", "", $4); a=$4; + sub(",[^,]*$", "", $5); b=$5} + END {print a "\n" b "\n" t}')" ;; "muine"*) From 4a414135aee2db521deed3a09ffa1421ebffa74c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Dec 2019 22:53:10 +0000 Subject: [PATCH 284/550] disk: clean up --- neofetch | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/neofetch b/neofetch index 606a1b60..50a30807 100755 --- a/neofetch +++ b/neofetch @@ -3325,17 +3325,17 @@ END } get_disk() { - type -p df &>/dev/null ||\ + type -p df &>/dev/null || { err "Disk requires 'df' to function. Install 'df' to get disk info."; return; } - df_version="$(df --version 2>&1)" + df_version=$(df --version 2>&1) case $df_version in - *"IMitv"*) df_flags=(-P -g) ;; # AIX - *"befhikm"*) df_flags=(-P -k) ;; # IRIX - *"hiklnP"*) df_flags=(-h) ;; # OpenBSD + *IMitv*) df_flags=(-P -g) ;; # AIX + *befhikm*) df_flags=(-P -k) ;; # IRIX + *hiklnP*) df_flags=(-h) ;; # OpenBSD - *"Tracker"*) # Haiku + *Tracker*) # Haiku err "Your version of df cannot be used due to the non-standard flags" return ;; @@ -3349,7 +3349,7 @@ get_disk() { unset "disks[0]" # Stop here if 'df' fails to print disk info. - [[ -z "${disks[*]}" ]] && { + [[ ${disks[*]} ]] || { err "Disk: df failed to print the disks, make sure the disk_show array is set properly." return } @@ -3357,10 +3357,10 @@ get_disk() { for disk in "${disks[@]}"; do # Create a second array and make each element split at whitespace this time. IFS=" " read -ra disk_info <<< "$disk" - disk_perc="${disk_info[4]/\%}" + disk_perc=${disk_info[4]/\%} case $df_version in - *"befhikm"*) + *befhikm*) disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G (${disk_perc}%)" ;; @@ -3369,35 +3369,33 @@ get_disk() { ;; esac - # Subtitle. case $disk_subtitle in - "name") - disk_sub="${disk_info[0]}" + name) + disk_sub=${disk_info[0]} ;; - "dir") - disk_sub="${disk_info[5]/*\/}" - disk_sub="${disk_sub:-${disk_info[5]}}" + dir) + disk_sub=${disk_info[5]/*\/} + disk_sub=${disk_sub:-${disk_info[5]}} ;; *) - disk_sub="${disk_info[5]}" + disk_sub=${disk_info[5]} ;; esac - # Bar. case $disk_display in - "bar") disk="$(bar "$disk_perc" "100")" ;; - "infobar") disk+=" $(bar "$disk_perc" "100")" ;; - "barinfo") disk="$(bar "$disk_perc" "100")${info_color} $disk" ;; - "perc") disk="${disk_perc}% $(bar "$disk_perc" "100")" ;; + bar) disk="$(bar "$disk_perc" "100")" ;; + infobar) disk+=" $(bar "$disk_perc" "100")" ;; + barinfo) disk="$(bar "$disk_perc" "100")${info_color} $disk" ;; + perc) disk="${disk_perc}% $(bar "$disk_perc" "100")" ;; esac # Append '(disk mount point)' to the subtitle. - if [[ -z "$subtitle" ]]; then - prin "${disk_sub}" "$disk" + if [[ "$subtitle" ]]; then + prin "$subtitle ($disk_sub)" "$disk" else - prin "${subtitle} (${disk_sub})" "$disk" + prin "$disk_sub" "$disk" fi done } From f9ddc9f949ebb9830a6233214cd3775ebb471f3d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Dec 2019 22:54:38 +0000 Subject: [PATCH 285/550] model: Remove ASUS OEM string --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 7c3f0c56..cf93a365 100755 --- a/neofetch +++ b/neofetch @@ -1249,6 +1249,7 @@ get_model() { model=${model//Not Specified} model=${model//Type1ProductConfigId} model=${model//INVALID} + model=${model//All Series} model=${model//�} case $model in From 5c7ad91bdfba1caa7e8004fb5895e6ba75d10ef3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Dec 2019 22:58:06 +0000 Subject: [PATCH 286/550] docs: update --- .github/ISSUE_TEMPLATE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index e51b6bbd..d1120c08 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,6 +2,8 @@ If you're suggesting a new feature then just a description will suffice. +- [ ] Does this issue still occur in the master branch? (**Required if issue**) + #### Neofetch version From 541322beead948569a6a4013a99106929bb6e838 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 29 Dec 2019 11:00:13 +0100 Subject: [PATCH 287/550] song: print empty tags correctly --- neofetch | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index cf93a365..f3d098e0 100755 --- a/neofetch +++ b/neofetch @@ -2596,16 +2596,14 @@ get_song() { org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ string:'Metadata' |\ awk -F '"' 'BEGIN {RS=" entry"}; /"xesam:artist"/ {a = $4} /"xesam:album"/ {b = $4} - /"xesam:title"/ {t = $4} END {print a "\n" b "\n" t}' + /"xesam:title"/ {t = $4} END {print a " \n" b " \n" t}' )" } case ${player/*\/} in - "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; - "mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; - "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; - "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; - "qmmp"*) song="$(qmmp --nowplaying '%p\\n%a\\n%t')" ;; + "mocp"*) song="$(mocp -Q '%artist \n%album \n%song')" ;; + "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \\n%album% \\n%title%')" ;; + "qmmp"*) song="$(qmmp --nowplaying '%p \n%a \n%t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; @@ -2632,6 +2630,14 @@ get_song() { "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "io.elementary.music"*) get_song_dbus "Music" ;; + "mpd"* | "mopidy"*) + song="$(mpc -f '%artist% \n%album% \n%title%' current "${mpc_args[@]}")" + ;; + + "xmms2d"*) + song="$(xmms2 current -f "\${artist}"$' \n'"\${album}"$' \n'"\${title}")" + ;; + "cmus"*) # NOTE: cmus >= 2.8.0 supports mpris2 song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; @@ -2644,7 +2650,7 @@ get_song() { /tag title/ { $1=$2=""; sub(" ", ""); t=$0 } - END { print a "\n" b "\n" t }')" + END { print a " \n" b " \n" t }')" ;; "spotify"*) @@ -2668,7 +2674,7 @@ get_song() { "banshee"*) song="$(banshee --query-artist --query-album --query-title |\ awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END {print a "\n" b "\n"t}')" + END {print a " \n" b " \n"t}')" ;; "exaile"*) @@ -2678,31 +2684,31 @@ get_song() { awk -F ':' '{sub(",[^,]*$", "", $3); t=$3; sub(",[^,]*$", "", $4); a=$4; sub(",[^,]*$", "", $5); b=$5} - END {print a "\n" b "\n" t}')" + END {print a " \n" b " \n" t}')" ;; "muine"*) song="$(dbus-send --print-reply --dest=org.gnome.Muine /org/gnome/Muine/Player \ org.gnome.Muine.Player.GetCurrentSong | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END {print a "\n" b "\n" t}')" + END {print a " \n" b " \n" t}')" ;; "quodlibet"*) song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} - /"title"/ {t=$4} END {print a "\n" b "\n" t}')" + /"title"/ {t=$4} END {print a " \n" b " \n" t}')" ;; "pogo"*) song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \ org.freedesktop.MediaPlayer.GetMetadata | awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} - /"title"/ {t=$4} END {print a "\n" b "\n" t}')" + /"title"/ {t=$4} END {print a " \n" b " \n" t}')" ;; - *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" || return ;; + *) mpc &>/dev/null && song="$(mpc -f '%artist% \n%album% \n%title%' current)" || return ;; esac IFS=$'\n' read -d "" -r artist album title <<< "${song//'\n'/$'\n'}" From 92246e7b7fca9fc76d04f21e5a0809e996144b54 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 29 Dec 2019 11:02:30 +0100 Subject: [PATCH 288/550] song: simplify cmus --- neofetch | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index f3d098e0..68fb8c4d 100755 --- a/neofetch +++ b/neofetch @@ -2640,17 +2640,10 @@ get_song() { "cmus"*) # NOTE: cmus >= 2.8.0 supports mpris2 - song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; - /tag artist/ { - $1=$2=""; sub(" ", ""); a=$0 - } - /tag album / { - $1=$2=""; sub(" ", ""); b=$0 - } - /tag title/ { - $1=$2=""; sub(" ", ""); t=$0 - } - END { print a " \n" b " \n" t }')" + song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; a=$0} + /tag album / {$1=$2=""; b=$0} + /tag title/ {$1=$2=""; t=$0} + END {print a " \n" b " \n" t}')" ;; "spotify"*) From 03152764aaf4293ab349e59460bc0f5e49c0bfd8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 29 Dec 2019 23:46:29 +0000 Subject: [PATCH 289/550] cols: Fix issues --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index cf93a365..a5cef780 100755 --- a/neofetch +++ b/neofetch @@ -1975,8 +1975,8 @@ get_cpu() { # Select the right temperature file. for temp_dir in /sys/class/hwmon/*; do - [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power|k10temp) ]] && \ - { temp_dir="${temp_dir}/temp1_input"; break; } + [[ "$(< "$temp_dir/name")" =~ (coretemp|fam15h_power|k10temp) ]] && + { temp_dir=$temp_dir/temp1_input; break; } done # Get CPU speed. @@ -3598,12 +3598,13 @@ get_cols() { printf -v block_spaces "%${block_height}s" # Convert the spaces into rows of blocks. - [[ "$blocks" ]] && cols+="${block_spaces// /${blocks}${reset}nl}" - [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}${reset}nl}" + [[ "$blocks" ]] && cols+="${block_spaces// /${blocks}nl}" + [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}nl}" # Add newlines to the string. - cols="${cols%%'nl'}" - cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" + cols=${cols%%nl} + cols=${cols//nl/ +[${text_padding}C${zws}} # Add block height to info height. ((info_height+=block_range[1]>7?block_height+3:block_height+2)) From 74914899d835eb82ec42084c1e2f25fd353a5fa2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 3 Jan 2020 08:57:33 +0200 Subject: [PATCH 290/550] wm_theme: clean up --- neofetch | 200 +++++++++++++++++++++++++++---------------------------- 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/neofetch b/neofetch index 61461638..f6896323 100755 --- a/neofetch +++ b/neofetch @@ -1254,7 +1254,7 @@ get_model() { case $model in "Standard PC"*) model="KVM/QEMU (${model})" ;; - "OpenBSD"*) model="vmm ($model)" ;; + OpenBSD*) model="vmm ($model)" ;; esac } @@ -1637,17 +1637,17 @@ get_de() { if [[ $de_version == on && $de ]]; then case $de in - "Plasma"*) de_ver=$(plasmashell --version) ;; - "MATE"*) de_ver=$(mate-session --version) ;; - "Xfce"*) de_ver=$(xfce4-session --version) ;; - "GNOME"*) de_ver=$(gnome-shell --version) ;; - "Cinnamon"*) de_ver=$(cinnamon --version) ;; - "Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; - "Budgie"*) de_ver=$(budgie-desktop --version) ;; - "LXQt"*) de_ver=$(lxqt-session --version) ;; - "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; - "Trinity"*) de_ver=$(tde-config --version) ;; - "Unity"*) de_ver=$(unity --version) ;; + Plasma*) de_ver=$(plasmashell --version) ;; + MATE*) de_ver=$(mate-session --version) ;; + Xfce*) de_ver=$(xfce4-session --version) ;; + GNOME*) de_ver=$(gnome-shell --version) ;; + Cinnamon*) de_ver=$(cinnamon --version) ;; + Deepin*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; + Budgie*) de_ver=$(budgie-desktop --version) ;; + LXQt*) de_ver=$(lxqt-session --version) ;; + Lumina*) de_ver=$(lumina-desktop --version 2>&1) ;; + Trinity*) de_ver=$(tde-config --version) ;; + Unity*) de_ver=$(unity --version) ;; esac de_ver=${de_ver/*TDE:} @@ -1784,164 +1784,164 @@ get_wm_theme() { ((de_run != 1)) && get_de case $wm in - "E16") - wm_theme="$(awk -F "= " '/theme.name/ {print $2}' "${HOME}/.e16/e_config--0.0.cfg")" + E16) + wm_theme=$(awk -F "= " '/theme.name/ {print $2}' "${HOME}/.e16/e_config--0.0.cfg") ;; - "Sawfish") - wm_theme="$(awk -F '\\(quote|\\)' '/default-frame-style/ {print $(NF-4)}' \ - "${HOME}/.sawfish/custom")" + Sawfish) + wm_theme=$(awk -F '\\(quote|\\)' '/default-frame-style/ {print $(NF-4)}' \ + "$HOME/.sawfish/custom") ;; - "Cinnamon" | "Muffin" | "Mutter (Muffin)") - detheme="$(gsettings get org.cinnamon.theme name)" - wm_theme="$(gsettings get org.cinnamon.desktop.wm.preferences theme)" - wm_theme="$detheme (${wm_theme})" + Cinnamon|Muffin|"Mutter (Muffin)") + detheme=$(gsettings get org.cinnamon.theme name) + wm_theme=$(gsettings get org.cinnamon.desktop.wm.preferences theme) + wm_theme="$detheme ($wm_theme)" ;; - "Compiz" | "Mutter" | "Gala") + Compiz|Mutter|Gala) if type -p gsettings >/dev/null; then - wm_theme="$(gsettings get org.gnome.shell.extensions.user-theme name)" + wm_theme=$(gsettings get org.gnome.shell.extensions.user-theme name) - [[ -z "${wm_theme//\'}" ]] && \ - wm_theme="$(gsettings get org.gnome.desktop.wm.preferences theme)" + [[ ${wm_theme//\'} ]] || \ + wm_theme=$(gsettings get org.gnome.desktop.wm.preferences theme) elif type -p gconftool-2 >/dev/null; then - wm_theme="$(gconftool-2 -g /apps/metacity/general/theme)" + wm_theme=$(gconftool-2 -g /apps/metacity/general/theme) fi ;; - "Metacity"*) - if [[ "$de" == "Deepin" ]]; then - wm_theme="$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme)" + Metacity*) + if [[ $de == Deepin ]]; then + wm_theme=$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme) - elif [[ "$de" == "MATE" ]]; then - wm_theme="$(gsettings get org.mate.Marco.general theme)" + elif [[ $de == MATE ]]; then + wm_theme=$(gsettings get org.mate.Marco.general theme) else - wm_theme="$(gconftool-2 -g /apps/metacity/general/theme)" + wm_theme=$(gconftool-2 -g /apps/metacity/general/theme) fi ;; - "E17" | "Enlightenment") + E17|Enlightenment) if type -p eet >/dev/null; then - wm_theme="$(eet -d "${HOME}/.e/e/config/standard/e.cfg" config |\ - awk '/value \"file\" string.*.edj/ {print $4}')" - wm_theme="${wm_theme##*/}" - wm_theme="${wm_theme%.*}" + wm_theme=$(eet -d "$HOME/.e/e/config/standard/e.cfg" config |\ + awk '/value \"file\" string.*.edj/ {print $4}') + wm_theme=${wm_theme##*/} + wm_theme=${wm_theme%.*} fi ;; - "Fluxbox") - [[ -f "${HOME}/.fluxbox/init" ]] && \ - wm_theme="$(awk -F "/" '/styleFile/ {print $NF}' "${HOME}/.fluxbox/init")" + Fluxbox) + [[ -f $HOME/.fluxbox/init ]] && + wm_theme=$(awk -F "/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init") ;; - "IceWM"*) - [[ -f "${HOME}/.icewm/theme" ]] && \ - wm_theme="$(awk -F "[\",/]" '!/#/ {print $2}' "${HOME}/.icewm/theme")" + IceWM*) + [[ -f $HOME/.icewm/theme ]] && + wm_theme=$(awk -F "[\",/]" '!/#/ {print $2}' "$HOME/.icewm/theme") ;; - "Openbox") + Openbox) case $de in - "LXDE"*) ob_file="lxde-rc" ;; - "LXQt"*) ob_file="lxqt-rc" ;; - *) ob_file="rc" ;; + LXDE*) ob_file=lxde-rc ;; + LXQt*) ob_file=lxqt-rc ;; + *) ob_file=rc ;; esac - ob_file="${XDG_CONFIG_HOME}/openbox/${ob_file}.xml" + ob_file=$XDG_CONFIG_HOME/openbox/$ob_file.xml - [[ -f "$ob_file" ]] && \ - wm_theme="$(awk '// {while (getline n) {if (match(n, //)) - {l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file")" + [[ -f $ob_file ]] && + wm_theme=$(awk '// {while (getline n) {if (match(n, //)) + {l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file") ;; - "PekWM") - [[ -f "${HOME}/.pekwm/config" ]] && \ - wm_theme="$(awk -F "/" '/Theme/{gsub(/\"/,""); print $NF}' "${HOME}/.pekwm/config")" + PekWM) + [[ -f $HOME/.pekwm/config ]] && + wm_theme=$(awk -F "/" '/Theme/{gsub(/\"/,""); print $NF}' "$HOME/.pekwm/config") ;; - "Xfwm4") - [[ -f "${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml" ]] && \ - wm_theme="$(xfconf-query -c xfwm4 -p /general/theme)" + Xfwm4) + [[ -f $HOME/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]] && + wm_theme=$(xfconf-query -c xfwm4 -p /general/theme) ;; - "KWin"*) + KWin*) kde_config_dir - kwinrc="${kde_config_dir}/kwinrc" - kdebugrc="${kde_config_dir}/kdebugrc" + kwinrc=$kde_config_dir/kwinrc + kdebugrc=$kde_config_dir/kdebugrc - if [[ -f "$kwinrc" ]]; then - wm_theme="$(awk '/theme=/ { + if [[ -f $kwinrc ]]; then + wm_theme=$(awk '/theme=/ { gsub(/theme=.*qml_|theme=.*svg__/,"",$0); print $0; exit - }' "$kwinrc")" + }' "$kwinrc") - [[ -z "$wm_theme" ]] && \ - wm_theme="$(awk '/library=org.kde/ { + [[ "$wm_theme" ]] || + wm_theme=$(awk '/library=org.kde/ { gsub(/library=org.kde./,"",$0); print $0; exit - }' "$kwinrc")" + }' "$kwinrc") - [[ -z "$wm_theme" ]] && \ - wm_theme="$(awk '/PluginLib=kwin3_/ { + [[ $wm_theme ]] || + wm_theme=$(awk '/PluginLib=kwin3_/ { gsub(/PluginLib=kwin3_/,"",$0); print $0; exit - }' "$kwinrc")" + }' "$kwinrc") - elif [[ -f "$kdebugrc" ]]; then - wm_theme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$kdebugrc")" + elif [[ -f $kdebugrc ]]; then + wm_theme=$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$kdebugrc") fi - wm_theme="${wm_theme/theme=}" + wm_theme=${wm_theme/theme=} ;; "Quartz Compositor") - global_preferences="${HOME}/Library/Preferences/.GlobalPreferences.plist" - wm_theme="$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences")" - wm_theme_color="$(PlistBuddy -c "Print AppleAccentColor" "$global_preferences")" + global_preferences=$HOME/Library/Preferences/.GlobalPreferences.plist + wm_theme=$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences") + wm_theme_color=$(PlistBuddy -c "Print AppleAccentColor" "$global_preferences") - [[ -z "$wm_theme" ]] && \ - wm_theme="Light" + [[ "$wm_theme" ]] || + wm_theme=Light case $wm_theme_color in - "-1") wm_theme_color="Graphite" ;; - "0") wm_theme_color="Red" ;; - "1") wm_theme_color="Orange" ;; - "2") wm_theme_color="Yellow" ;; - "3") wm_theme_color="Green" ;; - "5") wm_theme_color="Purple" ;; - "6") wm_theme_color="Pink" ;; - *) wm_theme_color="Blue" ;; + -1) wm_theme_color=Graphite ;; + 0) wm_theme_color=Red ;; + 1) wm_theme_color=Orange ;; + 2) wm_theme_color=Yellow ;; + 3) wm_theme_color=Green ;; + 5) wm_theme_color=Purple ;; + 6) wm_theme_color=Pink ;; + *) wm_theme_color=Blue ;; esac - wm_theme="${wm_theme_color} ($wm_theme)" + wm_theme="$wm_theme_color ($wm_theme)" ;; - *"Explorer") - path="/proc/registry/HKEY_CURRENT_USER/Software/Microsoft" - path+="/Windows/CurrentVersion/Themes/CurrentTheme" + *Explorer) + path=/proc/registry/HKEY_CURRENT_USER/Software/Microsoft + path+=/Windows/CurrentVersion/Themes/CurrentTheme - wm_theme="$(head -n1 "$path")" - wm_theme="${wm_theme##*\\}" - wm_theme="${wm_theme%.*}" + wm_theme=$(head -n1 "$path") + wm_theme=${wm_theme##*\\} + wm_theme=${wm_theme%.*} ;; - "Blackbox" | "bbLean"*) - path="$(wmic process get ExecutablePath | grep -F "blackbox")" - path="${path//\\/\/}" + Blackbox|bbLean*) + path=$(wmic process get ExecutablePath | grep -F "blackbox") + path=${path//\\/\/} - wm_theme="$(grep '^session\.styleFile:' "${path/\.exe/.rc}")" - wm_theme="${wm_theme/session\.styleFile: }" - wm_theme="${wm_theme##*\\}" - wm_theme="${wm_theme%.*}" + wm_theme=$(grep '^session\.styleFile:' "${path/\.exe/.rc}") + wm_theme=${wm_theme/session\.styleFile: } + wm_theme=${wm_theme##*\\} + wm_theme=${wm_theme%.*} ;; esac - wm_theme="$(trim_quotes "$wm_theme")" + wm_theme=$(trim_quotes "$wm_theme") } get_cpu() { From 39d7188f4a6a6109a0c12bb98b94fc5c799f19d4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 01:00:16 +0200 Subject: [PATCH 291/550] disk: Added --disk_subtitle=none. Closes #1386 --- neofetch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index f6896323..9fa16841 100755 --- a/neofetch +++ b/neofetch @@ -419,7 +419,7 @@ disk_show=('/') # What to append to the Disk subtitle. # # Default: 'mount' -# Values: 'mount', 'name', 'dir' +# Values: 'mount', 'name', 'dir', 'none' # Flag: --disk_subtitle # # Example: @@ -433,6 +433,10 @@ disk_show=('/') # dir: 'Disk (/): 74G / 118G (66%)' # 'Disk (Local Disk): 74G / 118G (66%)' # 'Disk (Videos): 74G / 118G (66%)' +# +# none: 'Disk: 74G / 118G (66%)' +# 'Disk: 74G / 118G (66%)' +# 'Disk: 74G / 118G (66%)' disk_subtitle="mount" @@ -3383,6 +3387,8 @@ get_disk() { disk_sub=${disk_sub:-${disk_info[5]}} ;; + none) ;; + *) disk_sub=${disk_info[5]} ;; @@ -3397,7 +3403,7 @@ get_disk() { # Append '(disk mount point)' to the subtitle. if [[ "$subtitle" ]]; then - prin "$subtitle ($disk_sub)" "$disk" + prin "$subtitle${disk_sub:+ ($disk_sub)}" "$disk" else prin "$disk_sub" "$disk" fi @@ -4615,7 +4621,7 @@ INFO: NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir + Takes: name, mount, dir, none 'name' shows the disk's name (sda1, sda2, etc) @@ -4623,6 +4629,8 @@ INFO: 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + 'none' shows only 'Disk' or the configured title. + --ip_host url URL to query for public IP --ip_timeout int Public IP timeout (in seconds). --song_format format Print the song data in a specific format (see config file). From b699d75a9e7ae55a101daa000bb9b99d60f0cd14 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 01:04:39 +0200 Subject: [PATCH 292/550] neofetch: Fix Chrome OS detection. Closes #1384 --- neofetch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 9fa16841..fcaf9311 100755 --- a/neofetch +++ b/neofetch @@ -736,7 +736,7 @@ image_source="auto" # XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, # BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, # BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, -# Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, +# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, # DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, # Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, @@ -996,7 +996,7 @@ get_distro() { # While the file is a series of variables they can't be sourced # by the shell since the values aren't quoted. elif [[ -f /etc/lsb-release && $(< /etc/lsb-release) == *CHROMEOS* ]]; then - distro=$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release) + distro='Chrome OS' elif type -p guix >/dev/null; then case $distro_shorthand in @@ -1033,11 +1033,12 @@ get_distro() { esac elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then - case $distro_shorthand in - on) distro+=" [Chrome OS]" ;; - tiny) distro="Chrome OS" ;; - *) distro+=" on Chrome OS" ;; - esac + [[ $distro != *Chrome* ]] && + case $distro_shorthand in + on) distro+=" [Chrome OS]" ;; + tiny) distro="Chrome OS" ;; + *) distro+=" on Chrome OS" ;; + esac fi distro=$(trim_quotes "$distro") From f5263176dd5c0d2a1621e34de560e024dd9307d5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 01:18:15 +0200 Subject: [PATCH 293/550] neofetch: Added --disk_percent. Closes #1378 --- neofetch | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index fcaf9311..0b741130 100755 --- a/neofetch +++ b/neofetch @@ -439,6 +439,18 @@ disk_show=('/') # 'Disk: 74G / 118G (66%)' disk_subtitle="mount" +# Disk percent. +# Show/Hide disk percent. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --disk_percent +# +# Example: +# on: 'Disk (/): 74G / 118G (66%)' +# off: 'Disk (/): 74G / 118G' +disk_percent="on" + # Song @@ -3368,13 +3380,18 @@ get_disk() { IFS=" " read -ra disk_info <<< "$disk" disk_perc=${disk_info[4]/\%} + case $disk_percent in + off) disk_perc= + esac + case $df_version in *befhikm*) - disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G (${disk_perc}%)" + disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G" + disk+="${disk_perc:+ ($disk_perc%)}" ;; *) - disk="${disk_info[2]/i} / ${disk_info[1]/i} (${disk_perc}%)" + disk="${disk_info[2]/i} / ${disk_info[1]/i}${disk_perc:+ ($disk_perc%)}" ;; esac @@ -4632,6 +4649,8 @@ INFO: 'none' shows only 'Disk' or the configured title. + --disk_percent on/off Hide/Show disk percent. + --ip_host url URL to query for public IP --ip_timeout int Public IP timeout (in seconds). --song_format format Print the song data in a specific format (see config file). @@ -4835,6 +4854,7 @@ get_args() { ;; "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_percent") disk_percent="$2" ;; "--disk_show") unset disk_show for arg in "$@"; do From 6ae64c5990bdf4fe545d51fd45bade637628f105 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 01:20:01 +0200 Subject: [PATCH 294/550] neofetch: Fix resolution issue. Closes #1347 --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 0b741130..cc17c58b 100755 --- a/neofetch +++ b/neofetch @@ -2809,6 +2809,8 @@ get_resolution() { resolution="$(xrandr --nograb --current |\ awk -F 'connected |\\+|\\(' \ '/ connected/ && $2 {printf $2 ", "}')" + + resolution="${resolution/primary, }" resolution="${resolution/primary }" ;; esac From 7fdaed2f946c4e22a03389477f4a41761cace46e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 01:47:14 +0200 Subject: [PATCH 295/550] packages: Count nix-default. Closes #1317 --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index cc17c58b..d2937d70 100755 --- a/neofetch +++ b/neofetch @@ -1459,8 +1459,9 @@ get_packages() { } has nix-store && { - manager=nix-system && tot nix-store -q --requisites "/run/current-system/sw" - manager=nix-user && tot nix-store -q --requisites "$HOME/.nix-profile" + manager=nix-system && tot nix-store -q --requisites /run/current-system/sw + manager=nix-user && tot nix-store -q --requisites ~/.nix-profile + manager=nix-default && tot nix-store -q --requisites /nix/var/nix/profiles/default } # pkginfo is also the name of a python package manager which is painfully slow. From 0636706ecf3e709bc7a2ed5fc225207ec2516a6a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 10:44:33 +0200 Subject: [PATCH 296/550] neofetch: Fix CPU temp on some systems --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index d2937d70..72813772 100755 --- a/neofetch +++ b/neofetch @@ -1993,8 +1993,11 @@ get_cpu() { # Select the right temperature file. for temp_dir in /sys/class/hwmon/*; do - [[ "$(< "$temp_dir/name")" =~ (coretemp|fam15h_power|k10temp) ]] && - { temp_dir=$temp_dir/temp1_input; break; } + [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power|k10temp) ]] && { + temp_dirs=("$temp_dir"/temp*_input) + temp_dir=${temp_dirs[0]} + break + } done # Get CPU speed. From c323470f2fbe21fe3b7528a542da5749d27f6e72 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 10:49:47 +0200 Subject: [PATCH 297/550] neofetch: Add support for resolution in Wayland and TTY. Closes #1304 and #1301 --- neofetch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 72813772..4a6288fb 100755 --- a/neofetch +++ b/neofetch @@ -2801,7 +2801,7 @@ get_resolution() { ;; *) - if type -p xrandr >/dev/null; then + if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then case $refresh_rate in "on") resolution="$(xrandr --nograb --current |\ @@ -2820,13 +2820,20 @@ get_resolution() { esac resolution="${resolution//\*}" - elif type -p xwininfo >/dev/null; then + elif type -p xwininfo >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then read -r w h \ <<< "$(xwininfo -root | awk -F':' '/Width|Height/ {printf $2}')" resolution="${w}x${h}" - elif type -p xdpyinfo >/dev/null; then + elif type -p xdpyinfo >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then resolution="$(xdpyinfo | awk '/dimensions:/ {printf $2}')" + + elif [[ -d /sys/class/drm ]]; then + for dev in /sys/class/drm/*/modes; do + read -r resolution _ < "$dev" + + [[ $resolution ]] && break + done fi ;; esac From 155fe13d9a533ed8962fe89caf50c18853ef36c5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 10:56:38 +0200 Subject: [PATCH 298/550] docs: update --- neofetch | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index d190389b..d59ee15b 100755 --- a/neofetch +++ b/neofetch @@ -3357,11 +3357,7 @@ END ;; conemu-*) - local ce_arg_list - local ce_arg_idx - local ce_conf - - # Could have used `eval set -- "$ConEmuArgs"` instead for arg parsing + # Could have used `eval set -- "$ConEmuArgs"` instead for arg parsing. readarray -t ce_arg_list < <(xargs -n1 printf "%s\n" <<< "${ConEmuArgs-}") for ce_arg_idx in "${!ce_arg_list[@]}"; do @@ -3386,7 +3382,7 @@ END } done - # Null-terminated contents in /proc/registry files triggers a Bash warning + # Null-terminated contents in /proc/registry files triggers a Bash warning. [[ "$term_font" ]] || read -r term_font < \ /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName ;; From 1588155964c38cca2b568e9d37add13842fdbe26 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 17:54:24 +0200 Subject: [PATCH 299/550] resolution: Multi monitor support for Windows. Closes #1297 --- neofetch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index d59ee15b..b4e94ebf 100755 --- a/neofetch +++ b/neofetch @@ -2783,15 +2783,17 @@ get_resolution() { ;; "Windows") - local width="" - width="$(wmic path Win32_VideoController get CurrentHorizontalResolution)" - width="${width//CurrentHorizontalResolution/}" + maparray -t sw < <(wmic path Win32_VideoController get CurrentHorizontalResolution) + maparray -t sh < <(wmic path Win32_VideoController get CurrentVerticalResolution) - local height="" - height="$(wmic path Win32_VideoController get CurrentVerticalResolution)" - height="${height//CurrentVerticalResolution/}" + sw=("${sw[@]//CurrentHorizontalResolution}") + sh=("${sh[@]//CurrentHorizontalResolution}") - [[ "$(trim "$width")" ]] && resolution="${width//[[:space:]]}x${height//[[:space:]]}" + for ((mn = 0; mn < ${#sw[@]}; mn++)) { + resolution+=${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, + } + + resolution=${resolution%,} ;; "Haiku") From 3dd3f7f8e7c5df1c2cfa4ded1683a0a396873967 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 18:48:52 +0200 Subject: [PATCH 300/550] neofetch: Fix windows resolution. Closes #1297 --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index b4e94ebf..0ed2a32c 100755 --- a/neofetch +++ b/neofetch @@ -2783,8 +2783,11 @@ get_resolution() { ;; "Windows") - maparray -t sw < <(wmic path Win32_VideoController get CurrentHorizontalResolution) - maparray -t sh < <(wmic path Win32_VideoController get CurrentVerticalResolution) + IFS=$'\n' read -d "" -ra sw \ + < <(wmic path Win32_VideoController get CurrentHorizontalResolution) + + IFS=$'\n' read -d "" -ra sh \ + < <(wmic path Win32_VideoController get CurrentVerticalResolution) sw=("${sw[@]//CurrentHorizontalResolution}") sh=("${sh[@]//CurrentHorizontalResolution}") From c11f1499895fde14b6c9f47ac9d58ece92f59e63 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 19:04:14 +0200 Subject: [PATCH 301/550] neofetch: Fix windows issue. Closes #1297 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 0ed2a32c..9b5704fb 100755 --- a/neofetch +++ b/neofetch @@ -2784,10 +2784,10 @@ get_resolution() { "Windows") IFS=$'\n' read -d "" -ra sw \ - < <(wmic path Win32_VideoController get CurrentHorizontalResolution) + <<< "$(wmic path Win32_VideoController get CurrentHorizontalResolution)" IFS=$'\n' read -d "" -ra sh \ - < <(wmic path Win32_VideoController get CurrentVerticalResolution) + <<< "$(wmic path Win32_VideoController get CurrentVerticalResolution)" sw=("${sw[@]//CurrentHorizontalResolution}") sh=("${sh[@]//CurrentHorizontalResolution}") From 492af341b882c9835776875a3826556e869101da Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 19:11:17 +0200 Subject: [PATCH 302/550] neofetch: Fix windows issue. Closes #1297 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 9b5704fb..df9371f2 100755 --- a/neofetch +++ b/neofetch @@ -2789,8 +2789,8 @@ get_resolution() { IFS=$'\n' read -d "" -ra sh \ <<< "$(wmic path Win32_VideoController get CurrentVerticalResolution)" - sw=("${sw[@]//CurrentHorizontalResolution}") - sh=("${sh[@]//CurrentHorizontalResolution}") + sw=("${sw[@]//*CurrentHorizontalResolution*}") + sh=("${sh[@]//*CurrentVerticalResolution*}") for ((mn = 0; mn < ${#sw[@]}; mn++)) { resolution+=${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, From bf0eef3f0703d096a975c45d04b5988a674d937e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 19:17:23 +0200 Subject: [PATCH 303/550] neofetch: Fix windows issue. Closes #1297 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index df9371f2..39045f89 100755 --- a/neofetch +++ b/neofetch @@ -2793,7 +2793,8 @@ get_resolution() { sh=("${sh[@]//*CurrentVerticalResolution*}") for ((mn = 0; mn < ${#sw[@]}; mn++)) { - resolution+=${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, + [[ ${sw[mn]//[[:space:]]} && ${sh[mn]//[[:space:]]} ]] && + resolution+=${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, } resolution=${resolution%,} From 8f03e7082f523513be2e2fc58129ac14b63a97de Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 19:30:51 +0200 Subject: [PATCH 304/550] neofetch: Fix windows issue. Closes #1297 --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 39045f89..dd8e5e07 100755 --- a/neofetch +++ b/neofetch @@ -2789,12 +2789,12 @@ get_resolution() { IFS=$'\n' read -d "" -ra sh \ <<< "$(wmic path Win32_VideoController get CurrentVerticalResolution)" - sw=("${sw[@]//*CurrentHorizontalResolution*}") - sh=("${sh[@]//*CurrentVerticalResolution*}") + sw=("${sw[@]//CurrentHorizontalResolution}") + sh=("${sh[@]//CurrentVerticalResolution}") for ((mn = 0; mn < ${#sw[@]}; mn++)) { [[ ${sw[mn]//[[:space:]]} && ${sh[mn]//[[:space:]]} ]] && - resolution+=${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, + resolution+="${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, " } resolution=${resolution%,} From 74be40b5c653eeee59a389a2d63aafd21d95d1e7 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 21 Jan 2020 21:44:41 +0100 Subject: [PATCH 305/550] os: Add EndeavourOS --- neofetch | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index dd8e5e07..238078c5 100755 --- a/neofetch +++ b/neofetch @@ -751,7 +751,7 @@ image_source="auto" # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, # DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, -# Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +# EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, # gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, @@ -4779,7 +4779,7 @@ ASCII: Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, - Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, + EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, @@ -6543,6 +6543,27 @@ eee eeeeeeeeee eeeeee eee EOF ;; + "EndeavourOS"*) + set_colors 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} ./${c2}o${c3}. +${c1} ./${c2}sssso${c3}- +${c1} `:${c2}osssssss+${c3}- +${c1} `:+${c2}sssssssssso${c3}/. +${c1} `-/o${c2}ssssssssssssso${c3}/. +${c1} `-/+${c2}sssssssssssssssso${c3}+:` +${c1} `-:/+${c2}sssssssssssssssssso${c3}+/. +${c1} `.://o${c2}sssssssssssssssssssso${c3}++- +${c1} .://+${c2}ssssssssssssssssssssssso${c3}++: +${c1} .:///o${c2}ssssssssssssssssssssssssso${c3}++: +${c1} `:////${c2}ssssssssssssssssssssssssssso${c3}+++. +${c1}`-////+${c2}ssssssssssssssssssssssssssso${c3}++++- +${c1} `..-+${c2}oosssssssssssssssssssssssso${c3}+++++/` + ./++++++++++++++++++++++++++++++/:. + `:::::::::::::::::::::::::------`` +EOF + ;; + "Endless"*) set_colors 1 7 read -rd '' ascii_data <<'EOF' From 6b84f0e4deadce1acdb8acd2d300a19aee89dcb9 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 23 Jan 2020 21:46:20 +0100 Subject: [PATCH 306/550] Update man page --- neofetch.1 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 0737c78b..0cb48051 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. -.TH NEOFETCH "1" "December 2019" "Neofetch 6.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.12. +.TH NEOFETCH "1" "January 2020" "Neofetch 6.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -130,13 +130,18 @@ 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 +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 @@ -287,7 +292,7 @@ BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, -Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, From eaa4b35ee41c0ea6c1847ef4b0ea164e06197e25 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 28 Jan 2020 12:24:22 +0200 Subject: [PATCH 307/550] neofetch: Added --title_fqdn. Closes #1397 --- neofetch | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index dd8e5e07..3556936e 100755 --- a/neofetch +++ b/neofetch @@ -85,6 +85,16 @@ print_info() { info cols } +# Title + + +# Hide/Show Fully qualified domain name. +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --title_fqdn +title_fqdn="off" + # Kernel @@ -1277,7 +1287,12 @@ get_model() { get_title() { user=${USER:-$(id -un || printf %s "${HOME/*\/}")} - hostname=${HOSTNAME:-$(hostname)} + + case $title_fqdn in + on) hostname=$(hostname -f) ;; + *) hostname=${HOSTNAME:-$(hostname)} ;; + esac + title=${title_color}${bold}${user}${at_color}@${title_color}${bold}${hostname} length=$((${#user} + ${#hostname} + 1)) } @@ -4634,6 +4649,7 @@ INFO: NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + --title_fqdn on/off Hide/Show Fully Qualified Domain Name in title. --package_managers on/off Hide/Show Package Manager names . (on, tiny, off) --os_arch on/off Hide/Show OS architecture. --speed_type type Change the type of cpu speed to display. @@ -4873,6 +4889,7 @@ get_args() { while [[ "$1" ]]; do case $1 in # Info + "--title_fqdn") title_fqdn="$2" ;; "--package_managers") package_managers="$2" ;; "--os_arch") os_arch="$2" ;; "--cpu_cores") cpu_cores="$2" ;; From 388ba9c0a273b21e032cd250661245c769bfad3a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 1 Feb 2020 16:25:14 +0200 Subject: [PATCH 308/550] neofetch: Fix window size issue in gnome terminal --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 5528338d..3b1112c1 100755 --- a/neofetch +++ b/neofetch @@ -3975,14 +3975,14 @@ get_window_size() { if type -p xdo &>/dev/null; then current_window="$(xdo id)" + elif type -p xprop &>/dev/null; then + current_window="$(xprop -root _NET_ACTIVE_WINDOW)" + current_window="${current_window##* }" + elif type -p xdpyinfo &>/dev/null; then current_window="$(xdpyinfo | grep -F "focus:")" current_window="${current_window/*window }" current_window="${current_window/,*}" - - elif type -p xprop &>/dev/null; then - current_window="$(xprop -root _NET_ACTIVE_WINDOW)" - current_window="${current_window##* }" fi # If the ID was found get the window size. From e0e0033fc842766ba099e38f7e8e9edc07d1b132 Mon Sep 17 00:00:00 2001 From: Daniel Gurney Date: Sun, 2 Feb 2020 17:19:49 +0200 Subject: [PATCH 309/550] Add patterns for AMD CPUs with numeric core counts --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 3b1112c1..4a318f09 100755 --- a/neofetch +++ b/neofetch @@ -2191,6 +2191,8 @@ get_cpu() { cpu="${cpu//Quad-Core}" cpu="${cpu//Six-Core}" cpu="${cpu//Eight-Core}" + cpu="${cpu//[1-9][0-9]-Core}" + cpu="${cpu//[0-9]-Core}" cpu="${cpu//, * Compute Cores}" cpu="${cpu//Core / }" cpu="${cpu//(\"AuthenticAMD\"*)}" From d2ff375b2e1edef633f8c863f547e1b55762debf Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 2 Feb 2020 17:57:24 +0200 Subject: [PATCH 310/550] docs: update --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 3b1112c1..de408239 100755 --- a/neofetch +++ b/neofetch @@ -3943,6 +3943,9 @@ get_window_size() { # user input so we have to use read to store the out # -put as a variable. # The 1 second timeout is required for older bash + # + # False positive. + # shellcheck disable=2141 case ${BASH_VERSINFO[0]} in 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; *) IFS=';t' read -d t -t 1 -sra term_size ;; From f6fde7cc2456ad9150b6db857b42dda925f01d35 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 4 Feb 2020 12:45:36 +0100 Subject: [PATCH 311/550] docs: update --- LICENSE.md | 2 +- neofetch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 6867a5b2..a4f19eb8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2019 Dylan Araps +Copyright (c) 2015-2020 Dylan Araps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/neofetch b/neofetch index c351f556..5efd0b17 100755 --- a/neofetch +++ b/neofetch @@ -8,7 +8,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2015-2019 Dylan Araps +# Copyright (c) 2015-2020 Dylan Araps # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal From ab7c6cac7dd544fd5c2422bdccd0153f018e60b8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 5 Feb 2020 00:15:22 +0200 Subject: [PATCH 312/550] neofetch: Appimage support. Closes #1403 --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index c351f556..ce5c5ea7 100755 --- a/neofetch +++ b/neofetch @@ -1502,6 +1502,10 @@ get_packages() { # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. has snap && ps -e | grep -qFm 1 snapd >/dev/null && tot snap list && ((packages-=1)) + + # This is the only standard location for appimages. + # See: https://github.com/AppImage/AppImageKit/wiki + manager=appimage && has appimaged && dir ~/.local/bin/*.appimage ;; "Mac OS X"|MINIX) From 652c4ec8821fa7ce0d86f5dc0294b2ebbd0fe6b6 Mon Sep 17 00:00:00 2001 From: Law Zava Date: Thu, 6 Feb 2020 19:22:16 +0100 Subject: [PATCH 313/550] Regolith linux support --- neofetch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/neofetch b/neofetch index 59cfa1b3..ecf7594d 100755 --- a/neofetch +++ b/neofetch @@ -965,6 +965,12 @@ get_distro() { distro="Proxmox VE ${distro%/*}" esac + elif [[ $DESKTOP_SESSION == regolith ]]; then + case $distro_shorthand in + on|tiny) distro="Regolith";; + *) distro="Regolith ($(lsb_release -sic))" + esac + elif type -p lsb_release >/dev/null; then case $distro_shorthand in on) lsb_flags=-si ;; @@ -8867,6 +8873,31 @@ d/hhhhhhhhhhhh${c3}`-/osyso+-`${c1}hhhhhhhhhhhh.h EOF ;; + "Regolith"*) + set_colors 1 + read -rd '' ascii_data <<'EOF' +${c1} + ``....``` + `.:/++++++/::-.` + -/+++++++:.` + -++++++++:` + `/++++++++- + `/++++++++. -/+/ + /++++++++/ `` .:+++:. + -+++++++++/ ./++++:+++/-` + :+++++++++/ `+++++++/-` + :++++++++++` .-/+++++++` + `:++++++++++/``.-/++++:-:::-` ` + `:+++++++++++++++++/:.` ./` +:++/-:+++++++++/:-.. -/+. ++++++++++/::-...:/+++/-..````..-/+++. +`......``.::/+++++++++++++++++++++/. + -/+++++++++++++++++++++/. + .:/+++++++++++++++/-` + `.-:://////:-. +EOF + ;; + "Rosa"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From eabdbcdb2bf2713e660a2e3f6c6289385d94e154 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 6 Feb 2020 20:51:53 +0200 Subject: [PATCH 314/550] de: Temporary support for Regolith. --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 59cfa1b3..3fbf60ef 100755 --- a/neofetch +++ b/neofetch @@ -1629,7 +1629,11 @@ get_de() { *) ((wm_run != 1)) && get_wm - if [[ $XDG_CURRENT_DESKTOP ]]; then + # Temporary!! + if [[ $DESKTOP_SESSION == regolith ]]; then + de=Regolith + + elif [[ $XDG_CURRENT_DESKTOP ]]; then de=${XDG_CURRENT_DESKTOP/X\-} de=${de/Budgie:GNOME/Budgie} de=${de/:Unity7:ubuntu} From e9e70aeebd26d7ce077eb0db6a2c1b5658e4eacc Mon Sep 17 00:00:00 2001 From: Law Zava Date: Thu, 6 Feb 2020 20:02:57 +0100 Subject: [PATCH 315/550] regolith --- neofetch | 6 ------ 1 file changed, 6 deletions(-) diff --git a/neofetch b/neofetch index ecf7594d..69164c2b 100755 --- a/neofetch +++ b/neofetch @@ -965,12 +965,6 @@ get_distro() { distro="Proxmox VE ${distro%/*}" esac - elif [[ $DESKTOP_SESSION == regolith ]]; then - case $distro_shorthand in - on|tiny) distro="Regolith";; - *) distro="Regolith ($(lsb_release -sic))" - esac - elif type -p lsb_release >/dev/null; then case $distro_shorthand in on) lsb_flags=-si ;; From 88723ac00f2ca7aca9fa52d373124a28e703fd20 Mon Sep 17 00:00:00 2001 From: Law Zava Date: Thu, 6 Feb 2020 20:29:17 +0100 Subject: [PATCH 316/550] handle regolith as DE --- neofetch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index bd269051..eea06e8a 100755 --- a/neofetch +++ b/neofetch @@ -973,6 +973,15 @@ get_distro() { esac distro=$(lsb_release "$lsb_flags") + # Temporary support for Regolith Linux + if [[ $DESKTOP_SESSION == "regolith" ]]; then + case $distro_shorthand in + on) distro+="-REGOLITH" ;; + tiny) distro+="-REGOLITH" ;; + *) distro=$(lsb_release -si)"-REGOLITH "$(lsb_release -sr) ;; + esac + fi + elif [[ -f /etc/os-release || \ -f /usr/lib/os-release || \ -f /etc/openwrt_release || \ @@ -1629,7 +1638,7 @@ get_de() { *) ((wm_run != 1)) && get_wm - # Temporary!! + # Temporary support for Regolith Linux if [[ $DESKTOP_SESSION == regolith ]]; then de=Regolith @@ -8871,7 +8880,7 @@ d/hhhhhhhhhhhh${c3}`-/osyso+-`${c1}hhhhhhhhhhhh.h EOF ;; - "Regolith"*) + "Ubuntu-REGOLITH"*) set_colors 1 read -rd '' ascii_data <<'EOF' ${c1} From a1d001dd2fa3518f89fff968b604616f9bd3c8ba Mon Sep 17 00:00:00 2001 From: Law Zava Date: Thu, 6 Feb 2020 20:59:46 +0100 Subject: [PATCH 317/550] remove regolith from distro discovery --- neofetch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/neofetch b/neofetch index eea06e8a..6bf0a596 100755 --- a/neofetch +++ b/neofetch @@ -973,15 +973,6 @@ get_distro() { esac distro=$(lsb_release "$lsb_flags") - # Temporary support for Regolith Linux - if [[ $DESKTOP_SESSION == "regolith" ]]; then - case $distro_shorthand in - on) distro+="-REGOLITH" ;; - tiny) distro+="-REGOLITH" ;; - *) distro=$(lsb_release -si)"-REGOLITH "$(lsb_release -sr) ;; - esac - fi - elif [[ -f /etc/os-release || \ -f /usr/lib/os-release || \ -f /etc/openwrt_release || \ @@ -8880,7 +8871,7 @@ d/hhhhhhhhhhhh${c3}`-/osyso+-`${c1}hhhhhhhhhhhh.h EOF ;; - "Ubuntu-REGOLITH"*) + "Regolith"*) set_colors 1 read -rd '' ascii_data <<'EOF' ${c1} From 83a92ca5c20e262c254c0d6084a29d408024c2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Rebe?= Date: Fri, 7 Feb 2020 19:36:21 +0100 Subject: [PATCH 318/550] initial t2 support --- neofetch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/neofetch b/neofetch index 6bf0a596..cb69f57b 100755 --- a/neofetch +++ b/neofetch @@ -997,6 +997,12 @@ get_distro() { *) distro="GoboLinux $(< /etc/GoboLinuxVersion)" esac + elif [[ -f /etc/SDE-VERSION ]]; then + distro="$(< /etc/SDE-VERSION)" + case $distro_shorthand in + on|tiny) distro="${distro% *}" ;; + esac + elif type -p crux >/dev/null; then distro=$(crux) case $distro_shorthand in @@ -1446,6 +1452,7 @@ get_packages() { has sorcery && tot gaze installed has alps && tot alps showinstalled has butch && tot butch list + has mine && tot mine -q # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. @@ -9369,6 +9376,19 @@ ${c2} `-++:` EOF ;; + "t2"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c2} +TTTTTTTTTT + tt ${c1}222${c2} + tt ${c1}2 2${c2} + tt ${c1}2${c2} + tt ${c1}2${c2} + tt ${c1}22222${c2} +EOF + ;; + "openSUSE Tumbleweed"* | "openSUSE_Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' From 1c319f22bd4751327bcba860ebee978b14ef085a Mon Sep 17 00:00:00 2001 From: Gamegenorator Date: Sat, 8 Feb 2020 17:04:06 -0800 Subject: [PATCH 319/550] Updated Linux Mint Ascii Logo --- neofetch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/neofetch b/neofetch index cb69f57b..489eb78a 100755 --- a/neofetch +++ b/neofetch @@ -7740,6 +7740,31 @@ EOF "Linux Mint"* | "LinuxMint"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' +${c2} ...-:::::-... +${c2} .-MMMMMMMMMMMMMMM-. + .-MMMM${c1}`..-:::::::-..`${c2}MMMM-. + .:MMMM${c1}.:MMMMMMMMMMMMMMM:.${c2}MMMM:. + -MMM${c1}-M---MMMMMMMMMMMMMMMMMMM.${c2}MMM- + `:MMM${c1}:MM` :MMMM:....::-...-MMMM:${c2}MMM:` + :MMM${c1}:MMM` :MM:` `` `` `:MMM:${c2}MMM: +.MMM${c1}.MMMM` :MM. -MM. .MM- `MMMM.${c2}MMM. +:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM-${c2}MMM: +:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM:${c2}MMM: +:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM-${c2}MMM: +.MMM${c1}.MMMM` :MM:--:MM:--:MM: `MMMM.${c2}MMM. + :MMM${c1}:MMM- `-MMMMMMMMMMMM-` -MMM-${c2}MMM: + :MMM${c1}:MMM:` `:MMM:${c2}MMM: + .MMM${c1}.MMMM:--------------:MMMM.${c2}MMM. + '-MMMM${c1}.-MMMMMMMMMMMMMMM-.${c2}MMMM-' + '.-MMMM${c1}``--:::::--``${c2}MMMM-.' +${c2} '-MMMMMMMMMMMMM-' +${c2} ``-:::::-`` +EOF + ;; + + "Linux Mint_old") + set_colors 2 7 + read -rd '' ascii_data <<'EOF' ${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. MMm----::-://////////////oymNMd+` MMd ${c2}/++ ${c1}-sNMd: From 0593302797dced17d325500afaf55c3274dc0672 Mon Sep 17 00:00:00 2001 From: Gamegenorator Date: Sat, 8 Feb 2020 22:04:33 -0800 Subject: [PATCH 320/550] Updated archive tags --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 489eb78a..7e4aac42 100755 --- a/neofetch +++ b/neofetch @@ -7762,7 +7762,7 @@ ${c2} ``-:::::-`` EOF ;; - "Linux Mint_old") + "Linux Mint Old"* | "LinuxMintOld"* | "mint_old"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' ${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. From 9459ca32db64daaa664817edd4dbb740b4c70076 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 9 Feb 2020 08:11:02 +0200 Subject: [PATCH 321/550] docs: update --- neofetch | 83 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/neofetch b/neofetch index 7e4aac42..104cd59e 100755 --- a/neofetch +++ b/neofetch @@ -7737,31 +7737,6 @@ ${c1} ___________ EOF ;; - "Linux Mint"* | "LinuxMint"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c2} ...-:::::-... -${c2} .-MMMMMMMMMMMMMMM-. - .-MMMM${c1}`..-:::::::-..`${c2}MMMM-. - .:MMMM${c1}.:MMMMMMMMMMMMMMM:.${c2}MMMM:. - -MMM${c1}-M---MMMMMMMMMMMMMMMMMMM.${c2}MMM- - `:MMM${c1}:MM` :MMMM:....::-...-MMMM:${c2}MMM:` - :MMM${c1}:MMM` :MM:` `` `` `:MMM:${c2}MMM: -.MMM${c1}.MMMM` :MM. -MM. .MM- `MMMM.${c2}MMM. -:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM-${c2}MMM: -:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM:${c2}MMM: -:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM-${c2}MMM: -.MMM${c1}.MMMM` :MM:--:MM:--:MM: `MMMM.${c2}MMM. - :MMM${c1}:MMM- `-MMMMMMMMMMMM-` -MMM-${c2}MMM: - :MMM${c1}:MMM:` `:MMM:${c2}MMM: - .MMM${c1}.MMMM:--------------:MMMM.${c2}MMM. - '-MMMM${c1}.-MMMMMMMMMMMMMMM-.${c2}MMMM-' - '.-MMMM${c1}``--:::::--``${c2}MMMM-.' -${c2} '-MMMMMMMMMMMMM-' -${c2} ``-:::::-`` -EOF - ;; - "Linux Mint Old"* | "LinuxMintOld"* | "mint_old"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -7784,6 +7759,32 @@ ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm EOF ;; + "Linux Mint"* | "LinuxMint"* | "mint"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c2} ...-:::::-... +${c2} .-MMMMMMMMMMMMMMM-. + .-MMMM${c1}`..-:::::::-..`${c2}MMMM-. + .:MMMM${c1}.:MMMMMMMMMMMMMMM:.${c2}MMMM:. + -MMM${c1}-M---MMMMMMMMMMMMMMMMMMM.${c2}MMM- + `:MMM${c1}:MM` :MMMM:....::-...-MMMM:${c2}MMM:` + :MMM${c1}:MMM` :MM:` `` `` `:MMM:${c2}MMM: +.MMM${c1}.MMMM` :MM. -MM. .MM- `MMMM.${c2}MMM. +:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM-${c2}MMM: +:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM:${c2}MMM: +:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM-${c2}MMM: +.MMM${c1}.MMMM` :MM:--:MM:--:MM: `MMMM.${c2}MMM. + :MMM${c1}:MMM- `-MMMMMMMMMMMM-` -MMM-${c2}MMM: + :MMM${c1}:MMM:` `:MMM:${c2}MMM: + .MMM${c1}.MMMM:--------------:MMMM.${c2}MMM. + '-MMMM${c1}.-MMMMMMMMMMMMMMM-.${c2}MMMM-' + '.-MMMM${c1}``--:::::--``${c2}MMMM-.' +${c2} '-MMMMMMMMMMMMM-' +${c2} ``-:::::-`` +EOF + ;; + + "mx_small"*) set_colors 4 6 7 read -rd '' ascii_data <<'EOF' @@ -8907,24 +8908,24 @@ EOF set_colors 1 read -rd '' ascii_data <<'EOF' ${c1} - ``....``` - `.:/++++++/::-.` - -/+++++++:.` - -++++++++:` - `/++++++++- + ``....``` + `.:/++++++/::-.` + -/+++++++:.` + -++++++++:` + `/++++++++- `/++++++++. -/+/ /++++++++/ `` .:+++:. - -+++++++++/ ./++++:+++/-` - :+++++++++/ `+++++++/-` - :++++++++++` .-/+++++++` - `:++++++++++/``.-/++++:-:::-` ` - `:+++++++++++++++++/:.` ./` -:++/-:+++++++++/:-.. -/+. -+++++++++/::-...:/+++/-..````..-/+++. -`......``.::/+++++++++++++++++++++/. - -/+++++++++++++++++++++/. - .:/+++++++++++++++/-` - `.-:://////:-. + -+++++++++/ ./++++:+++/-` + :+++++++++/ `+++++++/-` + :++++++++++` .-/+++++++` + `:++++++++++/``.-/++++:-:::-` ` + `:+++++++++++++++++/:.` ./` +:++/-:+++++++++/:-.. -/+. ++++++++++/::-...:/+++/-..````..-/+++. +`......``.::/+++++++++++++++++++++/. + -/+++++++++++++++++++++/. + .:/+++++++++++++++/-` + `.-:://////:-. EOF ;; From 29714e1875dd622e5ea445fe4b4fe9c86ca5c766 Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Wed, 12 Feb 2020 12:23:15 -0500 Subject: [PATCH 322/550] Minor fixes for machine model, wm, and memory on FreeMiNT --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 59cfa1b3..bd8264df 100755 --- a/neofetch +++ b/neofetch @@ -1261,6 +1261,7 @@ get_model() { FreeMiNT) model=$(sysctl -n hw.model) + model=${model/ (_MCH *)} ;; esac @@ -1799,11 +1800,11 @@ get_wm() { freemint_wm=(/proc/*) case ${freemint_wm[*]} in - *xaaes*) wm=XaAES ;; - *myaes*) wm=MyAES ;; - *naes*) wm=N.AES ;; - geneva) wm=Geneva ;; - *) wm="Atari AES" ;; + *xaaes* | *xaloader*) wm=XaAES ;; + *myaes*) wm=MyAES ;; + *naes*) wm=N.AES ;; + geneva) wm=Geneva ;; + *) wm="Atari AES" ;; esac ;; esac @@ -2560,7 +2561,7 @@ get_memory() { "FreeMiNT") mem="$(awk -F ':|kB' '/MemTotal:|MemFree:/ {printf $2, " "}' /kern/meminfo)" mem_free="${mem/* }" - mem_total="${mem/ *}" + mem_total="${mem/$mem_free}" mem_used="$((mem_total - mem_free))" mem_total="$((mem_total / 1024))" mem_used="$((mem_used / 1024))" From bb8831831e885c5d581e29a5b07bb9a089a8960e Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Thu, 13 Feb 2020 07:15:43 -0500 Subject: [PATCH 323/550] Removal of special cases for FreeMiNT color settings. Added blocking of X11 queries on FreeMiNT. --- neofetch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index bd8264df..dfa53ff8 100755 --- a/neofetch +++ b/neofetch @@ -2828,6 +2828,10 @@ get_resolution() { [[ "$refresh_rate" == "off" ]] && resolution="${resolution/ @*}" ;; + "FreeMiNT") + # Need to block X11 queries + ;; + *) if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then case $refresh_rate in @@ -3712,10 +3716,6 @@ get_cols() { unset -v blocks blocks2 cols - # TosWin2 on FreeMiNT is terrible at this, - # so we'll reset colors arbitrarily. - [[ "$term" == "TosWin2" ]] && printf '\e[30;47m' - # Tell info() that we printed manually. prin=1 } @@ -6766,8 +6766,7 @@ EOF ;; "FreeMiNT"*) - # Don't explicitly set colors since - # TosWin2 doesn't reset well. + set_colors 7 read -rd '' ascii_data <<'EOF' ${c1} ## ## ######### From 3d803834c1b51f19146d06092573e79dbb2acc1e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 19 Feb 2020 11:43:01 +0200 Subject: [PATCH 324/550] neofetch: Fix GPU driver error. Closes #1411 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 104cd59e..90b8132b 100755 --- a/neofetch +++ b/neofetch @@ -3657,7 +3657,7 @@ get_gpu_driver() { case $os in "Linux") gpu_driver="$(lspci -nnk | awk -F ': ' \ - '/Display|3D|VGA/{nr[NR+2]}; NR in nr {printf $2 ", "}')" + '/Display|3D|VGA/{nr[NR+2]}; NR in nr {printf $2 ", "; exit}')" gpu_driver="${gpu_driver%, }" if [[ "$gpu_driver" == *"nvidia"* ]]; then From ede5c1ee291ab3d0065362a488e06c00251371b2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 4 Mar 2020 21:52:42 +0200 Subject: [PATCH 325/550] neofetch: Drop kitty win size func. Related to #1418 --- neofetch | 3 --- 1 file changed, 3 deletions(-) diff --git a/neofetch b/neofetch index 4bd60be3..ab064fda 100755 --- a/neofetch +++ b/neofetch @@ -3980,9 +3980,6 @@ get_window_size() { term_width="${term_size[2]}" fi - [[ "$image_backend" == "kitty" ]] && - IFS=x read -r term_width term_height <<< "$(kitty +kitten icat --print-window-size)" - # Get terminal width/height. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool &>/dev/null; then From f372d7162898cc8240b8eb9f54e97f0378aa503a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Mar 2020 21:49:26 +0200 Subject: [PATCH 326/550] neofetch: Fix yash shell. Closes #1421 --- neofetch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/neofetch b/neofetch index ab064fda..f514ad36 100755 --- a/neofetch +++ b/neofetch @@ -1594,6 +1594,13 @@ get_shell() { shell+=$("$SHELL" -c "printf %s \$tcsh") ;; + yash) + shell+=$("$SHELL" --version 2>&1) + shell=${shell/ $shell_name} + shell=${shell/ Yet another shell } + shell=${shell/ Copyright*} + ;; + *) shell+=$("$SHELL" --version 2>&1) shell=${shell/ $shell_name} From fb9d4d259c6f9ae8a0605b8acbb4e0cb32411d10 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Mar 2020 21:51:30 +0200 Subject: [PATCH 327/550] neofetch: Fix yash shell. Closes #1421 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f514ad36..150a615b 100755 --- a/neofetch +++ b/neofetch @@ -1597,8 +1597,8 @@ get_shell() { yash) shell+=$("$SHELL" --version 2>&1) shell=${shell/ $shell_name} - shell=${shell/ Yet another shell } - shell=${shell/ Copyright*} + shell=${shell/ Yet another shell} + shell=${shell/Copyright*} ;; *) From ba92ae75a3ed0c801a0db7ad9705c3c15b3bc867 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 8 Mar 2020 12:06:22 +0200 Subject: [PATCH 328/550] docs: update --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 150a615b..1bcb1a10 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version=6.1.0 +version=7.0.0 bash_version=${BASH_VERSION/.*} sys_locale=${LANG:-C} From bafbb7178b7aac38904b62a38ca62afede7977a4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 8 Mar 2020 12:21:10 +0200 Subject: [PATCH 329/550] docs: update --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index 0cb48051..8acb2921 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.12. -.TH NEOFETCH "1" "January 2020" "Neofetch 6.1.0" "User Commands" +.TH NEOFETCH "1" "January 2020" "Neofetch 7.0.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 87827df455558bd99ca40f443d49a9f7026040f8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 8 Mar 2020 12:23:36 +0200 Subject: [PATCH 330/550] docs: update --- CHANGELOG.md | 3056 -------------------------------------------------- 1 file changed, 3056 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 5053fbd7..00000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,3056 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - - -## [6.1.0] - 2019-31-08 - -logo - -**Contributors**: - -**Charlène**, **Michael Straube**, @14mRh4X0r, @Crestwave, @GrantM11235, @Mark-Peppermint, @Michal-Szczepaniak, @Renzix, @SibrenVasse, @asantam, @chrissxYT, @chrisweeksnz, @dawidd6, @edward-p, @feren, @fjallarefur, @hpjansson, @iandrewt, @infinitewarp, @jkhsjdhjs, @konimex, @lebensterben, @lightful, @mitchweaver, @ognarb, @protonesso, @rxhanson, @spacelike, @vaygr, @weslly, @xPMo, @zyg812 - - -**OS**: - -- Added support for [KISS Linux](https://getkiss.org). -- Added support for [Bonsai Linux](bonsai-linux.org). @mitchweaver -- Added support for [Radix Linux](http://www.radixsystems.com/software.php). -- os: Fix HAIKU issues - -**ASCII**: - -- ascii: Fixed bug causing ascii files to not work. -- postmarketOS: Replace ASCII logo. @GrantM11235 -- postmarketOS: Add small ASCII logo. @GrantM11235 -- Fix big Puffy ascii logo. **Charlène** -- ASCII: Updated Artix ASCII with new logo. @konimex -- Add ascii art for Clear Linux. @chrisweeksnz -- new logo for Ataraxia Linux. @protonesso -- ASCII: Add fedora_small. @zyg812 -- Added a case for displaying the Ubuntu logo for i3buntu. @chrissxYT -- New Peppermint Logo. @Mark-Peppermint -- ascii: Fix void. -- update Red Hat with new 2019 logo. @infinitewarp -- ascii: Add back old redhat logo (--ascii_distro redhat_old). -- ASCII: Added Feren OS. @konimex -- Linux: Update ASCII for Sailfish OS. @konimex -- Linux: Fix ASCII for Sailfish OS. @Michal-Szczepaniak -- Small tweak to the colours used for the Feren OS Logo. @feren - -**Images**: - -- general: fix image sizing in VTE terminals. -- general: Fix issue with URxvt and no internal border. -- display_image: Allow Chafa backend to stretch image to desired size. @hpjansson - -**Terminal**: - -- term_font [kitty]: Fix bug with empty config. -- term_font: fix issue with konsole font detection. **Michael Straube** -- Robuster kitty font parsing. @SibrenVasse -- term_font: Fix crash when parsing Xresources. -- kitty font parsing where font name has whitespaces. @lebensterben -- term: Fix wrapper scripts in NixOS. Thanks Tdeo. - -**Memory**: - -- Memory [AIX]: Detect memory based on pages (like Solaris) for more accuracy. @konimex - -**CPU**: - -- CPU [Linux/ARM]: Use Hardware field directly. @konimex - -**GPU**: - -- Properly work with multiple GPUs. @lebensterben -- Fix GPU parsing. - -**Packages**: - -- packages: Specify Haiku's pkgman. @Crestwave -- packages: Show IRIX package manager name. -- Use guix directly to report package count instead of counting directories. @spacelike -- Packages [Guix/Nix]: Use if for detecting system and user packages. @konimex -- packages: Fix DragonFlyBSD. Thanks pornguy. -- Set nullglob for package counting. @14mRh4X0r -- packages: Check brew on Linux. @dawidd6 - -**Theme**: - -- WM Theme: update for Mojave. @iandrewt -- Handle ${GTK2_RC_FILES} with multiple values. @edward-p -- use "$GTK2_RC_FILES". @edward-p - -**Song**: - -- song: add strawberry player. **Michael Straube** -- song: Added support for plasma-browser-integration. -- song: add gogglesmm. **Michael Straube** -- song: add xnoise. **Michael Straube** - -**Uptime**: - -- support uptime from Android 9+. @lightful - -**IP**: - -- Retrieve public IP info via drill. @vaygr - -**WM**: - -- WM: Add support for yabai on macOS. @weslly -- WM: Add support for Rectangle on macOS. @rxhanson -- Removed subshell from ps grep for macOS wm. @rxhanson - -**Shell**: - -- support other versions of ksh. @mitchweaver - -**Misc**: - -- Make neofetch compatible with `libedit`. -- general: Added `--no_config` to disable config file creation. -- Made variables local in get_cols function. @asantam -- Fixed option documentation. @xPMo -- Fixed gnome shell mutter issues. -- cache_uname: improve reading from 'SystemVersion.plist' on macOS and iOS. @jkhsjdhjs -- add device information for latest ios devices. @jkhsjdhjs -- include Fusion/Bionic in iDevice processor names. @jkhsjdhjs -- give precedence to "Hardware" entry in /proc/cpuinfo. @lightful -- config: Show 15 color blocks by default. -- underline: Fix bugs with incorrect lengths. -- Moved guix check below /etc/os-release check. @Renzix -- simple mode: Hide stderr by default. -- Linux: Move /etc/os-release directly below lsb_release. @konimex -- The K Desktop Environment was renamed to Plasma. @ognarb -- Rename GuixSD to Guix System. @fjallarefur - - -## [6.0.0] - 2019-01-08 - -logo - -This release fixes a wide range of bugs and adds some neat new features. -Scroll down to "highlights" to see the bigger changes from this release. -A big thank you to @konimex, @iandrewt and the contributors below who -kept development going during my absence. - -Expect a minor bug fix release sometime this week as I'm sure new bugs -will come up. I've done extensive testing but things always slip through. - -**Contributors** - -[**@konimex**](https://github.com/konimex), [**@iandrewt**](https://github.com/iandrewt), [**@arisinfenix**](https://github.com/arisinfenix), [**@xPMo**](https://github.com/xPMo), [**@nero**](https://github.com/nero), [**@alyssais**](https://github.com/alyssais), -[**@plgruener**](https://github.com/plgruener), [**@StarryTony**](https://github.com/StarryTony), [**@julianaito**](https://github.com/julianaito), [**@HolyStephano**](https://github.com/HolyStephano), -[**@nikitenich**](https://github.com/nikitenich), [**@Appadeia**](https://github.com/Appadeia), [**@marlonn**](https://github.com/marlonn), [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle), [**@Phuurl**](https://github.com/Phuurl), [**@erikdubois**](https://github.com/erikdubois) - - -**Breaking Changes** - -- **Config**: Removed `get_line_break()`. - - Alternative: `prin '\n'` - - Rationale: fix a bug that's been lingering for a couple of years now. - -**OS** - -- Added support for Bedrock Linux. [**@paradigm**](https://github.com/paradigm) -- Added support for Namib GNU/Linux. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for Reborn OS. [**@iandrewt**](https://github.com/iandrewt) -- Added support for OpenMandriva Lx. [**@konimex**](https://github.com/konimex) -- Added support for Star. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for BlueLight OS. -- Added support for Huayra Linux. -- Added support for Pentoo. - -**Highlights** - -[ASCII] Added support for command output. You can now use whatever -terminal commands you like as the ASCII art. - -```sh -# Use fortune and cowsay as ascii art. -neofetch --ascii "$(fortune|cowsay -W 30)" - -# use figlet as ascii art. -neofetch --ascii "$(figlet -w 30 hello world)" -``` - -scrot - -Added a new "simple" mode. You can now use neofetch for scripting -by getting it to output individual info functions in plain text. - -```sh -# Example: -neofetch uptime --uptime_shorthand tiny -> uptime: 32m - -# Example: -neofetch uptime disk wm memory -> uptime: 33 mins -> disk (/): 212G / 235G (96%) -> wm: Openbox -> memory: 1215MiB / 7881MiB - -# This can be used in bars and scripts like so: -memory="$(neofetch memory)"; memory="${memory##*: }" - -# For multiple outputs at once (each line of info in an array): -# Much faster than running neofetch multiple times. -IFS=$'\n' read -d "" -ra info < <(neofetch memory uptime wm) -info=("${info[@]##*: }") -``` - -Added new image backend [chafa](https://hpjansson.org/chafa/) (`--chafa`) -which displays images in the terminal using unicode characters. - -```sh -neofetch --chafa ~/Pictures/meow.jpg -``` - -scrot - - -**Info** - -- **Color Blocks**: Fixed issue where disabling blocks caused an extra newline to appear. -- **Color Blocks**: Color blocks now have their padding built in. No more need for `get_line_break()`. -- **Song**: Added snippet to display music player. - - `[[ $player ]] && prin "Music Player" "$player"` - - NOTE: Must have `info "Song" song` enabled. -- **Song**: Added support for Netease Cloud. -- **Song**: Fixed issues in various players. [**@arisinfenix**](https://github.com/arisinfenix) [**@xPMo**](https://github.com/xPMo) -- **Song**: Fixed issues with non-English tags. -- **Song**: Fixed issues with broken newlines. -- **Song**: Fixed issues with Deadbeef. -- **Song**: Fixed issues with `qmmp`. -- **Song**: Removed `gpmdp-remote` support (unmaintained/no longer works). -- **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero) -- **Packages**: Added support for `scoop`. [**@Phuurl**](https://github.com/Phuurl) -- **Packages**: Added support for `puyo`. [**@Appadeia**](https://github.com/Appadeia) -- **Packages**: Added support for `spm`. [**@Appadeia**](https://github.com/author=Appadeia) -- **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) -- **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. -- **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) -- **Terminal Font** [Kitty]: Use `kitty --debug-config` to get font information. -- **Memory** [Solaris]: Updated memory detection to use pages. [**@konimex**](https://github.com/konimex) -- **Memory**: Added option to show memory percentage (`--memory_percent`). -- **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito) -- **Model** [macOS]: Added VirtualSMC as a new FakeSMC alternative for Hackintosh. [**@nikitenich**](https://github.com/nikitenich) -- **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito) -- **WM** [OpenBSD]: Added a new `ps_flags` to correctly detect non-EWMH WMs. [**@julianaito**](https://github.com/julianaito) -- **Disk** [OpenBSD]: Added a separate disk array creation using `awk` since one cannot directly use `/dev/...` unless being root or in the `operator` group. [**@julianaito**](https://github.com/julianaito) -- **Battery** [OpenBSD]: Improve charge `%` and add status. **Charlène** -- **GPU** [AMD]: Remove unnecessary check. -- **Public IP**: Added configurable timeout to requests. -- **Resolution**: If resolution is not found, don't print anything. - -**ASCII** - -- Fixed issues with various ASCII arts (namely the `_small` ones). -- Added support for command output. - - `neofetch --ascii "$(fortune|cowsay -W 30)"` - - `neofetch --ascii "$(figlet -w 30 hello world)"` -- Added small ArcoLinux logo. [**@erikdubois**](https://github.com/erikdubois) -- Added new Lubuntu logo. [**@marlonn**](https://github.com/marlonn) -- Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) -- Fixed a bug when files named `auto` or `ascii` exist. -- Do not parse file as ASCII if the source is an image file. - -**Image** - -- Added new image backend [chafa](https://hpjansson.org/chafa/) (`--chafa`). -- **w3m**: Fixed issues with URxvt and internal borders. -- **w3m**: Fixed issues with URxvt and cursor position. -- **w3m**: Fixed issue with `bash 3`. -- **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) -- **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) -- **Kitty**: Update docs. [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) -- Thumbnails are high quality again. -- Cached thumbnails are now stored with PATH to prevent collision issues. - -## [5.0.0] - 2018-06-18 - -logo - -A lot of the script has been rewritten and all lint errors have been resolved. There's probably a few bugs so the version number has been bumped to `5.0`. Expect a minor release in the coming days to fix any bugs that come up. Thanks to everyone who contributed to this release. - -**Contributors** - -- [**@arisinfenix**](https://github.com/arisinfenix) -- [**@iandrewt**](https://github.com/iandrewt) -- [**@konimex**](https://github.com/konimex) -- [**@MindTooth**](https://github.com/MindTooth) - -**Operating System** - -- Added support for Condres OS. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for RedCore Linux. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for Regata OS. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for ClearOS. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for PureOS. -- Added support for Kibojoe Linux. -- Added support for SharkLinux. -- Added support for Linux Lite. -- Added support for macOS 10.14 Mojave. [**@iandrewt**](https://github.com/iandrewt) - -**General** - -- **output**: Added `--json` to output the info in `json`. -- **cursor**: Fixed prompt location issues after Neofetch is run. -- **macOS**: Fixed neofetch launching XQuartz. -- **misc**: Removed `uppercase()`. -- **misc**: Removed all instances of `export`. -- **misc**: Removed all deprecated options and functions. -- **info**: Removed `get_install_date()`. - -**Ascii** - -- Fixed a bug causing Windows 7 ASCII art to not display. -- Simplified ASCII art handling. -- Updated Funtoo ASCII art. - -**Image** - -- Improved performance of image handling. -- Removed `catimg` support (*It didn’t allow us to specify height so we - couldn’t accurately place the cursor*). -- Fixed `tycat`, `sixel` and `kitty icat` image sizes. -- Simplified `w3m-img` code. - -**Screenshot** - -See: https://github.com/dylanaraps/neofetch/issues/1001 - -- Removed screenshot functionality. -- Removed screenshot upload functionality. - -**Info** - -- **cpu**: Remove extra call to `uname`. -- **cpu**: Simplify core calculation. -- **disk**: Clean up. -- **font**: Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt") -- **gpu**: Fixed ATI/AMD branding issue. -- **gpu**: Removed `glxinfo` usage (*too slow*). -- **packages**: Added support for `flatpak`. [**@konimex**](https://github.com/konimex) -- **packages**: Added support for `snap`. [**@konimex**](https://github.com/konimex) -- **packages**: Added used package managers to output (`Packages: 900 - (pacman, snap)`). -- **packages**: Fixed issues with `pacman` 5.1. -- **packages**: Fixed issues with `dpkg`. -- **packages**: Removed `find` usage. -- **packages**: Removed `ls` usage. -- **packages**: Removed `wc -l` usage. -- **song**: Added support for `gmusicbrowser`. [**@arisinfenix**](https://github.com/arisinfenix) -- **song**: Added support for `SMPlayer`. [**@arisinfenix**](https://github.com/arisinfenix) -- **song**: Added support for `Dragon Player`. [**@arisinfenix**](https://github.com/arisinfenix) -- **song**: Fixed song detection on macOS. -- **song**: Fixed song output on systems using `C` locale. -- **song**: Added `mpc_args` to send additional arguments to `mpc`. -- **term\_font**: Clean up of config file handling. -- **resolution**: Added support for `xwininfo`. - -## [4.0.2] - 2018-05-19 - -### This fixes default config issues on Android, AIX, HP-UX and possibly others. - -- [config] Fixed `/dev/stdin` error. -- [config] Added `--print_config` to display the default config file. -- [macOS] Fixed xquartz issue. - -## [4.0.1] - 2018-05-18 - -### Note: This release is only required for those running `bash <3.3`. - -- [config] Fixed issue with default config in bash3. -- [packages] Simplified code. -- [term] Fixed macOS issue. -- [term] Fixed `tmux` issue. - - -## [4.0.0] - 2018-05-17 - -

logo

- -This release bumps the version number up to `4.0.0` as it contains major -changes to how Neofetch is packaged and installed. - -The entirety of Neofetch is now contained within a single executable. -Everything has been in-lined. Installing Neofetch is now as easy as -downloading the script and running it. - -Those using distributions with an outdated Neofetch version in their repos -can now easily install the latest version themselves. - -Thanks to those who contributed this time around and thanks to those who -discussed proposed changes in the bug tracker and Discord. I appreciate -it. :+1: - - -## Discord - -Neofetch now has a Discord server. Come and join the discussion! - - - - -## Contributors - - -- [**@aidanharris**](https://github.com/aidanharris) -- [**@DanySpin97**](https://github.com/DanySpin97) -- [**@SolitudeSF**](https://github.com/SolitudeSF) -- [**@Kayant**](https://github.com/Kayant) -- [**@robertwolter**](https://github.com/robertwolter) -- [**@TsundereBug**](https://github.com/TsundereBug) -- [**@dawidd6**](https://github.com/dawidd6) -- [**@mstraube**](https://github.com/mstraube) -- [**@iandrewt**](https://github.com/iandrewt) -- [**@MindTooth**](https://github.com/MindTooth) - - -## Operating System - -- Added support for ArcoLinux. - - -## General - -- Neofetch is now a single executable. -- Simplified `--version` output. -- Fixed theme issues by setting `GIO_EXTRA_MODULES`. - - -## Images - -- Added `wal`/`pywal` support to get the current wallpaper. -- Added `kitty` image backend. [**@SolitudeSF**](https://github.com/SolitudeSF) -- Added `setroot` wallpaper support. [**@SolitudeSF**](https://github.com/SolitudeSF) - - -## Ascii - -- Updated Android ascii art to better work on non-unicode terminals. [**@TsundereBug**](https://github.com/TsundereBug) - - -## Info - -**Song** - -- Added support for VLC. [**@mstraube**](https://github.com/mstraube) -- Added support for Sayonara. [**@mstraube**](https://github.com/mstraube) -- Added album data to song output. [**@mstraube**](https://github.com/mstraube), [**@iandrewt**](https://github.com/iandrewt) -- Added `song_format` to change the display format of the data. - - Default: `%artist% - %album% - %title%`. - -**Title** - -- Fixed unexpected backslash being inserted on some systems. - -**CPU** - -- Added temperature support for Zen processors. [**@Kayant**](https://github.com/Kayant) - -**GPU** - -- Fixed duplicate Intel GPUs. - -**Terminal Font** - -- Added support for `st`. [**@aidanharris**](https://github.com/aidanharris) -- Added support for `qterminal`. [**@mstraube**](https://github.com/mstraube) -- Fixed `kitty` font bug. [**@MindTooth**](https://github.com/MindTooth) - -**Packages** - -- Fixed package count in Exherbo. [**@DanySpin97**](https://github.com/DanySpin97) - -**Desktop Environment** - -- Fixed Unity output in Ubuntu 18.04. [**@dawidd6**](https://github.com/dawidd6) - -**Window Manager** - -- Added support for detecting `dwm`. - - -## [3.4.0] - 2018-04-05 - -This release adds support for a large number of Linux distros as well as support for the latest macOS and iOS devices. This release also contains a large number of bug fixes and some minor features. - -I'm pretty sure that this release is the largest in terms of number of contributors. Thanks to everyone who contributed this release! - -## Contributors - -- [**@yslgirl**](https://github.com/yslgirl) -- [**@iandrewt**](https://github.com/iandrewt) -- [**@chrisweeksnz**](https://github.com/chrisweeksnz) -- [**@dawidd6**](https://github.com/dawidd6) -- [**@MitchWeaver**](https://github.com/MitchWeaver) -- [**@StarryTony**](https://github.com/StarryTony) -- [**@rage311**](https://github.com/rage311) -- [**@matoro**](https://github.com/matoro) -- [**@szfcbr**](https://github.com/szfcbr) -- [**@ArmstrongJ**](https://github.com/ArmstrongJ) -- [**@robertwolter**](https://github.com/robertwolter) -- [**@JadeMatrix**](https://github.com/JadeMatrix) -- [**@MindTooth**](https://github.com/MindTooth) -- [**@aidanharris**](https://github.com/aidanharris) -- [**@khoacao96**](https://github.com/khoacao96) - - -## OS - -- Added support for ArchMerge. -- Added support for MagpieOS. -- Added support for PostMarketOS. -- Added support for Hyperbola GNU/Linux-libre [**@mstraube**](https://github.com/mstraube) -- Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) -- Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) -- Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) -- Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) -- Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) -- Added support for Lunar Linux. -- Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) -- Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) -- Added support for Anarchy Linux. [**@robertwolter**](https://github.com/robertwolter) -- Added support for Calculate Linux. [**@robertwolter**](https://github.com/robertwolter) -- Added support for NuTyX. [**@robertwolter**](https://github.com/robertwolter) -- Added support for openSUSE Tumbleweed. [**@robertwolter**](http://github.com/robertwolter) -- Fixed detection bug with Gentoo. -- Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed. -- Fixed ChromeOS detection. - - -## General - -- Added more info to verbose mode for debugging. -- Fixed bug in prompt location calculation. -- Fixed prompt bug in OpenBSD. -- Fixed broken AppleScript blocks. [**@JadeMatrix**](https://github.com/JadeMatrix) -- Fixed function not working in bash 3. [**@JadeMatrix**](https://github.com/JadeMatrix) -- Swapped sequences from `\033` to `\e`. -- Fixed Pacman name conflict with the game. [**@MitchWeaver**](https://github.com/MitchWeaver) -- Removed the last `echo` in the script. -- Fixed typo. [**@khoacao96**](https://github.com/khoacao96) - - -## Ascii - -- Added color updates for Kubuntu logo. **Maulik Mistry** -- Added new DragonflyBSD logo. [**@MitchWeaver**](https://github.com/MitchWeaver) - - -## Images - -- [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) -- Fixed bug with getting wallpaper from feh. -- Added `pixterm` backend. -- Don't force resolution in `catimg`. - -## Info - -**Desktop Environment** - -- Added GNOME version. -- Added support for TDE. - -**Window Manager** - -- Added support for most (*if not all*) current Wayland compositors/window manager's. -- Added support for some non-EWMH window managers. -- [macOS] Fixed `chunkwm` being detected as `Kwm`. [**@iandrewt**](https://github.com/iandrewt) - -**Window Manager Theme** - -- Fixed `sawfish` detection. -- [macOS] Now detects Light/Dark theme. [**@JadeMatrix**](https://github.com/JadeMatrix) - -**Install Date** - -- [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) - -**Theme** - -- Fixed KDE font issue. [**@mstraube**](https://github.com/mstraube) - -**CPU** - -- [linux] Detect the correct temperature file to use. -- [windows] Removed `$temp` usage as it's an envar. -- [OpenBSD] Fixed CPU temperature that fails to appear in some systems. [**@rage311**](https://github.com/rage311) - -**GPU** - -- [linux] Added driver version to NVIDIA output. -- [linux] Added driver version to Intel output. -- [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) - -**Memory** - -- [OpenBSD] Fixed memory usage values. [**@rage311**](https://github.com/rage311) - -**Package Manager** - -- Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) -- Changed `pacman` detection to fix issues in other distros. [**@MitchWeaver**](https://github.com/MitchWeaver) - -**Resolution** - -- [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) - -**Song** - -- Added option to manually specify the player to use. -- Added support for Elisa. [**@mstraube**](https://github.com/mstraube) -- macOS detection is now more reliable. [**@JadeMatrix**](https://github.com/JadeMatrix) - -**Model** - -- Remove more unneeded outputs. [**@konimex**](https://github.com/konimex) - -**Disk** - -- Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) - -**Battery** - -- Fixed Windows detection. [**@matoro**](https://github.com/matoro) - -**Shell** - -- Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) - -**Terminal Font** - -- Added more paths for Alacritty. -- Added font support for Kitty. [**@MindTooth**](https://github.com/MindTooth) -- Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris) -- Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris) - - -## [3.3.0] - 2017-09-14 - -Thanks to everyone who contributed this release, I appreciate ya! - -## Contributors - -- **[@konimex](https://github.com/konimex)** -- **[@mstraube](https://github.com/mstraube)** -- **[@dominiklohmann](https://github.com/dominiklohmann)** -- **[@ybden](https://github.com/ybden)** -- **[@lexruee](https://github.com/lexruee)** -- **[@AMDmi3](https://github.com/AMDmi3)** -- **[@deadda7a](https://github.com/deadda7a)** -- **[@winneon](https://github.com/winneon)** -- **[@DamnWidget](https://github.com/DamnWidget)** - - -## General - -- Config file now has a `.conf` suffix. -- Neofetch now assumes target directories (config file and ASCII directory) at install time, this fixes problems with systems such as NixOS. -- `stdout` mode is now reimplemented. - - This mode prints the information in plain text. - - You can use it with `--stdout`. - - Example: https://gist.github.com/dylanaraps/151c205322cf3acae62661b76464a3f7 -- Fixed prompt location if color blocks are disabled. -- Make makefile more portable. **[@AMDmi3](https://github.com/AMDmi3)** - - -## Operating System - -- Added support for AryaLinux. **[@mstraube](https://github.com/mstraube)** -- Added support for Amazon Linux AMI. -- Added support for Artix Linux. **[@DamnWidget](https://github.com/DamnWidget)** -- Added support for Endless OS. -- Added support for Sabotage Linux. -- Added support for Siduction. **[@lexruee](https://github.com/lexruee)** -- Added support for Source Mage. -- Added support for Parsix GNU/Linux. **[@mstraube](https://github.com/mstraube)** -- Added support for Nurunner. **[@mstraube](https://github.com/mstraube)** -- Fixed Raspbian being detected as ChromeOS. - - -## Images - -- [w3m] Fixed w3m-img not found on NixOS. -- Added support for using all image types as input. - - Neofetch now supports `svg`, `tiff` etc. - - -## ASCII - -- Added small Debian. -- Added small FreeBSD. -- Added small macOS. -- Added small NixOS. - - -## Info - -**GPU Driver** - -- [Linux] Added a new info function (*off by default*) to display the GPU Driver currently in use. -- Add `info "GPU Driver" gpu_driver` to your config to use it. - -**CPU** - -- [Linux] Fixed inaccurate output on ARM SoC devices. -- [Linux] Fixed CPU speed not appearing on PowerPC systems. -- [NetBSD] Added support for CPU temperature. (NOTE: This only supports newer Intel processors) -- Fixed inaccurate speed output in systems with CPU speed less than 1 GHz. -- Deprecated `cpu_shorthand` in favor of `cpu_brand`. - -**GPU** - -- [Linux] Filter out duplicate entries. - -**Model** - -- Added support for QEMU/KVM. -- Renamed subtitle to `Host:`. - -**Uptime** - -- [AIX/IRIX] Fixed Neofetch crashing when calculating uptime. - -**Terminal** - -- [SSH] Fixed infinite loop if neofetch is run on non-interactive shells. - -**Terminal Font** - -- Added support for LXTerminal. **[@mstraube](https://github.com/mstraube)** -- Added support for GNUStep Terminal. **[@mstraube](https://github.com/mstraube)** -- Fixed Xfce4-terminal font output when system-wide font is used. **[@mstraube](https://github.com/mstraube)** -- Fixed MATE-Terminal issue. **[@mstraube](https://github.com/mstraube)** -- Fixed URxvt font detection failing if `.` is used. **[@winneon](https://github.com/winneon)** - -**Theme** - -- [Qt/KDE] Fixed inaccurate theme naming. **[@mstraube](https://github.com/mstraube)** -- [Qt/KDE] GTK theme is now shows as well. - -**Window Manager** - -- [macOS] Added support for `chunkwm`. **[@dominiklohmann](https://github.com/dominiklohmann)** -- Fix incorrect output when using WindowMaker. **[@mstraube](https://github.com/mstraube)** - -**Song** - -- Added support for Pogo. **[@mstraube](https://github.com/mstraube)** -- Fixed bug with players not being found. - -**Battery** - -- Added battery support for Thinkpads and other devices that use the `CMB` naming for batteries. **[@deadda7a](https://github.com/deadda7a)** - - -## Images - -- Fixed division by 0 error in XTerm. - -## Screenshot - -- Use `maim` over `scrot`. **[@ybden](https://github.com/ybden)** -- Fixed `scrot_cmd` arguments not being used. **[@winneon](https://github.com/winneon)** - - -## [3.2.0] - 2017-06-21 - -This release was long overdue and I apologise for the delay. I've been busy with study among other things. This update is smaller than usual but fixes some important bugs. - - -Thanks once again to everyone that contributed! - - -## Contributors - -- **[@MatthewCox](https://github.com/MatthewCox)** -- **[@dawidd6](https://github.com/dawidd6)** -- **[@erikdubois](https://github.com/erikdubois)** -- **[@konimex](https://github.com/konimex)** -- **[@mstraube](https://github.com/mstraube)** -- **[@Artoriuz](https://github.com/Artoriuz)** -- **[@WilsonRU](https://github.com/WilsonRU)** -- **[@Takeya-Yuki](https://github.com/Takeya-Yuki)** -- **[@iandrewt](https://github.com/iandrewt)** -- **[@LER0ever](https://github.com/LER0ever)** - - -## Operating System - -- Added support for IRIX. -- Added support for Arch XFerience. **[@mstraube](https://github.com/mstraube)** -- Added support for CloverOS. -- Added support for Maui. **[@mstraube](https://github.com/mstraube)** -- Added support for KS Linux. **[@Takeya-Yuki](https://github.com/Takeya-Yuki)** - - -## General - -- Minimum required BASH version is now 3.2. - - (Neofetch has always used 3.2+ features, I've just made it obvious now in the documentation.) -- Fixed config file not being created on first install. - - -## Images - -- [w3m] Added `--loop` flag which makes Neofetch draw the image once per second. - - This is a workaround to the images disappearing on resize and workspace switch. - - Use Ctrl+C to exit. -- [w3m] Fixed w3m-img not found on FreeBSD 12. **[@Artoriuz](https://github.com/Artoriuz)** - - -## Ascii - -- Added Ubuntu-MATE ascii art. -- Fixed ArchLabs ascii art. **[@erikdubois](https://github.com/erikdubois)** -- Updated GoboLinux ascii art. **[@WilsonRU](https://github.com/WilsonRU)** -- Fixed `--ascii_distro windows10` not working. - - -## Info - -**Distro** - -- [Solaris, AIX, Haiku] The machine architecture will now be shown properly instead of machine ID. - -**Terminal Emulator** - -- Added support for Neovim terminal emulator. **[@LER0ever](https://github.com/LER0ever)** -- Added font support for mate-terminal. **[@mstraube](https://github.com/mstraube)** -- [Termite] Fix font mismatch. **[@MatthewCox](https://github.com/MatthewCox)** -- Use `$SSH_TTY` for terminal detection if machine is connected via SSH. -- Break from loop if PPID can't be accessed/not found. - -**GPU** - -- [Linux] Fixed GPU sort. - -**Song** - -- Do not detect ibus\* or indicator\* as player. **[@dawidd6](https://github.com/dawidd6)** - -**Model** - -- Specify when running on a Hackintosh. **[@LER0ever](https://github.com/LER0ever)** - - -**Memory** - -- [FreeBSD]: Fix inaccurate free memory calculation. - - -## [3.1.0] - 2017-04-25 - -Hi, It's been quite a while since the last release. I've been extremely busy with university and I finally found some time to flag a new release. (I've been meaning to do this for a few weeks now) - -Though I haven't worked on Neofetch as much as I'd have liked, most of the changes this time round come from some familiar faces as well as some new contributors! Thanks to everyone for contributing, I appreciate it. - - -## Contributors - -- **[@konimex](https://github.com/konimex)** -- **[@mstraube](https://github.com/mstraube)** -- **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- **[@ikeydoherty](https://github.com/ikeydoherty)** -- **[@eliezio](https://github.com/eliezio)** -- **[@nilesr](https://github.com/nilesr)** -- **[@dritter](https://github.com/dritter)** -- **[@HebaruSan](https://github.com/HebaruSan)** -- **[@LER0ever](https://github.com/LER0ever)** -- **[@obrevenge](https://github.com/obrevenge)** -- **[@ajjames31](https://github.com/ajjames31)** -- Eliezio Oliveira - - -## Operating System - -- Added Chrome OS Crouton support. **[@LER0ever](https://github.com/LER0ever)** -- Added support for SliTaz. **[@nilesr](https://github.com/nilesr)** -- Added support for Nitrux. **[@mstraube](https://github.com/mstraube)** -- Added support for DesaOS. -- Added support for MinGW. -- Added support for OBRevenge. **[@obrevenge](https://github.com/obrevenge)** -- Added support for ArchLabs. **[@obrevenge](https://github.com/obrevenge)** - - -## Screenshot - -The screenshot feature no longer requires any configuration before working. We no longer hardcode `${HOME}/Pictures/neofetch` as the screenshot location. Here's how the `-s` and `-su` flags now function: - -- `neofetch -s` will save a file in the current directory named: `neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png` -- `neofetch -s test.png` will save a file in the current directory called `test.png` -- `neofetch -s ~/` will save a file in `~` called `neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png` -- `neofetch -s ~/test.png` will save a file in `~` called `test.png`. - - -## ASCII - -- Arch ASCII art now uses lighter colors. -- Fixed Ubuntu-Studio ASCII setting. **[@@HebaruSan](https://github.com/HebaruSan)** -- Updated Parabola logo. **[@mstraube](https://github.com/mstraube)** -- Updated Raspbian ASCII art. - - -## Images - -- Added `libsixel` backend. -- Added `termpix` backend. -- Only use a zero width space in the `w3m` backend. -- Fixed bug causing terminal size to not be found. -- [iTerm2] Fixed images not appearing inside `tmux`. - - -## Info - -**Locale** - -- Added a new function to display system locale. (Disabled by default) - -**CPU** - -- Added option to show decimals in CPU speed. - -**Terminal Font** - -- Added \*experimental\* font detection for iTerm2. **[@dritter](https://github.com/dritter)** - -**Window Manager** - -- [MacOS] Added support for Kwm. **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- [MacOS] Added support for Spectacle. **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- [MacOS] Added support for Amethyst. **[@jorgegonzalez](https://github.com/jorgegonzalez)** - -**Battery** - -- Added battery support for Bay Trail devices. **[@mstraube](https://github.com/mstraube)** - -**Disk** - -- Added new option to only show dir name in subtitle. - -**Song** - -- Added support for Deepin Music. **[@mstraube](https://github.com/mstraube)** -- Added support for Tomahawk. **[@mstraube](https://github.com/mstraube)** -- Fixed Audacious song output when `dbus-send` fails. **[@mstraube](https://github.com/mstraube)** - -**Local IP** - -- [Linux] Fixed UID showing instead of Local IP on several versions/configs of iproute2. - -**Packages** - -- [eopkg] Use a faster detection method. **[@ikeydoherty](https://github.com/ikeydoherty)** - -**Resolution** - -- [macOS] Fixed `screenresolution` not appearing at all on newer versions. **[@eliezio](https://github.com/eliezio)** -- [Linux] Show decimals. - -**GPU** - -- [Linux] Hide duplicate GPU lines (Only display 1). - - -## [3.0.1] - 2017-01-30 - -This minor release fixes all of the bugs that were found in the 3.0 release. - -Thanks for all of the bug reports and contributions. :) - -## Contributors -- **[@SomaUlte](https://github.com/SomaUlte)** -- **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- **[@dawidd6](https://github.com/dawidd6)** -- **[@mstraube](https://github.com/mstraube)** -- **[@YellowApple](https://github.com/YellowApple)** -- **[@siiptuo](https://github.com/siiptuo)** -- **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** -- **[@konimex](https://github.com/konimex)** - -## Operating System -- Added support for ArchBox Linux. - -## General -- Fixed output if subtitles are disabled and `prin` is used in an info function. -- Fixed underlines not working when used with `prin`. -- Fixed HAIKU install path. **[@YellowApple](https://github.com/YellowApple)** - -## Config -- Fixed default config not found. -- Don't set locale in config file. - -## Info - -**Memory**
-- Changed memory label to `MiB` on OS that output memory in Mebibytes. - -**Shell**
-- Fixed a crash when the user has `bash 3` installed. - -**Packages**
-- Added support for Chromebrew. - -**GPU**
-- [Linux] Display detailed information about Intel GPUs. **[@SomaUlte](https://github.com/SomaUlte)** - -**Color Blocks**
-- Fixed issue with `color_blocks="off"` adding an extra newline to the output. - -**Song**
-- Don't print `$song` if it's empty and `song_shorthand` is on. **[@mstraube](https://github.com/mstraube)** -- Fixed `mpd` detection when `mpd` is on a different host. **[@dawidd6](https://github.com/dawidd6)** -- Use `get_song_dbus` for Audacious. **[@mstraube](https://github.com/mstraube)** - -**Terminal Font**
-- [Alacritty] Fixed font detection. **[@siiptuo](https://github.com/siiptuo)** - -## Images -- [iTerm2] Fixed issue with line-breaks printing spaces over the image. **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- Fixed issue with images not working in Terminology. -- Fixed issue when `image_source` was set to `wall`. -- [w3m-img] Fixed issues with `w3m-img` and `tmux`. - -## Ascii -- [Windows 10] Fixed `ascii_distro` not working. -- Fixed a bug where the backend is `ascii` but the image_source is an image file. -- Fixed custom ascii files not working. -- Removed extra backslashes from OpenBSD ascii art. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** - -## Scrot -- Added message to let users know that a screenshot was taken. - - -## [3.0] - 2017-01-23 - -This is another large release containing over `550` commits from 7 contributors. Due to the size and large amount of changes made this release expect at least one minor release to fix any bugs that come up. - -The version number has been bumped to `3.0` due to the large amount of breaking changes introduced this update. I've added backwards compatibility for all of the new changes but there may still be some breakage. I highly recommend starting with a new config to avoid any issues that may arise. - -Neofetch now supports displaying images using `catimg`, `libcaca` and `jp2a`. See this wiki page for screenshots. https://github.com/dylanaraps/neofetch/wiki/Image-Backends - -Thanks to everyone who contributed this release, there were a lot of new faces this time around. :) - -## Contributors -- **[@konimex](https://github.com/konimex)** -- **[@iandrewt](https://github.com/iandrewt)** -- **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- **[@z33ky](https://github.com/z33ky)** -- **[@mstraube](https://github.com/mstraube)** -- **[@gavinhungry](https://github.com/gavinhungry)** - -## IRC - -Neofetch now has an IRC channel at `#neofetch` on Freenode. If you have any questions, issues or ideas feel free to join the IRC channel and I'll be happy to assist you. I know that we've already got the Gitter chat but hopefully this makes things easier for those without a GitHub account. :) - -[![Freenode](https://img.shields.io/badge/%23neofetch-%20on%20Freenode-brightgreen.svg)](http://irc.lc/freenode/neofetch) - -## Collaborators - -I have given collaborator access to both **[@konimex](https://github.com/konimex)** and **[@iandrewt](https://github.com/iandrewt)**. In short this allows them to push directly to the master branch of the repo, manage the issue tracker and also merge pull requests. They've been a huge help the past year so this made sense to me. - -## OS -- Added support for AIX. -- Added support for AntiX. -- Added support for GNU/kFreeBSD. -- Added support for Gentoo FreeBSD. -- Added support for GrombyangOS. -- Added support for Joyent SmartOS. -- Added support for Mer. -- Added support for MINIX. -- Added support for MX. -- Added support for Open Source Media Center (OSMC). -- Added support for SalentOS. -- Added support for TrueOS. -- Added support for Windows (MSYS2). - -## General -- The default config file is now installed to `/etc/neofetch/config` and acts as a system-wide config file for Neofetch. Editing this file will make the changes available to all users on the system. Those packaging Neofetch **without** using the Makefile will need to make changes to support this. -- The Makefile was rewritten to remove GNU-isms. -- Removed executable permission from config files. BASH can source them even if they're un-executable. -- Travis now runs [shellcheck](https://github.com/koalaman/shellcheck) on every commit and pull request. - - We've had to exclude around 10 lint errors, see this wiki page for why we did this: - - https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions -- Neofetch now supports relative path values when specifying the location to images, ascii files and config files. - - For example, `neofetch --w3m Pictures/Wallpapers/10.jpg` and `neofetch --w3m 10.jpg` now work. -- Optimize usage of `get_de()`, `get_wm()` and `get_term(). - - We were calling these multiple times, we now only run them once and check to see if they were run previously. -- Optimize info caching, only check for cache files in functions that use caching. -- The manpage is now generated using `help2man`. `help2man` parses the output of `--help` and `--version` to create a manpage. This ensures that our manpage stays 1:1 with the script documentation. We actually found a lot of outdated info in the old manpage thanks to this. - - A new flag was added called `--gen-man` which generates a neofetch manpage in your current directory. -- Delete most of `info()` and instead call `prin()`. - - This removes a lot of duplicate code between `info()` and `prin()`. -- Remove `printf` subshells and instead use `printf -v` to declare the variables. -- Fixed artifacts when using line-breaks in TTYs. -- All errors are now sent to `stderr`. -- Renamed `XFCE` --> `Xfce`. **[@gavinhungry](https://github.com/gavinhungry)** -- Cleanup `main()`. -- Renamed `old_flags()` --> `old_options()`. - -## Info - -**Shell**
-- [Fish] Fixed memory leak caused by Fish. -- Added support for `xonsh`. -- Fixed version output on `ksh`. -- Rewrote the function to remove duplicate code. - -**Uptime**
-- Moved duplicate code to a function. -- Changed `$uptime_shorthand` to `on` by default. - -**Desktop Environment**
-- Fixed issues where MATE wouldn't be detected properly. -- Added fallback to `$DESKTOP_SESSION`, `$MATE_DESKTOP_SESSION_ID` and `$GNOME_DESKTOP_SESSION_ID`. -- Hide Desktop Environment if it matches Window Manager. - -**CPU**
-- [Linux] Don't simplify `cpufreq` speed option names for no reason. -- [Linux] Fixed issues with CPU name detection for architectures other than x86/amd64/ARM. -- [NetBSD] Remove case statement in favor of 1 line test. -- Simplify check for low CPU speeds. -- Expanded `cpu_temp` to take the values `C` and `F`. This means you can now display the CPU temperature as Fahrenheit. - -**CPU Usage**
-- Added Haiku cores command. -- Updated Linux and macOS commands to the match the commands in the `get_cpu()` function. - -**GPU**
-- [Linux] Each GPU is now printed on a separate line. -- [Linux] Added `--gpu_type` / `$gpu_type` which lets you display `all`, `dedicated` or `integrated` GPUs. - -**Memory**
-- [Solaris] Fixed inaccurate used memory size. - -**Resolution**
-- [Windows] Declare variables locally to fix conflicts in other functions. - -**~~Birthday~~ Install Date**
-- Renamed `get_birthday()` -- > `get_install_date()` -- Removed all `date` command usage from `get_install_date()`. -- Added a new function called `convert_time()` which takes the time stamped `ls` output and converts it to a pretty format. The function only uses bash so its much faster than calling `date`. This makes things simple and keeps the output consistent across all Operating Systems. Example: `2016-12-06 16:58:58.000000000` --> `Tue 06 Dec 2016 4:58 PM` -- Added an option so users can choose between using 24-hour and 12-hour time format -- `get_install_date()` will detect which `ls` program is being used instead of hardcoding them per OS. - -**Disk**
-- Rewrote function from scratch. - - The function is `40` lines smaller than before and works on all [1] versions of `df` we tested on [2]. -- Added the option/flag `disk_show` which allows you to specify which disks, mount points or directories to show the disk info of. (One per line) -- Added the option/flag `disk_subtitle` which allows you to specify how we label each disk. (Mount point or Disk name) -- Removed all percentage calculation since `df` already provides us with the percentage. -- Warn the user if `df` isn't installed. -- Fixed broken output if `df` wasn't installed but the function was enabled. - -[1] The function doesn't work on Haiku since their `df` is wildly non-standard. (The output format and flags are 100% different from all of the other `df` versions floating around.) - -[2] Tested on `GNU`, `Busybox`, `BSD`, `Solaris` and `macOS` `df` versions. - -**Theme**
-- [KDE] Don't display GTK Themes if KDE is detected. -- [KDE] If `kde[0-9]-config` isn't found, try and look for `$HOME/.kde`. - -**Window Manager Theme**
-- Fixed WM Theme not detected on MATE. **[@mstraube](https://github.com/mstraube)** -- Fixed WM Theme detection on KDE. **[@mstraube](https://github.com/mstraube)** - -**Song**
-- Added support for xmms2. **[@z33ky](https://github.com/z33ky)** -- Added support for Exaile music player. **[@mstraube](https://github.com/mstraube)** -- Added support for JuK .**[@mstraube](https://github.com/mstraube)** -- Added support for Bluemindo. **[@mstraube](https://github.com/mstraube)** -- Added support for Guayadeque Player. **[@mstraube](https://github.com/mstraube)** -- Added support for Yarock. **[@mstraube](https://github.com/mstraube)** -- Added support for Qmmp. **[@mstraube](https://github.com/mstraube)** -- Added support for QuodLibet. **[@mstraube](https://github.com/mstraube)** -- Added support for Mopidy. **[@d3rrial](https://github.com/d3rrial)** -- [cmus] Simplify block and fix `artistsort` bug. -- Removed `state` detection. -- Removed duplicate `dbus-send` commands. **[@mstraube](https://github.com/mstraube)** -- Hide output if no song is playing. -- Enforce order `artist - title` in `get_song_dbus()`. **[@mstraube](https://github.com/mstraube)** - -**Terminal Font**
-- Added support for Alacritty. -- Added support for Konsole. **[@mstraube](https://github.com/mstraube)** -- Added support for Sakura Terminal. **[@mstraube](https://github.com/mstraube)** -- Added support for Pantheon Terminal. **[@mstraube](https://github.com/mstraube)** -- Added support for deepin-terminal. **[@mstraube](https://github.com/mstraube)** -- [Termite] Fixed incorrect font chosen. **[@mstraube](https://github.com/mstraube)** -- [Termite] Also look at default config. **[@mstraube](https://github.com/mstraube)** - -**Battery**
-- [MacOS] Fixed issue where battery always appears as charging. **[@jorgegonzalez](https://github.com/jorgegonzalez)** - -**Local IP**
-- [BSD and Solaris] Merged the detection to Linux. -- [Windows] Support multiple interfaces. - -**Color Blocks**
-- Use `start++` instead of adding it manually after case. **[@konimex](https://github.com/konimex)** -- Fixed bug where color blocks wouldn't respect width in TTYs. -- Cursor positioning now takes `$block_height` into account. -- Fixed all artifacts in virtual consoles. -- Merged `$start` and `$end` into an array called `block_range`. - - This makes the config option match the command-line flag `--block_range`. - -## Images -- [iTerm2] Fixed blank images. -- Fixed bug where image mode would attempt to run in a TTY. -- All of the image/ascii backend handling was rewritten. Backend and Image/File/Directory selection is universal now and should make usage easier. - - Added `catimg` backend. - - Added `caca` backend. - - Added `jp2a` backend. - - `--image` has been replaced with `--backend`. - - `--backend` takes `ascii`, `caca`, `catimg`, `jp2a`, `iterm2`, `off`, `tycat`, `w3m`. - - Shortcut flags were added for easy picking of backends. - - Each flag can take a file, image or directory as an argument. - - For example: `neofetch --w3m /path/to/img.jpg` `neofetch --ascii /path/to/file` - - `--w3m` - - `--iterm2` - - `--tycat` - - `--ascii` - - `--off` - - `--catimg` - - `--caca` - - `--jp2a` - - All image and ascii file selection has been replaced with the universal `--source`. - - The value of `--source` can be any of the following: - - `auto`, `ascii`, `wallpaper`, `/path/to/img`, `/path/to/ascii`, `/path/to/dir/`. -- Fixed bugs with image shuffle mode. - -## Wallpaper -- Decode URI filenames. - -## Ascii -- Simplified ascii file handling. - - Removed a call to `tr` for those using `bash 3`. - - Fixed distro detection issues. - - Removed the assumption that `first word in distro --> ascii file name` -- Added Ubuntu-Studio. **[@konimex](https://github.com/konimex)** -- Fixed bug causing macOS ascii art to be used on other Operating Systems. -- Display warning about 'ascii' being the new default mode. -- Removed `ascii_logo_size` in favor of `ascii_distro='{arch,crux,gentoo}_small'`. -- [PCBSD] Use TrueOS ascii art. -- Added Void Linux (small) and Alpine Linux (small). - -## Screenshot -- Use arrays for `$scrot_program` - -## Args -- Fixed bug where `neofetch --config` sourced the user config twice. -- Cleaned up config arg handling. - - -## [2.0.2] - 2016-12-07 - -This minor release fixes some issues related to new features added in 2.0. These issues weren't picked up in the time between 2.0 and 2.1 and another minor release is needed due to the Packages issue being rather important. - -These issues were fixed by reverting the GPU caching and Packages optimizations. These issues occurred because not enough testing was done before these were implemented in master. In the future I'll take more care with testing these larger changes before they hit the master branch and I apologize for there being yet another release in one week. - -I also want to apologize to those packaging Neofetch for this unexpected release. - -## Info - -**Packages**
-- Fixed issue where package output was off by one. - -**GPU**
-- Fixed bug with `--gpu_brand` not working. - -**Theme**
-- [Cinnamon] Fixed incorrect information. - - -## [2.0.1] - 2016-12-06 - -This release of Neofetch fixes some important bugs that were found after 2.0 was release. This includes: Detection issues on CentOS and Linux Mint systems, Incorrect Memory usage on BSD, Linux GPU detection issues and more. - -This release also includes a rewrite of the screenshot functions. You no longer have to set the program to use in your config. Neofetch now automatically finds and uses whatever screenshot tool is available on your machine. - -See the screenshot section below for more info. - -The `get_packages()` function was optimized. Neofetch's packages function works by detecting which package managers are installed on your system and then using a sum of those as the packages output. - -Previously the function would call `wc -l` for every package manager, instead we now call `wc -l` only once at the end of the function. - -Thanks for reporting these bugs and also suggesting these features. Don't be shy, report any bugs, annoyances or etc with Neofetch and I'll happily help you out. - -Thanks to **[@konimex](https://github.com/konimex)** for all of his contributions this release. :) - -## Contributors -- **[@konimex](https://github.com/konimex)** - -## General -- Use `$kernel_name` instead of `$distro` in some functions. **[@konimex](https://github.com/konimex)** - -## Info - -**Distro**
-- Added support for Apricity OS. -- Added support for GoboLinux. **[@konimex](https://github.com/konimex)** -- Added support for SwagArch. -- Added support for AOSC OS. -- Added support for Parrot Security. -- Fixed bug that caused Linux Mint systems to be identified as Ubuntu. -- Fixed bug that caused CentOS systems to not be detected. - -**Memory**
-- [BSD] Fixed high memory output. - -**GPU**
-- [Linux] Fixed bug where sound card was detected as GPU. - -**Packages**
-- Only call `wc -l` once at the end of the function instead of calling it once per package manager. - -**Desktop Environment**
-- Show Cinnamon version. - -## Image -- Changed default image mode to `ascii`. - - See: [Images in the terminal](https://github.com/dylanaraps/neofetch/wiki/Images-in-the-terminal#enabling-image-mode) - -## Wallpaper -- Rewrote wallpaper function. -- Prioritize DE wallpaper setters before falling back to `feh`/`nitrogen`. -- Added support for XFCE's wallpaper setter. -- Added support for Solaris and GNU Hurd. **[@konimex](https://github.com/konimex)** - -## Ascii - -![ubuntu](https://u.teknik.io/zILeY.png) -
Old Ubuntu Logo vs New Ubuntu Logo -- Updated Ubuntu logo to the latest version. - - You can use the old logo by launching neofetch with `--ascii_distro ubuntu_old` or by changing `$ascii_distro` to `ubuntu_old` in your config file. -- `--ascii_colors` no longer changes text colors. -- Added ascii art for Ubuntu-Budgie. - - You can use the ascii art by launching Neofetch with `--ascii_distro ubuntu-budgie` or by changing `$ascii_distro` to `ubuntu-budgie` in your config file. -- Fixed bug causing RFRemix to use the incorrect ascii art. - -## Screenshots - -Neofetch will now automatically find and use whatever screenshot tool is available on your system. The screenshot tool is no longer hardcoded and you don't have to edit your config file to specify what program to use. - -On Haiku and macOS, Neofetch will use the built-in tools to take screenshots. On systems with an X server Neofetch will look for and use the following programs: `scrot`, `maim`, `import (imagemagick)`, `imlib2_grab` and `gnome-screenshot`. - -The config option `scrot_cmd` and the commandline flag `--scrot_cmd` are still there for those who want to use custom flags, programs or scripts to take screenshots. -- Automatically use whatever screenshot tool is available. -- Added screenshot support to macOS -- Added screenshot support to Haiku - -## Screenshot Upload -- [teknik.io] Fixed images not uploading with the right filetype. -- Changed default image upload host to `teknik.io`. - - teknik doesn't compress images whereas imgur does. - - You can change this back to imgur by using `--image_host imgur` or by editing your config file. - - -## [2.0] - 2016-12-02 - -This is the biggest release of Neofetch in a long time. 97 files were changed with 2700~ additions to 2900~ deletions. Although the changelog isn't as interesting this time majority of the script has been rewritten, restructered and cleaned up. Every function and variable name follows a proper naming scheme and a large number of bugs were fixed. - -Since this version of Neofetch differs so much from the previous versions expect a 2.0.1 release a few days later to fix any bugs that are found after release. - -The ascii file handling was rewritten, ascii art is now stored/read as plain text! All `eval` usage was removed from Neofetch, vim fold markers/comments are no longer enforced and we now run on GNU Hurd, Haiku and more. - -When I was rewriting parts of the script I thought to myself; Neofetch is using the bash shebang and does depend on bash so why not take full advantage of the features bash has to offer? All tests were changed from `[` to `[[`, arithmetic tests now use `(())` and C style for loops are used where possible. - -All of the config file documentation was rewritten and multiple wiki pages were created to hopefully make using/configuring Neofetch easier than ever before. You can see the wiki here: [Neofetch Wiki](https://github.com/dylanaraps/neofetch/wiki) - -Some of the config options/arguments were renamed/changed and Neofetch will warn you on run if you're using deprecated options (`neofetch -v`). For this release Neofetch **will** include backwards compatibility with the old config file but I'd like to remove this stuff in ~~2.1~~ 3.0. I recommend using this release with a fresh config file so that you can make use of the new documentation. - -I say this every release; This changelog is incomplete, for a full list of changes take a look through the commit history. Neofetch now has an unspoken commit style so reading the commit history won't hurt as much as it used to. - -Thanks to all of the contributors this time around, you guys are a big help and I really appreciate your work towards making Neofetch better and better each release. :) - -## Contributors -- **[@konimex](https://github.com/konimex)** -- **[@TonCherAmi](https://github.com/TonCherAmi)** -- **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** -- **[@iandrewt](https://github.com/iandrewt)** -- **[@iwamatsu](https://github.com/iwamatsu)** -- **[@Brottweiler](https://github.com/Brottweiler)** - -## Packages -- Neofetch is now in Debian's official repos. -- Neofetch is now in Ubuntu's official repos. - -## General -- All functions/variables now follow the same naming scheme. `example_func_name` -- Call `uname` once and cache the output instead of calling `uname` 4-5 times. -- Cleaned up and rewrote large chunks of the script. -- Convert math tests to correct syntax. -- Fixed `--disable` and capitalized arguments. -- Fixed issue where `bold=off` wouldn't work. -- Fixed issue where info wasn't detected properly but the subtitle was still displayed. -- Fixed issue where using `--disable func func` broke other args. -- Removed all traces of `eval` from Neofetch. -- Removed all vim fold markers and stopped enforcing folding for vim users. - - See [#431](https://github.com/dylanaraps/neofetch/pull/431) -- Rewrote all of config file documentation. -- Swap all tests from `[` to `[[`. - -## Operating System -- Added support for ChaletOS. -- Added support for DracOS. -- Added support for GNU Hurd. **[@konimex](https://github.com/konimex)** -- Added support for Haiku. **[@konimex](https://github.com/konimex)** -- Added support for Korora. **[@konimex](https://github.com/konimex)** -- Added support for Netrunner. **[@konimex](https://github.com/konimex)** -- Added support for Pardus. -- Added support for iPhone 7 and 7 Plus. - -## Ascii -- Ascii art is no longer read as a script and is now read as plain text. - - See this wiki page about the new ascii art format. - - https://github.com/dylanaraps/neofetch/wiki/Custom-Ascii-art-file-format -- Neofetch now displays your OS's ascii logo if your distro's logo isn't found. **[@konimex](https://github.com/konimex)** - - Example: [Linux] Tux is displayed if there's no distro ascii. -- `neofetch --ascii_distro x` now sets the mode to ascii for you. You no longer have to use a combination of `--ascii` and `--ascii_distro`. -- [Arch Linux] Changed default ascii colors. -- [Bunsenlabs] Changed default ascii colors. -- Fixed issue with Solarized and certain ascii art. -- Remove all duplicates from `get_distro_colors()`. -- Remove execution permission flag from ascii art files. **[@iwamatsu](https://github.com/iwamatsu)** -- Rename `colors()` to `get_distro_colors()`. -- Rename `setcolors()` to `set_colors()`. -- Update Netrunner ascii art. -- Added old arch ascii logo. **[@Brottweiler](https://github.com/Brottweiler)** - - Useable by using `--ascii_distro arch_old` or by editing the config. - -## Images -- Fixed images not appearing in st. -- Added `to_ascii()` and `to_off()`. - - These functions are used when falling back to different image modes. -- Renamed `check_old_flags()` to `old_flags()` to match `old_functions()`. -- Split `get_image()` into `get_term_size()`, `get_image_size()`, `get_image_program()` and `make_thumbnail()`. -- Use `$XDG_CACHE_HOME` as the thumbnail dir if available. - -## Wallpaper -- Added support for Cinnamon. - -## Bars -- Rename all `progress_` variables to `bar_` to match the function name. - -## Info - -**Distro**
-- [Linux] Source `/etc/*-release` files instead of having a dozen separate `awk` commands. - - We source `/etc/os-release` before falling back to `/etc/*-release`. -- Remove lsb_release detection. - - This change was made since lsb_release prints innacurate results on some distros. -- Added fallback when distro isn't found. **[@konimex](https://github.com/konimex)** - - Example: `Linux (Unknown)` - -**Packages**
-- [Solus] If `pisi` is unavailable, use `eopkg`. -- Added package detection for Lunar Linux. **[@konimex](https://github.com/konimex)** -- Added package detection for TinyCore. **[@konimex](https://github.com/konimex)** -- Remove `/usr/games` from `$PATH` to fix issues with pacman game. - -**GPU**
-- GPU is now cached till reboot. -- [Linux] Prefer dedicated GPU over integrated GPU. - -**Terminal**
-- Added support for HyperTerm. **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** - -**Terminal Font**
-- Added support for HyperTerm. **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** - -**CPU**
-- [BSD] Added cpu_temp support. **[@konimex](https://github.com/konimex)** - -**CPU Usage**
-- [iOS] Fixed CPU usage. - -**Shell**
-- [bash] Simplify bash version. - -**Song**
-- Added support for Clementine. **[@konimex](https://github.com/konimex)** -- Added support for GNOME Music. **[@konimex](https://github.com/konimex)** -- Added support for Lollypop. **[@konimex](https://github.com/konimex)** -- Added support for Pragha. **[@konimex](https://github.com/konimex)** - -**Public IP**
-- Cache the output of the command. **[@konimex](https://github.com/konimex)** -- [dig] Fixed connection timed out with public_ip. **[@iandrewt](https://github.com/iandrewt)** - -**Resolution**
-- [MacOS] If refresh rate is empty don't append Hz. - - -## [1.9.1] - 2016-11-04 - -This is a small release which fixes various issues found in 1.9. - -Note: Those packaging neofetch can ignore the new file: `config/travis` - -## Contributors -- **[@konimex](https://github.com/konimex)** -- **[@fornwall](https://github.com/fornwall)** -- **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** - -## Packages -- Neofetch is now in Termux`s repos. - -## General -- [Cursor Position] Fix cursor position in URxvt when using terminal padding. -- [Termux] Fix default ascii location. **[@konimex](https://github.com/konimex)** -- [Termux] Fix default config location. **[@fornwall](https://github.com/fornwall)** -- If a function fails to detect info, let the user know in verbose mode. (`-v`) -- Removed `--test` in favor of a separate config file. Travis.ci now uses `neofetch --config travis` instead of a hacked together arg. - -## Operating System -- Added support for BlankOn Linux. - -## Images -- Fix division by 0 error. - -## Ascii -- [Tails] Update ascii art. -- [OpenBSD] Made ascii art thinner - -## Info - -**Prin**
-- Fix color breakage. -- Fix bold not working. - -**Terminal**
-- Fix whitespace error. - -**Terminal Font**
-- [Termite] Fix incorrect Termite font chosen. -- [Termite] Simplify `awk` command. -- [xfce4-terminal] Simplify `awk` command. - -**Theme**
-- [Budgie] Fix incorrect GTK Theme/Icons - -**Window Manager Theme**
-- [Budgie (Mutter)] Don't print WM Theme. - -**Memory**
-- [OpenBSD] Fixed used memory usage. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** - - -## [1.9] - 2016-11-01 - -This change log won't cover everything that's changed. Have a look through the commit -history for more info. - -There were a lot of major changes made to how things work in this release so I'm expecting -bugs/things not working for people. Expect a 1.9.X release. - -I'm also looking for neofetch screenshots for the Readme, see this issue: [#405](https://github.com/dylanaraps/neofetch/issues/405) - -Thanks to everyone below who contributed, it's nice to see some new faces too. :) - -## Contributors -- **[@konimex](https://github.com/konimex)** -- **[@iandrewt](https://github.com/iandrewt)** -- **[@coypoop](https://github.com/coypoop)** -- **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** -- **[@koreacomputercenter](https://github.com/koreacomputercenter)** - -## General -- Added new function called `checkoldflags` which informs users about deprecated config options. -- Change all `OS X` references to `macOS`. **[@iandrewt](https://github.com/iandrewt)** -- Fix corrupted text when long lines are cut-off. -- Don't dynamically place prompt in `image=off` mode. -- Cursor Position: Fix issues when using URxvt+Padding - -## Operating System - -![android](https://u.teknik.io/4XdJy.png) -- Added support for Android. - - Dependencies: - - Required: `bash` and `busybox` - - Note: I recommend installing `termux` from the Play Store or F-Droid. Termux provides you with a fully - working Linux environment, doesn't require root acess and includes all dependencies. - - Note2: Neofetch will be packaged in `termux` thanks to **[@konimex](https://github.com/konimex)** - - PR [#351](https://github.com/termux/termux-packages/pull/531) -- Added support for Bitrig. **[@konimex](https://github.com/konimex)** -- Added support for Sparky Linux. -- Added support for Porteus. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** -- Added support for Red Star OS. **[@koreacomputercenter](https://github.com/koreacomputercenter)** - -## Packages -- Neofetch is now in Gentoo's official repos. - -## Images - -**Fixed rendering issues in URxvt when using an XFT font.** - -![scrot](https://i.sli.mg/6qp9Cg.png) - -This was first thought to be an issue between URxvt and W3m-img and I apologize for immediately closing bug reports and dismissing comments about this. - -I spent yesterday trying to fix this issue and found out that launching neofetch with `--bold off` -reduced the rendering problems. I did more digging and found out that removing all text formatting fixes the issue entirely. I later found out that adding a single unformatted character before the formatted text fixed the issue while keeping the formatting the same. - -I opened up this PR https://github.com/dylanaraps/neofetch/pull/358 which added options to enable a border between the image and the text to fix the issue. **[@konimex](https://github.com/konimex)** later commented informing me that we could just use a `zero-width space` to fix the issue and that we didn't need a new function/args/ugly border. doh - -The final fix was as simple as adding a zero-width space before the info, here's the commit. - -https://github.com/dylanaraps/neofetch/commit/3e9c3d648cb4c6f0d5fe5f0b96f9e29429af39d9 - -**Removed hard dependency on `\033[14t`** - -Neofetch no longer requires a terminal emulator that supports `\033[14t` this means that neofetch now works in Konsole. Instead of using the escape sequence users now have three options for getting the terminal size in pixels. -- `xdotool` -- `xwininfo` + `xprop` -- `xwininfo` + `xdpyinfo` - -Neofetch will detect whatever combination you have insalled and use these programs. - -Note: `\033[14t` is still supported, if images already work for you then you don't have to install anything else. -- [w3m-img] Draw the image twice to fix rendering issues in Konsole. -- [w3m-img] Fix cursor position when using `yoffset`. -- [w3m-img] Add `-bg` support with the new option `--bg_color`. - - `neofetch --bg_color blue` will make the background behind the image blue. - - Note: The background color is only visible behind transparent parts of the image. -- If the terminal width is found as `0`, fallback to ascii mode. - -## Ascii -- Bold ascii art by default. -- Fixed incorrect prompt location when using `ascii_logo_size small`. -- Fixed incorrect colors used on light terminals. -- Update Void Linux ascii art. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** -- Update Solus ascii art. - -## Info - -**Distro**
-- Expanded `distro_shorthand` to macOS, BSD and Solaris. **[@konimex](https://github.com/konimex)** -- Removed `osx_buildversion` and `osx_codename` in favour of `distro_shorthand`. **[@konimex](https://github.com/konimex)** - -**Desktop Environment**
-- [Windows] Added support for showing DE. - - Windows 8 and above: `Modern UI/Metro` - - Windows 7 and below: `Aero` - -**Window Manager**
-- [Windows] Added support for custom WMs/Shells. - - Neofetch now detects `blackbox`, `bugn`, `Windawesome`, `emerge` and `litestep`. - -**Window Manager Theme**
-- [Windows] Added support for Blackbox themes. - -**CPU**
-- Added `cpu_speed` which lets you hide/show the speed in the output. -- Expanded `cpu_cores` option by adding two new values, `logical` and `physical`. - - `logical`: Show all virtual cores (hyperthreaded). - - `physical`: Only show physical cores. -- [Linux] Added support for showing CPU temperature. - - Added new option called `cpu_temp`. - - Note: This is disabled by default and can be enabled by changing the value of `cpu_temp` in your config to `on`. -- [macOS] Print physical cores instead of hyper-threaded cores. **[@iandrewt](https://github.com/iandrewt)** -- [iOS] Rewrite CPU function. - -**GPU** -- [iOS] Rewrite GPU function. -- [Linux] Rewrite GPU function. - - Neofetch also caches the info until reboot. - -**Uptime**
-- Rewrote uptime function to use seconds since boot instead of the `uptime` command. - - Every OS/Distro now has the pretty `uptime -p` output! -- Remove `up` from output. - -**Resolution**
-- [macOS] Add @2x label for retina resolutions. **[@iandrewt](https://github.com/iandrewt)** - -**Memory**
-- [Linux] Correctly calculate used memory. - - The output should now match `conky`, `htop` and etc. - - Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 -- [NetBSD] Fix memory output for sizes over 4GB. **[@coypoop](https://github.com/coypoop)** - -**Shell**
-- Hide shell path by default. -- Show shell version by default. - -**Battery**
-- [Linux] Rewrote and simplified battery function. -- Removed `battery_shorthand` -- Removed `battery_num` - -**Theme Font**
-- [XFCE] Fixed incorrect font output. - -**Color Blocks**
-- Fixed `block_width` not working. -- Fixed `% s` appearing in color blocks when neofetch is run from `tty` -- Fixed `block_width` being off by one. A value of `2` made the blocks `3` wide instead of `2` wide. - -**Terminal and Terminal Font**
-- [Linux] Use `/proc/$PPID/comm` instead of parsing `ps`. -- Uppercase first letter of `termfont` output. -- Don't print broken output of busybox's `ps`. -- Remove path from output. - -**Song**
-- [macOS] Fix iTunes automatically opening. **[@iandrewt](https://github.com/iandrewt)** -- Added support for Audacious. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** -- Rewrote song function, it's now much faster/cleaner. - - -## [1.8.1] - 2016-10-04 - -This release fixes various bugs found in 1.8. - -**General**
-- Fixed issues with single args (`-s` `-su`) being treated as values for other args. - -## Info - -**GPU**
-- Added `gpu_brand` to enable/disable showing GPU brand in output. (AMD/NVIDIA/Intel) - -**DE**
-- Added Cinnamon version number to output. - -**WM Theme**
-- Fix GNOME showing wrong WM Theme. - -**Battery**
-- Fixed battery not appearing when set to `all`. - -**Terminal Font**
-- [Termite] Ignore lines starting with `;`. - -**Progress Bars**
-- Fixed progress bars displaying incorrectly in image mode. - -## Screenshot -- Added support for uploading screenshots to Imgur and Teknik. - - Adds two new identical flags `--upload` and `-su`. -- Changed default screenshot name so that it works on Windows. - -## Images - -**General**
-- Added a tiny delay before running w3m-img which suprisingly fixed all flickering issues in VTE based terminals. See [#349](https://github.com/dylanaraps/neofetch/pull/349) - -**Wallpaper**
-- Fix wallpapers with spaces in the filename from not showing up. - -## Ascii -- Added logo mode which only displays the ascii art. - - Adds two new identical flags `--logo` and `-L`. - - -## [1.8] - 2016-10-02 - -This version of neofetch is vastly different from the previous versions and this -changelog won't cover everything that's changed. Have a look through the commit -history for more info. - -There were a lot of major changes to how things work in this release so I'm expecting -bugs/things not working for people. Depending on what comes up we my release a few 1.8.X -versions. - -This changelog is a bit of a mess this time around and I apologize but it should at least -get the message across. - -Android support didn't make it into this release as it requires testing on more devices. -If you've got a device running android and would like to help test out the branch, check -out the open PR here: [#322](https://github.com/dylanaraps/neofetch/pull/322) - -This release also saw a lot more contributors which makes me really happy. Thanks to those -below for helping out. :) - -### Contributors -- **[@hashhar](https://github.com/hashhar)** -- **[@williamkray](https://github.com/williamkray)** -- **[@dar-irl](https://github.com/dar-irl)** -- **[@gabe565](https://github.com/gabe565)** -- **[@maddcoder](https://github.com/maddcoder)** -- **[@iandrewt](https://github.com/iandrewt)** -- **[@aranega](https://github.com/aranega)** -- **[@vendion](https://github.com/vendion)** -- **[@konimex](https://github.com/konimex)** -- **[@undrskr](https://github.com/undrskr)** - -### General -- Added `--version` to print the neofetch version. -- Fix issue when title and background were both color `7`. -- Fix issue with incorrect text color when `barinfo` is set. -- Fixed various Travis.ci bugs. -- Fix lint errors. -- Moved all whitespace trimming to a dedicated function. - - Neofetch will no longer have any whitespace issues in the output. - - See [trim()](https://github.com/dylanaraps/neofetch/commit/d3c87cdaacf1ea9fbf245146c910dc53b49dba08#diff-e863270127ca6116fd30e708cdc582fcR2789) -- Quote all variable/command substitutions. -- Removed `line_wrap` as having it set to `on` broke the output. -- Removed `stdout` mode since it's been broken for a while now and I don't see the - point in fixing it. -- Removed in-script config in favor of sourcing the default user config. -- Remove all instances of `! -z` since they're pointless. -- Remove all `bc` usage by simplifying math. -- Suppress `getconfig` and `getscriptdir` errors. -- Suppress `xprop` errors since it's now an optional dependency. -- The prompt is now dynamically set in image mode instead of being anchored to the
- bottom of the window. See [#279](https://github.com/dylanaraps/neofetch/pull/279) and [#299](https://github.com/dylanaraps/neofetch/pull/299) for examples. -- The title at the top is now much more colorful. -- Moved commands near the bottom of the script to a new function called `main`. -- Use `read -s` instead of `stty -echo` and `stty +echo`. -- Use faster `$(())` syntax for index variables. -- `-v` now shows where the config files were sourced from. -- Cleanup -- Neofetch no longer clears the screen when run in ascii or image=off modes. - - You can use the old behavior by aliasing `clear && neofetch` to `neofetch`. - -### OS -- Added support for Windows 10 Linux subsystem. **[@konimex](https://github.com/konimex)** -- Added support for GuixSD. **[@konimex](https://github.com/konimex)** -- Added support for Devuan Linux. -- Added support for GalliumOS. -- Added support for Openwrt. -- Added support for PacBSD. **[@vendion](https://github.com/vendion)** -- Added support for Rosa. -- Added support for Solaris (Oracle / OpenIndiana). **[@konimex](https://github.com/konimex)** -- Added support for macOS Sierra. **[@iandrewt](https://github.com/iandrewt)** -- Fixed various iOS related issues. - -### Packages -- Added Cydia package for iOS. - - See https://github.com/dylanaraps/neofetch#ios-1 - -### Info - -**Terminal and Terminal Font**
- -![img](https://ipfs.pics/ipfs/QmR39ScLi56Yt73pA3YWri9ayatN6mpwSTEmM8RVdeRsB1) -- Added `term` function to display current terminal emulator. [1] -- Added `termfont` function to display current terminal font. [2] - -[1] Both of these functions are enabled by default. -[2] See this wiki page for more info about the functions: [Link](https://github.com/dylanaraps/neofetch/wiki/Terminal-and-Terminal-Font-detection) - -**Model**
-- Added `model` a new function which displays your device's product vendor/name. - -![Mode](https://ipfs.pics/ipfs/Qmcy2o5xZCELxroNLHAhY96ZsrwBFR86NGDCu5e2UPVn4b) - -**Distro**
-- Added `distro_shorthand` **[@konimex](https://github.com/konimex)** - -**Title**
-- Added additional fallback which gets the current username from `$HOME`. - -**Color Blocks**
-- Added `--block_height` / `$block_height` to change the number of lines high each
- block will be. - -![Big Blocks](https://ipfs.pics/ipfs/QmZpR8ukZNfGXkhXjTwAy3eWVRCeHdrurhgAdV5CSiTVvR) - -**Resolution**
-- [Windows] Fix resolution on Windows 10. **[@dar-irl](https://github.com/dar-irl)** -- [Mac OS X] Hide refresh rate if `0`. **[@iandrewt](https://github.com/iandrewt)** -- Fixed `xrandr` output on systems not using gawk. -- [Linux / BSD] Shortened refresh rate output. - -**Shell**
-- Show `fish` shell version. **[@maddcoder](https://github.com/maddcoder)** - -**Song**
-- Added support for Deadbeef. **[@konimex](https://github.com/konimex)** -- Added support for Amarok. **[@konimex](https://github.com/konimex)** -- Added support for Banshee. **[@konimex](https://github.com/konimex)** -- Added support for Rhythmbox. **[@konimex](https://github.com/konimex)** -- [Cmus] Prevent `tag artistsort` from showing up in song title. **[@williamkray](https://github.com/williamkray)** -- [Cmus] Fix order of music tags. **[@iandrewt](https://github.com/iandrewt)** -- [Cmus] The function now works on both OS X and Linux. -- [iTunes] Fix song not displaying. **[@iandrewt](https://github.com/iandrewt)** - -**CPU**
-- Simplify CPU Core command. - -**CPU Usage**
-- Fixed broken CPU usage output on BSD and Windows. -- Fixed misleading output on Linux / Mac OS X. -- Moved CPU Usage to its own dedicated function. - -### Image - -![terminology](https://ipfs.pics/ipfs/QmbVEUREBg4hMG22WrQ2bkt2sZZzyTEP5EEXmHRw7MHD6A) -- Added image support for terminology with `tycat`. **[@aranega](https://github.com/aranega)** [1] -- Fixed issues with lines getting drawn through images. See [#296](https://github.com/dylanaraps/neofetch/pull/296) -- Added `--crop_mode none` / `crop_mode=none` to disable cropping the images. -- Added `--size none` / `size=none` to disable resizing / cropping the images. -- Removed `image_position` -- `--image off` now behaves like the other image modes. - -[1] `tycat` is a terminology builtin that works similarly to w3m-img. Those using terminology
-now have working image support. - -##### Shuffle mode -- Fixed directory going out of bounds causing a fallback to ascii mode. **[@gabe565](https://github.com/gabe565)** -- Simplified shuffle function. -- Path no longer requires a `/` at the end. **[@aranega](https://github.com/aranega)** - -### Ascii -- Add `ascii_bold` which allows you to bold the ascii art. -- Added `--ascii_distro mac` as a shorter way of using the OS X ascii. -- Added missing `$ascii_distro` config option. -- Better `Ubuntu-GNOME` ascii art. **[@hashhar](https://github.com/hashhar)** -- Custom ascii files (`--ascii path/to/ascii_file`) now follow the same format as the - distro ascii files. See this wiki page that explains the syntax. [Link](https://github.com/dylanaraps/neofetch/wiki/Custom-Ascii-art-file-format) -- Fix a color issue with Debian's ascii logo. -- Fix an error with an unescaped char in Windows' ascii art. -- Use a pure bash solution to getting ascii size. -- Updated Solus ascii art to match new logo. **[@undrskr](https://github.com/undrskr)** - - -## [1.7] - 2016-05-14 - -Hello, sorry this release took so long. I've been extremely busy with uni and -haven't had as much time to work on neofetch. - -As always, check the `Following HEAD` wiki page for all breaking changes -this release. - -I'm also looking for some new Readme screenshots, see this github issue: **https://github.com/dylanaraps/neofetch/issues/245** - -### Contributers - -Thanks to the following people for contributing this release. -- **[@dawidd6](https://github.com/dawidd6)** -- **[@tudurom](https://github.com/tudurom)** -- **[@iandrewt](https://github.com/iandrewt)** - -### General -- Made it easier to get verbose logs. -- Added issue template for github. -- New repo for Crux. **[@tudurom](https://github.com/tudurom)** -- Added release badge to readme. **[@dawidd6](https://github.com/dawidd6)** -- Updated man page and usage with newest flags. -- Font is now enabled by default to match Screenfetch's default config. -- Fixed `bold` option not working. - -### OS / Distro Support -- Added support for Kogaion Linux. -- Added support for Apple iOS. **[@iandrewt](https://github.com/iandrewt)** - - Neofetch should now work on your iPhone, iPod and iPad. -- Added support for DragonflyBSD. -- Added support for PCBSD. - -![iOS screenshot](https://ipfs.pics/ipfs/QmYmPhwpFrxwySW2phdxH1TyQ6tCgCnxtYtbEEe3RY5TwZ) - -### Error Messages - -Neofetch now supports displaying error messages and saving a verbose log for -troubleshooting. - -![log](https://ipfs.pics/ipfs/QmeTWGKozY79zcxbrgXueyTRfQcTUe7ZmDqLv4ASgJB4G4) -- Added `-v` to print error messages to stdout. -- Added `-vv` to print a verbose log to stdout. [1] - -[1] Use `neofetch -vv 2> file` to save a verbose log for bug reporting. - -### Info -- Rewrote most BSD info functions, they're now much smaller and work on more - BSD distros. - -**prin** -- Format changes to fix issues with colons in string. This change also makes - `prin` use the same args as `info`. - -``` sh -# OLD Format -prin "Subtitle: Text goes here" - -# NEW Format -prin "Subtitle" "Text goes here" -``` - -**Title** -- Made title faster by using `$HOSTNAME` when available. - -**Underline** -- Fixed bug with `--underline on/off` not working. -- Underlining is no longer hardcoded to title length meaning you can now - underline any part of the output and the length will match. -- `$underline` was renamed to `$underline_enabled`. - -``` sh -# OLD Variable -underline="on" - -# NEW Variable -underline_enabled="on" -``` - -**Distro** -- Fix arch issues with ARM cpus. -- We now use `uname -m` to get the arch instead of hardcoding `x86`. -- Moved distro detection to a function called `getdistro`. -- Fixed issue with `ascii_distro` not working. - -**CPU** -- Fixed issues when cpu speed was < 1Ghz -- Cleanup of CPU function. -- Don't print `Dual-Core` or `Quad-Core` in CPU output. - -**GPU** -- [Linux] More GPU substitutions for AMD cards. -- Added BSD support using `glxinfo`. - -**Memory** -- [Linux / Windows] Use `memavail` if available for a more accurate output. - -**Packages** -- Package count now works when the user has multiple package managers installed. - For example, if the user has both `dpkg` and `pacman` installed the function will - add up the packages from both package managers to get a grand total. (`dpkg pkgs` + `pacman pkgs`) - -**Uptime** -- Fixed various issues with OS X and BSD. - -**Desktop Environment** -- [ Linux ] Fallback to using `xprop` if `$XDG_CURRENT_DESKTOP` is empty. -- Use `$de` instead of `$XDG_CURRENT_DESKTOP` for wallpaper and theme detection. -- Fixed xprop bug with DE detection when X wasn't running. -- Don't assume that user is using MATE if marco wm is detected. - -**Window Manager Theme** -- Fixed bug when `$de` was unset. - -**Color Blocks** -- Fixed bug when the blocks wrap a line causing a large white strip to appear. - -### Ascii -- Added KDE neon ascii art. -- Added small OpenBSD ascii art. - - Credit goes to ufetch. -- Reduced the size of NetBSD's ascii art. -- [Windows 8/8.1] Use modern windows ascii art. - -### Colors -- Fixed bug with `--colors` not working with all 256 terminal colors. -- `--colors 7` now uses the color white. [1] -- `--colors fg` now uses the foreground color. [1] - -[1] Neofetch tried to be smart before by assuming that the foreground color -would be white or black. This caused issues for those setting the foreground -color to red or etc. This change adds a new value for `--colors` and `colors=()` -called `fg` which will set the color to your foreground color. - -### Progress Bars -- The default progress bar look was changed to `[=====-----]` instead of `━━━━━━━━━━` - fix issues with older systems. -- You can now enable/disable a border around the progress bars with `progress_border`. - -``` sh -# $progress_border on -[=====-----] - -# $progress_border off -=====----- -``` -- You can now individually set the progress bar characters by using - `progress_char_elapsed` and `progress_char_total`. This means that you can - have a seperate character for the elapsed and total portions of the bar. - -``` sh -# Examples with $progress_border on - -# Elapsed: = -# Total: - -[=====-----] - -# Elapsed: . -# Total: " " -[..... ] - -# Elapsed: / -# Total: " " -[///// ] -``` - - -## [1.6] - 2016-04-01 - -# Neofetch 1.6 - -Another ~~week~~ another release of Neofetch. - -This release focused on cleanup, bug fixes and optimization. Neofetch -is now much much faster than last release and more bug free than ever -before! - -This release surprisingly didn't break much at all, see the latest entry in -the wiki page `Following HEAD`. - -https://github.com/dylanaraps/neofetch/wiki/Following-HEAD - -![scrot](https://ipfs.pics/ipfs/QmTD6cRmYfLdrvvyLfGdUfBDCzE5uYNsRpLUx7vLUFkYxM) - -### Contributors - -Thanks to the following people for contributing this release. -- **[@iandrewt](https://github.com/iandrewt)** -- **[@dawidd6](https://github.com/dawidd6)** -- **[@onodera-punpun](https://github.com/onodera-punpun)** -- **[@onespaceman](https://github.com/onespaceman)** -- **[@firstEncounter](https://github.com/firstEncounter)** -- **[@konimex](https://github.com/konimex)** - -### General -- Added Travis CI support. -- Added `--test` which is meant for testing and prints all functions. -- Cleanup of Distro, Uptime, Memory and CPU functions. -- We now use a more reliable white-space trimming substitution for CPU/GPU etc. -- Use `stty` instead of `read -s` to fix an issue with escape sequences
- appearing in the output. -- Line wrap is now disabled by default. -- Implement base support for caching specific info. This will eventually
- allow us to speed up the script by caching info that won't change for a
- long period of time like the CPU/GPU. [1] -- Fixed a locale issue when `LC_ALL` is unset on the user's system. -- Change all usage of `$HOME/.config` to `$XDG_CONFIG_HOME` with a fallback to `$HOME/.config`. - -[1] You can clear the cache with `--clean`. - -### Colors - -![vs](https://ipfs.pics/ipfs/QmNVw4zm78tgBGdhDJ1FZ1aktpEtVapVtNWWMMKh5aitrZ) - -

Neofetch 1.5 vs Neofetch 1.6

- -

Neofetch now works with bright color schemes and uses the foreground color instead of hard-coding white.

- -
-- Fixed buggy colors in older versions of *BSD, OS X and Linux. -- The default text colors now work on bright color schemes. We no longer force
- the color white, it's now based on your foreground color. -- Progress bars are now by default colored based on your distro's logo colors. -- Color blocks now work in older systems and in Travis CI. - -### Packages -- Neofetch is now is Void Linux's official repos. **[@konimex](https://github.com/konimex)** - -### Info -- Functions now no longer print `Unknown` when they fail, they now don't appear at all. - -**Window Manager Theme**
-- Added new `WM Theme` function to print window manager themes. - -**OS**
-- [ CRUX ] Also print the CRUX version. **[@onodera-punpun](https://github.com/onodera-punpun)** -- [ Fedora ] Fixed a weird detection bug. - -**CPU**
-- [ Windows ] Don't print CPU cores if detection fails. -- [ BSD ] Fixed extremely long output. -- Fixed broken CPU speed when source is `/proc/cpuinfo`. - -**GPU**
-- Don't show GPU output on unsupported OS. -- `Nvidia` is now displayed as `NVIDIA`. **[@firstEncounter](https://github.com/firstEncounter)** -- Intel GPUs now all appear as `Intel Integrated Graphics`. to avoid naming issues. -- [ OS X ] We now cache the GPU value. - -**Battery**
-- Show charging state in battery output. **[@dawidd6](https://github.com/dawidd6)** and **[@iandrewt](https://github.com/iandrewt)** -- [ Windows / OpenBSD ] Fix blank battery output when battery isn't found. - -**Resolution**
-- [ Windows ] Don't print resolution if detection fails. -- [ Linux / OSX / BSD ] Print refresh rate next to resolutions. -- [ Linux ] Multi monitor support using `xorg-xrandr`. -- [ Linux ] Refresh rate support using `xorg-xrandr`. -- [ OSX ] Added support for using `screenresolution` to print the output.
- This is much faster than the default method. - -**Packages**
-- Listing homebrew packages is now super fast. **[@iandrewt](https://github.com/iandrewt)** - -**Public IP**
-- Made public IP function faster by using `dig` if available. **[@iandrewt](https://github.com/iandrewt)** -- Each source now has a timeout to avoid a hang. -- If the IP detection fails we try another method. - -**Theme**
-- Use `$GTK2_RC_FILES` if the envar is set. **[@onespaceman](https://github.com/onespaceman)** - -**Desktop Environment**
-- Added OS X detection. - -**Song**
-- [ MPD ] Fixed function when mpd is running on another PC and not your own. -- Song now displays `Not Playing` instead of `Unknown` when no music player is found. -- Added support for Google Play Music Desktop Player (adds optional dependency of [`gpmdp-bash`](https://github.com/iandrewt/gpmdp-bash)) **[@iandrewt](https://github.com/iandrewt)** - -**Disk**
-- Added new display option `perc` to display just the percentage with the progress bar. -- [ FreeBSD ] Fixed disk usage not working. - -**Memory**
-- [ OpenBSD ] Fixed completely broken memory output on OpenBSD. -- [ Linux ] Rewrote memory function so that it works on old kernel versions. - -**Uptime**
-- [ OSX / BSD ] Performance improvements. **[@iandrewt](https://github.com/iandrewt)** -- [ OpenBSD ] Fixed duplicate `up` in output. - -**Birthday**
-- Fix stray `+` sign in output. - -### Image -- Remove `shuffledir` in favor of '--image path/to/dir/' -- Use `printf` instead of `shuf` to pick a random image. -- [ OS X ] Fixed issues with wallpaper detection. -- [ OS X ] Wallpaper detection now works on a per desktop basis. -- Removed `image_backend` and instead use iterm2 mode only when iterm2 is detected. - -### Ascii -- Added ascii art for Qubes OS. -- Added ascii art for Travis CI. -- Revamped Alpine Linux's ascii art. -- Fixed missing ascii colors for Puppy Linux. -- [ OSX ] Fixed incorrect text colors. -- Sped up ascii function by dropping `wc` usage. - -### Scrot -- Fixed scrot function not using user defined options. - - -## [1.5] - 2016-03-17 - -# Neofetch 1.5 - -![Xubuntu](https://ipfs.pics/ipfs/QmWPvwW3nQoKVffHSZUu57MwCpQDZoMVTHQVwwCom2ChqM) - -### Contributers - -Thanks to the following people for helping me to improve neofetch. -- **[@iandrewt](https://github.com/iandrewt)** -- **[@konimex](https://github.com/konimex)** -- **[@CousinMachu](https://github.com/CousinMachu)** - -### General -- Remove all `echo` usage inside the script. -- More cleanup and misc bug fixes. - -### Packages -- Neofetch is now packaged for `Fedora` and `Fedora` based distros. **[@konimex](https://github.com/konimex)**. -- Added installation instructions for RHEL and CentOS. **[@konimex](https://github.com/konimex)**. -- Added stable package to the AUR. **[neofetch](https://aur.archlinux.org/packages/neofetch/)** - -### Progress Bars - -This has finally been merged to master, a big thanks to **[@iandrewt](https://github.com/iandrewt)** for helping -me finish up with this PR. - -![bars](https://ipfs.pics/ipfs/Qmbj8S7pi4CVw12XTawtRwRpLvkiZ9cxRxCUPMLQ1Nhhkb) -- Added progress bar support to CPU, Memory, Disk, Battery. -- Added `progress_char` which allows you to change the character used when drawing the bars. -- Added `progress_length` which allows you to set the max length in spaces of the bars. -- Added `progress_elapsed_color` which sets the elapsed color. -- Added `progress_total_color` which sets the total color. -- Added `--progress_colors` which takes two color values: `elapsed`, `total`. -- Added `cpu_display`, `memory_display`, `disk_display` and `battery_display` which allow you
- to customize where or if the progress bar will appear. - - Takes these values: `info`, `bar`, `infobar`, `barinfo` - -### OS -- Added support for `SteamOS`. - -### Images -- Using `xoffset` now also moves the text over. -- Changed default gap size to `2`. -- Fixed an issue with Nitrogen and multi monitor wallpaper setups. **[@CousinMachu](https://github.com/CousinMachu)** - -### Ascii -- Kaos: Update ascii logo to the new logo. -- Added ascii logos for `Kubuntu`, `Lubuntu`, `Xubuntu` and `ubuntu-gnome`. - - You can enable them with `--ascii_distro kubuntu`, `--ascii_distro lubuntu` and etc. - -### Info - -**OS**
-- [ OSX ] Fix buildversion displaying regardless of on/off. **[@iandrewt](https://github.com/iandrewt)** -- [ OSX ] Added `osx_codename` (on by default) which prints the OSX codename. **[@iandrewt](https://github.com/iandrewt)** - -**Disk Usage**
-- Only display usage of local disks. -- Fixed disk usage progress bars when the used value was larger than the total. **[@iandrewt](https://github.com/iandrewt)** - -**Theme**
-- Added `/usr/share` as another theme directory to fix an issue with no theme being found. **[@iandrewt](https://github.com/iandrewt)** - -**CPU**
-- Added `cpu_shorthand` to shorten the output of CPU. **[@iandrewt](https://github.com/iandrewt)** - - Takes these values: `name`, `speed`, `tiny`, `on`, `off` -- Added the ability to print the CPU Usage by using `cpu_display="info"` or `--cpu_display off/on info`. -- Added `cpu_cores` to enable/disable showing the number of CPU cores in the output. **[@iandrewt](https://github.com/iandrewt)** - -**GPU**
-- Added new `tiny` option to `gpu_shorthand` to further shorten the GPU output. **[@iandrewt](https://github.com/iandrewt)** - -**Memory**
-- Fix hang on older systems. - -**Desktop Environment**
-- Fixed bug where `i3` would show up as both a DE and a WM. - -**Birthday**
-- Fixed the birthday function on OS X, it apparently wasn't working from the start. **[@iandrewt](https://github.com/iandrewt)** - -**Song**
-- [ OSX ] Added Spotify support to song. **[@iandrewt](https://github.com/iandrewt)** -- [ OSX ] Added Itunes support to song. **[@iandrewt](https://github.com/iandrewt)** -- Fix bug with `song_shorthand` and songs with more than one occurence of `-`. - -**Battery**
-- Fixed a naming error when multiple batteries are displayed. **[@iandrewt](https://github.com/iandrewt)** - -### Stdout Mode -- Fixed issues with functions that use `prin`. - - -## [1.4] - 2016-03-09 - -Lots of bugs were fixed and a lot of code was cleaned up, this changelog just lists -the major changes made to neofetch. For a full list, checkout the git commit history. - -Thanks to everyone for contributing, I appreciate it! -- Renamed `fetch` to `neofetch`. Thanks for voting. -- Neofetch now has a man page. (man neofetch) Thanks **[@konimex](https://github.com/konimex)** -- Added support for `Alpine Linux`. -- Fix issue with color blocks ending up on the same line as the prompt. - -### Packages -- Added Debian/Ubuntu package. Thanks **[@dawidd6](https://github.com/dawidd6)** -- Added Homebrew package for OS X. Thanks **[@iandrewt](https://github.com/iandrewt)** - -### Info -- Reimplement `color` function. - -**Battery**
-- Added support for NetBSD - -**Song**
-- [Linux] Added support for Spotify. - -**Birthday**
-- Added `--birthday_format` and `$birthday_format` to change the date format of the
- birthday function. The flag uses the `date` cmd's format options so see `man date`
- for a list. - -**Packages**
-- Fix 0 package count in Slackware. Thanks **[@h3xx](https://github.com/h3xx)** - -**GPU**
-- Added more GPU substitutions. - -Example: - -``` sh -neofetch --birthday_format "%D" -neofetch --birthday_format "%a %d %b %Y %l:%M %p" -neofetch --birthday_format "%c" -``` - -**Theme**
-- Fix incorrect theme detection on Cinnamon. - -### Ascii -- Added small ascii logo variants for Arch, Crux and Gentoo. [1] -- Added new flag/option `ascii_logo_size` that takes the values `normal` and `small`. -- Optimized all ascii art fixing all leading whitespace issues. - -[1] The small ascii art was taken from [ufetch](https://github.com/jschx/ufetch). - -Example of small ascii logo: - -![CRUX](https://ipfs.pics/ipfs/QmSpadVHtBPRBUJEiiztqkXqfhE2fuGS5t8bzsbxWUYaXA) - -### Stdout -- Don't create config file when using `--stdout`. -- Simplified stdout function. -- Reimplent `--stdout_separator` and `$stdout_separator` which allow you to change
- the separator between the info. - -Example: - -``` sh -# Display memory, battery and disk in a single line separated by " | " -# This output can then be used in lemonbar etc. -neofetch --stdout memory battery disk --stdout_separator " | " -``` - - -## [1.3] - 2016-02-26 - -# Fetch 1.3 - -Hey guys, - -This update brought some breaking changes, see this wiki page for what you'll -need to update in your config file. - -https://github.com/dylanaraps/fetch/wiki/Following-HEAD - -We're in the middle of renaming 'fetch' to something else as there are -already other programs using the name and we don't appear in any searches. - -You can help out by voting in our poll here: - -http://strawpoll.me/6894425 -- Fetch now supports **bash 3.0+**. -- More cleanup -- The text is now by default colored according to your distro's logo. -- Removed `$*_color` variables/flags in favour of a general `$colors` - variable/flag. See my writeup here: **https://github.com/dylanaraps/fetch/pull/96** - -### Image -- You no longer need to set the font_width value, your font size - is now calculated by fetch automatically. -- Image sizing now takes terminal height into account. -- `--size` now also takes a percentage as a value, for example. - -``` sh -# Image takes up 70% of the terminal size. -fetch --size 70% - -# Size the image in pixels. -fetch --size 200px -``` - -### Packages -- Fetch now has a `crux` port. Thanks **[@ix](https://github.com/ix)**. - -### OS -- Added support for `BunsenLabs`. -- Added support for `SailfishOS`. (Untested) - -### Info -- Don't display Theme, Icons, Font or Window Manager if X isn't running. -- Added function to show currently logged in users. - -**Window Manager** -- Add support for Wayland window managers. (Hardcoded) - -**Song** -- Added `song_shorthand` which prints the Artist/Title on seperate lines. - -**Theme** -- Windows Visual Style is now a part of `getstyle`. -- Disabled theme output on OS X to fix a `gsetttings` related crash. -- Uppercase the first letter of the theme. - -**Resolution** -- Added Windows support. -- Enabled by default but only displays info if the dependency is found. - -**Battery** -- Added FreeBSD and OpenBSD support. Thanks **[@tudurom](https://github.com/tudurom)**. - -**GPU** -- Added more substitutions/ - -### Stdout - -Printing to stdout in a plaintext format for use in scripts is now -much faster and cleaner. -- Removed `--stdout_separator` (Separator is now 2 spaces) -- Removed `--stdout_subtitles` -- Removed `--stdout_title` - - -## [1.2] - 2016-02-17 - -# Fetch 1.2 - -This new release comes with a few config breaking changes, see this wiki page -for info on how you can workaround the issues. - -https://github.com/dylanaraps/fetch/wiki/Following-HEAD -- Fetch now has a **gitter** chatroom. [![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -- Fixed text padding when the user didn't have the locale `en_US.UTF8` installed. -- Cleaned up parts of the script. - -### OS - -We now support almost all the Linux distros Screenfetch supports excluding -the distros that have been discontinued. - -Added support for these distros: -- `Puppy Linux` -- `Kali Linux` -- `openSUSE` -- `Raspbian` -- `Mageia` -- `PCLinuxOS` -- `Zorin OS` -- `Tails` -- `BLAG` -- `Void Linux` -- `Trisquel` -- `Solus` -- `Peppermint` -- `NixOS` -- `Chakra` -- `Mandriva` -- `gNewSense` -- `LMDE` -- `KaOS` -- `Sabayon` -- `Frugalware` -- `Chapeau` -- `Slackware` -- `Scientific Linux` -- `Exherbo` -- `Chrome OS` -- `Chromium OS` - -### Makefile -- Fixed makefile on OS X El Captain. -- `$PREFIX` is now also used when installing ascii art and the default config - -### Wallpaper -- Fetch now supports using `MATE` desktop's wallpapers. -- Fetch now fallsback to ascii mode if the found wallpaper is an xml file. This - fixes issues where the wallpaper set by gsettings is an xml file. - -### Info - -**Desktop Environment**: -- Added support for showing the user's DE. - -**Window Manager**: -- `xprop` is now a required dependency. See **[#79](https://github.com/dylanaraps/fetch/pull/79)**. -- Renamed 'windowmanager' to 'wm' - -**IP Address**: -- Added function to get your local IP -- Added function to get your public IP [1] -- Added `--ip_host` and `$public_ip_host` which allow you to change the website we - ping for the public IP. - -[1] Public IP requires an internet connection as we ping a website. - -**Packages**: -- Check for packages based on which package manager is installed instead of - using a hardcoded list of distros. - -**Theme**: -- Added support for getting DE theme. -- Added support for getting KDE theme. -- Renamed `getgtk` to `getstyle`. -- Dropped the `gtk` from these printinfo functions `gtktheme`, `gtkicons` - and `gtkfont`. Theme output will be blank until you make these changes: - -``` sh -# Old Naming -info "GTK Theme" gtktheme -info "Icons" gtkicons -info "Font" gtkfont - -# New Naming -info "Theme" theme -info "Icons" icons -info "Font" font -``` - -**GPU**: -- `gpu_shorthand` is now enabled by default. -- We now favor showing the dedicated GPU over the integrated one. - -**Song**: -- Added support for `MOC`. -- We now check to see if the player is running before printing anything. -- We now check playback state and show it if relevent. - -**Uptime**: -- [Linux] Fixed uptime when it's under 1 minute. - -### Ascii Art -- `--ascii_distro` now also enables ascii mode. -- Fix missing ascii art when fetch is installed in /usr/local -- Update Deepin's ascii art to their new logo - - -## [1.1] - 2016-02-06 - -# Fetch 1.1 changelog - -Over the past 10~ days over **190** more commits have been pushed to master and the -script has had some big changes. Thanks to everyone who has contributed, you've been -a big help. - -![screenfetch mode](http://i.imgur.com/nW3HiNP.png) -New screenfetch mode -- If `w3m` or `imagemagick` aren't installed we gracefully fallback to ascii mode. -- Automatically find the `w3m-img` path and fallback to ascii mode if not found. [1] -- Fix padding escape codes on BSD systems. -- Swap escape codes from `\e` to `\033` for consistency. -- We only move the cursor to the bottom of the terminal in w3m/iterm2 rendering modes. -- Cursor position is now dynamic in ascii mode based on the height of the ascii and info text. -- If images and ascii are off, don't clear the terminal -- The script now exits correctly instead of always exiting with status code `1` -- If the script exits for any reason, unhide the cursor. -- Removed duplicate blocks inside `getcpu` and `getmemory`. -- Removed `--colors` as it was apparently broken from day 1. -- Usage has been reformatted so that every flag has a value. - -[1] Setting `$w3m_img_path` will make the script look there first. - -### Image -- Added support for displaying ascii art inside of text files. -- Added "screenfetch mode" which will display your distro's ascii art next to the info. [1] -- Added `--ascii_distro` to choose which distro's ascii logo to display. -- Added `--ascii_colors` and `$ascii_colors` which allow you to change the colors of the ascii art - and distro logos. [2] -- Added `--size` and `$image_size` to set the image size in pixels. -- Rename `--shuffledir` and `$shuffledir` to `shuffle_dir`. -- Rename `--imgtempdir` and `$imgtempdir` to `thumbnail_dir` -- Removed `--split_size` and `$split_size` as they were weird and confusing to use. -- Default thumbnail directory is now `$HOME/.cache/thumbnails/fetch`. Thanks @tudurom -- If `--image` and `--ascii` are left empty we fallback to ascii distro mode. - -Example usage of ascii from file: - -``` sh -fetch --ascii "path/to/ascii" --ascii_color 2 - -``` - -[1] **[How do I enable screenfetch mode?](http://github.com/dylanaraps/fetch#how-do-i-enable-screenfetch-mode)** -[2] `ascii_colors` takes a range of colors which allows you to color every aspect of -distro and OS ascii art. For custom art the script will color the entirety of it using -the first value of `ascii_colors`. If `ascii_colors` is left empty, color will be disabled. - -### Config file -- Fetch now has a config file that you can share with people and keep between - script versions! [1] -- Added `--config` and `$config_file` to specify a custom config location. -- Added `--config off`, `--config none` and `$config` to enable / disable config files - at launch or in script. - -[1] https://github.com/dylanaraps/fetch#using-the-config-file - -### Makefile -- Fetch now has a make file due to the increasing number of files, - this allows the script to be easily installed and uninstalled on - systems it isn't packaged for yet! [1] - -[1] The script will still work just fine on its own, you'll just be missing -the distro ascii art and the automatic config creation. - -### Packages -- Fetch now has a Gentoo/Funtoo e-build courtesy of **@z1lt0id** - -### Stdout -- Added `stdout` mode which allows you to fetch info in a plain text format that works - with lemonbar and in your scripts. You can use it by launching fetch with `--stdout` to print all - functions enabled in your `printinfo` function. You can selectively print functions by passing - arguments to `--stdout` like so: - -``` sh -# Print the output of all info functions enabled in printinfo -fetch --stdout - -# Print the output of memory -fetch --stdout memory - -# Print the output of memory and disk -fetch --stdout disk - -# Print the output of all functions excluding x -fetch --stdout --disable kernel packages gtktheme - -``` -- Added `--stdout_separator` and `$stdout_separator` which takes a string and adds it - as a separator between the output. -- Added `--stdout_title` and `$stdout_title` which allow you to toggle the `title@hostname` - from appearing in the output. -- Added `--stdout_subtitles` which allow you to toggle the `Info:` titles from appearing in - the output. - -``` sh -# Hiding subtitles -fetch --stdout --stdout_subtitles off - -# Custom separator -fetch --stdout disk gpu --stdout_separator " | " - -``` - -**NOTE:** `stdout_subtitles` and `stdout_title` only work when `--stdout` is used on its own -without any args. - -### Info -- You can now display info without a subtitle. eg. `info memory` -- Added `--disable` which allows you to stop an info line from appearing at launch. -- Added `--underline` and `$underline` which allow you to toggle visibility of the - underline at launch and in your config. - -``` sh -# Stop cpu, gpu, disk and shell functions from being called -fetch --disable cpu gpu disk shell -``` - -**Kernel:** Added `--kernel_shorthand` and `$kernel_shorthand` to print less or more kernel info -**Window Manager:** Added support for `$XINITRC` -**GTK:** Fix incorrect GTK3 theme being displayed -**CPU:** `cpu_shorthand`: New substitutions -**GPU:** `[Linux]` Count the number of identical GPUs. eg. `Nvidia Geforce GTX 970 x 2` -**Memory:** `[Mac OS X]` Added wired memory to memory usage. - -**Distro:** -- Added support for showing OS architecture. eg `Arch Linux x86_64`, `Windows 7 Ultimate 64-bit` [1] -- Mac OS X: Added support for showing Max OS X build version. [2] -- Windows: Distro now displays Windows edition. eg. `Windows 7 Ultimate` - -[1] You can toggle this using `--os_arch` and `$os_arch`. -[2] You can toggle it using `--osx_buildversion` and `$osx_buildversion`. - -**Shell:** -- Added `--shell_version` and `$shell_version` to hide/show your shell's version. -- Added `--shell_path` and `$shell_path` to hide/show the path to your shell - -**Birthday:** -- Added `birthday` which prints the age of your OS install. -- Added `--birthday_shorthand` and `$birthday_shorthand` to shorten/lengthen - the output of birthday. -- Added `--birthday_time` and `$birthday_time` to show/hide the time in the output. - -**Battery:** -- Added `battery` which prints the battery usage percentage for each battery - in your system. -- Linux: Added `battery_num` which allows you to choose which battery to display, - it also takes the value `all` which will print all batteries line by line. -- Linux: Added `battery_shorthand` which when set to `on` prints each battery on the - same line like so: - -``` sh -# battery_shorthand="on" -Battery: 10%, 5%, 67% - -# battery_shorthand="off" -Battery0: 10% -Battery1: 5% -Battery2: 67% - -# If there's only a single battery in the system -# we ommit the numbered title. -Battery: 10% -``` -- **NOTE:** This currently doesn't support BSD systems as we have no one to help us test - - See **[Issue #46](https://github.com/dylanaraps/fetch/issues/46)** - - -## [1.0] - 2016-01-27 - -# Fetch 1.0 - -There have been over **260** commits to master since I last made a release -and the script is at a point now where I can say that it's feature complete -so I'm releasing 1.0. The script now supports many more OS/distros and has -had lots of bug fixes, changes and features added. - -I'm probably missing a bunch of stuff from this changelog so if i've -forgotten anything, let me know! - -I'm also slowly adding pages to the wiki so check it out! - -# Here's what's new: -- Added full support for **Windows**, **BSD** and **Mac OS X**. -- Fetch is now MIT licensed -- Dropped the `.sh` from the filename and title. -- Dropped support for `mksh` so we can support some `bash` only features. -- Cleanup of everything -- Added `--prompt_height` and `$prompt_height` to fix the script going
- offscreen due to multi-line shell prompts. This option should be set to
- your prompt height in lines. -- The script now supports bash **4.0**. It turns out that we only
- supported bash **4.3** -- Restore cursor and clear screen on ctrl+c. -- Swap `tput` cmds for `ansi escape sequences` where possible. -- Added folds to make the script easier to navigate in *vim. -- Added `-F` to grep where possible for a speedup where possible. -- Fix whitespace issues with different distros. -- Remove uneeded `$` symbols. -- Remove double negative tests. -- Added note about needing `procps` or `procps-ng` for uptime support. -- Fix syntax errors in script and readme. -- All vars now use `on/off` instead of `1/0`. -- Quote things that should be quoted. - -**Linux:** -- Fix issues with `Elementary OS` and `CentOS`. - -**Mac OS X:** -- Added support for other package managers. -- Fix issue with multiple resolutions in `getresolution` - -**Windows:** -- Added `getvisualstyle` function to get the current Windows theme. -- Added `choclatey` support to package count. - -**BSD:** -- Fix tput commands not working on BSD - -## Info: - -As of commit 9daacdd the info array at the top of the script has changed -to a regular function. The benefits of this are pretty cool, you can now -use any bash syntax to customize what gets displayed. You could have an -if statment and only print window manager and gtk themes if X is running -or only show current song if there's one playing. - -You can see some examples and read more about it here: - -https://github.com/dylanaraps/fetch/wiki/Customizing-Info - -
- -**All:** -- All functions return `Unknown` or `None` instead of printing nothing.
- -**Title:** -- You can now color the `@` symbol in the title using `--at_color`,
- `$at_color` and `--colors x x x x x x`. - -**OS:** -- We now check `lsb_release` before looking inside of files, this fixes
- detection for some *buntu based distros. -- We now exit if the OS type wasn't detected. - -**Window Manager:** -- `wmctrl` is now used by default if found. - -**Uptime:** -- Added `--uptime_shorthand` and `$uptime_shorthand` to make the output
- of `uptime` smaller and prettier. -- Added new `--uptime_shorthand` and `$uptime_shorthand` value
- called `tiny`. This makes the output even tinier. eg. `1d 10h 32m` - -**GTK:** -- Added functions to get GTK Theme, Icons and Font -- Added `--gtk{2,3}` and `$gtk{2,3}` to enable/disable gtk2 or gtk3 from
- being displayed. -- Added `--gtk_shorthand` and `$gtk_shorthand` to make the output of
- `gtk*` smaller and prettier. - -**Packages:** -- Remove package version and color from `Pacman` output -- All distros are now wildcarded so that version numbers from
- `lsb_release` are ignored. - -**CPU:** -- Added more cpu speed types to `--speed_type` and `$speed_type`. -- Use `cpufreq` when available instead of hardcoding it for specific distros. - -**GPU:** - -See **[issue #21](https://github.com/dylanaraps/fetch/issues/21)** -- Added function to get the current Graphics Card. -- Added support for VirtualBox GPU. -- Added `--gpu_shorthand` and `$gpu_shorthand` to make the output of `gpu`
- smaller and prettier. - -**Disk:** - -See **[issue #27](https://github.com/dylanaraps/fetch/issues/27)** -- Added function to get current/total disk usage. - -**Song:** -- Added `cmus` support. - -## Images: -- Added support for **iTerm2's** image rendering. -- Added `--image_backend` and `$image_backend` to change which program
- is used to render the images. -- The image is now displayed **before** the text, this fixes image
- rendering issues with **vte** based terminal emulators. -- Added `$w3m_img_path` to set the location of `w3mimgdisplay`. -- Unified all image options, the new var `$image` takes these
- values: `wall`, `shuffle`, `path/to/img.png`, `off`. -- Added `shuffle` to image modes. The script can now pick a random
- image from a specified folder to display. You can pick the shuffle
- directory with `--shuffle_dir` and `$shuffle_dir` -- Fixed images getting cut off at the top. -- Added image size to filename which allowed us to remove a _really_
- slow check. - -**Wallpaper:** -- Added `nitrogen` and `gsettings` support. -- Added wallpaper support to `Mac OS X` and `Windows`. -- Fix hang when wallpaper isn't found. -- We now check to see that `feh` set the wallpaper. -- Fixed wallpapers with spaces in the filename. -- `wall` is now the default image source. - -## Screenshot: - -The script can now take a screenshot on script finish. You can use -the flags `--scrot` or `-s` to take a screenshot. - -`--scrot` and `-s` can also take a path/filename so you can choose -where and what to name the file at launch. - -If left empty `--scrot` and `-s` will use `$scrot_dir` and -`$scrot_name` when saving the screenshot. - -By default the script uses `scrot` as the screenshot program. -You can use the launch flag `--scrot_cmd` or the option `$srot_cmd` -to set the program to use to take the screenshot. - -## Wiki: - -Added `Customizing Info` page which has info/examples about -the new printinfo function. - -https://github.com/dylanaraps/fetch/wiki/Customizing-Info - -Added `Customization` which lists all options and their values. - -https://github.com/dylanaraps/fetch/wiki/Customization - - -## [0.2.1] - 2016-01-04 - -Here's what's new: -- Mac OS X support (It's done now) -- Resolution Detection (Off by default) -- Song info is now off by default. -- You can now display the image on the right with: - - `--image_position left/right` -- Fixed bug with multiple colons -- Fixed underlines not being drawn the full width. -- Functions now fallback to "Unknown" instead of printing nothing. -- `getos` now gets os type and `getdistro` gets the distro. - - This makes it even easier to add other os types. - -Here's what I'm working on: -- Finishing OpenBSD support -- Cygwin support - -Enjoy - - -## [0.2] - 2016-01-03 - -I finished my rewrite! - -## Here's what's new: -- The script is now way faster. -- You can now pick what gets displayed and where using an array - at the top of the script. This also allows you to: - - underline anything - - print custom info - - print a custom title - - add linebreaks -- Mac OS X support and a base that allows us to add other OS later. -- You can now specify split size. -- Fixed issue with 2 line prompts -- Fixed image not displaying in vte based terminals -- Move all config options to the top of the script -- Moved almost everything to a function. -- Removed wmctrl dependency -- Made variable names more consistent -- Added shell substitution for cpu output. This means - that the cpu output won't include: (tm) (r) "Processor" "CPU" -- Optimized all get\* functions -- Use variable substitution where possible as it's faster than sed/awk -- Moved crop and smart_crop to crop_mode -- Removed --size and --padding in favor of --split_size - -## Here's what I'm currently working on: -- Window support (I'm almost done) -- Option to swap the image and text around -- Imagemagick optimizations -- Cleanup of info array handling -- More info outputs. Now that it's easy to customize what's printed and - everything is a function we can add optional support for pretty much anything. - - Resolution - - GTK themes - - Terminal Font - - GPU - - IP - - etc - -## Issues: -- Uptime doesn't work in OS X yet. -- If the customizable info includes a third colon then it breaks. - -I'd love to hear your thoughts. - - -## 0.1 - 2015-12-31 - -Changelog: -- Added flag to disable bold text `--nobold` -- Added flag to disable text wrapping `--nowrap` -- Moved to using only printf instead of a mix of echo/printf -- The script now aligns the cursor to the bottom of the - terminal instead of using a hardcoded amount of newlines -- Image size and padding is now dynamic, the only difference on the user - side is that instead of setting a long line of spaces as - padding, you set your font width. This means that you set the - var once and the script will just work at any window size. -- You can disable dynamic images and go back to the old - behaviour with by using the `--size` or the in config var. - $img_auto -- Manual padding now takes a count, so `--padding 10` will pad - the text 10 spaces. -- tput is now a dependency because we need (tput cols/lines/cup) - for the dynamic images and it allows us to support more terminals. -- Color block width can now be changed with the flag `--blockwidth`. - It takes a count like `--padding` so `--blockwidth 10` will make - the color blocks 10 spaces wide. - -Let me know if you're having issues. - - -[Unreleased]: https://github.com/dylanaraps/neofetch/compare/5.0.0...HEAD -[5.0.0]: https://github.com/dylanaraps/neofetch/compare/4.0.2...5.0.0 -[4.0.2]: https://github.com/dylanaraps/neofetch/compare/4.0.1...4.0.2 -[4.0.1]: https://github.com/dylanaraps/neofetch/compare/4.0.0...4.0.1 -[4.0.0]: https://github.com/dylanaraps/neofetch/compare/3.4.0...4.0.0 -[3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0 -[3.3.0]: https://github.com/dylanaraps/neofetch/compare/3.2.0...3.3.0 -[3.2.0]: https://github.com/dylanaraps/neofetch/compare/3.1.0...3.2.0 -[3.1.0]: https://github.com/dylanaraps/neofetch/compare/3.0.1...3.1.0 -[3.0.1]: https://github.com/dylanaraps/neofetch/compare/3.0...3.0.1 -[3.0]: https://github.com/dylanaraps/neofetch/compare/2.0.2...3.0 -[2.0.2]: https://github.com/dylanaraps/neofetch/compare/2.0.1...2.0.2 -[2.0.1]: https://github.com/dylanaraps/neofetch/compare/2.0...2.0.1 -[2.0]: https://github.com/dylanaraps/neofetch/compare/1.9.1...2.0 -[1.9.1]: https://github.com/dylanaraps/neofetch/compare/1.9...1.9.1 -[1.9]: https://github.com/dylanaraps/neofetch/compare/1.8.1...1.9 -[1.8.1]: https://github.com/dylanaraps/neofetch/compare/1.8...1.8.1 -[1.8]: https://github.com/dylanaraps/neofetch/compare/1.7...1.8 -[1.7]: https://github.com/dylanaraps/neofetch/compare/1.6...1.7 -[1.6]: https://github.com/dylanaraps/neofetch/compare/1.5...1.6 -[1.5]: https://github.com/dylanaraps/neofetch/compare/1.4...1.5 -[1.4]: https://github.com/dylanaraps/neofetch/compare/1.3...1.4 -[1.3]: https://github.com/dylanaraps/neofetch/compare/1.2...1.3 -[1.2]: https://github.com/dylanaraps/neofetch/compare/1.1...1.2 -[1.1]: https://github.com/dylanaraps/neofetch/compare/1.0...1.1 -[1.0]: https://github.com/dylanaraps/neofetch/compare/0.2.1...1.0 -[0.2.1]: https://github.com/dylanaraps/neofetch/compare/0.2...0.2.1 -[0.2]: https://github.com/dylanaraps/neofetch/compare/0.1...0.2 From e960c5168654211a8429e8089ba160e3cc89dc37 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 8 Mar 2020 16:13:19 +0200 Subject: [PATCH 331/550] neofetch: Fix uptime seconds on Linux. Closes #1422 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 1bcb1a10..614d51e7 100755 --- a/neofetch +++ b/neofetch @@ -1396,7 +1396,7 @@ get_uptime() { uptime=${d:+$d, }${h:+$h, }$m uptime=${uptime%', '} - uptime=${uptime:-$seconds secs} + uptime=${uptime:-$s secs} # Make the output of uptime smaller. case $uptime_shorthand in From e09146142f9abdf0ecf0badc4e3c3a5e3c51c23a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 8 Mar 2020 17:42:00 +0200 Subject: [PATCH 332/550] neofetch: Prefer lsb-release --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 614d51e7..0a25c0b1 100755 --- a/neofetch +++ b/neofetch @@ -979,8 +979,8 @@ get_distro() { -f /etc/lsb-release ]]; then # Source the os-release file - for file in /usr/lib/os-release /etc/os-release \ - /etc/openwrt_release /etc/lsb-release; do + for file in /etc/lsb-release /usr/lib/os-release \ + /etc/os-release /etc/openwrt_release; do source "$file" && break done From 5241b24bf4e8c21ba5a4eaf3464102d8316b2b76 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 9 Mar 2020 10:58:31 +0200 Subject: [PATCH 333/550] neofetch: Enable DE version by default --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 0a25c0b1..88ce6965 100755 --- a/neofetch +++ b/neofetch @@ -398,10 +398,10 @@ public_ip_timeout=2 # Show Desktop Environment version # -# Default: 'off' +# Default: 'on' # Values: 'on', 'off' # Flag: --de_version -de_version="off" +de_version="on" # Disk From 07a9bcdd3cfb6e9642744a7a280e0a2a54dccf44 Mon Sep 17 00:00:00 2001 From: Mitch Weaver Date: Thu, 12 Mar 2020 03:39:35 -0500 Subject: [PATCH 334/550] detect whether using -current on OpenBSD change name to please shellhcheck sorry shellcheck... --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index 88ce6965..ce9b3478 100755 --- a/neofetch +++ b/neofetch @@ -1032,6 +1032,11 @@ get_distro() { *) distro="Guix System $(guix system -V | awk 'NR==1{printf $5}')" esac + # Display whether using '-current' or '-release' on OpenBSD. + elif [[ $kernel_name = OpenBSD ]] ; then + read -ra kernel_info <<< "$(sysctl -n kern.version)" + distro=${kernel_info[*]:0:2} + else for release_file in /etc/*-release; do distro+=$(< "$release_file") From b9ca399ff6d3b938d779bbda9fe739d9b02042b6 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 29 Mar 2020 14:04:30 +0200 Subject: [PATCH 335/550] os: Add OpenStage Linux --- neofetch | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index ce9b3478..c9b68782 100755 --- a/neofetch +++ b/neofetch @@ -769,7 +769,7 @@ image_source="auto" # LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, +# NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, OpenStage, # OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, # Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, @@ -4833,7 +4833,7 @@ ASCII: LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, - NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, + NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, @@ -8174,6 +8174,29 @@ ${c1} `````` EOF ;; + "OpenStage"*) + set_colors 2 + read -rd '' ascii_data <<'EOF' +${c1} /(/ + .(((((((, + /(((((((((/ + .(((((/,/(((((, + *(((((* ,(((((/ + (((((* .*/(( + *((((/ (//(/* + /((((* ((((((((((, + . /((((* (((((((((((((. + ((. *((((/ ,(((((((( + ,(((/ (((((/ ** ,((((((* + /(((((. .(((((/ //(((* *(((((/ + .(((((, ((/ .(((((/. .(((((, + /((((* ,(((((((/ ,((((( + /(((((((((((((((((((/. /(((((((((/ + /(((((((((((((((((, /(((((((((((/ + */(((((//*. */((/(/(/* +EOF + ;; + "OpenWrt"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From d9389a1f5188504fa26e1e182cd3b1e91bb7d168 Mon Sep 17 00:00:00 2001 From: Mark Barbone Date: Mon, 30 Mar 2020 04:26:13 -0400 Subject: [PATCH 336/550] Change order GTK3 settings.ini files are read --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index c9b68782..5359f811 100755 --- a/neofetch +++ b/neofetch @@ -2984,11 +2984,11 @@ get_style() { elif type -p gsettings >/dev/null; then gtk3_theme="$(gsettings get org.gnome.desktop.interface "$gsettings")" - elif [[ -f "/usr/share/gtk-3.0/settings.ini" ]]; then - gtk3_theme="$(grep "^[^#]*$name" /usr/share/gtk-3.0/settings.ini)" - elif [[ -f "/etc/gtk-3.0/settings.ini" ]]; then gtk3_theme="$(grep "^[^#]*$name" /etc/gtk-3.0/settings.ini)" + + elif [[ -f "/usr/share/gtk-3.0/settings.ini" ]]; then + gtk3_theme="$(grep "^[^#]*$name" /usr/share/gtk-3.0/settings.ini)" fi gtk3_theme="${gtk3_theme/${name}*=}" From 16cf4fd4c6b16a08a341014fc2196b57bd7859d0 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 1 Apr 2020 20:21:26 -0500 Subject: [PATCH 337/550] neofetch/aosc: split AOSC OS and AOSC OS/Retro --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 5359f811..e4cd3c88 100755 --- a/neofetch +++ b/neofetch @@ -753,8 +753,8 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, -# Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", +# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, # XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, # BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, # BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, @@ -4817,8 +4817,8 @@ ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, - Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, + NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", + "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, From f2baf51fc18c2995e80895eb0abeec15dd494108 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 1 Apr 2020 20:21:55 -0500 Subject: [PATCH 338/550] neofetch: add AOSC OS/Retro logo --- neofetch | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e4cd3c88..128c9b02 100755 --- a/neofetch +++ b/neofetch @@ -5393,7 +5393,31 @@ ${c1} EOF ;; - "AOSC"*) + "AOSC OS/Retro"*) + set_colors 4 7 1 3 + 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 + ;; + + "AOSC OS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c2} .:+syhhhhys+:. From a24fa712dd9ea7d44eecf72adccdc1ba3040bbf0 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 10 Apr 2020 21:09:07 +0200 Subject: [PATCH 339/550] os: Add openmamba --- neofetch | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 5359f811..24801a4d 100755 --- a/neofetch +++ b/neofetch @@ -769,8 +769,8 @@ image_source="auto" # LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, OpenStage, -# OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, +# NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, +# OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, # Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, @@ -4833,8 +4833,8 @@ ASCII: LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, - NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, OpenStage, - OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, + NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, + OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, @@ -8145,6 +8145,32 @@ h+` `.-:+oyyyo/-` EOF ;; + "openmamba"*) + set_colors 7 2 + read -rd '' ascii_data <<'EOF' +${c1} ````` + .-/+ooooooooo+/:-` + ./ooooooooooooooooooo+:. + -+oooooooooooooooooooooooo+- + .+ooooooooo+/:---::/+ooooooooo+. + :oooooooo/-` `-/oo${c2}s´${c1}oooo.${c2}s´${c1} + :ooooooo/` `${c2}sNds${c1}ooo${c2}sNds${c1} + -ooooooo- ${c2}:dmy${c1}ooo${c2}:dmy${c1} + +oooooo: :oooooo- +.ooooooo .://:` +:oooooo+ ./+o+:` +-ooooooo` `oooooo+ +`ooooooo: /oooooo+ + -ooooooo: :ooooooo. + :ooooooo+. .+ooooooo: + :oooooooo+-` `-+oooooooo: + .+ooooooooo+/::::://oooooooooo+. + -+oooooooooooooooooooooooo+- + .:ooooooooooooooooooo+:. + `-:/ooooooooo+/:.` + `````` +EOF + ;; "OpenMandriva"*) set_colors 4 From d7b37b4c450a23103dc8f929d03468558b67f4e6 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 10 Apr 2020 21:20:44 +0200 Subject: [PATCH 340/550] docs: update --- neofetch.1 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 8acb2921..45cd4d6a 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.12. -.TH NEOFETCH "1" "January 2020" "Neofetch 7.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. +.TH NEOFETCH "1" "April 2020" "Neofetch 7.0.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -40,6 +40,9 @@ 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 @@ -300,8 +303,8 @@ Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, -OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, +NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, +OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, From 23c445d05f9359877d0cdc3e18615723214e8257 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 15 Apr 2020 15:21:53 +0300 Subject: [PATCH 341/550] neofetch: Drop . outside of iOS for oil shell --- neofetch | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index 4ccf4ae9..fbe07c65 100755 --- a/neofetch +++ b/neofetch @@ -903,24 +903,24 @@ get_os() { # $kernel_name is set in a function called cache_uname and is # just the output of "uname -s". case $kernel_name in - Darwin): "$darwin_name" ;; - SunOS): Solaris ;; - Haiku): Haiku ;; - MINIX): MINIX ;; - AIX): AIX ;; - IRIX*): IRIX ;; - FreeMiNT): FreeMiNT ;; + Darwin) os=$darwin_name ;; + SunOS) os=Solaris ;; + Haiku) os=Haiku ;; + MINIX) os=MINIX ;; + AIX) os=AIX ;; + IRIX*) os=IRIX ;; + FreeMiNT) os=FreeMiNT ;; Linux|GNU*) - : Linux + os=Linux ;; *BSD|DragonFly|Bitrig) - : BSD + os=BSD ;; CYGWIN*|MSYS*|MINGW*) - : Windows + os=Windows ;; *) @@ -929,8 +929,6 @@ get_os() { exit 1 ;; esac - - os=$_ } get_distro() { @@ -1425,7 +1423,7 @@ get_packages() { # dir: Count files or dirs in a glob. # pac: If packages > 0, log package manager name. # tot: Count lines in command output. - has() { type -p "$1" >/dev/null && manager=$_; } + has() { type -p "$1" >/dev/null && manager=$1; } dir() { ((packages+=$#)); pac "$#"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+=${#pkgs[@]}));pac "${#pkgs[@]}";} From e1af688b36ef3fdae795c5280971fa1eafd6d356 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 15 Apr 2020 15:25:20 +0300 Subject: [PATCH 342/550] neofetch: Fix incorrect variable name --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fbe07c65..5cbfdd4d 100755 --- a/neofetch +++ b/neofetch @@ -1727,7 +1727,7 @@ get_wm() { # If function was run, stop here. ((wm_run == 1)) && return - case $uname in + case $kernel_name in *OpenBSD*) ps_flags=(x -c) ;; *) ps_flags=(-e) ;; esac From 12f8cb9189b23dcf50609e00a4b1c13a380d2bed Mon Sep 17 00:00:00 2001 From: ignapk Date: Tue, 14 Apr 2020 20:17:58 +0200 Subject: [PATCH 343/550] os: Add GNOME OS --- neofetch | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 5cbfdd4d..eb55fd56 100755 --- a/neofetch +++ b/neofetch @@ -763,7 +763,7 @@ image_source="auto" # DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, -# gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, # Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, # LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, @@ -4825,7 +4825,7 @@ ASCII: DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, - gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, + gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, @@ -6980,6 +6980,33 @@ ollllllh +llllllllllll+ hllllllo EOF ;; + "GNOME"*) + set_colors 4 + read -rd '' ascii_data <<'EOF' +${c1} ,@@@@@@@@, + @@@@@@ @@@@@@@@@@@@ + ,@@. @@@@@@@ *@@@@@@@@@@@@ + @@@@@% @@@@@@( @@@@@@@@@@@& + @@@@@@ @@@@* @@@@@@@@@# +@@@@* @@@@, *@@@@@% +@@@@@. + @@@@# @@@@@@@@@@@@@@@@ + ,@@@@@@@@@@@@@@@@@@@@@@@, + ,@@@@@@@@@@@@@@@@@@@@@@@@@@& + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@( + @@@@@@@@@@@@@@@@@@@@% + @@@@@@@@@@@@@@@@ + @@@@@@@@@@@@* @@@@@@@@/ + &@@@@@@@@@@ @@@@@@@@@* + @@@@@@@@@@@, @@@@@@@@@* + ,@@@@@@@@@@@@@@@@@@@@& + &@@@@@@@@@@@@@@ + ... +EOF + ;; + "GNU") set_colors fg 7 read -rd '' ascii_data <<'EOF' From fbe6666aa438da76f804876c2dedaca44e91a735 Mon Sep 17 00:00:00 2001 From: ignapk Date: Tue, 14 Apr 2020 20:18:18 +0200 Subject: [PATCH 344/550] Update man page --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index 45cd4d6a..1b45673d 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -297,7 +297,7 @@ Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, -gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +gNewSense, GNOMEOS, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, From ff6d59ef0c790648973708fe595ae64a9bb7eb0d Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 08:01:16 +0800 Subject: [PATCH 345/550] neofetch: add support for OSH --- neofetch | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 5cbfdd4d..4c12b86c 100755 --- a/neofetch +++ b/neofetch @@ -30,7 +30,14 @@ version=7.0.0 -bash_version=${BASH_VERSION/.*} +if [[ "$BASH_VERSION" ]]; then + bash_version=${BASH_VERSION/.*} +else + BASH_VERSION=$(bash -c "printf %s \"\$BASH_VERSION\"") + bash_version=5 + shopt -s eval_unsafe_arith +fi + sys_locale=${LANG:-C} XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config} PATH=$PATH:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec @@ -1593,6 +1600,10 @@ get_shell() { shell=${shell/version} ;; + osh) + shell+=$("$SHELL" -c "printf %s \"\$OIL_VERSION\"") + ;; + tcsh) shell+=$("$SHELL" -c "printf %s \$tcsh") ;; @@ -2338,7 +2349,7 @@ get_gpu() { { unset -v gpu; continue; } case $gpu in - *"advanced"*) + *"Advanced"*) brand="${gpu/*AMD*ATI*/AMD ATI}" brand="${brand:-${gpu/*AMD*/AMD}}" brand="${brand:-${gpu/*ATI*/ATi}}" @@ -2352,13 +2363,13 @@ get_gpu() { gpu="$brand $gpu" ;; - *"nvidia"*) + *"NVIDIA"*) gpu="${gpu/*\[}" gpu="${gpu/\]*}" gpu="NVIDIA $gpu" ;; - *"intel"*) + *"Intel"*) gpu="${gpu/*Intel/Intel}" gpu="${gpu/\(R\)}" gpu="${gpu/Corporation}" @@ -2369,7 +2380,7 @@ get_gpu() { [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics" ;; - *"virtualbox"*) + *"VirtualBox"*) gpu="VirtualBox Graphics Adapter" ;; @@ -4261,7 +4272,11 @@ info() { [[ "$prin" ]] && return # Update the variable. - output="$(trim "${!2:-${!1}}")" + if [[ "$2" ]]; then + output="$(trim "${!2}")" + else + output="$(trim "${!1}")" + fi if [[ "$2" && "${output// }" ]]; then prin "$1" "$output" From c2fcf35ab1a103065c0804b0bd9874f5052932eb Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 09:52:25 +0800 Subject: [PATCH 346/550] neofetch: only fork for {BASH,OIL}_VERSION when necessary --- neofetch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 4c12b86c..234a7907 100755 --- a/neofetch +++ b/neofetch @@ -33,7 +33,6 @@ version=7.0.0 if [[ "$BASH_VERSION" ]]; then bash_version=${BASH_VERSION/.*} else - BASH_VERSION=$(bash -c "printf %s \"\$BASH_VERSION\"") bash_version=5 shopt -s eval_unsafe_arith fi @@ -1590,7 +1589,11 @@ get_shell() { [[ $shell_version != on ]] && return case ${shell_name:=${SHELL##*/}} in - bash) shell+=${BASH_VERSION/-*} ;; + bash) + [[ $BASH_VERSION ]] || + BASH_VERSION=$("$SHELL" -c "printf %s \"\$BASH_VERSION\"") + shell+=${BASH_VERSION/-*} + ;; sh|ash|dash) ;; @@ -1601,7 +1604,11 @@ get_shell() { ;; osh) - shell+=$("$SHELL" -c "printf %s \"\$OIL_VERSION\"") + if [[ $OIL_VERSION ]]; then + shell+=$OIL_VERSION + else + shell+=$("$SHELL" -c "printf %s \"\$OIL_VERSION\"") + fi ;; tcsh) From 8e56495da8fa3557de47be60facddc670a41947a Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 09:57:39 +0800 Subject: [PATCH 347/550] neofetch: remove unnecessary(?) parameter expansion and BASH_VERSINFO --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 234a7907..9d92964e 100755 --- a/neofetch +++ b/neofetch @@ -30,8 +30,8 @@ version=7.0.0 -if [[ "$BASH_VERSION" ]]; then - bash_version=${BASH_VERSION/.*} +if [[ "${BASH_VERSINFO[0]}" ]]; then + bash_version=${BASH_VERSINFO[0]} else bash_version=5 shopt -s eval_unsafe_arith @@ -3992,7 +3992,7 @@ get_window_size() { # # False positive. # shellcheck disable=2141 - case ${BASH_VERSINFO[0]} in + case $bash_version in 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; *) IFS=';t' read -d t -t 1 -sra term_size ;; esac @@ -4240,7 +4240,7 @@ display_image() { # Add a tiny delay to fix issues with images not # appearing in specific terminal emulators. - ((BASH_VERSINFO[0]>3)) && sleep 0.05 + ((bash_version>3)) && sleep 0.05 printf '%b\n%s;\n%s\n' "0;1;$xoffset;$yoffset;$width;$height;;;;;$image" 3 4 |\ "${w3m_img_path:-false}" -bg "$background_color" &>/dev/null ;; From 2943116dd552783f51303d5d08ab92b95f9ef806 Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 14:47:13 +0800 Subject: [PATCH 348/550] neofetch: clean up --- neofetch | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 9d92964e..5b3362d1 100755 --- a/neofetch +++ b/neofetch @@ -30,13 +30,8 @@ version=7.0.0 -if [[ "${BASH_VERSINFO[0]}" ]]; then - bash_version=${BASH_VERSINFO[0]} -else - bash_version=5 - shopt -s eval_unsafe_arith -fi - +bash_version=${BASH_VERSINFO[0]:-5} +shopt -s eval_unsafe_arith &>/dev/null sys_locale=${LANG:-C} XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config} PATH=$PATH:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec From b441c57aeac0359ad9fe9fa4c35fe2020a317466 Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 14:56:45 +0800 Subject: [PATCH 349/550] neofetch: add comments --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 5b3362d1..fcd2d219 100755 --- a/neofetch +++ b/neofetch @@ -30,6 +30,8 @@ version=7.0.0 +# Fallback to a value of '5' for shells which support bash +# but do not set the 'BASH_' shell variables (osh). bash_version=${BASH_VERSINFO[0]:-5} shopt -s eval_unsafe_arith &>/dev/null sys_locale=${LANG:-C} From d0d6d208b0cc4b0000d3045108d56b8af7ad16bb Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 15:00:12 +0800 Subject: [PATCH 350/550] neofetch: clean up --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index fcd2d219..050eb60d 100755 --- a/neofetch +++ b/neofetch @@ -34,6 +34,7 @@ version=7.0.0 # but do not set the 'BASH_' shell variables (osh). bash_version=${BASH_VERSINFO[0]:-5} shopt -s eval_unsafe_arith &>/dev/null + sys_locale=${LANG:-C} XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config} PATH=$PATH:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec @@ -1589,6 +1590,7 @@ get_shell() { bash) [[ $BASH_VERSION ]] || BASH_VERSION=$("$SHELL" -c "printf %s \"\$BASH_VERSION\"") + shell+=${BASH_VERSION/-*} ;; From ff5600a3ec4832ea3a31e705e1c6d83dc1a75dd8 Mon Sep 17 00:00:00 2001 From: Morgaux <34286986+Morgaux@users.noreply.github.com> Date: Fri, 17 Apr 2020 05:21:01 +1200 Subject: [PATCH 351/550] Correct spelling --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index e2412109..a1d5ef19 100755 --- a/neofetch +++ b/neofetch @@ -1689,7 +1689,7 @@ get_de() { # When a window manager is started from a display manager # the desktop variables are sometimes also set to the # window manager name. This checks to see if WM == DE - # and dicards the DE value. + # and discards the DE value. [[ $de == "$wm" ]] && { unset -v de; return; } ;; esac @@ -5200,7 +5200,7 @@ get_simple() { } old_functions() { - # Removed functions for backwards compatability. + # Removed functions for backwards compatibility. get_line_break() { :; } } From 2eae510bd9b6efd05725738a281b083f50624788 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 19 Apr 2020 12:01:41 +0300 Subject: [PATCH 352/550] docs: update --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f313c14a..60c4a730 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,6 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi -install: - # Install a custom version of shellcheck instead of Travis CI's default - - scversion="latest" # or "v0.4.7", or "latest" - - wget "https://storage.googleapis.com/shellcheck/shellcheck-${scversion}.linux.x86_64.tar.xz" - - tar --xz -xvf "shellcheck-${scversion}.linux.x86_64.tar.xz" - - shellcheck() { "shellcheck-${scversion}/shellcheck" "$@"; } - script: - time ./neofetch --travis -v - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2244 -e SC2243 neofetch; fi From a61724f6b28b6285a003e403c184b5a5a2e155c9 Mon Sep 17 00:00:00 2001 From: Hayao0819 Date: Sun, 19 Apr 2020 21:02:20 +0900 Subject: [PATCH 353/550] Added support for Alter Linux and Serene Linux (#1447) * neofetch : Added alterlinux logo. * os: Added SereneLinux * Added Serene Linux and Alter Linux to the description * Added Serene Linux and Alter Linux to help message * Added Serene Linux and Alter Linux to man --- neofetch | 70 +++++++++++++++++++++++++++++++++++++++++++++++------- neofetch.1 | 8 +++---- 2 files changed, 65 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index a1d5ef19..98a017b5 100755 --- a/neofetch +++ b/neofetch @@ -757,7 +757,7 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", +# NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, "AOSC OS", # "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, # XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, # BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, @@ -778,9 +778,9 @@ image_source="auto" # Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, -# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -# SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +# Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, # Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX @@ -4836,9 +4836,9 @@ ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", - "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, - XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, + NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, + "AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, + ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, @@ -4858,8 +4858,8 @@ ASCII: PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, - SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, - Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, + SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, + Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX @@ -5273,6 +5273,32 @@ hdddyo+ohddyosdddddddddho+oydddy++ohdddh EOF ;; + "Alter"*) + set_colors 6 6 + read -rd '' ascii_data <<'EOF' +${c1} %, + ^WWWw + 'wwwwww + !wwwwwwww + #`wwwwwwwww + @wwwwwwwwwwww + wwwwwwwwwwwwwww + wwwwwwwwwwwwwwwww + wwwwwwwwwwwwwwwwwww + wwwwwwwwwwwwwwwwwwww, + w~1i.wwwwwwwwwwwwwwwww, + 3~:~1lli.wwwwwwwwwwwwwwww. + :~~:~?ttttzwwwwwwwwwwwwwwww + #<~:~~~~?llllltO-.wwwwwwwwwww + #~:~~:~:~~?ltlltlttO-.wwwwwwwww + @~:~~:~:~:~~(zttlltltlOda.wwwwwww + @~:~~: ~:~~:~:(zltlltlO a,wwwwww + 8~~:~~:~~~~:~~~~_1ltltu ,www + 5~~:~~:~~:~~:~~:~~~_1ltq N,, + g~:~~:~~~:~~:~~:~:~~~~1q N, +EOF + ;; + "Amazon"*) set_colors 3 7 read -rd '' ascii_data <<'EOF' @@ -9221,6 +9247,32 @@ yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy EOF ;; + "Serene"*) + set_colors 6 6 + read -rd '' ascii_data <<'EOF' +${c1} __---''''''---__ + . . + : : + - _______----_- + s __----''' __---- + __h_ _-' _-' h + '-._''--.._ ; _-' y + : ''-._ '-._/ _-' : + y ':_ _--'' y + m .--'' '-._.;' m + m : : m + y '.._ '-__ y + : '--._ '''----___ : + y '--._ ''-- _ y + h '--._ : h + s __'; vs + - __..--'' - + :_..--'' : + . _ . + `''---______---''-`` +EOF + ;; + "SharkLinux"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 1b45673d..22d21105 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -287,8 +287,8 @@ Colors to print the ascii art \fB\-\-ascii_distro\fR distro Which Distro's ascii art to print .TP -NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, -Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, +AOSC, Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, @@ -309,8 +309,8 @@ Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX From c85509f838eeb107a48190d982c9886714787a22 Mon Sep 17 00:00:00 2001 From: Shantanu Joshi Date: Fri, 24 Apr 2020 22:06:33 +0530 Subject: [PATCH 354/550] WM: Add support for xmonad (#1451) * WM: add xmonad * Fix shellcheck warning --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 98a017b5..c386112e 100755 --- a/neofetch +++ b/neofetch @@ -1798,7 +1798,8 @@ get_wm() { -e "[d]wm" \ -e "[2]bwm" \ -e "[m]onsterwm" \ - -e "[t]inywm") + -e "[t]inywm" \ + -e "[x]monad") else case $os in @@ -4837,7 +4838,7 @@ ASCII: --ascii_distro distro Which Distro's ascii art to print NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, - "AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, + \"AOSC OS\", \"AOSC OS/Retro\", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, From a1f80c3a613692c9e727e8cef67d729e2f335e82 Mon Sep 17 00:00:00 2001 From: Erick Cafferata Date: Fri, 1 May 2020 14:25:05 -0500 Subject: [PATCH 355/550] distro: speed up guix lookup (#1452) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c386112e..37d82900 100755 --- a/neofetch +++ b/neofetch @@ -1031,7 +1031,7 @@ get_distro() { elif type -p guix >/dev/null; then case $distro_shorthand in on|tiny) distro="Guix System" ;; - *) distro="Guix System $(guix system -V | awk 'NR==1{printf $5}')" + *) distro="Guix System $(guix -V | awk 'NR==1{printf $4}')" esac # Display whether using '-current' or '-release' on OpenBSD. From 1c2b5ff624cbe655c141b4be7a747c35637bc87c Mon Sep 17 00:00:00 2001 From: Noah Cain Date: Sun, 3 May 2020 12:48:38 -0700 Subject: [PATCH 356/550] Update neofetch (#1454) --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 37d82900..f2577883 100755 --- a/neofetch +++ b/neofetch @@ -6424,6 +6424,30 @@ o/${c2}--...::-:/::/:-......-::::::-/-...-${c1}:/o `.-://++++++//:-.` EOF ;; + + "dahlia"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} + .#. + *%@@@%* + .,,,,,(&@@@@@@@&/,,,,,. + ,#@@@@@@@@@@@@@@@@@@@@@#. + ,#@@@@@@@&#///#&@@@@@@@#. + ,/%&@@@@@%/, .,(%@@@@@&#/. + *#&@@@@@@#,. .*#@@@@@@&#, + .&@@@@@@@@@( .(@@@@@@@@@&&. +#@@@@@@@@@@( )@@@@@@@@@@@# + °@@@@@@@@@@( .(@@@@@@@@@@@° + *%@@@@@@@(. ,#@@@@@@@%* + ,(&@@@@@@%*. ./%@@@@@@%(, + ,#@@@@@@@&(***(&@@@@@@@#. + ,#@@@@@@@@@@@@@@@@@@@@@#. + ,*****#&@@@@@@@&(*****, + ,/%@@@%/. + ,#, +EOF + ;; "debian_small") set_colors 1 7 3 From 51e0237f86d98f991d954c6433a7c2b2bd2a18fb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 May 2020 22:53:20 +0300 Subject: [PATCH 357/550] neofetch: Fix CI --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index a1d5ef19..1453723a 100755 --- a/neofetch +++ b/neofetch @@ -758,9 +758,9 @@ image_source="auto" # Values: 'auto', 'distro_name' # Flag: --ascii_distro # NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", -# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, -# XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, -# BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, +# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, +# ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, +# Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, # BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, From 58e90e8f299ba9120171019c186a7c01cc618460 Mon Sep 17 00:00:00 2001 From: aosync Date: Sun, 10 May 2020 12:58:11 +0200 Subject: [PATCH 358/550] es shell support (no shell version) (#1456) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0646d669..64b45c96 100755 --- a/neofetch +++ b/neofetch @@ -1594,7 +1594,7 @@ get_shell() { shell+=${BASH_VERSION/-*} ;; - sh|ash|dash) ;; + sh|ash|dash|es) ;; *ksh) shell+=$("$SHELL" -c "printf %s \"\$KSH_VERSION\"") From 564ee212f3507df6a5f9f680fb4ccea4b8c1b7d7 Mon Sep 17 00:00:00 2001 From: ulkuderner Date: Sun, 10 May 2020 13:58:26 +0300 Subject: [PATCH 359/550] Added SambaBOX logo (#1455) Added SamBOX logo to os logos. --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 64b45c96..7c7c860e 100755 --- a/neofetch +++ b/neofetch @@ -10181,6 +10181,31 @@ ${c3}#######${c2}#${c1}#####${c2}#${c3}####### ${c3} #####${c2}#######${c3}##### EOF ;; + "Profelis SambaBOX"* | "SambaBOX"*) + set_colors 3 6 + read -rd '' ascii_data <<'EOF' +${c1} + # + *////##### + /////////#########( + .((((((///// ,####(#((((( + /#######(((* (#(((((((((. +//((#(#(#, ((##( ,((((((// +////// #(##########( ////// +////// ((#(#(#(#(##########(///////// +/////( (((((((#########(##((((((///// +/(((#( ((((/ +####(# ((### +#########(((/////////(((((((((, (#(#( +########( /////////(((((((* ##### +####///, *////((( ((((((( +./////////// .//((((((((( + ///////////, *(/////((((* + ,/(((((((((##########/. + .((((((####### + ((##* +EOF + ;; "SunOS") set_colors 3 7 @@ -10220,6 +10245,7 @@ oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ .odNm+ /dNms. EOF ;; + esac ;; esac From 027c80ce4fc6cf1a2a5203fc3463510b1139cede Mon Sep 17 00:00:00 2001 From: Georgy Komarov Date: Fri, 15 May 2020 21:27:35 +0300 Subject: [PATCH 360/550] Add OS Elbrus support (#1459) --- neofetch | 38 ++++++++++++++++++++++++++++++++++---- neofetch.1 | 4 ++-- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 7c7c860e..412eea0d 100755 --- a/neofetch +++ b/neofetch @@ -774,8 +774,8 @@ image_source="auto" # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, # NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -# OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, -# Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +# OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, +# Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, # Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, @@ -958,6 +958,12 @@ get_distro() { *) distro="Siduction ($(lsb_release -sic))" esac + elif [[ -f /etc/mcst_version ]]; then + case $distro_shorthand in + on|tiny) distro="OS Elbrus" ;; + *) distro="OS Elbrus $(< /etc/mcst_version)" + esac + elif type -p pveversion >/dev/null; then case $distro_shorthand in on|tiny) distro="Proxmox VE" ;; @@ -2387,6 +2393,10 @@ get_gpu() { [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics" ;; + *"MCST"*) + gpu="${gpu/*MCST*MGA2*/MCST MGA2}" + ;; + *"VirtualBox"*) gpu="VirtualBox Graphics Adapter" ;; @@ -4854,8 +4864,8 @@ ASCII: Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, - OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, - Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, + OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, + Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, @@ -8403,6 +8413,26 @@ ${c1} EOF ;; + "OS Elbrus"*) + set_colors 4 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + ██▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀██ + ██ ██ + ██ ███████ ███████ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ███████ ███████ + ██ ██ ██ + ██ ██▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄██ + ██ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀██ + ██ ██ + ███████████████████████████ +EOF + ;; + "PacBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 22d21105..6c1f70eb 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -304,8 +304,8 @@ LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, -Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, +Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, From c160c07399644533a778890ddb851ecb9d0a86a1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 May 2020 10:27:36 +0300 Subject: [PATCH 361/550] disk: Fix paths with spaces in names. Closes #1445 --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 0646d669..27b0e512 100755 --- a/neofetch +++ b/neofetch @@ -3493,7 +3493,7 @@ get_disk() { for disk in "${disks[@]}"; do # Create a second array and make each element split at whitespace this time. IFS=" " read -ra disk_info <<< "$disk" - disk_perc=${disk_info[4]/\%} + disk_perc=${disk_info[-2]/\%} case $disk_percent in off) disk_perc= @@ -3501,29 +3501,29 @@ get_disk() { case $df_version in *befhikm*) - disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G" + disk="$((disk_info[-4]/1024/1024))G / $((disk_info[-5]/1024/1024))G" disk+="${disk_perc:+ ($disk_perc%)}" ;; *) - disk="${disk_info[2]/i} / ${disk_info[1]/i}${disk_perc:+ ($disk_perc%)}" + disk="${disk_info[-4]/i} / ${disk_info[-5]/i}${disk_perc:+ ($disk_perc%)}" ;; esac case $disk_subtitle in name) - disk_sub=${disk_info[0]} + disk_sub=${disk_info[@]::${#disk_info[@]}-5} ;; dir) - disk_sub=${disk_info[5]/*\/} - disk_sub=${disk_sub:-${disk_info[5]}} + disk_sub=${disk_info[-1]/*\/} + disk_sub=${disk_sub:-${disk_info[-1]}} ;; none) ;; *) - disk_sub=${disk_info[5]} + disk_sub=${disk_info[-1]} ;; esac From 241ac6c1525549323a8782e619237b65bb9eede3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 May 2020 10:37:01 +0300 Subject: [PATCH 362/550] neofetch: Windows multi GPI support. Closes #1462 --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 880a9916..5cda684f 100755 --- a/neofetch +++ b/neofetch @@ -2472,8 +2472,11 @@ get_gpu() { ;; "Windows") - gpu="$(wmic path Win32_VideoController get caption)" - gpu="${gpu//Caption}" + while read -r line; do + prin "${subtitle:+${subtitle}${gpu_name}}" "$(trim "$line")" + done < <(wmic path Win32_VideoController get caption) + + gpu=${gpu//Caption} ;; "Haiku") From 488ceb764b0c61008eb3218b8cf746cdc01ee4f9 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 29 May 2020 16:06:50 +0200 Subject: [PATCH 363/550] Add Venom Linux (#1468) * os: Add Venom Linux * docs: update * Make shellcheck happy * Fix long lines (travis) --- neofetch | 78 ++++++++++++++++++++++++++++++++++-------------------- neofetch.1 | 12 ++++----- 2 files changed, 55 insertions(+), 35 deletions(-) diff --git a/neofetch b/neofetch index 5cda684f..9a341cb0 100755 --- a/neofetch +++ b/neofetch @@ -783,7 +783,7 @@ image_source="auto" # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, -# Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX +# Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX # have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. @@ -1480,6 +1480,7 @@ get_packages() { has eopkg && dir ${br_prefix}/var/lib/eopkg/package/* has crew && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist has pkgtool && dir ${br_prefix}/var/log/packages/* + has scratch && dir ${br_prefix}/var/lib/scratchpkg/index/*/.pkginfo has kagami && dir ${br_prefix}/var/lib/kagami/pkgs/* has cave && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ ${br_prefix}/var/db/paludis/repositories/installed/data/*/ @@ -3525,7 +3526,7 @@ get_disk() { case $disk_subtitle in name) - disk_sub=${disk_info[@]::${#disk_info[@]}-5} + disk_sub=${disk_info[*]::${#disk_info[@]}-5} ;; dir) @@ -4851,33 +4852,31 @@ ASCII: --ascii_distro distro Which Distro's ascii art to print NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, - \"AOSC OS\", \"AOSC OS/Retro\", Apricity, ArcoLinux, ArchBox, ARCHlabs, - ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, - BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, - BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, - Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, - Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, - DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, - EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, - FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, - gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, - Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, - Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, - LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, - Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, - Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, - NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, - OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, - Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, - PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, - Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, - Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, - SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, - Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, - openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, - Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, - Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX - have ascii logos + \"AOSC OS\", \"AOSC OS/Retro\", Apricity, ArcoLinux, ArchBox, + ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, + Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, + BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, + Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, + Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, + DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, + EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, + Funtoo, GalliumOS, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, + Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, + KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, + Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, + Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, + NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, + OpenBSD, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, + osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, + TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, + Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, + Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, + Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, + Siduction, Slackware, SliTaz, SmartOS, Solus, Source_Mage, Sparky, + Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, + SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, + Ubuntu-Studio, Ubuntu, Venom, Void, Obarun, windows10, Windows7, + Xubuntu, Zorin, and IRIX have ascii logos NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. @@ -9941,6 +9940,27 @@ oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso EOF ;; + "Venom"*) + set_colors 8 4 + read -rd '' ascii_data <<'EOF' +${c1} ::::::: ::::::: + mMMMMMMm dMMMMMMm + /MMMMMMMo +MMMMMMM/ + yMMMMMMN mMMMMMMy + NMMMMMMs oMMMMMMm + +MMMMMMN: NMMMMMM+ + hMMMMMMy sMMMMMMy + :NMMMMMM::NMMMMMN: + oMMMMMMyyMMMMMM+ + dMMMMMMMMMMMMh + /MMMMMMMMMMMN: + sMMMMMMMMMMo + mMMMMMMMMd + +MMMMMMMN: + :::::: +EOF + ;; + "void_small") set_colors 2 8 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 6c1f70eb..159d8336 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH NEOFETCH "1" "April 2020" "Neofetch 7.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.15. +.TH NEOFETCH "1" "May 2020" "Neofetch 7.0.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -288,8 +288,8 @@ Colors to print the ascii art Which Distro's ascii art to print .TP NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, -AOSC, Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, -XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, +"AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, +ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, @@ -297,7 +297,7 @@ Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, -gNewSense, GNOMEOS, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, @@ -313,7 +313,7 @@ SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, -Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX +Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. From d14dc2d54fa8408d846503a03773aafa7d9384fa Mon Sep 17 00:00:00 2001 From: Halo-Michael <45062120+Halo-Michael@users.noreply.github.com> Date: Sat, 6 Jun 2020 18:56:23 +0800 Subject: [PATCH 364/550] Add more device support (#1473) * Update * Update * Update --- neofetch | 99 +++++++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 52 deletions(-) diff --git a/neofetch b/neofetch index 9a341cb0..44354722 100755 --- a/neofetch +++ b/neofetch @@ -1206,26 +1206,29 @@ get_model() { "iPhone OS") case $kernel_machine in - iPad1,1): "iPad" ;; - iPad2,[1-4]): "iPad 2" ;; - iPad3,[1-3]): "iPad 3" ;; - iPad3,[4-6]): "iPad 4" ;; - iPad6,1[12]): "iPad 5" ;; - iPad7,[5-6]): "iPad 6" ;; - iPad4,[1-3]): "iPad Air" ;; - iPad5,[3-4]): "iPad Air 2" ;; - iPad11,[3-4]): "iPad Air 3" ;; - iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; - iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; - iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; - iPad7,[3-4]): "iPad Pro (10.5 Inch)" ;; - iPad8,[1-4]): "iPad Pro (11 Inch)" ;; - iPad8,[5-8]): "iPad Pro 3 (12.9 Inch)" ;; - iPad2,[5-7]): "iPad mini" ;; - iPad4,[4-6]): "iPad mini 2" ;; - iPad4,[7-9]): "iPad mini 3" ;; - iPad5,[1-2]): "iPad mini 4" ;; - iPad11,[1-2]): "iPad mini 5" ;; + iPad1,1): "iPad" ;; + iPad2,[1-4]): "iPad 2" ;; + iPad3,[1-3]): "iPad 3" ;; + iPad3,[4-6]): "iPad 4" ;; + iPad6,1[12]): "iPad 5" ;; + iPad7,[5-6]): "iPad 6" ;; + iPad7,1[12]): "iPad 7" ;; + iPad4,[1-3]): "iPad Air" ;; + iPad5,[3-4]): "iPad Air 2" ;; + iPad11,[3-4]): "iPad Air 3" ;; + iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; + iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; + iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; + iPad7,[3-4]): "iPad Pro (10.5 Inch)" ;; + iPad8,[1-4]): "iPad Pro (11 Inch)" ;; + iPad8,[5-8]): "iPad Pro 3 (12.9 Inch)" ;; + iPad8,9 | iPad8,10): "iPad Pro 4 (11 Inch)" ;; + iPad8,1[1-2]): "iPad Pro 4 (12.9 Inch)" ;; + iPad2,[5-7]): "iPad mini" ;; + iPad4,[4-6]): "iPad mini 2" ;; + iPad4,[7-9]): "iPad mini 3" ;; + iPad5,[1-2]): "iPad mini 4" ;; + iPad11,[1-2]): "iPad mini 5" ;; iPhone1,1): "iPhone" ;; iPhone1,2): "iPhone 3G" ;; @@ -1248,6 +1251,10 @@ get_model() { iPhone11,2): "iPhone XS" ;; iPhone11,[46]): "iPhone XS Max" ;; iPhone11,8): "iPhone XR" ;; + iPhone12,1): "iPhone 11" ;; + iPhone12,3): "iPhone 11 Pro" ;; + iPhone12,5): "iPhone 11 Pro Max" ;; + iPhone12,8): "iPhone SE 2020" ;; iPod1,1): "iPod touch" ;; ipod2,1): "iPod touch 2G" ;; @@ -2110,12 +2117,12 @@ get_cpu() { "iPhone6,"[1-2]): "Apple A7 (2) @ 1.3GHz" ;; "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;; "iPhone8,"[1-4] | "iPad6,1"[12]): "Apple A9 (2) @ 1.85GHz" ;; - "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;; - "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; - - "iPhone11,"[2468] | "iPad11,"[1-4]) - : "Apple A12 Bionic (6) @ 2.49GHz" + "iPhone9,"[1-4] | "iPad7,"[5-6] | "iPad7,1"[1-2]): + "Apple A10 Fusion (4) @ 2.34GHz" ;; + "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; + "iPhone11,"[2468] | "iPad11,"[1-4]): "Apple A12 Bionic (6) @ 2.49GHz" ;; + "iPhone12,"[1358]): "Apple A13 Bionic (6) @ 2.65GHz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; @@ -2132,6 +2139,7 @@ get_cpu() { "iPad6,"[7-8]): "Apple A9X (2) @ 2.26GHz" ;; "iPad7,"[1-4]): "Apple A10X Fusion (6) @ 2.39GHz" ;; "iPad8,"[1-8]): "Apple A12X Bionic (8) @ 2.49GHz" ;; + "iPad8,9" | "iPad8,1"[0-2]): "Apple A12Z Bionic (8) @ 2.49GHz" ;; esac cpu="$_" ;; @@ -2433,38 +2441,25 @@ get_gpu() { "iPhone OS") case $kernel_machine in - "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; - "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; - "iPhone11,"[2468]): "G11P" ;; + "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; + "iPhone2,1" | "iPhone3,"[1-3] | "iPod3,1" | "iPod4,1" | "iPad1,1"): + "PowerVR SGX535" + ;; + "iPhone4,1" | "iPad2,"[1-7] | "iPod5,1"): "PowerVR SGX543MP2" ;; + "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; + "iPhone6,"[1-2] | "iPad4,"[1-9]): "PowerVR G6430" ;; + "iPhone7,"[1-2] | "iPod7,1" | "iPad5,"[1-2]): "PowerVR GX6450" ;; + "iPhone8,"[1-4] | "iPad6,1"[12]): "PowerVR GT7600" ;; + "iPhone9,"[1-4] | "iPad7,"[5-6]): "PowerVR GT7600 Plus" ;; + "iPhone10,"[1-6]): "Apple Designed GPU (A11)" ;; + "iPhone11,"[2468]): "Apple Designed GPU (A12)" ;; + "iPhone12,"[1358]): "Apple Designed GPU (A13)" ;; + "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; "iPad5,"[3-4]): "PowerVR GXA6850" ;; "iPad6,"[3-8]): "PowerVR 7XT" ;; - "iPhone2,1" | "iPhone3,"[1-3] | "iPod3,1" | "iPod4,1" | "iPad1,1") - : "PowerVR SGX535" - ;; - - "iPhone4,1" | "iPad2,"[1-7] | "iPod5,1") - : "PowerVR SGX543MP2" - ;; - - "iPhone6,"[1-2] | "iPad4,"[1-9]) - : "PowerVR G6430" - ;; - - "iPhone7,"[1-2] | "iPod7,1" | "iPad5,"[1-2]) - : "PowerVR GX6450" - ;; - - "iPhone8,"[1-4] | "iPad6,1"[12]) - : "PowerVR GT7600" - ;; - - "iPhone9,"[1-4] | "iPad7,"[5-6]) - : "PowerVR GT7600 Plus" - ;; - "iPod1,1" | "iPod2,1") : "PowerVR MBX Lite" ;; From 298d75665a6b91453b3967fd83639f61e32c4f26 Mon Sep 17 00:00:00 2001 From: Cyril Raffatelli Date: Sun, 7 Jun 2020 15:31:39 +0200 Subject: [PATCH 365/550] Add playerctl support (#1475) --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 44354722..3a878b5f 100755 --- a/neofetch +++ b/neofetch @@ -501,6 +501,7 @@ disk_percent="on" # mpd # muine # netease-cloud-music +# playerctl # pogo # pragha # qmmp @@ -2656,6 +2657,7 @@ get_song() { "muine" "netease-cloud-music" "plasma-browser-integration" + "playerctl" "pogo" "pragha" "qmmp" @@ -2791,6 +2793,10 @@ get_song() { awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} /"title"/ {t=$4} END {print a " \n" b " \n" t}')" ;; + + "playerctl"*) + song="$(playerctl metadata --format '{{ artist }} \n{{ album }} \n{{ title }}')" + ;; *) mpc &>/dev/null && song="$(mpc -f '%artist% \n%album% \n%title%' current)" || return ;; esac From c8e08cd76e59aa759bda815f61a149955b61466a Mon Sep 17 00:00:00 2001 From: wilssonmartee <47995524+wilssonmartee@users.noreply.github.com> Date: Tue, 9 Jun 2020 03:05:59 -0400 Subject: [PATCH 366/550] Added Hash Linux Ascii (#1477) More info: https://hashproject.org --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 3a878b5f..f9adc6a2 100755 --- a/neofetch +++ b/neofetch @@ -5249,6 +5249,28 @@ h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y EOF ;; + "Hash"*) + set_colors 123 + read -rd '' ascii_data <<'EOF' +${c1} + + + ###### + + ### ###### ### + ##### ###### ##### + ###### ###### ###### + +####### '"###### '"######## +####### ###### ######## +####### ###### ######## + + ###### '"###### '"###### + ##### ###### ##### + ### ###### ### + ~ ###### ~ + +EOF + ;; + "alpine_small") set_colors 4 7 read -rd '' ascii_data <<'EOF' From 7b710257c993a491827e5eb15910778fbee4b04c Mon Sep 17 00:00:00 2001 From: sgse Date: Fri, 12 Jun 2020 22:19:29 +0000 Subject: [PATCH 367/550] add garuda linux (#1479) * add garuda linux * fix garuda linux Co-authored-by: SGSm --- neofetch | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index f9adc6a2..d8ae4c78 100755 --- a/neofetch +++ b/neofetch @@ -767,7 +767,7 @@ image_source="auto" # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, # DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, -# FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, +# FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, # Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, @@ -4861,7 +4861,7 @@ ASCII: Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, - Funtoo, GalliumOS, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, + Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, @@ -7004,7 +7004,34 @@ yyyo+:-..............................-// o/:-...................................: EOF ;; - + + "Garuda"*) + set_colors 7 7 + read -rd '' ascii_data <<'EOF' +${c1} __,,,,,,,_ + _╓╗╣╫╠╠╠╠╠╠╠╠╠╠╠╠╠╕╗╗┐_ + ╥╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╥, + ╗╠╠╠╠╠╠╠╝╜╜╜╜╝╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠┐ + ╣╠╠╠╠╠╠╠╠╢╣╢╗╕ , `"╘╠╠╠╠╠╠╠╠╠╠╠╠╠╠╔╥_ + ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╕╙╥╥╜ `"╜╠╬╠╠╠╠╠╠╠╠╠╠╠╥, + ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗╥╥╥╥╗╗╬╠╠╠╠╠╠╠╝╙╠╠╣╠╠╠╠╢┐ + ╣╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╥╬╣╠╠╠╠╠╠╠╠╗ + ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ + ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠ + ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╬ ```"╜╝╢╠╠╡ + ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╣, ╘╠╪ + ╞╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╢┐ ╜ + `╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ + ,╬╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠"╕ + ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ + ╝^╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╝╣╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╡ + ╔╜`╞┘╢╛╜ ╡╢╠"╚╠╠╜╝┌╞╞"╢╠╠╠╠╠╠╠╠╠╠╣╩╢╪ + ╜╒" `╜ ` ╜╙╕ └╣╠╠╠╠╕ ╞╙╖ + ╠╠╠ + ╜ +EOF + ;; + "gentoo_small") set_colors 5 7 read -rd '' ascii_data <<'EOF' From 5b8eea997491fb382f5af6a30284d8a16a1cdac5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 13 Jun 2020 01:23:26 +0300 Subject: [PATCH 368/550] docs: update --- neofetch | 58 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/neofetch b/neofetch index d8ae4c78..7d496504 100755 --- a/neofetch +++ b/neofetch @@ -775,17 +775,17 @@ image_source="auto" # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, # NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -# OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, -# Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, -# PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, -# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, -# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -# SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, -# Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, -# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, -# Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, -# Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX -# have ascii logos +# OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, +# Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, +# Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, +# Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, +# Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, +# Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, +# SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, +# openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, +# Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, +# Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, +# and IRIX have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -2793,7 +2793,7 @@ get_song() { awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} /"title"/ {t=$4} END {print a " \n" b " \n" t}')" ;; - + "playerctl"*) song="$(playerctl metadata --format '{{ artist }} \n{{ album }} \n{{ title }}')" ;; @@ -5252,22 +5252,22 @@ EOF "Hash"*) set_colors 123 read -rd '' ascii_data <<'EOF' -${c1} - - + ###### + - ### ###### ### - ##### ###### ##### - ###### ###### ###### - +${c1} + + + ###### + + ### ###### ### + ##### ###### ##### + ###### ###### ###### + ####### '"###### '"######## ####### ###### ######## ####### ###### ######## - - ###### '"###### '"###### - ##### ###### ##### - ### ###### ### - ~ ###### ~ - + + ###### '"###### '"###### + ##### ###### ##### + ### ###### ### + ~ ###### ~ + EOF ;; @@ -7004,12 +7004,12 @@ yyyo+:-..............................-// o/:-...................................: EOF ;; - + "Garuda"*) set_colors 7 7 read -rd '' ascii_data <<'EOF' ${c1} __,,,,,,,_ - _╓╗╣╫╠╠╠╠╠╠╠╠╠╠╠╠╠╕╗╗┐_ + _╓╗╣╫╠╠╠╠╠╠╠╠╠╠╠╠╠╕╗╗┐_ ╥╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╥, ╗╠╠╠╠╠╠╠╝╜╜╜╜╝╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠┐ ╣╠╠╠╠╠╠╠╠╢╣╢╗╕ , `"╘╠╠╠╠╠╠╠╠╠╠╠╠╠╠╔╥_ @@ -7028,10 +7028,10 @@ ${c1} __,,,,,,,_ ╔╜`╞┘╢╛╜ ╡╢╠"╚╠╠╜╝┌╞╞"╢╠╠╠╠╠╠╠╠╠╠╣╩╢╪ ╜╒" `╜ ` ╜╙╕ └╣╠╠╠╠╕ ╞╙╖ ╠╠╠ - ╜ + ╜ EOF ;; - + "gentoo_small") set_colors 5 7 read -rd '' ascii_data <<'EOF' From 726d9b81337c235a03f2d26d11746190a0e7b50d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 28 Jun 2020 01:08:39 +0300 Subject: [PATCH 369/550] wm: Added support for x11fs --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 7d496504..dd29a954 100755 --- a/neofetch +++ b/neofetch @@ -1814,6 +1814,7 @@ get_wm() { -e "[2]bwm" \ -e "[m]onsterwm" \ -e "[t]inywm" \ + -e "[x]11fs" \ -e "[x]monad") else From 824866e14c0b3c2623481259e36e2401ed971a1f Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 28 Jun 2020 19:19:52 +0200 Subject: [PATCH 370/550] song: Add Tauon Music Box (#1489) * song: Add Tauon Music Box * Fix long line (travis) --- neofetch | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index dd29a954..76572e04 100755 --- a/neofetch +++ b/neofetch @@ -511,6 +511,7 @@ disk_percent="on" # smplayer # spotify # strawberry +# tauonmb # tomahawk # vlc # xmms2d @@ -2669,6 +2670,7 @@ get_song() { "spotify" "Spotify" "strawberry" + "tauonmb" "tomahawk" "vlc" "xmms2d" @@ -2720,6 +2722,7 @@ get_song() { "strawberry"*) get_song_dbus "strawberry" ;; "gogglesmm"*) get_song_dbus "gogglesmm" ;; "xnoise"*) get_song_dbus "xnoise" ;; + "tauonmb"*) get_song_dbus "tauon" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "io.elementary.music"*) get_song_dbus "Music" ;; @@ -4862,15 +4865,15 @@ ASCII: Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, - Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, - Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, - KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, - Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, - Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, - NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, - OpenBSD, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, - osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, - TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, + Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, + GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, + KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, + LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, + Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, + Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, + OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, OpenStage, + OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, + Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, From 7805b2c4cb3c9015bcf4be7167f1ec8ab70fe540 Mon Sep 17 00:00:00 2001 From: "Ybenel (R2dr0dn)" <44820142+r2dr0dn@users.noreply.github.com> Date: Tue, 30 Jun 2020 18:34:15 +0100 Subject: [PATCH 371/550] Added DarkOs Logo (#1491) Co-authored-by: r2dr0dn --- neofetch | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 76572e04..156c6600 100755 --- a/neofetch +++ b/neofetch @@ -766,7 +766,7 @@ image_source="auto" # BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, -# DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, +# DesaOS, Devuan, DracOS, DarkOs, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, @@ -4863,7 +4863,7 @@ ASCII: BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, - DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, + DracOS, DarkOs, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, @@ -6606,6 +6606,34 @@ ${c1} `-:/- `:sy: `. `/yyyyys: ./o/.` .oyyso+oo:` :+oo+//::::///:-.` `.` +EOF + ;; + + "DarkOs") + set_colors 1 6 5 3 2 + read -rd '' ascii_data <<'EOF' + +${c3}⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⠢⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c1}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣶⠋⡆⢹⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c5}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡆⢀⣤⢛⠛⣠⣿⠀⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c6}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣶⣿⠟⣡⠊⣠⣾⣿⠃⣠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c2}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣴⣯⣿⠀⠊⣤⣿⣿⣿⠃⣴⣧⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c1}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣤⣶⣿⣿⡟⣠⣶⣿⣿⣿⢋⣤⠿⠛⠉⢁⣭⣽⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c4} ⠀⠀⠀⠀⠀⠀ ⠀⣠⠖⡭⢉⣿⣯⣿⣯⣿⣿⣿⣟⣧⠛⢉⣤⣶⣾⣿⣿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c5}⠀⠀⠀⠀⠀⠀⠀⠀⣴⣫⠓⢱⣯⣿⢿⠋⠛⢛⠟⠯⠶⢟⣿⣯⣿⣿⣿⣿⣿⣿⣦⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c2}⠀⠀⠀⠀⠀⠀⢀⡮⢁⣴⣿⣿⣿⠖⣠⠐⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠛⠛⠛⢿⣶⣄⠀⠀⠀⠀⠀⠀⠀ +${c3}⠀⠀⠀⠀⢀⣤⣷⣿⣿⠿⢛⣭⠒⠉⠀⠀⠀⣀⣀⣄⣤⣤⣴⣶⣶⣶⣿⣿⣿⣿⣿⠿⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀ +${c1}⠀⢀⣶⠏⠟⠝⠉⢀⣤⣿⣿⣶⣾⣿⣿⣿⣿⣿⣿⣟⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c6}⢴⣯⣤⣶⣿⣿⣿⣿⣿⡿⣿⣯⠉⠉⠉⠉⠀⠀⠀⠈⣿⡀⣟⣿⣿⢿⣿⣿⣿⣿⣿⣦⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c5}⠀⠀⠀⠉⠛⣿⣧⠀⣆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠃⣿⣿⣯⣿⣦⡀⠀⠉⠻⣿⣦⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c3}⠀⠀⠀⠀⠀⠀⠉⢿⣮⣦⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⣿⠀⣯⠉⠉⠛⢿⣿⣷⣄⠀⠈⢻⣆⠀⠀⠀⠀⠀⠀⠀⠀ +${c2}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠢⠀⠀⠀⠀⠀⠀⠀⢀⢡⠃⣾⣿⣿⣦⠀⠀⠀⠙⢿⣿⣤⠀⠙⣄⠀⠀⠀⠀⠀⠀⠀ +${c6}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⢋⡟⢠⣿⣿⣿⠋⢿⣄⠀⠀⠀⠈⡄⠙⣶⣈⡄⠀⠀⠀⠀⠀⠀ +${c1}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠐⠚⢲⣿⠀⣾⣿⣿⠁⠀⠀⠉⢷⡀⠀⠀⣇⠀⠀⠈⠻⡀⠀⠀⠀⠀⠀ +${c4}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢢⣀⣿⡏⠀⣿⡿⠀⠀⠀⠀⠀⠀⠙⣦⠀⢧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c3}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⠿⣧⣾⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣮⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c5}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠛⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + EOF ;; From e00afa6b92cc9cdbbaa729b79d9da54c40c91791 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 4 Jul 2020 17:11:24 +0200 Subject: [PATCH 372/550] song: Add olivia player (#1495) --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 156c6600..19c12648 100755 --- a/neofetch +++ b/neofetch @@ -501,6 +501,7 @@ disk_percent="on" # mpd # muine # netease-cloud-music +# olivia # playerctl # pogo # pragha @@ -2658,6 +2659,7 @@ get_song() { "mpd" "muine" "netease-cloud-music" + "olivia" "plasma-browser-integration" "playerctl" "pogo" @@ -2723,6 +2725,7 @@ get_song() { "gogglesmm"*) get_song_dbus "gogglesmm" ;; "xnoise"*) get_song_dbus "xnoise" ;; "tauonmb"*) get_song_dbus "tauon" ;; + "olivia"*) get_song_dbus "olivia" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "io.elementary.music"*) get_song_dbus "Music" ;; From 0343552f49dd2fa9925329f026c71840ce093c96 Mon Sep 17 00:00:00 2001 From: Hyd3r1 <60399586+Hyd3r1@users.noreply.github.com> Date: Mon, 6 Jul 2020 15:36:39 +0200 Subject: [PATCH 373/550] Add ITC distro logo (#1496) * Add ITC distro logo * update logo to smaller --- neofetch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/neofetch b/neofetch index 19c12648..11d8a552 100755 --- a/neofetch +++ b/neofetch @@ -6637,6 +6637,23 @@ ${c4}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢢⣀⣿⡏⠀⣿⡿⠀⠀⠀ ${c3}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⠿⣧⣾⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣮⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ${c5}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠛⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +EOF + ;; + + "Itc") + set_colors 1 + read -rd '' ascii_data <<'EOF' +${c1}....................-==============+... +${c1}....................-==============:... +${c1}...:===========-....-==============:... +${c1}...-===========:....-==============-... +${c1}....*==========+........-::********-... +${c1}....*===========+.:*====**==*+-.-...... +${c1}....:============*+-..--:+**====*---... +${c1}......::--........................::... +${c1}..+-:+-.+::*:+::+:-++::++-.:-.*.:++:++. +${c1}..:-:-++++:-::--:+::-::.:++-++:++--:-:. ⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ EOF ;; From f4a83d604fa96a1e91f25c075cbb4b8f509ec43c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Jul 2020 23:53:51 +0300 Subject: [PATCH 374/550] neofetch: Fix trailing whitespace --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 11d8a552..15d17325 100755 --- a/neofetch +++ b/neofetch @@ -6639,7 +6639,7 @@ ${c5}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠛⠀⠀⠀⠀ EOF ;; - + "Itc") set_colors 1 read -rd '' ascii_data <<'EOF' From 0e448167c02f28603425c6913a33439d5d3a5e05 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Jul 2020 23:54:25 +0300 Subject: [PATCH 375/550] resolution: Fix output when monitor is turned off. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 15d17325..f9ac2306 100755 --- a/neofetch +++ b/neofetch @@ -2905,7 +2905,7 @@ get_resolution() { "off") resolution="$(xrandr --nograb --current |\ awk -F 'connected |\\+|\\(' \ - '/ connected/ && $2 {printf $2 ", "}')" + '/ connected.*[0-9]+x[0-9]+\+/ && $2 {printf $2 ", "}')" resolution="${resolution/primary, }" resolution="${resolution/primary }" From 77a34f884d487721533949033ad9c98fc21ce9fb Mon Sep 17 00:00:00 2001 From: SeungheonOh Date: Tue, 7 Jul 2020 11:26:23 -0500 Subject: [PATCH 376/550] Adding pot terminal image backend (#1482) --- neofetch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index f9ac2306..479f9b5b 100755 --- a/neofetch +++ b/neofetch @@ -732,7 +732,7 @@ disk_display="off" # # Default: 'ascii' # Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off', -# 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' +# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' # Flag: --backend image_backend="ascii" @@ -3792,7 +3792,7 @@ image_backend() { "off") image_backend="off" ;; "caca" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ - "tycat" | "w3m" | "sixel" | "pixterm" | "kitty") + "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot") get_image_source [[ ! -f "$image" ]] && { @@ -3817,7 +3817,7 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty', - 'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')" + 'off', 'sixel', 'pot', 'pixterm', 'termpix', 'tycat', 'w3m')" err "Image: Falling back to ascii mode." print_ascii ;; @@ -4219,6 +4219,13 @@ display_image() { "$image" ;; + "pot") + pot \ + "$image" \ + --size="$((width / font_width))x$((height / font_height))" \ + --loader=std + ;; + "pixterm") pixterm \ -tc "$((width / font_width))" \ @@ -4845,6 +4852,7 @@ IMAGE BACKEND: --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. --kitty source Shortcut to use 'kitty' backend. + --pot source Shortcut to use 'pot' backend. --pixterm source Shortcut to use 'pixterm' backend. --sixel source Shortcut to use 'sixel' backend. --termpix source Shortcut to use 'termpix' backend. @@ -5062,7 +5070,7 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" | "--pixterm" |\ "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" case $2 in From 59335d35818d07e32f485fc4bbee378039aba972 Mon Sep 17 00:00:00 2001 From: SeungheonOh Date: Tue, 7 Jul 2020 11:47:51 -0500 Subject: [PATCH 377/550] pot argument fix (#1498) * pot argument fix * removing '\' --- neofetch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 479f9b5b..42476d7d 100755 --- a/neofetch +++ b/neofetch @@ -4222,8 +4222,7 @@ display_image() { "pot") pot \ "$image" \ - --size="$((width / font_width))x$((height / font_height))" \ - --loader=std + --size="$((width / font_width))x$((height / font_height))" ;; "pixterm") From af2c02ceb63f3013f8227ba4476670a91784cb27 Mon Sep 17 00:00:00 2001 From: Hyd3r1 <60399586+Hyd3r1@users.noreply.github.com> Date: Wed, 8 Jul 2020 01:23:53 +0200 Subject: [PATCH 378/550] Repair ITC distro show (#1499) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 42476d7d..a5b68280 100755 --- a/neofetch +++ b/neofetch @@ -6647,7 +6647,7 @@ ${c5}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠛⠀⠀⠀⠀ EOF ;; - "Itc") + "Itc"*) set_colors 1 read -rd '' ascii_data <<'EOF' ${c1}....................-==============+... From f954cbab30c92d0fb009d7f77e5275b7da6c297d Mon Sep 17 00:00:00 2001 From: Steve Kang Date: Sun, 12 Jul 2020 19:12:22 +0900 Subject: [PATCH 379/550] Add latest macOS support and fix issue (#1487) Support for both "Mac OS X" and "macOS" Support for macOS 10.16(11.0), Big Sur Resolve issue #1486 --- neofetch | 62 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index a5b68280..738b7a7d 100755 --- a/neofetch +++ b/neofetch @@ -1089,7 +1089,7 @@ get_distro() { distro=${distro/NAME=} ;; - "Mac OS X") + "Mac OS X"|"macOS") case $osx_version in 10.4*) codename="Mac OS X Tiger" ;; 10.5*) codename="Mac OS X Leopard" ;; @@ -1103,6 +1103,8 @@ get_distro() { 10.13*) codename="macOS High Sierra" ;; 10.14*) codename="macOS Mojave" ;; 10.15*) codename="macOS Catalina" ;; + 10.16*) codename="macOS Big Sur" ;; + 11.0*) codename="macOS Big Sur" ;; *) codename=macOS ;; esac @@ -1115,7 +1117,7 @@ get_distro() { case $osx_version in 10.[4-7]*) distro=${distro/${codename}/Mac OS X} ;; 10.[8-9]*|10.1[0-1]*) distro=${distro/${codename}/OS X} ;; - 10.1[2-4]*) distro=${distro/${codename}/macOS} ;; + 10.1[2-6]*|11.0*) distro=${distro/${codename}/macOS} ;; esac distro=${distro/ ${osx_build}} ;; @@ -1199,7 +1201,7 @@ get_model() { fi ;; - "Mac OS X") + "Mac OS X"|"macOS") if [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC") != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else @@ -1371,7 +1373,7 @@ get_uptime() { fi ;; - "Mac OS X"|"iPhone OS"|BSD|FreeMiNT) + "Mac OS X"|"macOS"|"iPhone OS"|BSD|FreeMiNT) boot=$(sysctl -n kern.boottime) boot=${boot/\{ sec = } boot=${boot/,*} @@ -1540,7 +1542,7 @@ get_packages() { manager=appimage && has appimaged && dir ~/.local/bin/*.appimage ;; - "Mac OS X"|MINIX) + "Mac OS X"|"macOS"|MINIX) has port && tot port installed && ((packages-=1)) has brew && dir /usr/local/Cellar/* has pkgin && tot pkgin list @@ -1656,7 +1658,7 @@ get_de() { ((de_run == 1)) && return case $os in - "Mac OS X") de=Aqua ;; + "Mac OS X"|"macOS") de=Aqua ;; Windows) case $distro in @@ -1796,7 +1798,7 @@ get_wm() { -e westford \ -e weston) - elif [[ $DISPLAY && $os != "Mac OS X" && $os != FreeMiNT ]]; then + elif [[ $DISPLAY && $os != "Mac OS X" && $os != "macOS" && $os != FreeMiNT ]]; then type -p xprop &>/dev/null && { id=$(xprop -root -notype _NET_SUPPORTING_WM_CHECK) id=${id##* } @@ -1821,7 +1823,7 @@ get_wm() { else case $os in - "Mac OS X") + "Mac OS X"|"macOS") ps_line=$(ps -e | grep -o \ -e "[S]pectacle" \ -e "[A]methyst" \ @@ -2101,7 +2103,7 @@ get_cpu() { esac ;; - "Mac OS X") + "Mac OS X"|"macOS") cpu="$(sysctl -n machdep.cpu.brand_string)" # Get CPU cores. @@ -2281,8 +2283,8 @@ get_cpu() { # Add CPU cores to the output. [[ "$cpu_cores" != "off" && "$cores" ]] && \ case $os in - "Mac OS X") cpu="${cpu/@/(${cores}) @}" ;; - *) cpu="$cpu ($cores)" ;; + "Mac OS X"|"macOS") cpu="${cpu/@/(${cores}) @}" ;; + *) cpu="$cpu ($cores)" ;; esac # Add CPU speed to the output. @@ -2321,14 +2323,14 @@ get_cpu_usage() { # Get CPU cores if unset. if [[ "$cpu_cores" != "logical" ]]; then case $os in - "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; - "Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;; - "BSD") cores="$(sysctl -n hw.ncpu)" ;; - "Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; - "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; - "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; - "IRIX") cores="$(sysconf NPROC_ONLN)" ;; - "FreeMiNT") cores="$(sysctl -n hw.ncpu)" ;; + "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; + "Mac OS X"|"macOS") cores="$(sysctl -n hw.logicalcpu_max)" ;; + "BSD") cores="$(sysctl -n hw.ncpu)" ;; + "Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; + "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; + "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; + "IRIX") cores="$(sysconf NPROC_ONLN)" ;; + "FreeMiNT") cores="$(sysctl -n hw.ncpu)" ;; "AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" @@ -2429,7 +2431,7 @@ get_gpu() { return ;; - "Mac OS X") + "Mac OS X"|"macOS") if [[ -f "${cache_dir}/neofetch/gpu" ]]; then source "${cache_dir}/neofetch/gpu" @@ -2526,7 +2528,7 @@ get_memory() { mem_total="$((mem_total / 1024))" ;; - "Mac OS X" | "iPhone OS") + "Mac OS X" | "macOS" | "iPhone OS") mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))" mem_wired="$(vm_stat | awk '/ wired/ { print $4 }')" mem_active="$(vm_stat | awk '/ active/ { printf $3 }')" @@ -2750,7 +2752,7 @@ get_song() { case $os in "Linux") get_song_dbus "spotify" ;; - "Mac OS X") + "Mac OS X"|"macOS") song="$(osascript -e 'tell application "Spotify" to artist of current track as¬ string & "\n" & album of current track as¬ string & "\n" & name of current track as string')" @@ -2832,7 +2834,7 @@ get_song() { get_resolution() { case $os in - "Mac OS X") + "Mac OS X"|"macOS") if type -p screenresolution >/dev/null; then resolution="$(screenresolution get 2>&1 | awk '/Display/ {printf $6 "Hz, "}')" resolution="${resolution//x??@/ @ }" @@ -2939,7 +2941,7 @@ get_style() { # Fix weird output when the function is run multiple times. unset gtk2_theme gtk3_theme theme path - if [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then + if [[ "$DISPLAY" && $os != "Mac OS X" && $os != "macOS" ]]; then # Get DE if user has disabled the function. ((de_run != 1)) && get_de @@ -3622,7 +3624,7 @@ get_battery() { esac ;; - "Mac OS X") + "Mac OS X"|"macOS") battery="$(pmset -g batt | grep -o '[0-9]*%')" state="$(pmset -g batt | awk '/;/ {print $4}')" [[ "$state" == "charging;" ]] && battery_state="charging" @@ -3662,7 +3664,7 @@ get_local_ip() { local_ip="$(ifconfig | awk '{printf $3; exit}')" ;; - "Mac OS X" | "iPhone OS") + "Mac OS X" | "macOS" | "iPhone OS") local_ip="$(ipconfig getifaddr en0)" [[ -z "$local_ip" ]] && local_ip="$(ipconfig getifaddr en1)" ;; @@ -3722,7 +3724,7 @@ get_gpu_driver() { fi ;; - "Mac OS X") + "Mac OS X"|"macOS") if [[ "$(kextstat | grep "GeForceWeb")" != "" ]]; then gpu_driver="NVIDIA Web Driver" else @@ -3889,7 +3891,7 @@ get_image_source() { get_wallpaper() { case $os in - "Mac OS X") + "Mac OS X"|"macOS") image="$(osascript </dev/null; then IFS=$'\n' read -d "" -ra win \ <<< "$(xdotool getactivewindow getwindowgeometry --shell %1)" @@ -4558,7 +4560,7 @@ cache() { get_cache_dir() { case $os in - "Mac OS X") cache_dir="/Library/Caches" ;; + "Mac OS X"|"macOS") cache_dir="/Library/Caches" ;; *) cache_dir="/tmp" ;; esac } From a4bf721014bef8cdd099a802abe07b81abee2333 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 17 Jul 2020 16:56:13 +0300 Subject: [PATCH 380/550] neofetch: Fix CI (long lines) --- neofetch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 738b7a7d..b72a55d2 100755 --- a/neofetch +++ b/neofetch @@ -3819,7 +3819,8 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty', - 'off', 'sixel', 'pot', 'pixterm', 'termpix', 'tycat', 'w3m')" + 'off', 'sixel', 'pot', 'pixterm', 'termpix', 'tycat', + 'w3m')" err "Image: Falling back to ascii mode." print_ascii ;; @@ -5071,8 +5072,8 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ + "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" case $2 in "-"* | "") ;; From 47d8dbcec8b6edbcee4676532f61132362c0a16d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 17 Jul 2020 21:05:58 +0200 Subject: [PATCH 381/550] Detect Ubuntu flavors (#1507) --- neofetch | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index b72a55d2..c51bb016 100755 --- a/neofetch +++ b/neofetch @@ -1087,6 +1087,18 @@ get_distro() { distro=$(trim_quotes "$distro") distro=${distro/NAME=} + + # Get Ubuntu flavor. + if [[ $distro == "Ubuntu"* ]]; then + case $XDG_CONFIG_DIRS in + *"plasma"*) distro=${distro/Ubuntu/Kubuntu} ;; + *"mate"*) distro=${distro/Ubuntu/Ubuntu MATE} ;; + *"xubuntu"*) distro=${distro/Ubuntu/Xubuntu} ;; + *"Lubuntu"*) distro=${distro/Ubuntu/Lubuntu} ;; + *"budgie"*) distro=${distro/Ubuntu/Ubuntu Budgie} ;; + *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; + esac + fi ;; "Mac OS X"|"macOS") @@ -9890,7 +9902,7 @@ ${c1} ▀█████████ ███████${c2}███▀ EOF ;; - "Ubuntu-Budgie"*) + "Ubuntu Budgie"* | "Ubuntu-Budgie"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c2} ./oydmMMMMMMmdyo/. @@ -9938,7 +9950,7 @@ ${c4} `soooo. .oooo` EOF ;; - "Ubuntu-MATE"*) + "Ubuntu MATE"* | "Ubuntu-MATE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' ${c1} `:+shmNNMMNNmhs+:` @@ -9988,7 +10000,7 @@ ${c3} `oo++. EOF ;; - "Ubuntu-Studio") + "Ubuntu Studio"* | "Ubuntu-Studio") set_colors 6 7 read -rd '' ascii_data <<'EOF' ${c1} ..-::::::-.` From 3c63ac1d4a69cb032f112a1586907138e69475ce Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 20 Jul 2020 07:57:30 +0200 Subject: [PATCH 382/550] Add Ubuntu Cinnamon (#1508) --- neofetch | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index c51bb016..6ff4ff2f 100755 --- a/neofetch +++ b/neofetch @@ -1091,12 +1091,13 @@ get_distro() { # Get Ubuntu flavor. if [[ $distro == "Ubuntu"* ]]; then case $XDG_CONFIG_DIRS in - *"plasma"*) distro=${distro/Ubuntu/Kubuntu} ;; - *"mate"*) distro=${distro/Ubuntu/Ubuntu MATE} ;; - *"xubuntu"*) distro=${distro/Ubuntu/Xubuntu} ;; - *"Lubuntu"*) distro=${distro/Ubuntu/Lubuntu} ;; - *"budgie"*) distro=${distro/Ubuntu/Ubuntu Budgie} ;; - *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; + *"plasma"*) distro=${distro/Ubuntu/Kubuntu} ;; + *"mate"*) distro=${distro/Ubuntu/Ubuntu MATE} ;; + *"xubuntu"*) distro=${distro/Ubuntu/Xubuntu} ;; + *"Lubuntu"*) distro=${distro/Ubuntu/Lubuntu} ;; + *"budgie"*) distro=${distro/Ubuntu/Ubuntu Budgie} ;; + *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; + *"cinnamon"*) distro=${distro/Ubuntu/Ubuntu Cinnamon} ;; esac fi ;; @@ -9902,6 +9903,32 @@ ${c1} ▀█████████ ███████${c2}███▀ EOF ;; + "Ubuntu Cinnamon"* | "Ubuntu-Cinnamon"*) + set_colors 1 + read -rd '' ascii_data <<'EOF' +${c1} .-:/++oooo++/:-. + `:/oooooooooooooooooo/-` + -/oooooooooooooooooooo+ooo/- + .+oooooooooooooooooo+/-`.ooooo+. + :oooooooooooo+//:://++:. .ooooooo: + /oooooooooo+o:`.----.``./+/oooooooo/ + /ooooooooo+. +ooooooooo+:``/ooooooooo/ +.ooooooooo: .+ooooooooooooo- -ooooooooo. +/oooooo/o+ .ooooooo:`+oo+ooo- :oooooooo/ +ooo+:. .o: :ooooo:` .+/. ./o+:/ooooooooo +oooo/-`.o: :ooo/` `/+. ./.:ooooooooo +/oooooo+o+``++. `:+- /oooooooo/ +.ooooooooo/`` -+:` :ooooooooo. + /ooooooooo+--+/` .+ooooooooo/ + /ooooooooooo+.` `.:++:oooooooo/ + :oooooooooooooo++++oo+-` .ooooooo: + .+ooooooooooooooooooo+:..ooooo+. + -/oooooooooooooooooooooooo/- + `-/oooooooooooooooooo/:` + .-:/++oooo++/:-. +EOF + ;; + "Ubuntu Budgie"* | "Ubuntu-Budgie"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 96da4081006a881bb18b2879af1e8c7b449d246e Mon Sep 17 00:00:00 2001 From: Luke Yue Date: Thu, 23 Jul 2020 16:55:00 +0800 Subject: [PATCH 383/550] Add openEuler (#1510) Signed-off-by: Luke Yue --- neofetch | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 6ff4ff2f..f31996d4 100755 --- a/neofetch +++ b/neofetch @@ -776,10 +776,10 @@ image_source="auto" # LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -# OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, -# Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, -# Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, +# NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, +# OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, +# Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, +# popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, # Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, # Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, # Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, @@ -4897,9 +4897,9 @@ ASCII: LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, - OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, OpenStage, - OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, - Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, + OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, + OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, + Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, @@ -8381,6 +8381,29 @@ ${c1} `-|.' /_. ${c4}\_| ${c1} F EOF ;; + "openEuler"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} + (##### + (((######## ##### + ((( ########## __...__ + (((((((( ####### /((((((###\ + ((((((((((( ....... \(((((####/ + (((((( ((((######### ******* + %((((((# ((######## + /////((((( ### +/////(((((((# (((& + ((((((((((((( + (((((((((((( + ((((((((( ((((((### + /((((((###### + //((((((###### + /((((((##### + *********/ +EOF + ;; + "OpenIndiana"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From b19d2b3caca6f7cb530d45d3ce9e7496e3443176 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 25 Jul 2020 08:35:21 +0300 Subject: [PATCH 384/550] term: Add support for Windows Terminal. Related to #1513 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index b72a55d2..200ea0bb 100755 --- a/neofetch +++ b/neofetch @@ -3122,6 +3122,7 @@ get_term() { # Most likely TosWin2 on FreeMiNT - quick check [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && term="TosWin2" [[ "$SSH_CONNECTION" ]] && term="$SSH_TTY" + [[ "$WT_SESSION" ]] && term="Windows Terminal" # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do From 0435dcd0cd44bb22afa9b986f15742cc05de7b20 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 26 Jul 2020 09:33:16 +0300 Subject: [PATCH 385/550] neofetch: Added support for --memory_unit to change memory output unit. Examples: kib '1020928KiB / 7117824KiB' mib '1042MiB / 6951MiB' gib: '0.98GiB / 6.79GiB' Precision level of GiB output is /not/ configurable at this stage in time. This may be added later. Closes #1388 --- neofetch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/neofetch b/neofetch index 4b6583c6..8537340c 100755 --- a/neofetch +++ b/neofetch @@ -170,6 +170,18 @@ uptime_shorthand="on" # off: '1801MiB / 7881MiB' memory_percent="off" +# Change memory output unit. +# +# Default: 'mib' +# Values: 'kib', 'mib', 'gib' +# Flag: --memory_unit +# +# Example: +# kib '1020928KiB / 7117824KiB' +# mib '1042MiB / 6951MiB' +# gib: ' 0.98GiB / 6.79GiB' +memory_unit="mib" + # Packages @@ -2638,6 +2650,20 @@ get_memory() { [[ "$memory_percent" == "on" ]] && ((mem_perc=mem_used * 100 / mem_total)) + case $memory_unit in + gib) + mem_used=$(awk '{printf "%.2f", $1 / $2}' <<< "$mem_used 1024") + mem_total=$(awk '{printf "%.2f", $1 / $2}' <<< "$mem_total 1024") + mem_label=GiB + ;; + + kib) + mem_used=$((mem_used * 1024)) + mem_total=$((mem_total * 1024)) + mem_label=KiB + ;; + esac + memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}" # Bars. @@ -4817,6 +4843,7 @@ INFO: --song_format format Print the song data in a specific format (see config file). --song_shorthand on/off Print the Artist/Album/Title on separate lines. --memory_percent on/off Display memory percentage. + --memory_unit kib/mib/gib Memory output unit. --music_player player-name Manually specify a player to use. Available values are listed in the config file @@ -5009,6 +5036,7 @@ get_args() { "--song_shorthand") song_shorthand="$2" ;; "--music_player") music_player="$2" ;; "--memory_percent") memory_percent="$2" ;; + "--memory_unit") memory_unit="$2" ;; "--cpu_temp") cpu_temp="$2" [[ "$cpu_temp" == "on" ]] && cpu_temp="C" From 5413aff1dffc03ea2d1eb72bc93392b0c0034de6 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 1 Aug 2020 09:30:01 +0200 Subject: [PATCH 386/550] wallpaper: Add LXQt desktop (#1516) --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index 8537340c..e4ef1c75 100755 --- a/neofetch +++ b/neofetch @@ -3986,6 +3986,11 @@ END image=$(awk -F '=' '$1 == "Image" { print $2 }' "$image") ;; + "LXQt"*) + image="$XDG_CONFIG_HOME/pcmanfm-qt/lxqt/settings.conf" + image="$(awk -F '=' '$1 == "Wallpaper" {print $2}' "$image")" + ;; + *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" From fe921d7d173f783009e40b5f46e8ff0a74b05e31 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 1 Aug 2020 10:31:23 +0300 Subject: [PATCH 387/550] docs: update --- neofetch | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 8537340c..3d6fdb36 100755 --- a/neofetch +++ b/neofetch @@ -4926,16 +4926,17 @@ ASCII: Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, - OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, - Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, - Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, - Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, - Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, - Siduction, Slackware, SliTaz, SmartOS, Solus, Source_Mage, Sparky, - Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, - SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, - Ubuntu-Studio, Ubuntu, Venom, Void, Obarun, windows10, Windows7, - Xubuntu, Zorin, and IRIX have ascii logos + OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, + Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, + Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, + Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, + Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, + Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, + SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, + openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, + Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, + Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, + and IRIX have ascii logos NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. From 60d07dee6b76769d8c487a40639fb7b5a1a7bc85 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 2 Aug 2020 21:37:41 +0300 Subject: [PATCH 388/550] neofetch: 7.0.0 --- neofetch | 2 +- neofetch.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index ff0bd3ad..1e4b5646 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version=7.0.0 +version=7.1.0 # Fallback to a value of '5' for shells which support bash # but do not set the 'BASH_' shell variables (osh). diff --git a/neofetch.1 b/neofetch.1 index 159d8336..21c54782 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.15. -.TH NEOFETCH "1" "May 2020" "Neofetch 7.0.0" "User Commands" +.TH NEOFETCH "1" "Aug 2020" "Neofetch 7.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From a8c9214b994e9561fb01edfe0800963ba4e4cff2 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 3 Aug 2020 18:22:39 +0200 Subject: [PATCH 389/550] ascii: Update Lubuntu and Xubuntu (#1518) * ascii: Update Lubuntu * ascii: Update Xubuntu --- neofetch | 84 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/neofetch b/neofetch index 1e4b5646..9367b7fd 100755 --- a/neofetch +++ b/neofetch @@ -7745,28 +7745,28 @@ EOF ;; "Lubuntu"*) - set_colors 4 7 1 + set_colors 27 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-mddhhhhhhhhhddmss` - ./mdhhhhhhhhhhhhhhhhhhhhhh. - :mdhhhhhhhhhhhhhhhhhhhhhhhhhhhm` - :ymhhhhhhhhhhhhhhhyyyyyyhhhhhhhhhy: - `odhyyyhhhhhhhhhy+-````./syhhhhhhhho` - `hhy..:oyhhhhhhhy-`:osso/..:/++oosyyyh` - dhhs .-/syhhhhs`shhhhhhyyyyyyyyyyyyhs -:hhhy` yso/:+syhy/yhhhhhshhhhhhhhhhhhhh: -hhhhho. +hhhys++oyyyhhhhh-yhhhhhhhhhhhhhs -hhhhhhs-`/syhhhhyssyyhhhh:-yhhhhhhhhhhhhh -hhhhhhs `:/+ossyyhyyhhhhs -yhhhhhhhhhhhh -hhhhhhy/ `syyyssyyyyhhhhhh: :yhhhhhhhhhhs -:hhhhhhyo:-/osyhhhhhhhhhhho ohhhhhhhhhh: - sdhhhhhhhyyssyyhhhhhhhhhhh+ +hhhhhhhhs - `shhhhhhhhhhhhhhhhhhhhhhy+` .yhhhhhhhh` - +sdhhhhhhhhhhhhhhhhhyo/. `/yhhhhhhhd` - `:shhhhhhhhhh+---..``.:+yyhhhhhhh: - `:mdhhhhhh/.syssyyyyhhhhhhhd:` - `+smdhhh+shhhhhhhhhhhhdm` - `sNmdddhhhhhhhddm-` +${c1} `.:/ossyyyysso/:. + `.:yyyyyyyyyyyyyyyyyy:.` + .:yyyyyyyyyyyyyyyyyyyyyyyy:. + .:yyyyyyyyyyyyyyyyyyyyyyyyyyyy:. + -yyyyyyyyyyyyyy${c2}+hNMMMNh+${c1}yyyyyyyyy- + :yy${c2}mNy+${c1}yyyyyyyy${c2}+Nmso++smMdhyysoo+${c1}yy: + -yy${c2}+MMMmmy${c1}yyyyyy${c2}hh${c1}yyyyyyyyyyyyyyyyyyy- +.yyyy${c2}NMN${c1}yy${c2}shhs${c1}yyy${c2}+o${c1}yyyyyyyyyyyyyyyyyyyy. +:yyyy${c2}oNM+${c1}yyyy${c2}+sso${c1}yyyyyyy${c2}ss${c1}yyyyyyyyyyyyy: +:yyyyy${c2}+dNs${c1}yyyyyyy${c2}++${c1}yyyyy${c2}oN+${c1}yyyyyyyyyyyy: +:yyyyy${c2}oMMmhysso${c1}yyyyyyyyyy${c2}mN+${c1}yyyyyyyyyyy: +:yyyyyy${c2}hMm${c1}yyyyy${c2}+++${c1}yyyyyyy${c2}+MN${c1}yyyyyyyyyyy: +.yyyyyyy${c2}ohmy+${c1}yyyyyyyyyyyyy${c2}NMh${c1}yyyyyyyyyy. + -yyyyyyyyyy${c2}++${c1}yyyyyyyyyyyy${c2}MMh${c1}yyyyyyyyy- + :yyyyyyyyyyyyyyyyyyyyy${c2}+mMN+${c1}yyyyyyyy: + -yyyyyyyyyyyyyyyyy${c2}+sdMMd+${c1}yyyyyyyy- + .:yyyyyyyyy${c2}hmdmmNMNdy+${c1}yyyyyyyy:. + .:yyyyyyy${c2}my${c1}yyyyyyyyyyyyyyy:. + `.:yyyy${c2}s${c1}yyyyyyyyyyyyy:.` + `.:/oosyyyysso/:.` EOF ;; @@ -10281,28 +10281,28 @@ EOF ;; "Xubuntu"*) - set_colors 4 7 1 + set_colors 20 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` +${c1} `.:/ossyyyysso/:. + `.yyyyyyyyyyyyyyyyyyyy.` + `yyyyyyyyyyyyyyyyyyyyyyyyyy` + `yyyyyyyyyyyyyyyyyyyy${c2}::${c1}yyyyyyyy` + .yyyyyyyyyyy${c2}/+:${c1}yyyyyyy${c2}ds${c1}yyy${c2}+y${c1}yyyy. + yyyyyyy${c2}:o/${c1}yy${c2}dMMM+${c1}yyyyy${c2}/M+${c1}y${c2}:hM+${c1}yyyyyy + yyyyyyy${c2}+MMMy${c1}y${c2}mMMMh${c1}yyyyy${c2}yM::mM+${c1}yyyyyyyy +`yyyyyyy${c2}+MMMMysMMMd${c1}yyyyy${c2}dh:mN+${c1}yyyyyyyyy` +yyyyyyyy${c2}:NMMMMmMMMMmmdhyy+/y:${c1}yyyyyyyyyyy +yyyyyyyy${c2}+MMMMMMMMMMMMMMMMMMNho:${c1}yyyyyyyyy +yyyyyyyy${c2}mMMMMMMMMMMMMMMMMMMMMMMy${c1}yyyyyyyy +yyyyyyy${c2}+MMMMMMMMMMMMMMMMMMMMMMMM/${c1}yyyyyyy +`yyyyyy${c2}sMMMMMMMMMMMMMMMMMMMMMMmo${c1}yyyyyyy` + yyyyyy${c2}oMMMMMMMMMMMMMMMMMMMmy+${c1}yyyyyyyyy + yyyyy${c2}:mMMMMMMMMMMMMMMNho/${c1}yyyyyyyyyyy + .yyyy${c2}:yNMMMMMMMNdyo:${c1}yyyyyyyyyyyyy. + `yyyyyy${c2}:/++/::${c1}yyyyyyyyyyyyyyyyy` + `yyyyyyyyyyyyyyyyyyyyyyyyyy` + `.yyyyyyyyyyyyyyyyyyyy.` + `.:/oosyyyysso/:.` EOF ;; "IRIX"*) From bed4e9a8a117e6be20659ab05af00dab3e3ecb20 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 3 Aug 2020 21:38:38 +0200 Subject: [PATCH 390/550] ascii: revert colors (#1519) --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 9367b7fd..3a7562c7 100755 --- a/neofetch +++ b/neofetch @@ -7745,7 +7745,7 @@ EOF ;; "Lubuntu"*) - set_colors 27 7 1 + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} `.:/ossyyyysso/:. `.:yyyyyyyyyyyyyyyyyy:.` @@ -10281,7 +10281,7 @@ EOF ;; "Xubuntu"*) - set_colors 20 7 1 + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} `.:/ossyyyysso/:. `.yyyyyyyyyyyyyyyyyyyy.` From 9a82c8cac29f71323d12b379309daadc13af5d25 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 4 Aug 2020 16:27:58 +0200 Subject: [PATCH 391/550] Update Ubuntu Cinnamon logo (#1521) --- neofetch | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 3a7562c7..ac7f2c3e 100755 --- a/neofetch +++ b/neofetch @@ -9962,28 +9962,28 @@ EOF ;; "Ubuntu Cinnamon"* | "Ubuntu-Cinnamon"*) - set_colors 1 + set_colors 1 7 read -rd '' ascii_data <<'EOF' -${c1} .-:/++oooo++/:-. - `:/oooooooooooooooooo/-` - -/oooooooooooooooooooo+ooo/- - .+oooooooooooooooooo+/-`.ooooo+. - :oooooooooooo+//:://++:. .ooooooo: - /oooooooooo+o:`.----.``./+/oooooooo/ - /ooooooooo+. +ooooooooo+:``/ooooooooo/ -.ooooooooo: .+ooooooooooooo- -ooooooooo. -/oooooo/o+ .ooooooo:`+oo+ooo- :oooooooo/ -ooo+:. .o: :ooooo:` .+/. ./o+:/ooooooooo -oooo/-`.o: :ooo/` `/+. ./.:ooooooooo -/oooooo+o+``++. `:+- /oooooooo/ -.ooooooooo/`` -+:` :ooooooooo. - /ooooooooo+--+/` .+ooooooooo/ - /ooooooooooo+.` `.:++:oooooooo/ - :oooooooooooooo++++oo+-` .ooooooo: - .+ooooooooooooooooooo+:..ooooo+. - -/oooooooooooooooooooooooo/- - `-/oooooooooooooooooo/:` - .-:/++oooo++/:-. +${c1} .-/+oooooooo+/-. + `:+oooooooooooooooooo+:` + -+oooooooooooooooooooooooo+- + .ooooooooooooooooooo${c2}:ohNd${c1}oooooo. + /oooooooooooo${c2}:/+oo++:/ohNd${c1}ooooooo/ + +oooooooooo${c2}:osNdhyyhdNNh+:+${c1}oooooooo+ + /ooooooooo${c2}/dN/${c1}ooooooooo${c2}/sNNo${c1}ooooooooo/ +.ooooooooo${c2}oMd:${c1}oooooooooooo${c2}:yMy${c1}ooooooooo. ++ooooo${c2}:+o/Md${c1}oooooo${c2}:sm/${c1}oo/ooo${c2}yMo${c1}oooooooo+ +ooo${c2}:sdMdosMo${c1}ooooo${c2}oNMd${c1}//${c2}dMd+${c1}o${c2}:so${c1}ooooooooo +oooo${c2}+ymdosMo${c1}ooo${c2}+mMm${c1}+/${c2}hMMMMMh+hs${c1}ooooooooo ++oooooo${c2}:${c1}:${c2}/Nm:${c1}/${c2}hMNo${c1}:y${c2}MMMMMMMMMM+${c1}oooooooo+ +.ooooooooo${c2}/NNMNy${c1}:o${c2}NMMMMMMMMMMo${c1}ooooooooo. +/oooooooooo${c2}:yh:${c1}+m${c2}MMMMMMMMMMd/${c1}ooooooooo/ + +oooooooooo${c2}+${c1}/h${c2}mMMMMMMNds//o${c1}oooooooo+ + /oooooooooooo${c2}+:////:o/ymMd${c1}ooooooo/ + .oooooooooooooooooooo${c2}/sdh${c1}oooooo. + -+oooooooooooooooooooooooo+- + `:+oooooooooooooooooo+:` + .-/+oooooooo+/-. EOF ;; From db6fa4c374bd7a3fdbfa86084824c721855b4103 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 4 Aug 2020 19:17:22 +0200 Subject: [PATCH 392/550] Update Ubuntu Mate logo (#1522) --- neofetch | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index ac7f2c3e..de0441fe 100755 --- a/neofetch +++ b/neofetch @@ -10038,26 +10038,27 @@ EOF "Ubuntu MATE"* | "Ubuntu-MATE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` +${c1} .:/+oossssoo+/:.` + `:+ssssssssssssssssss+:` + -+sssssssssssssss${c2}y${c1}ssssssss+- + .osssssssssssss${c2}yy${c1}ss${c2}mMmh${c1}ssssssso. + /sssssssss${c2}ydmNNNmmd${c1}s${c2}mMMMMNdy${c1}sssss/ + `+ssssssss${c2}hNNdy${c1}sssssss${c2}mMMMMNdy${c1}ssssss+` + +sssssss${c2}yNNh${c1}ss${c2}hmNNNNm${c1}s${c2}mMmh${c1}s${c2}ydy${c1}sssssss+ +-sssss${c2}y${c1}ss${c2}Nm${c1}ss${c2}hNNh${c1}ssssss${c2}y${c1}s${c2}hh${c1}ss${c2}mMy${c1}sssssss- ++ssss${c2}yMNdy${c1}ss${c2}hMd${c1}ssssssssss${c2}hMd${c1}ss${c2}NN${c1}sssssss+ +sssss${c2}yMMMMMmh${c1}sssssssssssss${c2}NM${c1}ss${c2}dMy${c1}sssssss +sssss${c2}yMMMMMmhy${c1}ssssssssssss${c2}NM${c1}ss${c2}dMy${c1}sssssss ++ssss${c2}yMNdy${c1}ss${c2}hMd${c1}ssssssssss${c2}hMd${c1}ss${c2}NN${c1}sssssss+ +-sssss${c2}y${c1}ss${c2}Nm${c1}ss${c2}hNNh${c1}ssssssss${c2}dh${c1}ss${c2}mMy${c1}sssssss- + +sssssss${c2}yNNh${c1}ss${c2}hmNNNNm${c1}s${c2}mNmh${c1}s${c2}ymy${c1}sssssss+ + +ssssssss${c2}hNNdy${c1}sssssss${c2}mMMMMmhy${c1}ssssss+ + /sssssssss${c2}ydmNNNNmd${c1}s${c2}mMMMMNdh${c1}sssss/ + .osssssssssssss${c2}yy${c1}ss${c2}mMmdy${c1}sssssso. + -+sssssssssssssss${c2}y${c1}ssssssss+- + `:+ssssssssssssssssss+:` + .:/+oossssoo+/:. + EOF ;; From 286ef32f4557ab221a079631b764573d1a8cd5e5 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 7 Aug 2020 17:17:28 +0200 Subject: [PATCH 393/550] Add LibreELEC logo (#1526) --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index de0441fe..0439d1ca 100755 --- a/neofetch +++ b/neofetch @@ -7664,6 +7664,32 @@ EOF EOF ;; + "LibreELEC"*) + set_colors 2 3 7 14 13 + read -rd '' ascii_data <<'EOF' +${c1} :+ooo/. ${c2}./ooo+: +${c1} :+ooooooo/. ${c2}./ooooooo+: +${c1} :+ooooooooooo:${c2}:ooooooooooo+: +${c1} :+ooooooooooo+- ${c2}-+ooooooooooo+: +${c1} :+ooooooooooo+- ${c3}-- ${c2}-+ooooooooooo+: +${c1}.+ooooooooooo+- ${c3}:+oo+: ${c2}-+ooooooooooo+- +${c1}-+ooooooooo+- ${c3}:+oooooo+: ${c2}-+oooooooooo- +${c1} :+ooooo+- ${c3}:+oooooooooo+: ${c2}-+oooooo: +${c1} :+o+- ${c3}:+oooooooooooooo+: ${c2}-+oo: +${c4} ./ ${c3}:oooooooooooooooooo: ${c5}/. +${c4} ./oo+: ${c3}-+oooooooooooooo+- ${c5}:+oo/. +${c4} ./oooooo+: ${c3}-+oooooooooo+- ${c5}:+oooooo/. +${c4}-oooooooooo+: ${c3}-+oooooo+- ${c5}:+oooooooooo- +${c4}.+ooooooooooo+: ${c3}-+oo+- ${c5}:+ooooooooooo+. +${c4} -+ooooooooooo+: ${c3}.. ${c5}:+ooooooooooo+- +${c4} -+ooooooooooo+: ${c5}:+ooooooooooo+- +${c4} -+oooooooooo+:${c5}:+oooooooooo+- +${c4} -+oooooo+: ${c5}:+oooooo+- +${c4} -+oo+: ${c5}:+oo+- +${c4} .. ${c5}.. +EOF + ;; + "Linux") set_colors fg 8 3 read -rd '' ascii_data <<'EOF' From e33625ba92f088403940beecedde4dc4006e4c15 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 7 Aug 2020 18:16:34 +0200 Subject: [PATCH 394/550] song: Switch Exaile to get_song_dbus (#1528) --- neofetch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 0439d1ca..129fc194 100755 --- a/neofetch +++ b/neofetch @@ -2767,6 +2767,7 @@ get_song() { "xnoise"*) get_song_dbus "xnoise" ;; "tauonmb"*) get_song_dbus "tauon" ;; "olivia"*) get_song_dbus "olivia" ;; + "exaile"*) get_song_dbus "exaile" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "io.elementary.music"*) get_song_dbus "Music" ;; @@ -2811,16 +2812,6 @@ get_song() { END {print a " \n" b " \n"t}')" ;; - "exaile"*) - # NOTE: Exaile >= 4.0.0 will support mpris2. - song="$(dbus-send --print-reply --dest=org.exaile.Exaile \ - /org/exaile/Exaile org.exaile.Exaile.Query | - awk -F ':' '{sub(",[^,]*$", "", $3); t=$3; - sub(",[^,]*$", "", $4); a=$4; - sub(",[^,]*$", "", $5); b=$5} - END {print a " \n" b " \n" t}')" - ;; - "muine"*) song="$(dbus-send --print-reply --dest=org.gnome.Muine /org/gnome/Muine/Player \ org.gnome.Muine.Player.GetCurrentSong | From d96ed38f25a394e214b01ab34080baa09ff3d12f Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 17 Aug 2020 20:03:35 +0200 Subject: [PATCH 395/550] term_font: fix alacritty (#1535) --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 129fc194..9d634597 100755 --- a/neofetch +++ b/neofetch @@ -3206,7 +3206,8 @@ get_term_font() { [[ -f "${confs[0]}" ]] || return - term_font="$(awk -F ':|#' '/normal:/ {getline; print}' "${confs[0]}")" + term_font="$(awk '/normal:/ {while (!/family:/ || /#/) + {if (!getline) {exit}} print; exit}' "${confs[0]}")" term_font="${term_font/*family:}" term_font="${term_font/$'\n'*}" term_font="${term_font/\#*}" From bfbefc7f6bacf3016a973e8c874b2346fae539e1 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 19 Aug 2020 08:54:41 +0200 Subject: [PATCH 396/550] docs: update (#1538) --- neofetch | 2 +- neofetch.1 | 63 +++++++++++++++++++++++++++++------------------------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index 9d634597..4a380962 100755 --- a/neofetch +++ b/neofetch @@ -4854,7 +4854,7 @@ TEXT FORMATTING: COLOR BLOCKS: --color_blocks on/off Enable/Disable the color blocks - --col_offset auto/num Left-padding of color blocks + --col_offset auto/num Left-padding of color blocks --block_width num Width of color blocks in spaces --block_height num Height of color blocks in lines --block_range num num Range of colors to print as blocks diff --git a/neofetch.1 b/neofetch.1 index 21c54782..5cadd702 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.15. -.TH NEOFETCH "1" "Aug 2020" "Neofetch 7.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. +.TH NEOFETCH "1" "August 2020" "Neofetch 7.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -161,6 +161,9 @@ Print the Artist/Album/Title on separate lines. \fB\-\-memory_percent\fR on/off Display memory percentage. .TP +\fB\-\-memory_unit\fR kib/mib/gib +Memory output unit. +.TP \fB\-\-music_player\fR player\-name Manually specify a player to use. Available values are listed in the config file @@ -259,6 +262,9 @@ Shortcut to use 'jp2a' backend. \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 @@ -288,33 +294,32 @@ Colors to print the ascii art Which Distro's ascii art to print .TP NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, -"AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, -ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, -BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, -BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, -Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, -Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, -DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, -EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, -FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, -gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, -Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, -Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, -LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, -Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, -Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, -Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, -PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, -Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, -Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, -Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, -openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, -Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, -Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX -have ascii logos +"AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, +ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, +Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, +BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, +Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, +Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, +DracOS, DarkOs, DragonFly, Drauger, Elementary, EndeavourOS, Endless, +EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, +Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, +GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, +KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, +LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, +Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, +Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, +OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, +OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, +Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, +Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, +Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, +Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, +Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, +SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, +openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, +Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, +Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, +and IRIX have ascii logos .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP From 5f8ce9bbc462c28f5976e14245e7df5a236e52fc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 Sep 2020 08:27:48 +0300 Subject: [PATCH 397/550] packages: Add support for carbs --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 4a380962..0df70a8a 100755 --- a/neofetch +++ b/neofetch @@ -1489,6 +1489,7 @@ get_packages() { Linux|BSD|"iPhone OS"|Solaris) # Package Manager Programs. has kiss && tot kiss l + has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never has dpkg && tot dpkg-query -f '.\n' -W has rpm && tot rpm -qa From af4cf16bf4ec5c9ad4a93d71f715fdf14c88db6d Mon Sep 17 00:00:00 2001 From: ncmprhnsbl Date: Thu, 17 Sep 2020 21:58:37 +1000 Subject: [PATCH 398/550] add song= support for MellowPlayer using get_song_dbus (#1558) * add song= support for MellowPlayer using get_song_dbus * adjusted indent for mellowplayer get_song_dbus Co-authored-by: ncmprhnsb1 --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 0df70a8a..bce4e2a9 100755 --- a/neofetch +++ b/neofetch @@ -508,6 +508,7 @@ disk_percent="on" # iTunes # juk # lollypop +# MellowPlayer # mocp # mopidy # mpd @@ -2696,6 +2697,7 @@ get_song() { "iTunes" "juk" "lollypop" + "MellowPlayer" "mocp" "mopidy" "mpd" @@ -2772,6 +2774,7 @@ get_song() { "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "io.elementary.music"*) get_song_dbus "Music" ;; + "MellowPlayer"*) get_song_dbus "MellowPlayer3" ;; "mpd"* | "mopidy"*) song="$(mpc -f '%artist% \n%album% \n%title%' current "${mpc_args[@]}")" From 8a9eacbab8653bb5f4546d51e50af3b15518caaa Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 19 Sep 2020 23:47:15 +0200 Subject: [PATCH 399/550] os: Add Live Raizo (#1560) --- neofetch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/neofetch b/neofetch index bce4e2a9..3c27b00e 100755 --- a/neofetch +++ b/neofetch @@ -8108,6 +8108,31 @@ ${c2} ``-:::::-`` EOF ;; + "Live Raizo"* | "Live_Raizo"*) + set_colors 3 + read -rd '' ascii_data <<'EOF' +${c1} `......` + -+shmNMMMMMMNmhs/. + :smMMMMMmmhyyhmmMMMMMmo- + -hMMMMd+:. `----` .:odMMMMh- + `hMMMN+. .odNMMMMMMNdo. .yMMMMs` + hMMMd. -dMMMMmdhhdNMMMNh` .mMMMh +oMMMm` :MMMNs.:sddy:-sMMMN- `NMMM+ +mMMMs dMMMo sMMMMMMd yMMMd sMMMm +----` .---` oNMMMMMh `---. .---- + .sMMy: + /MM/ + +dMMms. + hMMMMMMN + `dMMMMMMm: + .+ss+sMNysMMoomMd+ss+. + +MMMMMMN` +MM/ hMMMMMNs + sMMMMMMm-hNMMMd-hMMMMMMd + :yddh+`hMMMMMMN :yddy/` + .hMMMMd: + `..` +EOF + ;; "mx_small"*) set_colors 4 6 7 From f74746d5b94727587fccd43820396335e0d928b0 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 20 Sep 2020 18:28:17 +0200 Subject: [PATCH 400/550] os: Add Quibian (#1561) --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 3c27b00e..e8de6b06 100755 --- a/neofetch +++ b/neofetch @@ -9110,6 +9110,30 @@ ${c1} `..--..` EOF ;; + "Quibian"*) + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `.--::::::::--.` + `.-:::-..`` ``..-::-.` + .::::-` .${c2}+${c1}:`` `.-::.` + .::::.` -::::::-` `.::. + `-:::-` -:::::::::--..`` .::` + `::::- .${c2}oy${c1}:::::::---.```.: `::` + -:::: `.-:::::::::::-.``` `:: +.::::.`-:::::::::::::. `:. +-::::.::::::::::::::: -: +::::::::::::::::::::` `: +:::::::::::::::::::- `: +::::::::::::::::::: -- +.:::::::::::::::::` `:` +`::::::::::::::::: -` + .:::::::::::::::- -` + `::::::::::::::- `.` + .::::::::::::- `` + `.--:::::-. +EOF + ;; + "Radix"*) set_colors 1 2 read -rd '' ascii_data <<'EOF' From b83a48a60f2a06b87b4d6532f3e2cc1df6d0795e Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 25 Sep 2020 13:36:46 +0200 Subject: [PATCH 401/550] uptime: Fix shorthand off (#1564) --- neofetch | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index e8de6b06..c9a3e5cd 100755 --- a/neofetch +++ b/neofetch @@ -1433,7 +1433,7 @@ get_uptime() { d="$((s / 60 / 60 / 24)) days" h="$((s / 60 / 60 % 24)) hours" - m="$((s / 60 % 60)) mins" + m="$((s / 60 % 60)) minutes" # Remove plural if < 2. ((${d/ *} == 1)) && d=${d/s} @@ -1447,20 +1447,24 @@ get_uptime() { uptime=${d:+$d, }${h:+$h, }$m uptime=${uptime%', '} - uptime=${uptime:-$s secs} + uptime=${uptime:-$s seconds} # Make the output of uptime smaller. case $uptime_shorthand in - on) ;; + on) + uptime=${uptime/ minutes/ mins} + uptime=${uptime/ minute/ min} + uptime=${uptime/ seconds/ secs} + ;; tiny) uptime=${uptime/ days/d} uptime=${uptime/ day/d} uptime=${uptime/ hours/h} uptime=${uptime/ hour/h} - uptime=${uptime/ mins/m} - uptime=${uptime/ min/m} - uptime=${uptime/ secs/s} + uptime=${uptime/ minutes/m} + uptime=${uptime/ minute/m} + uptime=${uptime/ seconds/s} uptime=${uptime//,} ;; esac From 6f8d365deb07accaa728ffe0850abca53f561ee5 Mon Sep 17 00:00:00 2001 From: Simon Gredal Date: Sun, 27 Sep 2020 06:39:11 +0200 Subject: [PATCH 402/550] Fix CPU Temp. not showing up on Raspberry Pi (#1566) Added another possible name to the regex for finding cpu temperature. This was tested on a Raspberry Pi 4 running Arch Linux ARM. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c9a3e5cd..eaefbf23 100755 --- a/neofetch +++ b/neofetch @@ -2103,7 +2103,7 @@ get_cpu() { # Select the right temperature file. for temp_dir in /sys/class/hwmon/*; do - [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power|k10temp) ]] && { + [[ "$(< "${temp_dir}/name")" =~ (cpu_thermal|coretemp|fam15h_power|k10temp) ]] && { temp_dirs=("$temp_dir"/temp*_input) temp_dir=${temp_dirs[0]} break From 1a4fdc346f0c914585a282c8e7e2ed53af3fbc67 Mon Sep 17 00:00:00 2001 From: j-james <35242550+j-james@users.noreply.github.com> Date: Tue, 29 Sep 2020 21:44:09 -0700 Subject: [PATCH 403/550] Images: Reimplement catimg support (#1570) Fixes broken size parameter from the last implementation --- neofetch | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index eaefbf23..7a8c22fb 100755 --- a/neofetch +++ b/neofetch @@ -744,7 +744,7 @@ disk_display="off" # Image backend. # # Default: 'ascii' -# Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off', +# Values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', 'off', # 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' # Flag: --backend image_backend="ascii" @@ -881,6 +881,14 @@ crop_offset="center" # --size image_size="auto" +# Catimg block size. +# Control the resolution of catimg. +# +# Default: '2' +# Values: '1', '2' +# Flags: --catimg_size +catimg_size="2" + # Gap between image and text # # Default: '3' @@ -3833,7 +3841,7 @@ image_backend() { "ascii") print_ascii ;; "off") image_backend="off" ;; - "caca" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ + "caca" | "catimg" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot") get_image_source @@ -3858,9 +3866,9 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." - err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty', - 'off', 'sixel', 'pot', 'pixterm', 'termpix', 'tycat', - 'w3m')" + err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', + 'kitty', 'off', 'sixel', 'pot', 'pixterm', 'termpix', + 'tycat', 'w3m')" err "Image: Falling back to ascii mode." print_ascii ;; @@ -4248,6 +4256,10 @@ display_image() { "$image" ;; + "catimg") + catimg -w "$((width*catimg_size / font_width))" -r "$catimg_size" "$image" + ;; + "chafa") chafa --stretch --size="$((width / font_width))x$((height / font_height))" "$image" ;; @@ -4885,8 +4897,8 @@ BARS: IMAGE BACKEND: --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', - 'off', 'sixel', 'tycat', 'w3m', 'kitty' + Possible values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', + 'iterm2', 'off', 'sixel', 'tycat', 'w3m', 'kitty' --source 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] @@ -4896,6 +4908,7 @@ IMAGE BACKEND: NEW: neofetch --ascii \"\$(fortune | cowsay -W 30)\" --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. --chafa source Shortcut to use 'chafa' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. @@ -4969,6 +4982,7 @@ IMAGE: in some terminals emulators when using image mode. --size 00px | --size 00% How to size the image. Possible values: auto, 00px, 00%, none + --catimg_size 1/2 Change the resolution of catimg. --crop_mode mode Which crop mode to use Takes the values: normal, fit, fill --crop_offset value Change the crop offset for normal mode. @@ -5120,8 +5134,8 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ - "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" |\ + "--pot" | "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" case $2 in "-"* | "") ;; @@ -5132,6 +5146,7 @@ get_args() { # Image options "--loop") image_loop="on" ;; "--image_size" | "--size") image_size="$2" ;; + "--catimg_size") catimg_size="$2" ;; "--crop_mode") crop_mode="$2" ;; "--crop_offset") crop_offset="$2" ;; "--xoffset") xoffset="$2" ;; From 4b5f4e33beec42db4d3278ab92c7549656dc8202 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 13:42:05 +0300 Subject: [PATCH 404/550] de/wm: Fix Windows 10 issues. Closes #1571, #1573 --- neofetch | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 0df70a8a..5ae16b32 100755 --- a/neofetch +++ b/neofetch @@ -1688,8 +1688,17 @@ get_de() { Windows) case $distro in - "Windows 8"*|"Windows 10"*) de="Modern UI/Metro" ;; - *) de=Aero + "Windows 10"*) + de=Fluent + ;; + + "Windows 8"*) + de=Metro + ;; + + *) + de=Aero + ;; esac ;; @@ -1870,15 +1879,21 @@ get_wm() { ;; Windows) - wm=$(tasklist | grep -m 1 -o -F \ - -e bugn \ - -e Windawesome \ - -e blackbox \ - -e emerge \ - -e litestep) + wm=$( + tasklist | - [[ $wm == blackbox ]] && wm="bbLean (Blackbox)" - wm=${wm:+$wm, }Explorer + grep -Fom 1 \ + -e bugn \ + -e Windawesome \ + -e blackbox \ + -e emerge \ + -e litestep + ) + + [[ $wm == blackbox ]] && + wm="bbLean (Blackbox)" + + wm=${wm:+$wm, }DWM.exe ;; FreeMiNT) From 77bac34cc5f406373ab31615a67f3eeb4c2609da Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 13:53:30 +0300 Subject: [PATCH 405/550] general: drop cpu_usage. Always been unreliable. Never worked well. Closes #1551 --- neofetch | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/neofetch b/neofetch index 4f6a04a6..9f824816 100755 --- a/neofetch +++ b/neofetch @@ -75,7 +75,6 @@ print_info() { info "Memory" memory # info "GPU Driver" gpu_driver # Linux/macOS only - # info "CPU Usage" cpu_usage # info "Disk" disk # info "Battery" battery # info "Font" font @@ -2365,47 +2364,6 @@ get_cpu() { fi } -get_cpu_usage() { - case $os in - "Windows") - cpu_usage="$(wmic cpu get loadpercentage)" - cpu_usage="${cpu_usage/LoadPercentage}" - cpu_usage="${cpu_usage//[[:space:]]}" - ;; - - *) - # Get CPU cores if unset. - if [[ "$cpu_cores" != "logical" ]]; then - case $os in - "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; - "Mac OS X"|"macOS") cores="$(sysctl -n hw.logicalcpu_max)" ;; - "BSD") cores="$(sysctl -n hw.ncpu)" ;; - "Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; - "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; - "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; - "IRIX") cores="$(sysconf NPROC_ONLN)" ;; - "FreeMiNT") cores="$(sysctl -n hw.ncpu)" ;; - - "AIX") - cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" - ;; - esac - fi - - cpu_usage="$(ps aux | awk 'BEGIN {sum=0} {sum+=$3}; END {print sum}')" - cpu_usage="$((${cpu_usage/\.*} / ${cores:-1}))" - ;; - esac - - # Print the bar. - case $cpu_display in - "bar") cpu_usage="$(bar "$cpu_usage" 100)" ;; - "infobar") cpu_usage="${cpu_usage}% $(bar "$cpu_usage" 100)" ;; - "barinfo") cpu_usage="$(bar "$cpu_usage" 100)${info_color} ${cpu_usage}%" ;; - *) cpu_usage="${cpu_usage}%" ;; - esac -} - get_gpu() { case $os in "Linux") @@ -5258,7 +5216,6 @@ get_args() { info "GPU Driver" gpu_driver info "Memory" memory - info "CPU Usage" cpu_usage info "Disk" disk info "Battery" battery info "Font" font @@ -5311,6 +5268,7 @@ get_simple() { old_functions() { # Removed functions for backwards compatibility. get_line_break() { :; } + get_cpu_usage() { :; } } get_distro_ascii() { From fb572770362144915e3b47283c09f4a97ed31c3f Mon Sep 17 00:00:00 2001 From: Alan Griffiths Date: Sun, 4 Oct 2020 12:04:48 +0100 Subject: [PATCH 406/550] Better handling of Wayland compositors (#1539) * Better handling of Wayland compositors * Reinstate setting ps_flags, it's used elsewhere * Try another incantation * Try another incantation * Try another incantation * Use short options and a newline to reduce line-length * Rework to handle the "better way" failing on some systems and fall back to the old method (which has the virtue of working most of the time). --- neofetch | 66 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/neofetch b/neofetch index 9f824816..9752e09a 100755 --- a/neofetch +++ b/neofetch @@ -1815,35 +1815,43 @@ get_wm() { *) ps_flags=(-e) ;; esac - if [[ $WAYLAND_DISPLAY ]]; then - wm=$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ - -e arcan \ - -e asc \ - -e clayland \ - -e dwc \ - -e fireplace \ - -e gnome-shell \ - -e greenfield \ - -e grefsen \ - -e kwin \ - -e lipstick \ - -e maynard \ - -e mazecompositor \ - -e motorcar \ - -e orbital \ - -e orbment \ - -e perceptia \ - -e rustland \ - -e sway \ - -e ulubis \ - -e velox \ - -e wavy \ - -e way-cooler \ - -e wayfire \ - -e wayhouse \ - -e westeros \ - -e westford \ - -e weston) + if [[ -O "${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}" ]]; then + if tmp_pid="$(lsof -t "${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}" 2>&1)" || + tmp_pid="$(fuser "${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}" 2>&1)"; then + wm="$(ps -p "${tmp_pid}" -ho comm=)" + else + # lsof may not exist, or may need root on some systems. Similarly fuser. + # On those systems we search for a list of known window managers, this can mistakenly + # match processes for another user or session and will miss unlisted window managers. + wm=$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ + -e arcan \ + -e asc \ + -e clayland \ + -e dwc \ + -e fireplace \ + -e gnome-shell \ + -e greenfield \ + -e grefsen \ + -e kwin \ + -e lipstick \ + -e maynard \ + -e mazecompositor \ + -e motorcar \ + -e orbital \ + -e orbment \ + -e perceptia \ + -e rustland \ + -e sway \ + -e ulubis \ + -e velox \ + -e wavy \ + -e way-cooler \ + -e wayfire \ + -e wayhouse \ + -e westeros \ + -e westford \ + -e weston) + fi elif [[ $DISPLAY && $os != "Mac OS X" && $os != "macOS" && $os != FreeMiNT ]]; then type -p xprop &>/dev/null && { From a6137b26dbc9c4527f5468d5804652c729f47cb6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 14:11:56 +0300 Subject: [PATCH 407/550] de: Display Wayland if detected. Closes #1471 --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9f824816..764a8415 100755 --- a/neofetch +++ b/neofetch @@ -1800,9 +1800,15 @@ get_de() { de_ver=${de_ver/* } de_ver=${de_ver//\"} - de="$de $de_ver" + de+=" $de_ver" fi + # TODO: + # - New config option + flag: --de_display_server on/off ? + # - Add display of X11, Arcan and anything else relevant. + [[ $de && $WAYLAND_DISPLAY ]] && + de+=" (Wayland)" + de_run=1 } From a4d9c557b3c7e55510bf4009537bc4963760e4d2 Mon Sep 17 00:00:00 2001 From: Julian Torreno Date: Sun, 4 Oct 2020 07:26:51 -0400 Subject: [PATCH 408/550] Remove extra newlines from get_cols (#1449) Co-authored-by: Julian Torreno --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f53cd9b8..19e574fe 100755 --- a/neofetch +++ b/neofetch @@ -3807,8 +3807,8 @@ get_cols() { ((info_height+=block_range[1]>7?block_height+3:block_height+2)) case $col_offset in - "auto") printf '\n\e[%bC%b\n\n' "$text_padding" "${zws}${cols}" ;; - *) printf '\n\e[%bC%b\n\n' "$col_offset" "${zws}${cols}" ;; + "auto") printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" ;; + *) printf '\n\e[%bC%b\n' "$col_offset" "${zws}${cols}" ;; esac fi From 1c468b4e3163977ff47780e8534793cd7fe8bf75 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 14:34:57 +0300 Subject: [PATCH 409/550] neofetch: Fix cursor placement issue --- neofetch | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 19e574fe..e336c53c 100755 --- a/neofetch +++ b/neofetch @@ -3804,7 +3804,7 @@ get_cols() { [${text_padding}C${zws}} # Add block height to info height. - ((info_height+=block_range[1]>7?block_height+3:block_height+2)) + ((info_height+=block_range[1]>7?block_height+2:block_height+1)) case $col_offset in "auto") printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" ;; @@ -3885,7 +3885,14 @@ print_ascii() { done <<< "${ascii_data//\$\{??\}}" # Fallback if file not found. - ((lines==1)) && { lines=; ascii_len=; image_source=auto; get_distro_ascii; print_ascii; return; } + ((lines==1)) && { + lines= + ascii_len= + image_source=auto + get_distro_ascii + print_ascii + return + } # Colors. ascii_data="${ascii_data//\$\{c1\}/$c1}" From 566c8096dad0c2eb8bc8bfba58ff031cd20b928e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 14:44:04 +0300 Subject: [PATCH 410/550] term_font: Fix st font2 issue. Closes #1446 --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index e336c53c..4a900135 100755 --- a/neofetch +++ b/neofetch @@ -3409,15 +3409,16 @@ END # like a font definition. NOTE: There is a slight limitation in this approach. # Technically "Font Name" is a valid font. As it doesn't specify any font options # though it is hard to match it correctly amongst the rest of the noise. - [[ -n "$binary" ]] && \ - term_font="$(strings "$binary" | grep -F -m 1 \ - -e "pixelsize=" \ - -e "size=" \ - -e "antialias=" \ - -e "autohint=")" + [[ -n "$binary" ]] && + term_font=$( + strings "$binary" | + + grep -m 1 "*font[^2]" + ) fi term_font="${term_font/xft:}" + term_font="${term_font#*=}" term_font="${term_font/:*}" ;; From c155bdecd1c314b5f3744d553ad049b34bd42730 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 14:50:26 +0300 Subject: [PATCH 411/550] wm: Fix issue with dwm. Closes #1433 --- neofetch | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index 4a900135..249ab3fd 100755 --- a/neofetch +++ b/neofetch @@ -1860,7 +1860,19 @@ get_wm() { fi elif [[ $DISPLAY && $os != "Mac OS X" && $os != "macOS" && $os != FreeMiNT ]]; then - type -p xprop &>/dev/null && { + # non-EWMH WMs. + wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \ + -e "[s]owm" \ + -e "[c]atwm" \ + -e "[f]vwm" \ + -e "[d]wm" \ + -e "[2]bwm" \ + -e "[m]onsterwm" \ + -e "[t]inywm" \ + -e "[x]11fs" \ + -e "[x]monad") + + [[ -z $wm ]] && type -p xprop &>/dev/null && { id=$(xprop -root -notype _NET_SUPPORTING_WM_CHECK) id=${id##* } wm=$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t) @@ -1869,19 +1881,6 @@ get_wm() { wm=${wm/\"*} } - # Fallback for non-EWMH WMs. - [[ $wm ]] || - wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \ - -e "[s]owm" \ - -e "[c]atwm" \ - -e "[f]vwm" \ - -e "[d]wm" \ - -e "[2]bwm" \ - -e "[m]onsterwm" \ - -e "[t]inywm" \ - -e "[x]11fs" \ - -e "[x]monad") - else case $os in "Mac OS X"|"macOS") From f730fc6a81b939dccdedd1a7d630b0cd40cb3810 Mon Sep 17 00:00:00 2001 From: Andrea Canepa <32621046+A-725-K@users.noreply.github.com> Date: Sun, 4 Oct 2020 13:53:30 +0200 Subject: [PATCH 412/550] Wrong number of packages reported for some package managers (#1556) * Wrong number of snap packages reported: fixed for snap (#1274) * Adjusted indentation and improved packages count (#1274) * Fixed spacing in empty lines --- neofetch | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 249ab3fd..aca6d003 100755 --- a/neofetch +++ b/neofetch @@ -1478,21 +1478,28 @@ get_uptime() { } get_packages() { + # to adjust the number of pkgs per pkg manager + pkgs_h=0 + # has: Check if package manager installed. # dir: Count files or dirs in a glob. # pac: If packages > 0, log package manager name. # tot: Count lines in command output. has() { type -p "$1" >/dev/null && manager=$1; } - dir() { ((packages+=$#)); pac "$#"; } + dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } - tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+=${#pkgs[@]}));pac "${#pkgs[@]}";} + tot() { + IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; + ((packages+=${#pkgs[@]})); + pac "$((${#pkgs[@]}-pkgs_h))"; + } # Redefine tot() for Bedrock Linux. [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) - pac "${#pkgs[@]}" + pac "$((${#pkgs[@]}-pkgs_h))"; } br_prefix="/bedrock/strata/*" } @@ -1512,7 +1519,7 @@ get_packages() { has lvu && tot lvu installed has tce-status && tot tce-status -i has pkg_info && tot pkg_info - has tazpkg && tot tazpkg list && ((packages-=6)) + has tazpkg && pkgs_h=6 tot tazpkg list && ((packages-=6)) has sorcery && tot gaze installed has alps && tot alps showinstalled has butch && tot butch list @@ -1573,7 +1580,8 @@ get_packages() { # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. - has snap && ps -e | grep -qFm 1 snapd >/dev/null && tot snap list && ((packages-=1)) + has snap && ps -e | grep -qFm 1 snapd >/dev/null && \ + pkgs_h=1 tot snap list && ((packages-=1)) # This is the only standard location for appimages. # See: https://github.com/AppImage/AppImageKit/wiki @@ -1581,7 +1589,7 @@ get_packages() { ;; "Mac OS X"|"macOS"|MINIX) - has port && tot port installed && ((packages-=1)) + has port && pkgs_h=1 tot port installed && ((packages-=1)) has brew && dir /usr/local/Cellar/* has pkgin && tot pkgin list @@ -1603,9 +1611,9 @@ get_packages() { esac # Scoop environment throws errors if `tot scoop list` is used - has scoop && dir ~/scoop/apps/* && ((packages-=1)) + has scoop && pkgs_h=1 dir ~/scoop/apps/* && ((packages-=1)) - # Count chocolatey packages. + # Count chocolatey packages. [[ -d /cygdrive/c/ProgramData/chocolatey/lib ]] && \ dir /cygdrive/c/ProgramData/chocolatey/lib/* ;; @@ -1613,11 +1621,11 @@ get_packages() { Haiku) has pkgman && dir /boot/system/package-links/* packages=${packages/pkgman/depot} - ;; - + ;; + IRIX) manager=swpkg - tot versions -b && ((packages-=3)) + pkgs_h=3 tot versions -b && ((packages-=3)) ;; esac From 6dca2c4037c35c71e9c676908070296087541974 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 4 Oct 2020 13:56:51 +0200 Subject: [PATCH 413/550] os: Add Univention (#1572) --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index aca6d003..6c4b02b3 100755 --- a/neofetch +++ b/neofetch @@ -10242,6 +10242,32 @@ oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso EOF ;; + "Univention"*) + set_colors 1 7 + read -rd '' ascii_data <<'EOF' +${c1} ./osssssssssssssssssssssso+- + `ohhhhhhhhhhhhhhhhhhhhhhhhhhhhy: + shhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh- + `-//${c2}sssss${c1}/hhhhhhhhhhhhhh+${c2}s${c1}.hhhhhhhhh+ + .ohhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sss${c1}+hhhhhhh+ +.yhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}ssss${c1}:hhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}ssssss${c1}+yhhhhhhhhhhy/${c2}ssssss${c1}yhhhhh+ ++hhhhhh:${c2}sssssss${c1}:hhhhhhh+${c2}.ssssssss${c1}yhhhhy. ++hhhhhhh+`${c2}ssssssssssssssss${c1}hh${c2}sssss${c1}yhhho` ++hhhhhhhhhs+${c2}ssssssssssss${c1}+hh+${c2}sssss${c1}/:-` +-hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhho + :yhhhhhhhhhhhhhhhhhhhhhhhhhhhh+` + -+ossssssssssssssssssssss+:` +EOF + ;; + "Venom"*) set_colors 8 4 read -rd '' ascii_data <<'EOF' From 1cd67b9f9ae45ceb095ee8f022c8dab3b6620d0a Mon Sep 17 00:00:00 2001 From: RhinoCodes <51250021+RhinoCodes@users.noreply.github.com> Date: Sun, 4 Oct 2020 06:57:09 -0500 Subject: [PATCH 414/550] Add semcOS (#1567) --- neofetch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/neofetch b/neofetch index 6c4b02b3..6cdff4fd 100755 --- a/neofetch +++ b/neofetch @@ -10324,6 +10324,36 @@ ${c1} -1vvnvv. `~+++` ++|+++ ~|Invnvnvvnvvvnnv}+` -~|{*l}*|~ EOF + + ;; + + "semc"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2} _______._______.___ ___. ______ + / | ____| \/ | / | + | (----| |__ | \ / || ,----' + \ \ | __| | |\/| || | +.----) | | |____| | | || `----. +|_______/ |_______|__| |__| \______| + +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ + +EOF + ;; "Obarun"*) From 19af3abaee51460ea5ed137c09776ca7269e0a16 Mon Sep 17 00:00:00 2001 From: Aditya Shakya Date: Sun, 4 Oct 2020 17:27:24 +0530 Subject: [PATCH 415/550] Added Archcraft OS (#1547) --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 6cdff4fd..2e9700ab 100755 --- a/neofetch +++ b/neofetch @@ -5630,6 +5630,30 @@ dhhyys+/-` EOF ;; + "Archcraft"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} -m: + :NMM+ .+ + +MMMMMo -NMy + sMMMMMMMy -MMMMh` + yMMMMMMMMMd` oMMMMd` + `dMMMMMMMMMMMm. /MMMMm- + .mMMMMMm-dMMMMMN- :NMMMN: + -NMMMMMd` yMMMMMN: .mMMMM/ + :NMMMMMy sMMMMMM+ `dMMMMo + +MMMMMMs +MMMMMMs `hMMMMy + oMMMMMMMds- :NMMMMMy sMMMMh` + yMMMMMNoydMMmo` -NMMMMMd` +MMMMd. + `dMMMMMN- `:yNNs` .mMMMMMm. /MMMMm- + .mMMMMMm. :hN/ `dMMMMMN- -NMMMN: + -NMMMMMd` -hh` `yMMMMMN: .mMMMM/ + :NMMMMMy `s` :h. oMMMMMM+ `----- + +MMMMMMo .dMm. `o. +MMMMMMo +sMMMMMM+ .mMMMN: :` :NMMMMMy +EOF + ;; + "arcolinux_small"*) set_colors 7 4 read -rd '' ascii_data <<'EOF' From 314a0bc4f6bf1801dcd015f84e5ae8d6d973144f Mon Sep 17 00:00:00 2001 From: Rising Thumb Date: Sun, 4 Oct 2020 13:00:26 +0100 Subject: [PATCH 416/550] =?UTF-8?q?=C3=9Cberzug=20image=20support=20(#1562?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Support for Ueberzug backend * Ueberzug cli argument * Fixed slight issues according to shellcheck * Read output suppressed * --xoffset and --yoffset support Co-authored-by: dylan --- neofetch | 32 +++++++++++++++++++++++++++----- neofetch.1 | 9 ++++++--- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 2e9700ab..e80541ed 100755 --- a/neofetch +++ b/neofetch @@ -744,7 +744,8 @@ disk_display="off" # # Default: 'ascii' # Values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', 'off', -# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' +# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty', 'ueberzug' + # Flag: --backend image_backend="ascii" @@ -3837,13 +3838,14 @@ image_backend() { "off") image_backend="off" ;; "caca" | "catimg" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ - "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot") + "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot", | "ueberzug") get_image_source [[ ! -f "$image" ]] && { to_ascii "Image: '$image_source' doesn't exist, falling back to ascii mode." return } + [[ "$image_backend" == "ueberzug" ]] && wait=true; get_window_size @@ -4258,6 +4260,24 @@ display_image() { "$image" ;; + + "ueberzug") + if [ "$wait" = true ];then + wait=false; + else + source "$(ueberzug library)" + ImageLayer 0< <( + ImageLayer::add\ + ['identifier']="neofetch"\ + ['x']="$xoffset" ['y']="$yoffset"\ + ['max_width']="$((width / font_width))"\ + ['max_height']="$((height / font_height))"\ + ['path']="$image"; + read -rs; + ) + fi + ;; + "catimg") catimg -w "$((width*catimg_size / font_width))" -r "$catimg_size" "$image" ;; @@ -4921,6 +4941,7 @@ IMAGE BACKEND: --termpix source Shortcut to use 'termpix' backend. --tycat source Shortcut to use 'tycat' backend. --w3m source Shortcut to use 'w3m' backend. + --ueberzug source Shortcut to use 'ueberzug' backend --off Shortcut to use 'off' backend (Disable ascii art). NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', @@ -5135,9 +5156,9 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" |\ - "--pot" | "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ + "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" | "--ueberzug") image_backend="${1/--}" case $2 in "-"* | "") ;; @@ -10726,6 +10747,7 @@ main() { # w3m-img: Draw the image a second time to fix # rendering issues in specific terminal emulators. [[ $image_backend == *w3m* ]] && display_image + [[ $image_backend == *ueberzug* ]] && display_image # Add neofetch info to verbose output. err "Neofetch command: $0 $*" diff --git a/neofetch.1 b/neofetch.1 index 5cadd702..4a766043 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -235,7 +235,7 @@ Possible values: bar, infobar, barinfo, off \fB\-\-backend\fR backend Which image backend to use. Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', -\&'off', 'sixel', 'tycat', 'w3m', 'kitty' +\&'off', 'sixel', 'tycat', 'w3m', 'kitty', 'ueberzug' .TP \fB\-\-source\fR source Which image or ascii file to use. @@ -280,6 +280,9 @@ Shortcut to use 'tycat' backend. \fB\-\-w3m\fR source Shortcut to use 'w3m' backend. .TP +\fB\-\-ueberzug\fR source +Shortcut to use 'ueberzug' backend. +.TP \fB\-\-off\fR Shortcut to use 'off' backend (Disable ascii art). .IP @@ -365,11 +368,11 @@ 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. +window. This only works with w3m and ueberzug. .TP \fB\-\-yoffset\fR px How close the image will be to the top edge of the -window. This only works with w3m. +window. This only works with w3m and ueberzug. .TP \fB\-\-bg_color\fR color Background color to display behind transparent image. From f3991ad97024b8766a9f1531462e4e40a7aa4284 Mon Sep 17 00:00:00 2001 From: manzoor ahmed Date: Sun, 4 Oct 2020 17:03:28 +0500 Subject: [PATCH 417/550] add LaxerOS (#1541) --- neofetch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/neofetch b/neofetch index e80541ed..561d9413 100755 --- a/neofetch +++ b/neofetch @@ -7723,6 +7723,34 @@ EOF \ LE \ / \ DE \ / \________\/ +EOF + ;; + + "LaxerOS"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c2} + /. + `://:- + `//////: + .////////:` + -//////////:` + -/////////////` + :///////////////. + `://////.```-//////- + `://///:` .//////- + `//////: `//////: + .//////- `://///:` + -//////- `://///:` + -//////. ://////` + ://////` -//////. + `/////:` ./////: + .-::-` .:::-` + +.:://////////////////////////////////::. +//////////////////////////////////////// +.:////////////////////////////////////:. + EOF ;; From 60d090164dc25c5d63698151feccdba7afac49d6 Mon Sep 17 00:00:00 2001 From: paperbenni Date: Sun, 4 Oct 2020 14:03:57 +0200 Subject: [PATCH 418/550] Update neofetch (#1537) --- neofetch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/neofetch b/neofetch index 561d9413..04bb10d5 100755 --- a/neofetch +++ b/neofetch @@ -5533,6 +5533,34 @@ ${c1} -o o- EOF ;; + "instantOS"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' + +${c1} + 'cx0XWWMMWNKOd:'. + .;kNMMMMMMMMMMMMMWNKd' + 'kNMMMMMMWNNNWMMMMMMMMXo. +,0MMMMMW0o;'..,:dKWMMMMMWx. +OMMMMMXl. .xNMMMMMNo +WMMMMNl .kWWMMMMO' +MMMMMX; oNWMMMMK, +NMMMMWo .OWMMMMMK, +kWMMMMNd. ,kWMMMMMMK, +'kWMMMMWXxl:;;:okNMMMMMMMMK, + .oXMMMMMMMWWWMMMMMMMMMMMMK, + 'oKWMMMMMMMMMMMMMMMMMMMK, + .;lxOKXXXXXXXXXXXXXXXO;...... + ................,d0000000kd:. + .kMMMMMMMMMW0; + .kMMMMMMMMMMMX + .xMMMMMMMMMMMW + cXMMMMMMMMMM0 + :0WMMMMMMNx, + .o0NMWNOc. +EOF + ;; + "Antergos"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' From d8e957cb0d4204d144f964941ec58fae11bbb8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Sun, 4 Oct 2020 14:05:34 +0200 Subject: [PATCH 419/550] Improve glxinfo call, OpenBSD sensors fix (#1494) * Use `glxinfo -B' instead of `glxinfo' It's enough to get the gpu infos and it's way faster. * OpenBSD: fix cpu sensors informations, add ksmn(4) and adt(4) --- neofetch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 04bb10d5..ae42adbd 100755 --- a/neofetch +++ b/neofetch @@ -2246,8 +2246,7 @@ get_cpu() { ;; "OpenBSD"* | "Bitrig"*) deg="$(sysctl hw.sensors | \ - awk -F '=| degC' '/lm0.temp|cpu0.temp/ {print $2; exit}')" - deg="${deg/00/0}" + awk -F'=|degC' '/(ksmn|adt|lm|cpu)0.temp0/ {printf("%2.1f", $2); exit}')" ;; esac ;; @@ -2529,7 +2528,7 @@ get_gpu() { ;; *) - gpu="$(glxinfo | grep -F 'OpenGL renderer string')" + gpu="$(glxinfo -B | grep -F 'OpenGL renderer string')" gpu="${gpu/OpenGL renderer string: }" ;; esac From 6b26a4d688ae8f2e71cc95471be247d1d4ee5c04 Mon Sep 17 00:00:00 2001 From: Alex Mirrington <34053287+alexmirrington@users.noreply.github.com> Date: Sun, 4 Oct 2020 23:05:59 +1100 Subject: [PATCH 420/550] Update raspbian_small ascii art (#1483) * Update raspbian_small ascii art * Escape rogue backslash --- neofetch | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index ae42adbd..57df2210 100755 --- a/neofetch +++ b/neofetch @@ -9282,16 +9282,15 @@ EOF "Raspbian_small"*) set_colors 2 1 read -rd '' ascii_data <<'EOF' -${c1} .~~. .~~. - '. \\ ' ' / .' -${c2} .~ .~~~..~. - : .~.'~'.~. : - ~ ( ) ( ) ~ -( : '~'.~.'~' : ) - ~ .~ ( ) ~. ~ - ( : '~' : ) - '~ .~~~. ~' - '~' +${c1} .. ,. + :oo: .:oo: + 'o\\o o/o: +${c2} :: . :: . :: +:: ::: ::: :: +:' '',.'' ': + ::: :::: ::: + ':, '' ,:' + ' ~::~ ' EOF ;; From d76815d3a245bc7acbaf839e663b6c4bde87abf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 4 Oct 2020 14:06:25 +0200 Subject: [PATCH 421/550] Add Armbian Linux (#1417) * Add Armbian Linux * Update neofetch * Update neofetch --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index 57df2210..196246b4 100755 --- a/neofetch +++ b/neofetch @@ -976,6 +976,10 @@ get_distro() { *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)" esac + elif [[ -f /etc/armbian-release ]]; then + . /etc/armbian-release + distro="Armbian $DISTRIBUTION_CODENAME ($VERSION)" + elif [[ -f /etc/siduction-version ]]; then case $distro_shorthand in on|tiny) distro=Siduction ;; From 9ca24eaa0ac41b70d84c7db0ee321f7520860333 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 4 Oct 2020 23:09:36 +1100 Subject: [PATCH 422/550] local_ip: Add interface selection (#1327) * local_ip: add interface selection local_ip: add interface selection for macOS local_ip: add interface support for Linux and others local_ip: fix quotes local_ip: fix line length local_ip: fix line length for realsies this time * local ip: change default to auto and simplify if statement * local ip: make error for invalid interface actually work on linux * local ip: remove unneeded slash * local ip: silence errors from ip and ifconfig Co-authored-by: dylan --- neofetch | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 196246b4..633328af 100755 --- a/neofetch +++ b/neofetch @@ -407,6 +407,13 @@ public_ip_host="http://ident.me" # Flag: --ip_timeout public_ip_timeout=2 +# Local IP interface +# +# Default: 'auto' (interface of default route) +# Values: 'auto', 'en0', 'en1' +# Flag: --ip_interface +local_ip_interface=('auto') + # Desktop Environment @@ -3702,9 +3709,25 @@ get_battery() { get_local_ip() { case $os in "Linux" | "BSD" | "Solaris" | "AIX" | "IRIX") - local_ip="$(ip route get 1 | awk -F'src' '{print $2; exit}')" - local_ip="${local_ip/uid*}" - [[ -z "$local_ip" ]] && local_ip="$(ifconfig -a | awk '/broadcast/ {print $2; exit}')" + if [[ "${local_ip_interface[0]}" == "auto" ]]; then + local_ip="$(ip route get 1 | awk -F'src' '{print $2; exit}')" + local_ip="${local_ip/uid*}" + [[ "$local_ip" ]] || local_ip="$(ifconfig -a | awk '/broadcast/ {print $2; exit}')" + else + for interface in "${local_ip_interface[@]}"; do + local_ip="$(ip addr show "$interface" 2> /dev/null | + awk '/inet / {print $2; exit}')" + local_ip="${local_ip/\/*}" + [[ "$local_ip" ]] || + local_ip="$(ifconfig "$interface" 2> /dev/null | + awk '/broadcast/ {print $2; exit}')" + if [[ -n "$local_ip" ]]; then + prin "$interface" "$local_ip" + else + err "Local IP: Could not detect local ip for $interface" + fi + done + fi ;; "MINIX") @@ -3712,8 +3735,19 @@ get_local_ip() { ;; "Mac OS X" | "macOS" | "iPhone OS") - local_ip="$(ipconfig getifaddr en0)" - [[ -z "$local_ip" ]] && local_ip="$(ipconfig getifaddr en1)" + if [[ "${local_ip_interface[0]}" == "auto" ]]; then + interface="$(route get 1 | awk -F': ' '/interface/ {printf $2; exit}')" + local_ip="$(ipconfig getifaddr "$interface")" + else + for interface in "${local_ip_interface[@]}"; do + local_ip="$(ipconfig getifaddr "$interface")" + if [[ -n "$local_ip" ]]; then + prin "$interface" "$local_ip" + else + err "Local IP: Could not detect local ip for $interface" + fi + done + fi ;; "Windows") @@ -4882,6 +4916,7 @@ INFO: --ip_host url URL to query for public IP --ip_timeout int Public IP timeout (in seconds). + --ip_interface value Interface(s) to use for local IP --song_format format Print the song data in a specific format (see config file). --song_shorthand on/off Print the Artist/Album/Title on separate lines. --memory_percent on/off Display memory percentage. @@ -5078,6 +5113,17 @@ get_args() { "--shell_version") shell_version="$2" ;; "--ip_host") public_ip_host="$2" ;; "--ip_timeout") public_ip_timeout="$2" ;; + "--ip_interface") + unset local_ip_interface + for arg in "$@"; do + case "$arg" in + "--ip_interface") ;; + "-"*) break ;; + *) local_ip_interface+=("$arg") ;; + esac + done + ;; + "--song_format") song_format="$2" ;; "--song_shorthand") song_shorthand="$2" ;; "--music_player") music_player="$2" ;; From 075eb43dd77cddcbe5f41706c9676ae29be0291f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 15:18:28 +0300 Subject: [PATCH 423/550] neofetch: clean up --- neofetch | 114 ++++++++++++++++++++++++++----------------------------- 1 file changed, 54 insertions(+), 60 deletions(-) diff --git a/neofetch b/neofetch index 633328af..60ef7d94 100755 --- a/neofetch +++ b/neofetch @@ -728,8 +728,7 @@ bar_color_total="distro" # # Default: 'off' # Values: 'bar', 'infobar', 'barinfo', 'off' -# Flags: --cpu_display -# --memory_display +# Flags: --memory_display # --battery_display # --disk_display # @@ -738,7 +737,6 @@ bar_color_total="distro" # infobar: 'info [---=======]' # barinfo: '[---=======] info' # off: 'info' -cpu_display="off" memory_display="off" battery_display="off" disk_display="off" @@ -985,7 +983,7 @@ get_distro() { elif [[ -f /etc/armbian-release ]]; then . /etc/armbian-release - distro="Armbian $DISTRIBUTION_CODENAME ($VERSION)" + distro="Armbian $DISTRIBUTION_CODENAME (${VERSION:-})" elif [[ -f /etc/siduction-version ]]; then case $distro_shorthand in @@ -1500,7 +1498,7 @@ get_packages() { has() { type -p "$1" >/dev/null && manager=$1; } dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } - tot() { + tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; ((packages+=${#pkgs[@]})); pac "$((${#pkgs[@]}-pkgs_h))"; @@ -1634,7 +1632,7 @@ get_packages() { has pkgman && dir /boot/system/package-links/* packages=${packages/pkgman/depot} ;; - + IRIX) manager=swpkg pkgs_h=3 tot versions -b && ((packages-=3)) @@ -4314,7 +4312,7 @@ display_image() { ) fi ;; - + "catimg") catimg -w "$((width*catimg_size / font_width))" -r "$catimg_size" "$image" ;; @@ -4946,8 +4944,6 @@ BARS: --bar_length num Length in spaces to make the bars. --bar_colors num num Colors to make the bar. Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off --memory_display mode Bar mode. Possible values: bar, infobar, barinfo, off --battery_display mode Bar mode. @@ -5198,14 +5194,13 @@ get_args() { bar_color_total="$3" ;; - "--cpu_display") cpu_display="$2" ;; "--memory_display") memory_display="$2" ;; "--battery_display") battery_display="$2" ;; "--disk_display") disk_display="$2" ;; # Image backend "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; + "--source") image_source="$2" ;; "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" | "--ueberzug") image_backend="${1/--}" @@ -5336,7 +5331,6 @@ get_args() { refresh_rate="on" shell_version="on" - cpu_display="infobar" memory_display="infobar" disk_display="infobar" cpu_temp="C" @@ -5587,26 +5581,26 @@ EOF read -rd '' ascii_data <<'EOF' ${c1} - 'cx0XWWMMWNKOd:'. - .;kNMMMMMMMMMMMMMWNKd' - 'kNMMMMMMWNNNWMMMMMMMMXo. -,0MMMMMW0o;'..,:dKWMMMMMWx. -OMMMMMXl. .xNMMMMMNo -WMMMMNl .kWWMMMMO' -MMMMMX; oNWMMMMK, -NMMMMWo .OWMMMMMK, -kWMMMMNd. ,kWMMMMMMK, -'kWMMMMWXxl:;;:okNMMMMMMMMK, - .oXMMMMMMMWWWMMMMMMMMMMMMK, - 'oKWMMMMMMMMMMMMMMMMMMMK, - .;lxOKXXXXXXXXXXXXXXXO;...... - ................,d0000000kd:. + 'cx0XWWMMWNKOd:'. + .;kNMMMMMMMMMMMMMWNKd' + 'kNMMMMMMWNNNWMMMMMMMMXo. +,0MMMMMW0o;'..,:dKWMMMMMWx. +OMMMMMXl. .xNMMMMMNo +WMMMMNl .kWWMMMMO' +MMMMMX; oNWMMMMK, +NMMMMWo .OWMMMMMK, +kWMMMMNd. ,kWMMMMMMK, +'kWMMMMWXxl:;;:okNMMMMMMMMK, + .oXMMMMMMMWWWMMMMMMMMMMMMK, + 'oKWMMMMMMMMMMMMMMMMMMMK, + .;lxOKXXXXXXXXXXXXXXXO;...... + ................,d0000000kd:. .kMMMMMMMMMW0; .kMMMMMMMMMMMX .xMMMMMMMMMMMW cXMMMMMMMMMM0 :0WMMMMMMNx, - .o0NMWNOc. + .o0NMWNOc. EOF ;; @@ -5731,24 +5725,24 @@ EOF "Archcraft"*) set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} -m: - :NMM+ .+ - +MMMMMo -NMy - sMMMMMMMy -MMMMh` - yMMMMMMMMMd` oMMMMd` - `dMMMMMMMMMMMm. /MMMMm- - .mMMMMMm-dMMMMMN- :NMMMN: - -NMMMMMd` yMMMMMN: .mMMMM/ - :NMMMMMy sMMMMMM+ `dMMMMo - +MMMMMMs +MMMMMMs `hMMMMy - oMMMMMMMds- :NMMMMMy sMMMMh` - yMMMMMNoydMMmo` -NMMMMMd` +MMMMd. - `dMMMMMN- `:yNNs` .mMMMMMm. /MMMMm- - .mMMMMMm. :hN/ `dMMMMMN- -NMMMN: +${c1} -m: + :NMM+ .+ + +MMMMMo -NMy + sMMMMMMMy -MMMMh` + yMMMMMMMMMd` oMMMMd` + `dMMMMMMMMMMMm. /MMMMm- + .mMMMMMm-dMMMMMN- :NMMMN: + -NMMMMMd` yMMMMMN: .mMMMM/ + :NMMMMMy sMMMMMM+ `dMMMMo + +MMMMMMs +MMMMMMs `hMMMMy + oMMMMMMMds- :NMMMMMy sMMMMh` + yMMMMMNoydMMmo` -NMMMMMd` +MMMMd. + `dMMMMMN- `:yNNs` .mMMMMMm. /MMMMm- + .mMMMMMm. :hN/ `dMMMMMN- -NMMMN: -NMMMMMd` -hh` `yMMMMMN: .mMMMM/ :NMMMMMy `s` :h. oMMMMMM+ `----- - +MMMMMMo .dMm. `o. +MMMMMMo -sMMMMMM+ .mMMMN: :` :NMMMMMy + +MMMMMMo .dMm. `o. +MMMMMMo +sMMMMMM+ .mMMMN: :` :NMMMMMy EOF ;; @@ -7806,24 +7800,24 @@ EOF "LaxerOS"*) set_colors 7 4 read -rd '' ascii_data <<'EOF' -${c2} +${c2} /. - `://:- - `//////: - .////////:` - -//////////:` - -/////////////` - :///////////////. - `://////.```-//////- - `://///:` .//////- - `//////: `//////: - .//////- `://///:` - -//////- `://///:` - -//////. ://////` - ://////` -//////. - `/////:` ./////: + `://:- + `//////: + .////////:` + -//////////:` + -/////////////` + :///////////////. + `://////.```-//////- + `://///:` .//////- + `//////: `//////: + .//////- `://///:` + -//////- `://///:` + -//////. ://////` + ://////` -//////. + `/////:` ./////: .-::-` .:::-` - + .:://////////////////////////////////::. //////////////////////////////////////// .:////////////////////////////////////:. @@ -10500,7 +10494,7 @@ ${c1} -1vvnvv. `~+++` ++|+++ +Invnvnvnnnnnnnnvvnn;. ~|Invnvnvvnvvvnnv}+` -~|{*l}*|~ - + EOF ;; From c511bcbcef44db3b05c885191ebd170ebaf15574 Mon Sep 17 00:00:00 2001 From: Rashil Gandhi <46838874+rashil2000@users.noreply.github.com> Date: Sun, 4 Oct 2020 19:07:50 +0530 Subject: [PATCH 424/550] Display charging status in Windows (#1575) --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 60ef7d94..3e93ed79 100755 --- a/neofetch +++ b/neofetch @@ -3686,6 +3686,9 @@ get_battery() { battery="$(wmic Path Win32_Battery get EstimatedChargeRemaining)" battery="${battery/EstimatedChargeRemaining}" battery="$(trim "$battery")%" + state="$(wmic /NameSpace:'\\root\WMI' Path BatteryStatus get Charging)" + state="${state/Charging}" + [[ "$state" == *TRUE* ]] && battery_state="charging" ;; "Haiku") From 71d8914ec7a30e42e800253433eae10bc1b43869 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 18:05:18 +0300 Subject: [PATCH 425/550] windows: Fix gpu output --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 3e93ed79..f88f5c95 100755 --- a/neofetch +++ b/neofetch @@ -2517,10 +2517,13 @@ get_gpu() { "Windows") while read -r line; do + [[ $win_gpu ]] || { + win_gpu=1 + continue + } + prin "${subtitle:+${subtitle}${gpu_name}}" "$(trim "$line")" done < <(wmic path Win32_VideoController get caption) - - gpu=${gpu//Caption} ;; "Haiku") From c93f3dabd6ab578bf055165c813ef80bc9829a57 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 18:26:26 +0300 Subject: [PATCH 426/550] gpu: Fix blank line in output on Windows. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f88f5c95..477a9b24 100755 --- a/neofetch +++ b/neofetch @@ -2517,7 +2517,7 @@ get_gpu() { "Windows") while read -r line; do - [[ $win_gpu ]] || { + [[ -z $win_gpu ]] || [[ -z "$line" ]] && { win_gpu=1 continue } From 7bf2ecee26adf67165a370e7510631914a5f47d2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 18:46:04 +0300 Subject: [PATCH 427/550] fix ci --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 477a9b24..e5e7dbbb 100755 --- a/neofetch +++ b/neofetch @@ -5207,8 +5207,9 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ - "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" | "--ueberzug") + "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" |\ + "--pot" | "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" |\ + "--ueberzug") image_backend="${1/--}" case $2 in "-"* | "") ;; From 4660ae7a53d61a90a66dc5634367a8e357bfb135 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 19:05:03 +0300 Subject: [PATCH 428/550] various: fix windows issues --- neofetch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index e5e7dbbb..ba183598 100755 --- a/neofetch +++ b/neofetch @@ -1718,11 +1718,11 @@ get_de() { Windows) case $distro in - "Windows 10"*) + *"Windows 10"*) de=Fluent ;; - "Windows 8"*) + *"Windows 8"*) de=Metro ;; @@ -2517,12 +2517,14 @@ get_gpu() { "Windows") while read -r line; do + line=$(trim "$line") + [[ -z $win_gpu ]] || [[ -z "$line" ]] && { win_gpu=1 continue } - prin "${subtitle:+${subtitle}${gpu_name}}" "$(trim "$line")" + prin "${subtitle:+${subtitle}${gpu_name}}" "$line" done < <(wmic path Win32_VideoController get caption) ;; From 53d938c4fee11e9437bf27134d10e2fff7eaf165 Mon Sep 17 00:00:00 2001 From: Xander Hess <5012529+XanderHess@users.noreply.github.com> Date: Fri, 16 Oct 2020 07:11:28 +0100 Subject: [PATCH 429/550] Adding support for Pengwin (#1578) * Added recently added distros to list of included distros with ascii art. * Fixed indent in usage for ueberzug backend. * Added ascii art for Pengwin (https://github.com/WhitewaterFoundry/Pengwin) and added Pengwin to the distro lists. --- neofetch | 121 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 49 deletions(-) diff --git a/neofetch b/neofetch index ba183598..803376a1 100755 --- a/neofetch +++ b/neofetch @@ -778,34 +778,34 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", -# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, -# ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, -# Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, -# BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, -# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, -# Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, -# DesaOS, Devuan, DracOS, DarkOs, DragonFly, Drauger, Elementary, +# 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, +# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, +# Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, +# Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, -# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, -# Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, -# LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, -# Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, -# Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, -# OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, -# Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, -# popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, -# Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, -# Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, -# Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, -# SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, -# openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, -# Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, -# Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, -# and IRIX have ascii logos +# 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, Maui, +# Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, +# Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, +# openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, +# osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, +# TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, +# Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, +# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, +# sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +# Solus, 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, semc, Obarun, +# windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -4983,7 +4983,7 @@ IMAGE BACKEND: --termpix source Shortcut to use 'termpix' backend. --tycat source Shortcut to use 'tycat' backend. --w3m source Shortcut to use 'w3m' backend. - --ueberzug source Shortcut to use 'ueberzug' backend + --ueberzug source Shortcut to use 'ueberzug' backend --off Shortcut to use 'off' backend (Disable ascii art). NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', @@ -4993,33 +4993,35 @@ ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, - \"AOSC OS\", \"AOSC OS/Retro\", Apricity, ArcoLinux, ArchBox, - ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, - Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, - BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, - Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, - Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, - DracOS, DarkOs, DragonFly, Drauger, Elementary, EndeavourOS, Endless, + 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, Chapeau, Chrom, + Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, + CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, + DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, - LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, - Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, - Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, - OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, - OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, - Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, - Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, - Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, - Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, - Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, - SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, - openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, - Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, - Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, - and IRIX have ascii logos + LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, + Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, + Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, + NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, + openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, + OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, + PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, + Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, + Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, + sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, + SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, + Solus, 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, semc, Obarun, + windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. @@ -9042,6 +9044,27 @@ yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ EOF ;; + "Pengwin"*) + set_colors 5 5 13 + read -rd '' ascii_data <<'EOF' +${c3} ...` +${c3} `-///:-` +${c3} .+${c2}ssys${c3}/ +${c3} +${c2}yyyyy${c3}o ${c2} +${c2} -yyyyyy: +${c2} `.:/+ooo+/:` -yyyyyy+ +${c2} `:oyyyyyys+:-.`syyyyyy: +${c2} .syyyyyyo-` .oyyyyyyo +${c2} `syyyyyy `-+yyyyyyy/` +${c2} /yyyyyy+ -/osyyyyyyo/. +${c2} +yyyyyy- `.-:::-.` +${c2} .yyyyyy- +${c3} :${c2}yyyyy${c3}o +${c3} .+${c2}ooo${c3}+ +${c3} `.::/:. +EOF + ;; + "Peppermint"*) set_colors 1 15 3 read -rd '' ascii_data <<'EOF' From f0b16b63ff33271cd184f5a1384be946f17de3f8 Mon Sep 17 00:00:00 2001 From: SGS Date: Fri, 16 Oct 2020 16:36:55 +0000 Subject: [PATCH 430/550] update garuda linux logo (#1579) Co-authored-by: SGSm --- neofetch | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 803376a1..f159d416 100755 --- a/neofetch +++ b/neofetch @@ -7262,28 +7262,27 @@ EOF "Garuda"*) set_colors 7 7 read -rd '' ascii_data <<'EOF' -${c1} __,,,,,,,_ - _╓╗╣╫╠╠╠╠╠╠╠╠╠╠╠╠╠╕╗╗┐_ - ╥╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╥, - ╗╠╠╠╠╠╠╠╝╜╜╜╜╝╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠┐ - ╣╠╠╠╠╠╠╠╠╢╣╢╗╕ , `"╘╠╠╠╠╠╠╠╠╠╠╠╠╠╠╔╥_ - ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╕╙╥╥╜ `"╜╠╬╠╠╠╠╠╠╠╠╠╠╠╥, - ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗╥╥╥╥╗╗╬╠╠╠╠╠╠╠╝╙╠╠╣╠╠╠╠╢┐ - ╣╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╥╬╣╠╠╠╠╠╠╠╠╗ - ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ - ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠ - ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╬ ```"╜╝╢╠╠╡ - ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╣, ╘╠╪ - ╞╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╢┐ ╜ - `╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ - ,╬╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠"╕ - ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ - ╝^╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╝╣╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╡ - ╔╜`╞┘╢╛╜ ╡╢╠"╚╠╠╜╝┌╞╞"╢╠╠╠╠╠╠╠╠╠╠╣╩╢╪ - ╜╒" `╜ ` ╜╙╕ └╣╠╠╠╠╕ ╞╙╖ - ╠╠╠ - ╜ +${c1} + .%;888:X8889888@8: + x;XxXB%8b8:b8%b88xx8: + .88Xx;; 8X8x:. + .tt8xX x8x8; + .t%xx8: Xxx.8: + .@8x8; x8xx@; + ,tSXXX° .bbbbbbbbbbbbbbbbb8x@. + .SXxx° bBBBBBBBBBBBBBBBBB:S;8. + ,888S° ;8SS + .@8@%° ;8: + <8X88/ + x%888 .@88@8@X@X8X@@X@X@8@Xx + .x8X@: bb8x8x8b8b8x8s8x88b88x; + .xxS88 .@8@;: + .x.88 .Xt@x; + .::SSX88@8b8B8B8b@@8Sxx; + .xq)9898999989989899° + EOF + ;; "gentoo_small") From 5dfce0f9c3068d4d8a49d0b7182bdace61b8f4d0 Mon Sep 17 00:00:00 2001 From: Kanashimia <56224949+kanashimia@users.noreply.github.com> Date: Mon, 2 Nov 2020 16:20:02 +0200 Subject: [PATCH 431/550] Update NixOS Logo (#1590) --- neofetch | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f159d416..50de9d39 100755 --- a/neofetch +++ b/neofetch @@ -8493,7 +8493,7 @@ EOF EOF ;; - "NixOS"*) + "nixos_old"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' ${c1} ::::. ${c2}'::::: ::::' @@ -8518,6 +8518,32 @@ ${c1} .:::: :::: ${c2}'::::. EOF ;; + "NixOS"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} ▗██▙ ${c2}▜███▙ ▟██▖ +${c1} ▜███▙ ${c2}▜███▙ ▟███▛ +${c1} ▜███▙ ${c2}▜███▙▟███▛ +${c1} ▜███▙ ${c2}▜██████▛ +${c1} ▟█████████████████▙ ${c2}▜████▛ ${c1}▟▙ +${c1} ▟███████████████████▙ ${c2}▜███▙ ${c1}▟██▙ +${c2} ▄▄▄▄▖ ▜███▙ ${c1}▟███▛ +${c2} ▟███▛ ▜██▛ ${c1}▟███▛ +${c2} ▟███▛ ▜▛ ${c1}▟███▛ +${c2}▟███████████▛ ${c1}▟██████████▙ +${c2}▜██████████▛ ${c1}▟███████████▛ +${c2} ▟███▛ ${c1}▟▙ ▟███▛ +${c2} ▟███▛ ${c1}▟██▙ ▟███▛ +${c2} ▟███▛ ${c1}▜███▙ ▝▀▀▀▀ +${c2} ▜██▛ ${c1}▜███▙ ${c2}▜██████████████████▛ +${c2} ▜▛ ${c1}▟████▙ ${c2}▜████████████████▛ +${c1} ▟██████▙ ${c2}▜███▙ +${c1} ▟███▛▜███▙ ${c2}▜███▙ +${c1} ▟███▛ ▜███▙ ${c2}▜███▙ +${c1} ▝██▛ ▜███▙ ${c2}▜██▘ +EOF + ;; + "Nurunner"*) set_colors 4 read -rd '' ascii_data <<'EOF' From 106a53c575d6dc97ed461139c0fd22991a5528f1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 3 Nov 2020 05:38:45 +0200 Subject: [PATCH 432/550] neofetch: Use MemAvailable for memory on Linux if supported. Closes #1591 --- neofetch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ba183598..285fa522 100755 --- a/neofetch +++ b/neofetch @@ -2568,10 +2568,21 @@ get_memory() { "MemFree" | "Buffers" | "Cached" | "SReclaimable") mem_used="$((mem_used-=${b/kB}))" ;; + + # Available since Linux 3.14rc (34e431b0ae398fc54ea69ff85ec700722c9da773). + # If detected this will be used over the above calculation for mem_used. + "MemAvailable") + mem_avail=${b/kB} + ;; esac done < /proc/meminfo - mem_used="$((mem_used / 1024))" + if [[ $mem_avail ]]; then + mem_used=$(((mem_total - mem_avail) / 1024)) + else + mem_used="$((mem_used / 1024))" + fi + mem_total="$((mem_total / 1024))" ;; From dbe781043b6f606b484e9b8268f4200542c52fc1 Mon Sep 17 00:00:00 2001 From: Paul Delafosse Date: Tue, 3 Nov 2020 12:11:00 +0100 Subject: [PATCH 433/550] feat(backend): add viu image backend (#1592) * feat(backend): add viu image backend * fix: double quote typo on viu command --- neofetch | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 281a5deb..67b77900 100755 --- a/neofetch +++ b/neofetch @@ -749,7 +749,8 @@ disk_display="off" # # Default: 'ascii' # Values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', 'off', -# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty', 'ueberzug' +# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty', 'ueberzug', +# 'viu' # Flag: --backend image_backend="ascii" @@ -3892,7 +3893,8 @@ image_backend() { "off") image_backend="off" ;; "caca" | "catimg" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ - "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot", | "ueberzug") + "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot", | "ueberzug" |\ + "viu") get_image_source [[ ! -f "$image" ]] && { @@ -3919,7 +3921,7 @@ image_backend() { err "Image: Unknown image backend specified '$image_backend'." err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', 'kitty', 'off', 'sixel', 'pot', 'pixterm', 'termpix', - 'tycat', 'w3m')" + 'tycat', 'w3m', 'viu')" err "Image: Falling back to ascii mode." print_ascii ;; @@ -4398,6 +4400,12 @@ display_image() { "$image" ;; + "viu") + viu \ + -t -w "$((width / font_width))" -h "$((height / font_height))" \ + "$image" + ;; + "w3m") get_w3m_img_path zws='\xE2\x80\x8B\x20' @@ -4973,7 +4981,7 @@ BARS: IMAGE BACKEND: --backend backend Which image backend to use. Possible values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', - 'iterm2', 'off', 'sixel', 'tycat', 'w3m', 'kitty' + 'iterm2', 'off', 'sixel', 'tycat', 'w3m', 'kitty', 'viu' --source 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] @@ -4995,6 +5003,7 @@ IMAGE BACKEND: --tycat source Shortcut to use 'tycat' backend. --w3m source Shortcut to use 'w3m' backend. --ueberzug source Shortcut to use 'ueberzug' backend + --viu source Shortcut to use 'viu' backend --off Shortcut to use 'off' backend (Disable ascii art). NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', @@ -5224,7 +5233,7 @@ get_args() { "--source") image_source="$2" ;; "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" |\ "--pot" | "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" |\ - "--ueberzug") + "--ueberzug" | "--viu") image_backend="${1/--}" case $2 in "-"* | "") ;; From ac6f6a1ce43159a270b7b66e48a05c6ef23c7d37 Mon Sep 17 00:00:00 2001 From: sudo killall windows <51250021+RhinoCodes@users.noreply.github.com> Date: Tue, 3 Nov 2020 21:21:00 -0600 Subject: [PATCH 434/550] Update SEMC logo (#1593) --- neofetch | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/neofetch b/neofetch index 67b77900..552333b9 100755 --- a/neofetch +++ b/neofetch @@ -10547,31 +10547,18 @@ EOF ;; - "semc"*) - set_colors 2 8 + "semc"*) + set_colors 2 8 1 read -rd '' ascii_data <<'EOF' -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2} _______._______.___ ___. ______ - / | ____| \/ | / | - | (----| |__ | \ / || ,----' - \ \ | __| | |\/| || | -.----) | | |____| | | || `----. -|_______/ |_______|__| |__| \______| - -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ - +${c1} /\ + ______/ \ + / |()| ${c2}E M C +${c1} | (-- | | + \ \ | | +.----) | |__| +|_______/ / ${c3}"${c1} \ + ${c3}" + " EOF ;; From 56c8d7e0c81108163a3f2970940ea2287648916f Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Wed, 4 Nov 2020 22:06:28 -0600 Subject: [PATCH 435/550] Support multiple displays under wayland (#1596) --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 552333b9..59e29d54 100755 --- a/neofetch +++ b/neofetch @@ -2991,9 +2991,9 @@ get_resolution() { elif [[ -d /sys/class/drm ]]; then for dev in /sys/class/drm/*/modes; do - read -r resolution _ < "$dev" + read -r single_resolution _ < "$dev" - [[ $resolution ]] && break + [[ $single_resolution ]] && resolution="${single_resolution}, ${resolution}" done fi ;; From 0c1a7996d35900f1768a46f4116791a00db53afc Mon Sep 17 00:00:00 2001 From: Quinten <58103738+HexaOneOfficial@users.noreply.github.com> Date: Tue, 10 Nov 2020 13:56:23 +0100 Subject: [PATCH 436/550] update man page (#1600) * Update neofetch.1 * Update neofetch.1 * Update neofetch.1 --- neofetch.1 | 59 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 4a766043..c05e3038 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -296,33 +296,34 @@ Colors to print the ascii art \fB\-\-ascii_distro\fR distro Which Distro's ascii art to print .TP -NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, -"AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, -ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, -Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, -BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, -Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, -DracOS, DarkOs, DragonFly, Drauger, Elementary, EndeavourOS, Endless, -EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, -Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, -GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, -KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, -LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, -Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, -Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, -OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, -OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, -Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, -Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, -Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, -Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, -Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, -SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, -openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, -Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, -Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, -and IRIX have ascii logos +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, +Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, +Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, +Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, +EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, +gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +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, Maui, +Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, +Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, +openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, +osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, +TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, +Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, +Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, +sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +Solus, 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, semc, Obarun, +windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP @@ -330,8 +331,8 @@ NOTE: Use '{distro name}_old' to use the old logos. .IP NOTE: Ubuntu has flavor variants. .TP -NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu\-GNOME, -Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors. +Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, +Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. .TP NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, From 2a1788a11bc25744bbdae3d9844c6c1ac5ce557b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 17 Nov 2020 11:49:46 +0200 Subject: [PATCH 437/550] fix macOS issue. See #1607 --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index 59e29d54..4cb397e7 100755 --- a/neofetch +++ b/neofetch @@ -4774,6 +4774,10 @@ cache_uname() { kernel_machine="${uname[2]}" if [[ "$kernel_name" == "Darwin" ]]; then + # macOS can report incorrect versions unless this is 0. + # https://github.com/dylanaraps/neofetch/issues/1607 + export SYSTEM_VERSION_COMPAT=0 + IFS=$'\n' read -d "" -ra sw_vers <<< "$(awk -F'<|>' '/key|string/ {print $3}' \ "/System/Library/CoreServices/SystemVersion.plist")" for ((i=0;i<${#sw_vers[@]};i+=2)) { From cb6f10d8f4d924ed8f6d8ec429d6632674ce10e4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 17 Nov 2020 18:35:33 +0200 Subject: [PATCH 438/550] fix whitespace --- neofetch | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 4cb397e7..37f2dbf7 100755 --- a/neofetch +++ b/neofetch @@ -7286,25 +7286,25 @@ EOF "Garuda"*) set_colors 7 7 read -rd '' ascii_data <<'EOF' -${c1} - .%;888:X8889888@8: - x;XxXB%8b8:b8%b88xx8: - .88Xx;; 8X8x:. - .tt8xX x8x8; - .t%xx8: Xxx.8: +${c1} + .%;888:X8889888@8: + x;XxXB%8b8:b8%b88xx8: + .88Xx;; 8X8x:. + .tt8xX x8x8; + .t%xx8: Xxx.8: .@8x8; x8xx@; ,tSXXX° .bbbbbbbbbbbbbbbbb8x@. .SXxx° bBBBBBBBBBBBBBBBBB:S;8. - ,888S° ;8SS - .@8@%° ;8: - <8X88/ - x%888 .@88@8@X@X8X@@X@X@8@Xx - .x8X@: bb8x8x8b8b8x8s8x88b88x; - .xxS88 .@8@;: - .x.88 .Xt@x; - .::SSX88@8b8B8B8b@@8Sxx; - .xq)9898999989989899° - + ,888S° ;8SS + .@8@%° ;8: + <8X88/ + x%888 .@88@8@X@X8X@@X@X@8@Xx + .x8X@: bb8x8x8b8b8x8s8x88b88x; + .xxS88 .@8@;: + .x.88 .Xt@x; + .::SSX88@8b8B8B8b@@8Sxx; + .xq)9898999989989899° + EOF ;; @@ -8553,7 +8553,7 @@ ${c1} ▟█████████████████▙ ${c2}▜█ ${c1} ▟███████████████████▙ ${c2}▜███▙ ${c1}▟██▙ ${c2} ▄▄▄▄▖ ▜███▙ ${c1}▟███▛ ${c2} ▟███▛ ▜██▛ ${c1}▟███▛ -${c2} ▟███▛ ▜▛ ${c1}▟███▛ +${c2} ▟███▛ ▜▛ ${c1}▟███▛ ${c2}▟███████████▛ ${c1}▟██████████▙ ${c2}▜██████████▛ ${c1}▟███████████▛ ${c2} ▟███▛ ${c1}▟▙ ▟███▛ From 2b39f58f749fa2641a4028419c6a9e20874a740c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 17 Nov 2020 18:43:32 +0200 Subject: [PATCH 439/550] disk: Fix bash 3.2 incompatibility. Closes #1586 --- neofetch | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 37f2dbf7..d650a7b0 100755 --- a/neofetch +++ b/neofetch @@ -3586,7 +3586,7 @@ get_disk() { for disk in "${disks[@]}"; do # Create a second array and make each element split at whitespace this time. IFS=" " read -ra disk_info <<< "$disk" - disk_perc=${disk_info[-2]/\%} + disk_perc=${disk_info[${#disk_info[@]} - 2]/\%} case $disk_percent in off) disk_perc= @@ -3594,29 +3594,34 @@ get_disk() { case $df_version in *befhikm*) - disk="$((disk_info[-4]/1024/1024))G / $((disk_info[-5]/1024/1024))G" - disk+="${disk_perc:+ ($disk_perc%)}" + disk=$((disk_info[${#disk_info[@]} - 4] / 1024 / 1024))G + disk+=" / " + disk+=$((disk_info[${#disk_info[@]} - 5] / 1024/ 1024))G + disk+=${disk_perc:+ ($disk_perc%)} ;; *) - disk="${disk_info[-4]/i} / ${disk_info[-5]/i}${disk_perc:+ ($disk_perc%)}" + disk=${disk_info[${#disk_info[@]} - 4]/i} + disk+=" / " + disk+=${disk_info[${#disk_info[@]} - 5]/i} + disk+=${disk_perc:+ ($disk_perc%)} ;; esac case $disk_subtitle in name) - disk_sub=${disk_info[*]::${#disk_info[@]}-5} + disk_sub=${disk_info[*]::${#disk_info[@]} - 5} ;; dir) - disk_sub=${disk_info[-1]/*\/} - disk_sub=${disk_sub:-${disk_info[-1]}} + disk_sub=${disk_info[${#disk_info[@]} - 1]/*\/} + disk_sub=${disk_sub:-${disk_info[${#disk_info[@]} - 1]}} ;; none) ;; *) - disk_sub=${disk_info[-1]} + disk_sub=${disk_info[${#disk_info[@]} - 1]} ;; esac From 494a7d8335cf0a2d815ea01b55401dbb4ae24ef9 Mon Sep 17 00:00:00 2001 From: Xaver Hellauer Date: Sat, 21 Nov 2020 17:34:34 +0100 Subject: [PATCH 440/550] Add support for `swupd` package manager (#1610) `swupd` is the default package manager of Clear Linux OS (they actually call their packages bundles). This patch adds support for swupd. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index d650a7b0..5b165dd0 100755 --- a/neofetch +++ b/neofetch @@ -1535,6 +1535,7 @@ get_packages() { has alps && tot alps showinstalled has butch && tot butch list has mine && tot mine -q + has swupd && tot swupd bundle-list --quiet # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. From d76d92f6b84c806e1b12e413eee443439c206947 Mon Sep 17 00:00:00 2001 From: SGS Date: Tue, 24 Nov 2020 04:47:07 +0100 Subject: [PATCH 441/550] New Garuda Neofetch Logo (#1613) Co-authored-by: SGSm --- neofetch | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/neofetch b/neofetch index 5b165dd0..2a6dd34f 100755 --- a/neofetch +++ b/neofetch @@ -7290,26 +7290,27 @@ EOF ;; "Garuda"*) - set_colors 7 7 + set_colors 7 7 3 7 2 4 read -rd '' ascii_data <<'EOF' -${c1} - .%;888:X8889888@8: - x;XxXB%8b8:b8%b88xx8: - .88Xx;; 8X8x:. - .tt8xX x8x8; - .t%xx8: Xxx.8: - .@8x8; x8xx@; - ,tSXXX° .bbbbbbbbbbbbbbbbb8x@. - .SXxx° bBBBBBBBBBBBBBBBBB:S;8. - ,888S° ;8SS - .@8@%° ;8: - <8X88/ - x%888 .@88@8@X@X8X@@X@X@8@Xx - .x8X@: bb8x8x8b8b8x8s8x88b88x; - .xxS88 .@8@;: - .x.88 .Xt@x; - .::SSX88@8b8B8B8b@@8Sxx; - .xq)9898999989989899° + +${c3} + .%;888:8898898: + x;XxXB%89b8:b8%b88: + .8Xxd 8X:. + .8Xx; 8x:. + .tt8x ${c6}.d${c3} x88; + .@8x8; ${c6}.db:${c3} xx@; + ${c4},tSXX° .bbbbbbbbbbbbbbbbbbbB8x@; + .SXxx bBBBBBBBBBBBBBBBBBBBbSBX8; + ,888S pd! + 8X88/ q + GBB. + ${c5}x%88 d888@8@X@X@X88X@@XX@@X@8@X. + dxXd dB8b8b8B8B08bB88b998888b88x. + dxx8o .@@;. + dx88 .t@x. + d:SS@8ba89aa67a853Sxxad. + .d988999889889899dd. EOF From d4f6abf1a87d1a6906f92f80931a9f402dbd45ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20L=C3=B6nnqvist?= Date: Tue, 24 Nov 2020 17:30:55 +0200 Subject: [PATCH 442/550] Refactor ueberzug (#1614) The previous way ueberzug was used is now deprecated. --- neofetch | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 2a6dd34f..b2db1711 100755 --- a/neofetch +++ b/neofetch @@ -4327,15 +4327,14 @@ display_image() { if [ "$wait" = true ];then wait=false; else - source "$(ueberzug library)" - ImageLayer 0< <( - ImageLayer::add\ - ['identifier']="neofetch"\ - ['x']="$xoffset" ['y']="$yoffset"\ - ['max_width']="$((width / font_width))"\ - ['max_height']="$((height / font_height))"\ - ['path']="$image"; - read -rs; + ueberzug layer --parser bash 0< <( + declare -Ap ADD=(\ + [action]="add"\ + [identifier]="neofetch"\ + [x]=$xoffset [y]=$yoffset\ + [path]=$image\ + ) + read -rs ) fi ;; From df61458e7fa60e98a165520c3832b86dc3108ef0 Mon Sep 17 00:00:00 2001 From: Sekai Zhou Date: Wed, 25 Nov 2020 13:22:45 +0800 Subject: [PATCH 443/550] Fix font support for yakuake (#1615) Originally added in #1063, but did not actually work because it only looked for konsole processes (rather than yakuake's) when querying its session profile. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b2db1711..328cc1cd 100755 --- a/neofetch +++ b/neofetch @@ -3335,7 +3335,7 @@ END QT_BINDIR="$(qtpaths --binaries-dir)" && PATH+=":$QT_BINDIR" IFS=$'\n' read -d "" -ra konsole_instances \ - <<< "$(qdbus | awk '/org.kde.konsole/ {print $1}')" + <<< "$(qdbus | awk '/org.kde.'"$term"'/ {print $1}')" for i in "${konsole_instances[@]}"; do IFS=$'\n' read -d "" -ra konsole_sessions <<< "$(qdbus "$i" | grep -F '/Sessions/')" From 2b559cb8c62088dcbe997f6bb5a27002a9c22e27 Mon Sep 17 00:00:00 2001 From: Iuri Jikidze <37273763+ijiki16@users.noreply.github.com> Date: Wed, 25 Nov 2020 01:09:10 -0800 Subject: [PATCH 444/550] Add Apple Music (#1611) * iTunes --> Music * add back iTunes * fix indentation * fix indentation 2 * ty vs code * fix ? --- neofetch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/neofetch b/neofetch index 328cc1cd..4a625fe0 100755 --- a/neofetch +++ b/neofetch @@ -512,6 +512,7 @@ disk_percent="on" # guayadeque # io.elementary.music # iTunes +# Music # juk # lollypop # MellowPlayer @@ -2728,6 +2729,7 @@ get_song() { "guayadeque" "io.elementary.music" "iTunes" + "Music" "juk" "lollypop" "MellowPlayer" @@ -2842,6 +2844,12 @@ get_song() { string & "\n" & album of current track as¬ string & "\n" & name of current track as string')" ;; + + "music"*) + song="$(osascript -e 'tell application "Music" to artist of current track as¬ + string & "\n" & album of current track as¬ + string & "\n" & name of current track as string')" + ;; "banshee"*) song="$(banshee --query-artist --query-album --query-title |\ From 80174ea4d9b3f2e1fb35de8214b011275ed4b736 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Nov 2020 14:09:31 +0200 Subject: [PATCH 445/550] neofetch: swap to apt for packages. Possible fix for #1616 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 4a625fe0..7b68ffb3 100755 --- a/neofetch +++ b/neofetch @@ -1522,7 +1522,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has dpkg && tot dpkg-query -f '.\n' -W + has apt && tot apt list has rpm && tot rpm -qa has xbps-query && tot xbps-query -l has apk && tot apk info @@ -2844,7 +2844,7 @@ get_song() { string & "\n" & album of current track as¬ string & "\n" & name of current track as string')" ;; - + "music"*) song="$(osascript -e 'tell application "Music" to artist of current track as¬ string & "\n" & album of current track as¬ From bec3918bfdf383e4695f3308a50e1115a1064c18 Mon Sep 17 00:00:00 2001 From: Kanashimia <56224949+kanashimia@users.noreply.github.com> Date: Thu, 26 Nov 2020 07:11:09 +0200 Subject: [PATCH 446/550] NixOS - squash logo, add new package location. (#1617) * Decrease size of NixOS logo by one block. * Improve package counting for NixOS. --- neofetch | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 7b68ffb3..ed7116ae 100755 --- a/neofetch +++ b/neofetch @@ -1566,9 +1566,13 @@ get_packages() { } has nix-store && { - manager=nix-system && tot nix-store -q --requisites /run/current-system/sw - manager=nix-user && tot nix-store -q --requisites ~/.nix-profile - manager=nix-default && tot nix-store -q --requisites /nix/var/nix/profiles/default + nix-user-pkgs() { + nix-store -qR ~/.nix-profile + nix-store -qR /etc/profiles/per-user/"$USER" + } + manager=nix-system && tot nix-store -qR /run/current-system/sw + manager=nix-user && tot nix-user-pkgs + manager=nix-default && tot nix-store -qR /nix/var/nix/profiles/default } # pkginfo is also the name of a python package manager which is painfully slow. @@ -1607,8 +1611,12 @@ get_packages() { has pkgin && tot pkgin list has nix-store && { - manager=nix-system && tot nix-store -q --requisites "/run/current-system/sw" - manager=nix-user && tot nix-store -q --requisites "$HOME/.nix-profile" + nix-user-pkgs() { + nix-store -qR ~/.nix-profile + nix-store -qR /etc/profiles/per-user/"$USER" + } + manager=nix-system && tot nix-store -qR /run/current-system/sw + manager=nix-user && tot nix-store -qR nix-user-pkgs } ;; @@ -8559,7 +8567,7 @@ EOF "NixOS"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c1} ▗██▙ ${c2}▜███▙ ▟██▖ +${c1} ▗▄▄▄ ${c2}▗▄▄▄▄ ▄▄▄▖ ${c1} ▜███▙ ${c2}▜███▙ ▟███▛ ${c1} ▜███▙ ${c2}▜███▙▟███▛ ${c1} ▜███▙ ${c2}▜██████▛ @@ -8578,7 +8586,7 @@ ${c2} ▜▛ ${c1}▟████▙ ${c2}▜█████████ ${c1} ▟██████▙ ${c2}▜███▙ ${c1} ▟███▛▜███▙ ${c2}▜███▙ ${c1} ▟███▛ ▜███▙ ${c2}▜███▙ -${c1} ▝██▛ ▜███▙ ${c2}▜██▘ +${c1} ▝▀▀▀ ▀▀▀▀▘ ${c2}▀▀▀▘ EOF ;; From dc8a834888d9c93a007f766db8cbbbd889d69776 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 26 Nov 2020 07:15:09 +0200 Subject: [PATCH 447/550] neofetch: Fix naming conflict with mine. See #1616 --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 7b68ffb3..051baf0e 100755 --- a/neofetch +++ b/neofetch @@ -1535,9 +1535,12 @@ get_packages() { has sorcery && tot gaze installed has alps && tot alps showinstalled has butch && tot butch list - has mine && tot mine -q has swupd && tot swupd bundle-list --quiet + # 'mine' conflicts with minesweeper games. + [[ -f /etc/SDE-VERSION ]] && + has mine && tot mine -q + # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. # $br_prefix is fixed and won't change based on user input so this is safe either way. From b0a654f162f6dcaf67871c2ca6785b97bca49c05 Mon Sep 17 00:00:00 2001 From: minhtricute69 <42957778+minhtricute69@users.noreply.github.com> Date: Fri, 11 Jun 2021 11:48:39 +0700 Subject: [PATCH 448/550] Add HydroOS distro support (#1766) Add HydroOS distro support --- neofetch | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 62b82ea4..59ccbb56 100755 --- a/neofetch +++ b/neofetch @@ -790,7 +790,7 @@ image_source="auto" # Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, -# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +# gNewSense, GNOME, GNU, GoboLinux, 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, Maui, @@ -7591,6 +7591,20 @@ ${c2} ` `` EOF ;; + "HydroOS"*) + set_colors 1 2 3 4 5 + read -rd '' ascii_data <<'EOF' +${c1} + _ _ _ ____ _____ + | | | | | | / __ \ / ____| + | |__| |_ _ __| |_ __ ___ | | | | (___ + | __ | | | |/ _` | '__/ _ \| | | |\___ \ + | | | | |_| | (_| | | | (_) | |__| |____) | + |_| |_|\__, |\__,_|_| \___/ \____/|_____/ + __/ | + |___/ +EOF + ;; "hyperbola_small"*) set_colors 8 From 19fefa65618241846f567815739fa2f7b4078e36 Mon Sep 17 00:00:00 2001 From: minhtricute69 <42957778+minhtricute69@users.noreply.github.com> Date: Fri, 11 Jun 2021 11:48:46 +0700 Subject: [PATCH 449/550] Add HydroOS distro support (#1767) Add HydroOS distro support --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index c05e3038..aa4c7c11 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -306,7 +306,7 @@ Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, -gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +gNewSense, GNOME, GNU, GoboLinux, 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, Maui, From 4d7ec21ad5c4ae24e634c92763eaa26ea2655b0f Mon Sep 17 00:00:00 2001 From: Philipp Wallisch Date: Fri, 11 Jun 2021 06:51:48 +0200 Subject: [PATCH 450/550] Rework macOS memory calculation to work on Apple Silicon (#1752) --- neofetch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 59ccbb56..c8489506 100755 --- a/neofetch +++ b/neofetch @@ -2601,12 +2601,13 @@ get_memory() { ;; "Mac OS X" | "macOS" | "iPhone OS") + hw_pagesize="$(sysctl -n hw.pagesize)" mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))" - mem_wired="$(vm_stat | awk '/ wired/ { print $4 }')" - mem_active="$(vm_stat | awk '/ active/ { printf $3 }')" - mem_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" - mem_compressed="${mem_compressed:-0}" - mem_used="$(((${mem_wired//.} + ${mem_active//.} + ${mem_compressed//.}) * 4 / 1024))" + pages_app="$(($(sysctl -n vm.page_pageable_internal_count) - $(sysctl -n vm.page_purgeable_count)))" + pages_wired="$(vm_stat | awk '/ wired/ { print $4 }')" + pages_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" + pages_compressed="${pages_compressed:-0}" + mem_used="$(((${pages_app} + ${pages_wired//.} + ${pages_compressed//.}) * hw_pagesize / 1024 / 1024))" ;; "BSD" | "MINIX") From 22b97f99c33e5e141dea9489e0393ff5723a197a Mon Sep 17 00:00:00 2001 From: jnats Date: Fri, 11 Jun 2021 05:52:52 +0100 Subject: [PATCH 451/550] Update neofetch (#1749) Co-authored-by: jnats --- neofetch | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index c8489506..b8c72bb3 100755 --- a/neofetch +++ b/neofetch @@ -786,8 +786,8 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # bonsai, BSD, BunsenLabs, 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, +# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, +# DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS @@ -5049,8 +5049,8 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, 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, + CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, + DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, @@ -6692,6 +6692,32 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; + *"CrystalUX"*) + set_colors 13 5 + read -rd '' ascii_data <<'EOF' +${c1} mysssym +${c1} mysssym +${c1} mysssym +${c1} mysssym +${c1} mysssyd +${c1} mysssyd N +${c1} mysssyd mysym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysym dysssym +${c1} N dysssym +${c1} dysssym +${c1} dysssym +${c1} dysssym +${c1} dysssym +${c1} dysssym +EOF + ;; + *"Cucumber"*) set_colors 2 3 read -rd '' ascii_data <<'EOF' From 87753c5057632d6b7cffd5c6097d72f61b13a123 Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Fri, 11 Jun 2021 00:53:33 -0400 Subject: [PATCH 452/550] fix neofetch not recognizing brew package count on M1 macs (#1747) * fix neofetch not recognizing brew package count on M1 macs * fix apt package count issue --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index b8c72bb3..8aee9f8d 100755 --- a/neofetch +++ b/neofetch @@ -1522,7 +1522,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has apt && tot apt list + has apt && tot apt list --installed && ((packages-=1)) has rpm && tot rpm -qa has xbps-query && tot xbps-query -l has apk && tot apk info @@ -1610,7 +1610,7 @@ get_packages() { "Mac OS X"|"macOS"|MINIX) has port && pkgs_h=1 tot port installed && ((packages-=1)) - has brew && dir /usr/local/Cellar/* + has brew && dir "$(brew --cellar)"/* has pkgin && tot pkgin list has nix-store && { From b7abdba2fdd6321cf6ac0acbbde54f857cc519d6 Mon Sep 17 00:00:00 2001 From: Luca Robbiano Date: Fri, 11 Jun 2021 06:54:26 +0200 Subject: [PATCH 453/550] Add Rocky Linux (#1743) * Add Rocky Linux * Add Rocky Linux ASCII Art * Add Rocky Linux into the ASCII logo list * Fix Co-authored-by: Kaleb <51819073+klebdotio@users.noreply.github.com> --- neofetch | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 8aee9f8d..0cf87a42 100755 --- a/neofetch +++ b/neofetch @@ -800,8 +800,8 @@ image_source="auto" # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, # Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, -# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, -# sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rocky, +# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, @@ -9705,6 +9705,49 @@ ${c1} EOF ;; + "rocky_small"*) + set_colors 2 + read -rd '' ascii_data <<'EOF' +${c1} `-/+++++++++/-.` + `-+++++++++++++++++-` +.+++++++++++++++++++++. +-+++++++++++++++++++++++. ++++++++++++++++/-/+++++++ ++++++++++++++/. ./+++++ ++++++++++++:. ./+++ ++++++++++:` `:/:` .:/ +-++++++:` .:+++++:` + .+++-` ./+++++++++:` + `-` ./+++++++++++- + -+++++++++:-.` +EOF + ;; + + "rocky"*) + set_colors 35 + read -rd '' ascii_data <<'EOF' +${c1} __wgliliiligw_, + _williiiiiiliilililw, + _%iiiiiilililiiiiiiiiiii_ + .Qliiiililiiiiiiililililiilm. + _iiiiiliiiiiililiiiiiiiiiiliil, + .lililiiilililiiiilililililiiiii, +_liiiiiiliiiiiiiliiiiiF{iiiiiilili, +jliililiiilililiiili@` ~ililiiiiiL +iiiliiiiliiiiiiili>` ~liililii +liliiiliiilililii` -9liiiil +iiiiiliiliiiiii~ "4lili +4ililiiiiilil~| -w, )4lf +-liiiiililiF' _liig, )' + )iiiliii@` _QIililig, + )iiii>` .Qliliiiililw + )<>~ .mliiiiiliiiiiil, + _gllilililiililii~ + giliiiiiiiiiiiiT` + -^~$ililili@~~' +EOF + ;; + "Rosa"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From cd6c4334db046b813e0002ff98919a30a472e52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Efe=20=C3=87etin?= <45270788+efectn@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:55:06 +0300 Subject: [PATCH 454/550] Add TeArch Linux. (#1741) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add TeArch Linux. * Update neofetch Co-authored-by: Efe Çetin --- neofetch | 31 +++++++++++++++++++++++++++++-- neofetch.1 | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 0cf87a42..7393fbf9 100755 --- a/neofetch +++ b/neofetch @@ -793,7 +793,7 @@ image_source="auto" # gNewSense, GNOME, GNU, GoboLinux, 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, Maui, +# Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, # Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, # Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, @@ -5056,7 +5056,7 @@ ASCII: GoboLinux, Grombyang, Guix, Haiku, Huayra, 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, Maui, Mer, Minix, LinuxMint, + Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, @@ -8231,6 +8231,33 @@ ${c1}██████████████████ ██████ EOF ;; + "TeArch"*) + set_colors 39 7 1 + read -rd '' ascii_data <<'EOF' +${c1} @@@@@@@@@@@@@@ + @@@@@@@@@ @@@@@@ + @@@@@ @@@@@ + @@ @@ + @% @@ + @ @ + @@@@@@@@@@@@@@@@@@@@@@@@ @@ + .@@@@@@@@@@@@/@@@@@@@@@@@@ + @@@@@@@@@@@@///@@@@@@@@@@@@ + @@@@@@@@@@@@@((((@@@@@@@@@@@@ + @@@@@@@@@@@#(((((((#@@@@@@@@@@@ + @@@@@@@@@@@#//////////@@@@@@@@@@& + @@@@@@@@@@////@@@@@////@@@@@@@@@@ + @@@@@@@@//////@@@@@/////@@@@@@@@@ + @@@@@@@//@@@@@@@@@@@@@@@//@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +@@ .@@@@@@@@@@@@@@@@@@@@@@@@@ @ + @@@@@@ @@@. @@@@@@@ + @@@@@@@&@@@@@@@# #@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@ +EOF + ;; + "Maui"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index aa4c7c11..8eed9bc3 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -309,7 +309,7 @@ FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, -Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, +Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, From d8b58a10b9c08deb236bd85bea0f4f0cdc6e3c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=B3czai=20Oliv=C3=A9r?= Date: Fri, 11 Jun 2021 06:55:35 +0200 Subject: [PATCH 455/550] Only use DNS if public_ip_host option is empty (#1737) In config: public_ip_host="" -> uses DNS for getting public IP public_ip_host="http://example.com/ip" -> uses wget/curl for getting public IP --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 7393fbf9..093fc030 100755 --- a/neofetch +++ b/neofetch @@ -3807,12 +3807,12 @@ get_local_ip() { } get_public_ip() { - if type -p dig >/dev/null; then + if [[ ! -n "$public_ip_host" ]] && type -p dig >/dev/null; then public_ip="$(dig +time=1 +tries=1 +short myip.opendns.com @resolver1.opendns.com)" [[ "$public_ip" =~ ^\; ]] && unset public_ip fi - if [[ -z "$public_ip" ]] && type -p drill >/dev/null; then + if [[ ! -n "$public_ip_host" ]] && [[ -z "$public_ip" ]] && type -p drill >/dev/null; then public_ip="$(drill myip.opendns.com @resolver1.opendns.com | \ awk '/^myip\./ && $3 == "IN" {print $5}')" fi From 21c9c5f22b32faed93f5110b40537694bdf670a4 Mon Sep 17 00:00:00 2001 From: Kevin Lapointe <80723850+klpnt@users.noreply.github.com> Date: Fri, 11 Jun 2021 00:55:56 -0400 Subject: [PATCH 456/550] New ASCII logo for Fedora (#1736) * Added new ASCII logo for Fedora * Added new ASCII art for Fedora * Added new ASCII for Fedora --- neofetch | 31 ++++++++++++++++++++++++++++--- neofetch.1 | 2 +- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 093fc030..0044858b 100755 --- a/neofetch +++ b/neofetch @@ -808,7 +808,7 @@ image_source="auto" # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, # Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, # windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. -# NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. +# NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. # Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, @@ -5072,7 +5072,7 @@ ASCII: Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. - NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. + NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. NOTE: Use '{distro name}_old' to use the old logos. @@ -7161,7 +7161,7 @@ ${c1}\\ \\${c2}__/ | EOF ;; - "Fedora"* | "RFRemix"*) + "Fedora_old"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} /:-------------:\\ @@ -7183,6 +7183,31 @@ ${c1} /:-------------:\\ :---------------------:// EOF ;; + + "Fedora"*) + set_colors 12 7 + read -rd '' ascii_data <<'EOF' +${c1} .',;::::;,'. + .';:cccccccccccc:;,. + .;cccccccccccccccccccccc;. + .:cccccccccccccccccccccccccc:. + .;ccccccccccccc;${c2}.:dddl:.${c1};ccccccc;. + .:ccccccccccccc;${c2}OWMKOOXMWd${c1};ccccccc:. +.:ccccccccccccc;${c2}KMMc${c1};cc;${c2}xMMc${c1};ccccccc:. +,cccccccccccccc;${c2}MMM.${c1};cc;${c2};WW:${c1};cccccccc, +:cccccccccccccc;${c2}MMM.${c1};cccccccccccccccc: +:ccccccc;${c2}oxOOOo${c1};${c2}MMM0OOk.${c1};cccccccccccc: +cccccc;${c2}0MMKxdd:${c1};${c2}MMMkddc.${c1};cccccccccccc; +ccccc;${c2}XM0'${c1};cccc;${c2}MMM.${c1};cccccccccccccccc' +ccccc;${c2}MMo${c1};ccccc;${c2}MMW.${c1};ccccccccccccccc; +ccccc;${c2}0MNc.${c1}ccc${c2}.xMMd${c1};ccccccccccccccc; +cccccc;${c2}dNMWXXXWM0:${c1};cccccccccccccc:, +cccccccc;${c2}.:odl:.${c1};cccccccccccccc:,. +:cccccccccccccccccccccccccccc:'. +.:cccccccccccccccccccccc:;,.. + '::cccccccccccccc::;,. +EOF + ;; "Feren"*) set_colors 4 7 1 diff --git a/neofetch.1 b/neofetch.1 index 8eed9bc3..39676dfb 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -325,7 +325,7 @@ Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP -NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. +NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. .IP NOTE: Use '{distro name}_old' to use the old logos. .IP From 41f75b7b484cca653e0db19b194d99a993dbf5f8 Mon Sep 17 00:00:00 2001 From: Adam Salt <75907419+whyadamsalt@users.noreply.github.com> Date: Fri, 11 Jun 2021 05:56:10 +0100 Subject: [PATCH 457/550] Update neofetch (#1732) --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 0044858b..f634e3bd 100755 --- a/neofetch +++ b/neofetch @@ -6359,6 +6359,28 @@ ${c2} .......... ...',;;;;;;,,... ..... EOF + + + "CelOS"*) + set_colors 3 2 4 5 7 + read -rd '' ascii_data <<'EOF' + +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +@@@# @@@ +@@ ,#%%%%%(. (@ +@# %%%%%%%%%%%%%%# @ +@# %%%%%%%%# %%%/ @ +@# #%%%%%%%%. #%%%* @ +@# %%%%%%%%%%%* (%%%%%# @ +@# #%%%% %%%%%%%%%%%, @ +@# #%%%%%%%%%%%%%%%%%, @ +@# #%%%%%%%%%%%%%* @ +@@ *##%#(, @@ +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + + +EOF + ;; ;; "centos_small"*) From 50a8bd285d965c2c94e863f7e5e4e547c1c101db Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:02:17 +0000 Subject: [PATCH 458/550] packages: Use dnf cache if available. Closes #1730 --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f634e3bd..e0298e69 100755 --- a/neofetch +++ b/neofetch @@ -1523,7 +1523,6 @@ get_packages() { has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never has apt && tot apt list --installed && ((packages-=1)) - has rpm && tot rpm -qa has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed @@ -1537,6 +1536,13 @@ get_packages() { has butch && tot butch list has swupd && tot swupd bundle-list --quiet + # Using the dnf package cache is much faster than rpm. + if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then + pac "$(sqlite3 /var/cache/dnf/packages.db "SELECT count(pkg) FROM installed")" + else + has rpm && tot rpm -qa + fi + # 'mine' conflicts with minesweeper games. [[ -f /etc/SDE-VERSION ]] && has mine && tot mine -q From 34d55b874787629fdf3936e2ad8560a44f8ac4bd Mon Sep 17 00:00:00 2001 From: MeztliRA <78863518+MeztliRA@users.noreply.github.com> Date: Fri, 11 Jun 2021 12:04:16 +0700 Subject: [PATCH 459/550] Fixes #1636 (#1727) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e0298e69..206dab8c 100755 --- a/neofetch +++ b/neofetch @@ -1769,7 +1769,7 @@ get_de() { ((wm_run != 1)) && get_wm # Temporary support for Regolith Linux - if [[ $DESKTOP_SESSION == regolith ]]; then + if [[ $DESKTOP_SESSION == *regolith ]]; then de=Regolith elif [[ $XDG_CURRENT_DESKTOP ]]; then From 96d9d3c4f6504226ae0674ffb31061bf29387b25 Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Fri, 11 Jun 2021 05:05:46 +0000 Subject: [PATCH 460/550] just removes any quotes from around the Alacritty font name, if any (#1708) --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 206dab8c..00578871 100755 --- a/neofetch +++ b/neofetch @@ -3274,6 +3274,7 @@ get_term_font() { term_font="${term_font/*family:}" term_font="${term_font/$'\n'*}" term_font="${term_font/\#*}" + term_font="${term_font//\"}" ;; "Apple_Terminal") From 0dd28db34e519962517efbf1b38bc16250c7d143 Mon Sep 17 00:00:00 2001 From: Rolex <62307498+DaOfficialRolex@users.noreply.github.com> Date: Fri, 11 Jun 2021 05:07:44 +0000 Subject: [PATCH 461/550] Added APT/Debian Packager to package managers for MacOS and combined PR #1702 (#1762) * Added new iOS and iPadOS device information * Updated neofetch to show dpkg and correct amount of packages. * Fixed indentation. --- neofetch | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 00578871..fc511402 100755 --- a/neofetch +++ b/neofetch @@ -1263,9 +1263,11 @@ get_model() { iPad6,1[12]): "iPad 5" ;; iPad7,[5-6]): "iPad 6" ;; iPad7,1[12]): "iPad 7" ;; + iPad11,[67]): "iPad 8" ;; iPad4,[1-3]): "iPad Air" ;; iPad5,[3-4]): "iPad Air 2" ;; iPad11,[3-4]): "iPad Air 3" ;; + iPad13,[1-2]): "iPad Air 4";; iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; @@ -1305,6 +1307,10 @@ get_model() { iPhone12,3): "iPhone 11 Pro" ;; iPhone12,5): "iPhone 11 Pro Max" ;; iPhone12,8): "iPhone SE 2020" ;; + iPhone13,1): "iPhone 12 Mini" ;; + iPhone13,2): "iPhone 12" ;; + iPhone13,3): "iPhone 12 Pro" ;; + iPhone13,4): "iPhone 12 Pro Max" ;; iPod1,1): "iPod touch" ;; ipod2,1): "iPod touch 2G" ;; @@ -1312,6 +1318,7 @@ get_model() { ipod4,1): "iPod touch 4G" ;; ipod5,1): "iPod touch 5G" ;; ipod7,1): "iPod touch 6G" ;; + iPod9,1): "iPod touch 7G" ;; esac model=$_ @@ -1618,6 +1625,7 @@ get_packages() { has port && pkgs_h=1 tot port installed && ((packages-=1)) has brew && dir "$(brew --cellar)"/* has pkgin && tot pkgin list + has dpkg && tot dpkg-query -f '.\n' -W has nix-store && { nix-user-pkgs() { @@ -2231,8 +2239,9 @@ get_cpu() { "Apple A10 Fusion (4) @ 2.34GHz" ;; "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; - "iPhone11,"[2468] | "iPad11,"[1-4]): "Apple A12 Bionic (6) @ 2.49GHz" ;; + "iPhone11,"[2468] | "iPad11,"[1-4] | "iPad11,"[6-7]): "Apple A12 Bionic (6) @ 2.49GHz" ;; "iPhone12,"[1358]): "Apple A13 Bionic (6) @ 2.65GHz" ;; + "iPhone13,"[1-4] | "iPad13,"[1-2]): "Apple A14 Bionic (6) @ 3.00Ghz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; @@ -2520,8 +2529,9 @@ get_gpu() { "iPhone8,"[1-4] | "iPad6,1"[12]): "PowerVR GT7600" ;; "iPhone9,"[1-4] | "iPad7,"[5-6]): "PowerVR GT7600 Plus" ;; "iPhone10,"[1-6]): "Apple Designed GPU (A11)" ;; - "iPhone11,"[2468]): "Apple Designed GPU (A12)" ;; + "iPhone11,"[2468] | "iPad11,"[67]): "Apple Designed GPU (A12)" ;; "iPhone12,"[1358]): "Apple Designed GPU (A13)" ;; + "iPhone13,"[1234] | "iPad13,"[12]): "Apple Designed GPU (A14)" ;; "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; From c0ceffb55455f00478753728135a0d447a6e5450 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:11:00 +0000 Subject: [PATCH 462/550] general: fix indentation --- neofetch | 61 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index fc511402..f1f97078 100755 --- a/neofetch +++ b/neofetch @@ -1263,11 +1263,11 @@ get_model() { iPad6,1[12]): "iPad 5" ;; iPad7,[5-6]): "iPad 6" ;; iPad7,1[12]): "iPad 7" ;; - iPad11,[67]): "iPad 8" ;; + iPad11,[67]): "iPad 8" ;; iPad4,[1-3]): "iPad Air" ;; iPad5,[3-4]): "iPad Air 2" ;; iPad11,[3-4]): "iPad Air 3" ;; - iPad13,[1-2]): "iPad Air 4";; + iPad13,[1-2]): "iPad Air 4";; iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; @@ -1307,10 +1307,10 @@ get_model() { iPhone12,3): "iPhone 11 Pro" ;; iPhone12,5): "iPhone 11 Pro Max" ;; iPhone12,8): "iPhone SE 2020" ;; - iPhone13,1): "iPhone 12 Mini" ;; - iPhone13,2): "iPhone 12" ;; - iPhone13,3): "iPhone 12 Pro" ;; - iPhone13,4): "iPhone 12 Pro Max" ;; + iPhone13,1): "iPhone 12 Mini" ;; + iPhone13,2): "iPhone 12" ;; + iPhone13,3): "iPhone 12 Pro" ;; + iPhone13,4): "iPhone 12 Pro Max" ;; iPod1,1): "iPod touch" ;; ipod2,1): "iPod touch 2G" ;; @@ -1318,7 +1318,7 @@ get_model() { ipod4,1): "iPod touch 4G" ;; ipod5,1): "iPod touch 5G" ;; ipod7,1): "iPod touch 6G" ;; - iPod9,1): "iPod touch 7G" ;; + iPod9,1): "iPod touch 7G" ;; esac model=$_ @@ -1508,9 +1508,9 @@ get_packages() { dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { - IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; - ((packages+=${#pkgs[@]})); - pac "$((${#pkgs[@]}-pkgs_h))"; + IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; + ((packages+=${#pkgs[@]})); + pac "$((${#pkgs[@]}-pkgs_h))"; } # Redefine tot() for Bedrock Linux. @@ -1518,7 +1518,7 @@ get_packages() { tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) - pac "$((${#pkgs[@]}-pkgs_h))"; + pac "$((${#pkgs[@]}-pkgs_h))"; } br_prefix="/bedrock/strata/*" } @@ -1614,7 +1614,7 @@ get_packages() { # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. has snap && ps -e | grep -qFm 1 snapd >/dev/null && \ - pkgs_h=1 tot snap list && ((packages-=1)) + pkgs_h=1 tot snap list && ((packages-=1)) # This is the only standard location for appimages. # See: https://github.com/AppImage/AppImageKit/wiki @@ -1625,7 +1625,7 @@ get_packages() { has port && pkgs_h=1 tot port installed && ((packages-=1)) has brew && dir "$(brew --cellar)"/* has pkgin && tot pkgin list - has dpkg && tot dpkg-query -f '.\n' -W + has dpkg && tot dpkg-query -f '.\n' -W has nix-store && { nix-user-pkgs() { @@ -1651,7 +1651,7 @@ get_packages() { # Scoop environment throws errors if `tot scoop list` is used has scoop && pkgs_h=1 dir ~/scoop/apps/* && ((packages-=1)) - # Count chocolatey packages. + # Count chocolatey packages. [[ -d /cygdrive/c/ProgramData/chocolatey/lib ]] && \ dir /cygdrive/c/ProgramData/chocolatey/lib/* ;; @@ -1659,7 +1659,7 @@ get_packages() { Haiku) has pkgman && dir /boot/system/package-links/* packages=${packages/pkgman/depot} - ;; + ;; IRIX) manager=swpkg @@ -2241,7 +2241,7 @@ get_cpu() { "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; "iPhone11,"[2468] | "iPad11,"[1-4] | "iPad11,"[6-7]): "Apple A12 Bionic (6) @ 2.49GHz" ;; "iPhone12,"[1358]): "Apple A13 Bionic (6) @ 2.65GHz" ;; - "iPhone13,"[1-4] | "iPad13,"[1-2]): "Apple A14 Bionic (6) @ 3.00Ghz" ;; + "iPhone13,"[1-4] | "iPad13,"[1-2]): "Apple A14 Bionic (6) @ 3.00Ghz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; @@ -2531,7 +2531,7 @@ get_gpu() { "iPhone10,"[1-6]): "Apple Designed GPU (A11)" ;; "iPhone11,"[2468] | "iPad11,"[67]): "Apple Designed GPU (A12)" ;; "iPhone12,"[1358]): "Apple Designed GPU (A13)" ;; - "iPhone13,"[1234] | "iPad13,"[12]): "Apple Designed GPU (A14)" ;; + "iPhone13,"[1234] | "iPad13,"[12]): "Apple Designed GPU (A14)" ;; "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; @@ -5067,7 +5067,7 @@ ASCII: Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, - DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, + DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, @@ -6381,7 +6381,7 @@ EOF "CelOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' - + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@@# @@@ @@ ,#%%%%%(. (@ @@ -6731,9 +6731,9 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - *"CrystalUX"*) - set_colors 13 5 - read -rd '' ascii_data <<'EOF' + *"CrystalUX"*) + set_colors 13 5 + read -rd '' ascii_data <<'EOF' ${c1} mysssym ${c1} mysssym ${c1} mysssym @@ -6755,7 +6755,7 @@ ${c1} dysssym ${c1} dysssym ${c1} dysssym EOF - ;; + ;; *"Cucumber"*) set_colors 2 3 @@ -7682,7 +7682,8 @@ ${c2} ` `` EOF ;; - "HydroOS"*) + + "HydroOS"*) set_colors 1 2 3 4 5 read -rd '' ascii_data <<'EOF' ${c1} @@ -7695,7 +7696,7 @@ ${c1} __/ | |___/ EOF - ;; + ;; "hyperbola_small"*) set_colors 8 @@ -9796,9 +9797,9 @@ ${c1} EOF ;; - "rocky_small"*) - set_colors 2 - read -rd '' ascii_data <<'EOF' + "rocky_small"*) + set_colors 2 + read -rd '' ascii_data <<'EOF' ${c1} `-/+++++++++/-.` `-+++++++++++++++++-` .+++++++++++++++++++++. @@ -9812,7 +9813,7 @@ ${c1} `-/+++++++++/-.` `-` ./+++++++++++- -+++++++++:-.` EOF - ;; + ;; "rocky"*) set_colors 35 @@ -10751,7 +10752,7 @@ EOF ;; - "semc"*) + "semc"*) set_colors 2 8 1 read -rd '' ascii_data <<'EOF' ${c1} /\ From 75198506b857e408eb6e9398f59842dd3dfcf6fe Mon Sep 17 00:00:00 2001 From: Daniel Thau Date: Fri, 11 Jun 2021 01:12:37 -0400 Subject: [PATCH 463/550] Bedrock Linux fixes (#1675) Neofetch is Bedrock-aware by default, but ignores Bedrock and restricts itself to the local layer of the Bedrock system when run in Bedrock's "restricted" mode. Previously, neofetch checked for restricted mode by looking at the $PATH, which can fail in some workflows. Instead, check for $BEDROCK_RESTRICT, which is more robust. Neofetch previously counted Bedrock stratum aliases when counting packages for some package managers. This resulted in over-counting packages. This commit restricts neofetch to only counting actual strata, not aliases. --- neofetch | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index fc511402..42e35e90 100755 --- a/neofetch +++ b/neofetch @@ -971,7 +971,7 @@ get_distro() { case $os in Linux|BSD|MINIX) - if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then + if [[ -f /bedrock/etc/bedrock-release && -z $BEDROCK_RESTRICT ]]; then case $distro_shorthand in on|tiny) distro="Bedrock Linux" ;; *) distro=$(< /bedrock/etc/bedrock-release) @@ -1505,7 +1505,9 @@ get_packages() { # pac: If packages > 0, log package manager name. # tot: Count lines in command output. has() { type -p "$1" >/dev/null && manager=$1; } - dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } + # globbing is intentional here + # shellcheck disable=SC2206 + dir() { pkgs=($@); ((packages+=${#pkgs[@]})); pac "$((${#pkgs[@]}-pkgs_h))"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; @@ -1513,14 +1515,22 @@ get_packages() { pac "$((${#pkgs[@]}-pkgs_h))"; } - # Redefine tot() for Bedrock Linux. + # Redefine tot() and dir() for Bedrock Linux. [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { + br_strata=$(brl list) tot() { - IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" + IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in ${br_strata}; do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) - pac "$((${#pkgs[@]}-pkgs_h))"; + pac "$((${#pkgs[@]}-pkgs_h))"; + } + dir() { + local pkgs=() + # globbing is intentional here + # shellcheck disable=SC2206 + for s in ${br_strata}; do pkgs+=(/bedrock/strata/$s/$@); done + ((packages+=${#pkgs[@]})) + pac "$((${#pkgs[@]}-pkgs_h))" } - br_prefix="/bedrock/strata/*" } case $os in @@ -1560,16 +1570,16 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob - has brew && dir "$(brew --cellar)"/* - has emerge && dir ${br_prefix}/var/db/pkg/*/*/ - has Compile && dir ${br_prefix}/Programs/*/ - has eopkg && dir ${br_prefix}/var/lib/eopkg/package/* - has crew && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist - has pkgtool && dir ${br_prefix}/var/log/packages/* - has scratch && dir ${br_prefix}/var/lib/scratchpkg/index/*/.pkginfo - has kagami && dir ${br_prefix}/var/lib/kagami/pkgs/* - has cave && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ - ${br_prefix}/var/db/paludis/repositories/installed/data/*/ + has brew && dir "$(brew --cellar)/*" + has emerge && dir "/var/db/pkg/*/*" + has Compile && dir "/Programs/*/" + has eopkg && dir "/var/lib/eopkg/package/*" + has crew && dir "/usr/local/etc/crew/meta/*.filelist" + has pkgtool && dir "/var/log/packages/*" + has scratch && dir "/var/lib/scratchpkg/index/*/.pkginfo" + has kagami && dir "/var/lib/kagami/pkgs/*" + has cave && dir "/var/db/paludis/repositories/cross-installed/*/data/*/ \ + /var/db/paludis/repositories/installed/data/*/" shopt -u nullglob } From 528010e0456fd6fe5c23cb68e5333d7f72360def Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 11 Jun 2021 07:13:36 +0200 Subject: [PATCH 464/550] Add AlmaLinux logo (#1715) * Add AlmaLinux logo * Update AlmaLinux logo --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 42e35e90..8f176daf 100755 --- a/neofetch +++ b/neofetch @@ -5504,6 +5504,32 @@ ${c1} EOF ;; + "AlmaLinux"*) + set_colors 1 3 4 2 6 + read -rd '' ascii_data <<'EOF' +${c1} 'c:. +${c1} lkkkx, .. ${c2}.. ,cc, +${c1} okkkk:ckkx' ${c2}.lxkkx.okkkkd +${c1} .:llcokkx' ${c2}:kkkxkko:xkkd, +${c1} .xkkkkdood: ${c2};kx, .lkxlll; +${c1} xkkx. ${c2}xk' xkkkkk: +${c1} 'xkx. ${c2}xd .....,. +${c3} .. ${c1}:xkl' ${c2}:c ..''.. +${c3} .dkx' ${c1}.:ldl:'. ${c2}' ${c4}':lollldkkxo; +${c3} .''lkkko' ${c4}ckkkx. +${c3}'xkkkd:kkd. .. ${c5};' ${c4}:kkxo. +${c3},xkkkd;kk' ,d; ${c5}ld. ${c4}':dkd::cc, +${c3} .,,.;xkko'.';lxo. ${c5}dx, ${c4}:kkk'xkkkkc +${c3} 'dkkkkkxo:. ${c5};kx ${c4}.kkk:;xkkd. +${c3} ..... ${c5}.;dk:. ${c5}lkk. ${c4}:;, + ${c5}:kkkkkkkdoxkkx + ,c,,;;;:xkkd. + ;kkkkl... + ;kkkkl + ,od; +EOF + ;; + "alpine_small") set_colors 4 7 read -rd '' ascii_data <<'EOF' From d16e6e36cac65415af54dd98be20bfbace4e2656 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:15:37 +0000 Subject: [PATCH 465/550] packages: use crew prefix. Closes #1697 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 83ff7168..14cd4739 100755 --- a/neofetch +++ b/neofetch @@ -1574,7 +1574,7 @@ get_packages() { has emerge && dir "/var/db/pkg/*/*" has Compile && dir "/Programs/*/" has eopkg && dir "/var/lib/eopkg/package/*" - has crew && dir "/usr/local/etc/crew/meta/*.filelist" + has crew && dir "${CREW_PREFIX:-/usr/local}/etc/crew/meta/*.filelist" has pkgtool && dir "/var/log/packages/*" has scratch && dir "/var/lib/scratchpkg/index/*/.pkginfo" has kagami && dir "/var/lib/kagami/pkgs/*" From df453e4f1bbb5d82b11db8910a19e49437eedef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCleyman=20Fatih=20=C5=9Eim=C5=9Fek?= <75628379+suleymanfatih@users.noreply.github.com> Date: Fri, 11 Jun 2021 08:17:02 +0300 Subject: [PATCH 466/550] added PNM Linux ascii art (#1695) --- neofetch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/neofetch b/neofetch index 14cd4739..39911309 100755 --- a/neofetch +++ b/neofetch @@ -9335,6 +9335,33 @@ ${c1} PPPPPPPPPPPPPP EOF ;; + "PNM Linux"* | "WHPNM Linux"*) + set_colors 33 9 15 202 + read -rd '' ascii_data <<'EOF' + +${c1} + ``.---..` `--` + ``.---........-:.${c2}-::`${c1} + ${c2}./::-${c1}........${c2}--::.````${c1} + ${c2}.:://:::${c1}----${c2}::::-..${c1} + ..${c2}--:::::--::::++-${c1}.` + ${c2}`-:-`${c1} .-ohy+::${c2}-:::${c1}/sdmdd:.${c2} `-:- + .-:::${c1}...${c3}sNNmds$y${c1}o/+${c3}sy+NN$m${c1}d+.`${c2}-:::-. + `.-:-${c1}./${c3}dN${c1}()${c3}yyooosd${c1}()${c3}$m${c1}dy${c2}-.::-.`${c1} + ${c2}`.${c1}-...-${c3}+hNdyyyyyydmy${c1}:......${c2}`${c1} + ``..--.....-${c3}yNNm${c4}hssssh${c3}mmdo${c1}.........``` +`-:://:.....${c3}hNNNNN${c4}mddm${c3}NNNmds${c1}.....//::--` + ```.:-...${c3}oNNNNNNNNNNNNNNmd/${c1}...:-.``` + .....${c3}hNNNNNNNNNNNNNNmds${c1}....` + --...${c3}hNNNNNNNNNNNNNNmdo${c1}..... + .:...${c3}/NNNNNNNNNNNNNNdd${c1}:....` + `-...${c3}+mNNNNNNNNNNNmh${c1}:...-. + ${c4}.:+o+/:-${c1}:+oo+///++o+/:-${c4}:/+ooo/:. + ${c4}+oo/:o- +oooooso.` + ${c4}.` ` `/ .-//- +EOF + ;; + "popos_small"* | "pop_os_small"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' From 611117f4af527de3b81bc92c74ae976e130d39e6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:16:43 +0000 Subject: [PATCH 467/550] general: Fix indentation --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 39911309..c5509a44 100755 --- a/neofetch +++ b/neofetch @@ -9336,8 +9336,8 @@ EOF ;; "PNM Linux"* | "WHPNM Linux"*) - set_colors 33 9 15 202 - read -rd '' ascii_data <<'EOF' + set_colors 33 9 15 202 + read -rd '' ascii_data <<'EOF' ${c1} ``.---..` `--` From 55beea7b6f5f0811ac66a9273161a134ceb83435 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:19:46 +0000 Subject: [PATCH 468/550] os: Add CyberOS. Closes #1690 --- neofetch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/neofetch b/neofetch index c5509a44..2c39e783 100755 --- a/neofetch +++ b/neofetch @@ -6819,6 +6819,27 @@ o/${c2}--...::-:/::/:-......-::::::-/-...-${c1}:/o EOF ;; + "CyberOS"*) + set_colors 50 32 57 + read -rd '' ascii_data <<'EOF' +${c3} !M$EEEEEEEEEEEP + .MMMMM000000Nr. + ${c3}&MMMMMM${c2}MMMMMMMMMMMMM9 + ${c3}~MMM${c1}MMMM${c2}MMMMMMMMMMMMC + ${c1}" ${c3}M${c1}MMMMMMM${c2}MMMMMMMMMMs + ${c1}iM${c2}MMM&&${c1}MMMMMMMM${c2}MMMMMMMM\\ + ${c1}BMMM${c2}MMMMM${c1}MMMMMMM${c2}MMMMMM${c3}" +${c1}9MMMMM${c2}MMMMMMM${c1}MMMM${c2}MMMM${c3}MMMf- + ${c2}sMMMMMMMM${c1}MM${c2}M${c3}MMMMMMMMM3_ + ${c2}+ffffffff${c1}P${c3}MMMMMMMMMMMM0 + ${c2}CMMMMMMMMMMM + }MMMMMMMMM + ~MMMMMMM + "RMMMM + .PMB +EOF + ;; + "dahlia"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From f572fb37a01417c571f89ce7481b51e03cc614e3 Mon Sep 17 00:00:00 2001 From: Suleyman Poyraz <22801690+Zaryob@users.noreply.github.com> Date: Fri, 11 Jun 2021 08:24:32 +0300 Subject: [PATCH 469/550] Added PuffOS successfuly instead of #1659 (#1678) Co-authored-by: dylan --- neofetch | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 2c39e783..942dfe69 100755 --- a/neofetch +++ b/neofetch @@ -799,9 +799,9 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, -# Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, -# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rocky, -# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, +# Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, @@ -5089,7 +5089,7 @@ ASCII: openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, - Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, + Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, @@ -9491,6 +9491,25 @@ ${c1} /\\ EOF ;; + "PuffOS"*) + set_colors 3 + read -rd '' ascii_data <<'EOF' +${c1} + _,..._,m, + ,/' '""; + / ". + ,'mmmMMMMmm. \ + _/-"^^^^^"""%#%mm, ; + ,m,_,' "###) ;, +(###% \#/ ;##mm. + ^#/ __ ___ ; (######) + ; //.\\ //.\\ ; \####/ + _; (#\"// \\"/#) ; ,/ +@##\ \##/ = `"=" ,;mm/ +`\##>.____,...,____,<####@ +EOF + ;; + "Proxmox"*) set_colors 7 202 read -rd '' ascii_data <<'EOF' From 6b755b7ac69af5d7df648575e3d55fffbcd8101e Mon Sep 17 00:00:00 2001 From: Jonas Frei <8ec426b4-7173-428a-a6dc-3c520b45b0e2@wwsxrfc8.anonaddy.com> Date: Fri, 11 Jun 2021 07:24:51 +0200 Subject: [PATCH 470/550] Added 'hikari' to supported WMs (#1669) Co-authored-by: Jonas Frei --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 942dfe69..a5f4314f 100755 --- a/neofetch +++ b/neofetch @@ -1894,6 +1894,7 @@ get_wm() { -e gnome-shell \ -e greenfield \ -e grefsen \ + -e hikari \ -e kwin \ -e lipstick \ -e maynard \ From 3514e02d61a7ee880b325436e8454e5d56eb07df Mon Sep 17 00:00:00 2001 From: jrt Date: Fri, 11 Jun 2021 07:25:40 +0200 Subject: [PATCH 471/550] add AsteroidOS (#1676) --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index a5f4314f..dfbe1404 100755 --- a/neofetch +++ b/neofetch @@ -6149,6 +6149,29 @@ ${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy EOF ;; + "AsteroidOS"*) + set_colors 160 208 202 214 + read -rd '' ascii_data <<'EOF' +${c1} *** +${c1} ***** +${c1} ********** +${c1} *************** +${c1} *///****////****////. +${c2} (/////// /////// ///////( +${c2} /(((((//* //, //((((((. +${c2} ((((((((((( ((( (((((((( +${c2} *((((((((((((((((((((((( (((((((( +${c3} (((((#(((((((#((((( ((#((((( +${c3} (#(#(#####(#(#, ####(#(# +${c3} ######### ######## +${c3} /######## ######## +${c4} #######%####### +${c4} (#%%%%%%%# +${c4} %%%%% +${c4} %%% +EOF + ;; + "Bedrock"*) set_colors 8 7 read -rd '' ascii_data <<'EOF' From 9b708d6e5fd4e0651fb218b7f63f9cbf14c6deda Mon Sep 17 00:00:00 2001 From: Tiny Date: Fri, 11 Jun 2021 05:25:57 +0000 Subject: [PATCH 472/550] fix:The main version file of GNU/Deepin Linux has been moved from /etc/deepin-version to /etc/os-version (#1667) Description: Log: --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index dfbe1404..f3367be7 100755 --- a/neofetch +++ b/neofetch @@ -1840,7 +1840,7 @@ get_de() { Xfce*) de_ver=$(xfce4-session --version) ;; GNOME*) de_ver=$(gnome-shell --version) ;; Cinnamon*) de_ver=$(cinnamon --version) ;; - Deepin*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; + Deepin*) de_ver=$(awk -F'=' '/MajorVersion/ {print $2}' /etc/os-version) ;; Budgie*) de_ver=$(budgie-desktop --version) ;; LXQt*) de_ver=$(lxqt-session --version) ;; Lumina*) de_ver=$(lumina-desktop --version 2>&1) ;; From 13cda3f7e40a79e3f4e7d64d6f13e134c1f75c4a Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Thu, 10 Jun 2021 22:30:28 -0700 Subject: [PATCH 473/550] neofetch: Fix Terminal Font for mintty (#1641) * neofetch: Fix Terminal Font for mintty * Quiet shellcheck error --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f3367be7..5cf2f5b1 100755 --- a/neofetch +++ b/neofetch @@ -3452,7 +3452,7 @@ END ;; "mintty") - term_font="$(awk -F '=' '!/^($|#)/ && /Font/ {printf $2; exit}' "${HOME}/.minttyrc")" + term_font="$(awk -F '=' '!/^($|#)/ && /^\\s*Font\\s*=/ {printf $2; exit}' "${HOME}/.minttyrc")" ;; "pantheon"*) From ec1fb325b0ea6324923d6b277a125efb86ebc17c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:39:31 +0000 Subject: [PATCH 474/550] misc: fix typo. Closes #1623 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 2c39e783..48271100 100755 --- a/neofetch +++ b/neofetch @@ -815,7 +815,7 @@ image_source="auto" # Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. # NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, # CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, -# Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, +# 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. @@ -5110,7 +5110,7 @@ ASCII: NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, - Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, + 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. From 2491af5e58924cc2d6d9a11183de62c45bc165d9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:41:19 +0000 Subject: [PATCH 475/550] os: Add support for Mandrake. Closes #1625 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a51ca9c5..c04ee1e3 100755 --- a/neofetch +++ b/neofetch @@ -8323,7 +8323,7 @@ o00. k0O${c2}dddddd${c1}occ EOF ;; - "Mandriva"*) + "Mandriva"* | "Mandrake"*) set_colors 4 3 read -rd '' ascii_data <<'EOF' ${c2} `` From 64dd7b68eff2cac409e10f92ea7f6b5bc83ae8e6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:47:20 +0000 Subject: [PATCH 476/550] term: Add newgrp to blacklist. Closes #1635 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c04ee1e3..fccdef9b 100755 --- a/neofetch +++ b/neofetch @@ -3245,7 +3245,7 @@ get_term() { name="$(get_process_name "$parent")" case ${name// } in - "${SHELL/*\/}"|*"sh"|"screen"|"su"*) ;; + "${SHELL/*\/}"|*"sh"|"screen"|"su"*|"newgrp") ;; "login"*|*"Login"*|"init"|"(init)") term="$(tty)" From 7de6bb8d2c4d817d67ce5e7c2f3f60897e37233d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:56:42 +0000 Subject: [PATCH 477/550] resolution: Fix truncation of drm modes. Closes #1639 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fccdef9b..b2938644 100755 --- a/neofetch +++ b/neofetch @@ -3047,7 +3047,8 @@ get_resolution() { ;; esac - resolution="${resolution%,*}" + resolution="${resolution%%,}" + resolution="${resolution%%, }" [[ -z "${resolution/x}" ]] && resolution= } From ab839cb9b01ca466212fc04b5285251bc2033575 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 06:14:10 +0000 Subject: [PATCH 478/550] os: Fix Chrome OS issue. Closes #1653 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index b2938644..e676aa1a 100755 --- a/neofetch +++ b/neofetch @@ -1115,6 +1115,7 @@ get_distro() { tiny) distro="Chrome OS" ;; *) distro+=" on Chrome OS" ;; esac + distro=${distro## on } fi distro=$(trim_quotes "$distro") From 27277eac1dd18738bb51978fed3e750cf29b6c14 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 10 Jun 2021 23:18:31 -0700 Subject: [PATCH 479/550] os: fix syntax error introduced by celos logo (#1772) Signed-off-by: Christian Stewart --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e676aa1a..8f8d4159 100755 --- a/neofetch +++ b/neofetch @@ -6438,6 +6438,7 @@ ${c2} .......... ...',;;;;;;,,... ..... EOF + ;; "CelOS"*) @@ -6460,7 +6461,6 @@ EOF EOF ;; - ;; "centos_small"*) set_colors 3 2 4 5 7 From 1c954ec55652dc14a4d17408cd6170319290be54 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 10 Jun 2021 23:19:21 -0700 Subject: [PATCH 480/550] Added support for SkiffOS (#1664) * os: fix syntax error introduced by celos logo Signed-off-by: Christian Stewart * Added support for SkiffOS https://github.com/skiffos/skiffos Fixes #1657 Signed-off-by: Christian Stewart --- neofetch | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8f8d4159..b525c857 100755 --- a/neofetch +++ b/neofetch @@ -802,7 +802,7 @@ image_source="auto" # Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -# SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +# SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, @@ -10292,6 +10292,22 @@ yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy EOF ;; + "SkiffOS"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c2} + ,@@@@@@@@@@@w,_ + ${c2}====~~~,,.${c2}A@@@@@@@@@@@@@@@@@W,_ + ${c1}`||||||||||||||L{${c2}"@$@@@@@@@@B" + ${c1}`|||||||||||||||||||||L{${c2}"$D + ${c2}@@@@@@@@@@@@@@@@@@@@@${c1}_||||}==, + ${c2}*@@@@@@@@@@@@@@@@@@@@@@@@@p${c1}||||==, + ${c1}`'||LLL{{""${c2}@$B@@@@@@@@@@@@@@@p${c1}|| + ${c1}`~=|||||||||||L"${c2}$@@@@@@@@@@@ + ${c1}````'"""""""${c2}'"""""""" +EOF + ;; + "Solus"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 06b1c77bb8311a91d09fbb2c11f9827a3570a97a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:03:16 +0000 Subject: [PATCH 481/550] gpu: Fix windows issue. See: #1759 --- neofetch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index b525c857..b735d512 100755 --- a/neofetch +++ b/neofetch @@ -2561,12 +2561,14 @@ get_gpu() { while read -r line; do line=$(trim "$line") - [[ -z $win_gpu ]] || [[ -z "$line" ]] && { - win_gpu=1 - continue - } + case $line in + *Caption*|'') + continue - prin "${subtitle:+${subtitle}${gpu_name}}" "$line" + *) + prin "${subtitle:+${subtitle}${gpu_name}}" "$line" + ;; + esac done < <(wmic path Win32_VideoController get caption) ;; From bcc8d98df5ced8a773ef890747b10a176ba986df Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:05:57 +0000 Subject: [PATCH 482/550] os: Fix ubuntu studio. Closes #1733 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b735d512..39f376fc 100755 --- a/neofetch +++ b/neofetch @@ -1124,12 +1124,12 @@ get_distro() { # Get Ubuntu flavor. if [[ $distro == "Ubuntu"* ]]; then case $XDG_CONFIG_DIRS in + *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; *"plasma"*) distro=${distro/Ubuntu/Kubuntu} ;; *"mate"*) distro=${distro/Ubuntu/Ubuntu MATE} ;; *"xubuntu"*) distro=${distro/Ubuntu/Xubuntu} ;; *"Lubuntu"*) distro=${distro/Ubuntu/Lubuntu} ;; *"budgie"*) distro=${distro/Ubuntu/Ubuntu Budgie} ;; - *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; *"cinnamon"*) distro=${distro/Ubuntu/Ubuntu Cinnamon} ;; esac fi From 4fbf8df1c80c49fdbef577e3723cc0d942c7eb31 Mon Sep 17 00:00:00 2001 From: Lorenzo Cauli Date: Fri, 11 Jun 2021 09:34:26 +0200 Subject: [PATCH 483/550] Edited PCLinuxOS logo for proper alignment. (#1685) Co-authored-by: Lorenzo Cauli --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 39f376fc..34ee2503 100755 --- a/neofetch +++ b/neofetch @@ -9314,7 +9314,7 @@ EOF "PCLinuxOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - ${c1}mhhhyyyyhhhdN +${c1} mhhhyyyyhhhdN dyssyhhhhhhhhhhhssyhN Nysyhhyo/:-.....-/oyhhhssd Nsshhy+. `/shhysm From 4b93d6824aaee58477569a88900505edc42acad3 Mon Sep 17 00:00:00 2001 From: Jaehee Hong Date: Fri, 11 Jun 2021 16:36:31 +0900 Subject: [PATCH 484/550] Fix Homebrew's Cellar path for brew package counts (#1656) From 0bbd6bff86da9c1fd016a86fd1557666b31bf5fb Mon Sep 17 00:00:00 2001 From: freddii Date: Fri, 11 Jun 2021 09:37:20 +0200 Subject: [PATCH 485/550] fixes spelling mistake (#1654) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 34ee2503..85473d29 100755 --- a/neofetch +++ b/neofetch @@ -158,7 +158,7 @@ uptime_shorthand="on" # Memory -# Show memory pecentage in output. +# Show memory percentage in output. # # Default: 'off' # Values: 'on', 'off' From 9b1108133caf38bcd8a19d4b96ebaa720caf0500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Fri, 11 Jun 2021 09:37:57 +0200 Subject: [PATCH 486/550] OpenBSD: change cpu count (#1650) Instead of using hw.ncpu, use hw.ncpuonline and hw.ncpufound, and check SMT status --- neofetch | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 85473d29..28900c8f 100755 --- a/neofetch +++ b/neofetch @@ -2286,7 +2286,17 @@ get_cpu() { [[ -z "$speed" ]] && speed="$(sysctl -n hw.clockrate)" # Get CPU cores. - cores="$(sysctl -n hw.ncpu)" + case $kernel_name in + "OpenBSD"*) + [[ "$(sysctl -n hw.smt)" == "1" ]] && smt="on" || smt="off" + ncpufound="$(sysctl -n hw.ncpufound)" + ncpuonline="$(sysctl -n hw.ncpuonline)" + cores="${ncpuonline}/${ncpufound},\\xc2\\xa0SMT\\xc2\\xa0${smt}" + ;; + *) + cores="$(sysctl -n hw.ncpu)" + ;; + esac # Get CPU temp. case $kernel_name in From 219714c86ef298102ce7eb7bce1124ac9df9df68 Mon Sep 17 00:00:00 2001 From: Guanzhong Chen Date: Fri, 11 Jun 2021 03:39:07 -0400 Subject: [PATCH 487/550] Show GPU subsystem name if possible. Fixes #1490 (#1648) After this change, if a subsystem name exists for a GPU, we display that name instead of the device name. This should fix the issue mentioned in #1490. For example, a card that would be shown as: GPU: AMD ATI Radeon RX 470/480/570/570X/580/580X/590 before will now be shown as: GPU: AMD ATI Radeon RX 480 4GB This fallback logic is implemented in the `awk` command. Additionally, the PCI address is now stripped from the awk output because it never is desirable to print it. It is, however, still kept internally in `awk` to distinguish multiple cards of the same model. --- neofetch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 28900c8f..f93e1fea 100755 --- a/neofetch +++ b/neofetch @@ -2449,9 +2449,17 @@ get_gpu() { case $os in "Linux") # Read GPUs into array. - gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ - '/"Display|"3D|"VGA/ {a[$0] = $1 " " $3 " " $4} - END {for(i in a) {if(!seen[a[i]]++) print a[i]}}')" + gpu_cmd="$(lspci -mm | + awk -F '\"|\" \"|\\(' \ + '/"Display|"3D|"VGA/ { + a[$0] = $1 " " $3 " " ($7 ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $7) + } + END { for (i in a) { + if (!seen[a[i]]++) { + sub("^[^ ]+ ", "", a[i]); + print a[i] + } + }}')" IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd" # Remove duplicate Intel Graphics outputs. From 07ae57453a5514e73a1c7c50b896b73f02532e9c Mon Sep 17 00:00:00 2001 From: kanashimia Date: Fri, 11 Jun 2021 10:41:32 +0300 Subject: [PATCH 488/550] Fix nix mistkae on darwin (#1628) See https://github.com/dylanaraps/neofetch/pull/1617#issuecomment-740655977 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f93e1fea..e681598f 100755 --- a/neofetch +++ b/neofetch @@ -1644,7 +1644,7 @@ get_packages() { nix-store -qR /etc/profiles/per-user/"$USER" } manager=nix-system && tot nix-store -qR /run/current-system/sw - manager=nix-user && tot nix-store -qR nix-user-pkgs + manager=nix-user && tot nix-user-pkgs } ;; From 70ad34e919b301f007fd18e5daf81120b45ce6db Mon Sep 17 00:00:00 2001 From: Koakuma Date: Fri, 11 Jun 2021 14:42:46 +0700 Subject: [PATCH 489/550] Fix CPU core/frequency reading on Linux/SPARC systems (#1643) --- neofetch | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index e681598f..2f0bb9e6 100755 --- a/neofetch +++ b/neofetch @@ -2213,17 +2213,50 @@ get_cpu() { speed="$((speed / 1000))" else - speed="$(awk -F ': |\\.' '/cpu MHz|^clock/ {printf $2; exit}' "$cpu_file")" - speed="${speed/MHz}" + case $kernel_machine in + "sparc"*) + # SPARC systems use a different file to expose clock speed information. + speed_file="/sys/devices/system/cpu/cpu0/clock_tick" + speed="$(($(< "$speed_file") / 1000000))" + ;; + + *) + speed="$(awk -F ': |\\.' '/cpu MHz|^clock/ {printf $2; exit}' "$cpu_file")" + speed="${speed/MHz}" + ;; + esac fi # Get CPU temp. [[ -f "$temp_dir" ]] && deg="$(($(< "$temp_dir") * 100 / 10000))" # Get CPU cores. - case $cpu_cores in - "logical" | "on") cores="$(grep -c "^processor" "$cpu_file")" ;; - "physical") cores="$(awk '/^core id/&&!a[$0]++{++i} END {print i}' "$cpu_file")" ;; + case $kernel_machine in + "sparc"*) + case $cpu_cores in + # SPARC systems doesn't expose detailed topology information in + # /proc/cpuinfo so I have to use lscpu here. + "logical" | "on") + cores="$(lscpu | awk -F ': *' '/^CPU\(s\)/ {print $2}')" + ;; + "physical") + cores="$(lscpu | awk -F ': *' '/^Core\(s\) per socket/ {print $2}')" + sockets="$(lscpu | awk -F ': *' '/^Socket\(s\)/ {print $2}')" + cores="$((sockets * cores))" + ;; + esac + ;; + + *) + case $cpu_cores in + "logical" | "on") + cores="$(grep -c "^processor" "$cpu_file")" + ;; + "physical") + cores="$(awk '/^core id/&&!a[$0]++{++i} END {print i}' "$cpu_file")" + ;; + esac + ;; esac ;; From 77f0efea26115639110a42abc1803623a0b91b40 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:45:19 +0000 Subject: [PATCH 490/550] packages: Fix apt. Closes #1620 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 39f376fc..4cd5b9bf 100755 --- a/neofetch +++ b/neofetch @@ -1540,7 +1540,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has apt && tot apt list --installed && ((packages-=1)) + has apt && pkgs_h=1 tot apt list --installed && ((packages-=1)) has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed From 010e3760581ea594a6871579f202c2bbb94f7ae5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:48:16 +0000 Subject: [PATCH 491/550] packages: use dpkg --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6cc30621..3c0a272c 100755 --- a/neofetch +++ b/neofetch @@ -1540,7 +1540,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has apt && pkgs_h=1 tot apt list --installed && ((packages-=1)) + has dpkg && pac "$(dpkg --list | grep -c ^ii)" has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed From 77cac59c84db2254c460c48a9c1a69c3b21b217a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 09:23:37 +0000 Subject: [PATCH 492/550] neofetch: Fix syntax error --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 3c0a272c..d675de47 100755 --- a/neofetch +++ b/neofetch @@ -2615,6 +2615,7 @@ get_gpu() { case $line in *Caption*|'') continue + ;; *) prin "${subtitle:+${subtitle}${gpu_name}}" "$line" From 370a50c3e36b091dc2dc2f6cd9161477f3638b31 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 09:25:11 +0000 Subject: [PATCH 493/550] term: ignore bwrap --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d675de47..d3aeb96c 100755 --- a/neofetch +++ b/neofetch @@ -3307,7 +3307,8 @@ get_term() { term="$(tty)" ;; - "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|"USER"*"PID"*|"kdeinit"*|"launchd"*) + "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*| + "USER"*"PID"*|"kdeinit"*|"launchd"*|"bwrap") break ;; From bb974c77fc04a66f8d2f78335990fdb1066385bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Fri, 11 Jun 2021 12:28:24 +0200 Subject: [PATCH 494/550] Fix a wrong multiple line spanning (#1774) ./neofetch: line 3310: syntax error near unexpected token `newline' ./neofetch: line 3310: `"ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|' --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d3aeb96c..11c80ff5 100755 --- a/neofetch +++ b/neofetch @@ -3307,7 +3307,7 @@ get_term() { term="$(tty)" ;; - "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*| + "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|\ "USER"*"PID"*|"kdeinit"*|"launchd"*|"bwrap") break ;; From 5e54a5e48b22fa316d1f35fe7b8470b9c01ba106 Mon Sep 17 00:00:00 2001 From: Gyro7 <65873913+Gyro7@users.noreply.github.com> Date: Fri, 11 Jun 2021 13:11:43 +0200 Subject: [PATCH 495/550] Add distribution AmogOS (#1773) * Add distribution AmogOS * Fixed indentation and removed unrelated changes * Added AmogOS to ascii art distros --- neofetch | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 11c80ff5..b0159927 100755 --- a/neofetch +++ b/neofetch @@ -780,7 +780,7 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS, +# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, AmogOS, 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, @@ -5676,7 +5676,31 @@ dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd `-+shy shs+:` EOF ;; - + "AmogOS"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ' +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⣤⣤⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⠟⠉⠉⠉⠉⠉⠉⠉⠙⠻⢶⣄⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣷⡀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡟⠀⣠⣶⠛⠛⠛⠛⠛⠛⠳⣦⡀⠀⠘⣿⡄⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⠁⠀⢹⣿⣦⣀⣀⣀⣀⣀⣠⣼⡇⠀⠀⠸⣷⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠀⠀⠀⠉⠛⠿⠿⠿⠿⠛⠋⠁⠀⠀⠀⠀⣿⡄ +⠀⠀ ⠀⠀⢠⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⡇⠀ + ⠀⠀⣸⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡇⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣧⠀ +⠀⠀⠀⠀⠀⠀⠀⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣿⠀ +⠀⠀⠀⠀⠀⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠀⠀⠀⠀⠀⠀⠀⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠀⠀⠀⠀⠀⠀⢰⣿⠀⠀⠀⠀⣠⡶⠶⠿⠿⠿⠿⢷⣦⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠀⠀⣀⣀⣀⠀⣸⡇⠀⠀⠀⠀⣿⡀⠀⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⣿⠀ +⣠⡿⠛⠛⠛⠛⠻⠀⠀⠀⠀⠀⢸⣇⠀⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⠀⠀⠀⣿⠀ +⢻⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⡟⠀⠀⢀⣤⣤⣴⣿⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠈⠙⢷⣶⣦⣤⣤⣤⣴⣶⣾⠿⠛⠁⢀⣶⡟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡟⠀ + ⠀⠀⠀⠀⠈⣿⣆⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⡾⠃⠀ +⠀ ⠀⠀⠀⠀⠀⠀⠈⠛⠻⢿⣿⣾⣿⡿⠿⠟⠋⠁⠀⠀⠀ +EOF + ;; "Anarchy"*) set_colors 7 4 read -rd '' ascii_data <<'EOF' From 25127b7793dc899fe03f06e564d64716de894556 Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Sat, 12 Jun 2021 03:47:27 -0400 Subject: [PATCH 496/550] fix package count not including brew casks (#1777) --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index b0159927..f4509273 100755 --- a/neofetch +++ b/neofetch @@ -1571,7 +1571,7 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob - has brew && dir "$(brew --cellar)/*" + has brew && dir "$(brew --cellar)/* $(brew --caskroom)/*" has emerge && dir "/var/db/pkg/*/*" has Compile && dir "/Programs/*/" has eopkg && dir "/var/lib/eopkg/package/*" @@ -1634,7 +1634,7 @@ get_packages() { "Mac OS X"|"macOS"|MINIX) has port && pkgs_h=1 tot port installed && ((packages-=1)) - has brew && dir "$(brew --cellar)"/* + has brew && dir "$(brew --cellar)/* $(brew --caskroom)/*" has pkgin && tot pkgin list has dpkg && tot dpkg-query -f '.\n' -W From 73ad76aa4be76fa78a2048075fb15d65e3aadbbd Mon Sep 17 00:00:00 2001 From: MrVeink <59528135+MrVeink@users.noreply.github.com> Date: Sat, 12 Jun 2021 10:48:38 +0300 Subject: [PATCH 497/550] Added iglunix to ascii art distros (#1775) --- neofetch | 138 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 60 deletions(-) diff --git a/neofetch b/neofetch index f4509273..d9e86e42 100755 --- a/neofetch +++ b/neofetch @@ -786,12 +786,12 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, +# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS -# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, +# Hyperbola, iglunix, 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, @@ -799,8 +799,8 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, -# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, -# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, @@ -5134,11 +5134,11 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, - CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, + CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, - GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, + GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, iglunix, 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, @@ -6523,7 +6523,7 @@ EOF "CelOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' - + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@@# @@@ @@ ,#%%%%%(. (@ @@ -7384,29 +7384,29 @@ ${c1} /:-------------:\\ :---------------------:// EOF ;; - + "Fedora"*) set_colors 12 7 read -rd '' ascii_data <<'EOF' ${c1} .',;::::;,'. - .';:cccccccccccc:;,. - .;cccccccccccccccccccccc;. - .:cccccccccccccccccccccccccc:. + .';:cccccccccccc:;,. + .;cccccccccccccccccccccc;. + .:cccccccccccccccccccccccccc:. .;ccccccccccccc;${c2}.:dddl:.${c1};ccccccc;. - .:ccccccccccccc;${c2}OWMKOOXMWd${c1};ccccccc:. + .:ccccccccccccc;${c2}OWMKOOXMWd${c1};ccccccc:. .:ccccccccccccc;${c2}KMMc${c1};cc;${c2}xMMc${c1};ccccccc:. ,cccccccccccccc;${c2}MMM.${c1};cc;${c2};WW:${c1};cccccccc, :cccccccccccccc;${c2}MMM.${c1};cccccccccccccccc: :ccccccc;${c2}oxOOOo${c1};${c2}MMM0OOk.${c1};cccccccccccc: cccccc;${c2}0MMKxdd:${c1};${c2}MMMkddc.${c1};cccccccccccc; ccccc;${c2}XM0'${c1};cccc;${c2}MMM.${c1};cccccccccccccccc' -ccccc;${c2}MMo${c1};ccccc;${c2}MMW.${c1};ccccccccccccccc; -ccccc;${c2}0MNc.${c1}ccc${c2}.xMMd${c1};ccccccccccccccc; -cccccc;${c2}dNMWXXXWM0:${c1};cccccccccccccc:, -cccccccc;${c2}.:odl:.${c1};cccccccccccccc:,. -:cccccccccccccccccccccccccccc:'. -.:cccccccccccccccccccccc:;,.. - '::cccccccccccccc::;,. +ccccc;${c2}MMo${c1};ccccc;${c2}MMW.${c1};ccccccccccccccc; +ccccc;${c2}0MNc.${c1}ccc${c2}.xMMd${c1};ccccccccccccccc; +cccccc;${c2}dNMWXXXWM0:${c1};cccccccccccccc:, +cccccccc;${c2}.:odl:.${c1};cccccccccccccc:,. +:cccccccccccccccccccccccccccc:'. +.:cccccccccccccccccccccc:;,.. + '::cccccccccccccc::;,. EOF ;; @@ -7895,6 +7895,24 @@ WW W EOF ;; + "iglunix"*|"iglu"*) + set_colors 8 + read -rd '' ascii_data <<'EOF' +${c1} | + | | + | +| ________ +| /\ | \ + / \ | \ | + / \ \ | +/ \________\ +\ / / + \ / / + \ / / + \/________/ +EOF + ;; + "januslinux"*|"janus"*|"Ataraxia Linux"*|"Ataraxia"*) set_colors 4 5 6 2 read -rd '' ascii_data <<'EOF' @@ -8461,27 +8479,27 @@ EOF "TeArch"*) set_colors 39 7 1 read -rd '' ascii_data <<'EOF' -${c1} @@@@@@@@@@@@@@ - @@@@@@@@@ @@@@@@ - @@@@@ @@@@@ - @@ @@ - @% @@ - @ @ - @@@@@@@@@@@@@@@@@@@@@@@@ @@ - .@@@@@@@@@@@@/@@@@@@@@@@@@ - @@@@@@@@@@@@///@@@@@@@@@@@@ - @@@@@@@@@@@@@((((@@@@@@@@@@@@ - @@@@@@@@@@@#(((((((#@@@@@@@@@@@ - @@@@@@@@@@@#//////////@@@@@@@@@@& - @@@@@@@@@@////@@@@@////@@@@@@@@@@ - @@@@@@@@//////@@@@@/////@@@@@@@@@ - @@@@@@@//@@@@@@@@@@@@@@@//@@@@@@@ +${c1} @@@@@@@@@@@@@@ + @@@@@@@@@ @@@@@@ + @@@@@ @@@@@ + @@ @@ + @% @@ + @ @ + @@@@@@@@@@@@@@@@@@@@@@@@ @@ + .@@@@@@@@@@@@/@@@@@@@@@@@@ + @@@@@@@@@@@@///@@@@@@@@@@@@ + @@@@@@@@@@@@@((((@@@@@@@@@@@@ + @@@@@@@@@@@#(((((((#@@@@@@@@@@@ + @@@@@@@@@@@#//////////@@@@@@@@@@& + @@@@@@@@@@////@@@@@////@@@@@@@@@@ + @@@@@@@@//////@@@@@/////@@@@@@@@@ + @@@@@@@//@@@@@@@@@@@@@@@//@@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@ .@@@@@@@@@@@@@@@@@@@@@@@@@ @ @@@@@@ @@@. @@@@@@@ - @@@@@@@&@@@@@@@# #@@@@@@@@@@@@@@@@ - @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - @@@@@@@@@@@@@@@@@@@@@ + @@@@@@@&@@@@@@@# #@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@ EOF ;; @@ -9466,25 +9484,25 @@ EOF read -rd '' ascii_data <<'EOF' ${c1} - ``.---..` `--` - ``.---........-:.${c2}-::`${c1} - ${c2}./::-${c1}........${c2}--::.````${c1} - ${c2}.:://:::${c1}----${c2}::::-..${c1} - ..${c2}--:::::--::::++-${c1}.` - ${c2}`-:-`${c1} .-ohy+::${c2}-:::${c1}/sdmdd:.${c2} `-:- - .-:::${c1}...${c3}sNNmds$y${c1}o/+${c3}sy+NN$m${c1}d+.`${c2}-:::-. - `.-:-${c1}./${c3}dN${c1}()${c3}yyooosd${c1}()${c3}$m${c1}dy${c2}-.::-.`${c1} - ${c2}`.${c1}-...-${c3}+hNdyyyyyydmy${c1}:......${c2}`${c1} - ``..--.....-${c3}yNNm${c4}hssssh${c3}mmdo${c1}.........``` + ``.---..` `--` + ``.---........-:.${c2}-::`${c1} + ${c2}./::-${c1}........${c2}--::.````${c1} + ${c2}.:://:::${c1}----${c2}::::-..${c1} + ..${c2}--:::::--::::++-${c1}.` + ${c2}`-:-`${c1} .-ohy+::${c2}-:::${c1}/sdmdd:.${c2} `-:- + .-:::${c1}...${c3}sNNmds$y${c1}o/+${c3}sy+NN$m${c1}d+.`${c2}-:::-. + `.-:-${c1}./${c3}dN${c1}()${c3}yyooosd${c1}()${c3}$m${c1}dy${c2}-.::-.`${c1} + ${c2}`.${c1}-...-${c3}+hNdyyyyyydmy${c1}:......${c2}`${c1} + ``..--.....-${c3}yNNm${c4}hssssh${c3}mmdo${c1}.........``` `-:://:.....${c3}hNNNNN${c4}mddm${c3}NNNmds${c1}.....//::--` - ```.:-...${c3}oNNNNNNNNNNNNNNmd/${c1}...:-.``` - .....${c3}hNNNNNNNNNNNNNNmds${c1}....` - --...${c3}hNNNNNNNNNNNNNNmdo${c1}..... - .:...${c3}/NNNNNNNNNNNNNNdd${c1}:....` - `-...${c3}+mNNNNNNNNNNNmh${c1}:...-. - ${c4}.:+o+/:-${c1}:+oo+///++o+/:-${c4}:/+ooo/:. - ${c4}+oo/:o- +oooooso.` - ${c4}.` ` `/ .-//- + ```.:-...${c3}oNNNNNNNNNNNNNNmd/${c1}...:-.``` + .....${c3}hNNNNNNNNNNNNNNmds${c1}....` + --...${c3}hNNNNNNNNNNNNNNmdo${c1}..... + .:...${c3}/NNNNNNNNNNNNNNdd${c1}:....` + `-...${c3}+mNNNNNNNNNNNmh${c1}:...-. + ${c4}.:+o+/:-${c1}:+oo+///++o+/:-${c4}:/+ooo/:. + ${c4}+oo/:o- +oooooso.` + ${c4}.` ` `/ .-//- EOF ;; @@ -9597,14 +9615,14 @@ EOF ;; "PuffOS"*) - set_colors 3 + set_colors 3 read -rd '' ascii_data <<'EOF' ${c1} - _,..._,m, - ,/' '""; + _,..._,m, + ,/' '""; / ". - ,'mmmMMMMmm. \ - _/-"^^^^^"""%#%mm, ; + ,'mmmMMMMmm. \ + _/-"^^^^^"""%#%mm, ; ,m,_,' "###) ;, (###% \#/ ;##mm. ^#/ __ ___ ; (######) From 55cce2dfef4cdaf73c1541a906f0b2769c38454b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 15 Jun 2021 06:15:36 +0200 Subject: [PATCH 498/550] Update ubuntu logo. Closes #1750 (#1779) --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index d9e86e42..029bf74e 100755 --- a/neofetch +++ b/neofetch @@ -10886,26 +10886,26 @@ EOF "Ubuntu"* | "i3buntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` +${c1} .-/+oossssoo+\-. + ´:+ssssssssssssssssss+:` -+ssssssssssssssssssyyssss+- .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ + /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss\ +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss\ .ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. +ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso +ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ .ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ + \ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ - /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ + \sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ .ossssssssssssssssss${c2}dMMMNy${c1}sssso. -+sssssssssssssssss${c2}yyy${c1}ssss+- `:+ssssssssssssssssss+:` - .-/+oossssoo+/-. + .-\+oossssoo+/-. EOF ;; From a980dc8e8be54e57a1c64518fb68c166b84cbd2c Mon Sep 17 00:00:00 2001 From: Biel Date: Tue, 15 Jun 2021 01:18:02 -0300 Subject: [PATCH 499/550] Add Aperio GNU/Linux information. (#1778) --- neofetch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/neofetch b/neofetch index 029bf74e..f1b2d633 100755 --- a/neofetch +++ b/neofetch @@ -5540,6 +5540,16 @@ h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y EOF ;; + "Aperio GNU/Linux"*) + set_colors 255 + read -rd '' ascii_data <<'EOF' +${c2} + _.._ _ ._.. _ +(_][_)(/,[ |(_) + | GNU/Linux +EOF + ;; + "Hash"*) set_colors 123 read -rd '' ascii_data <<'EOF' From bc71e732a905e6f27518058970cfe5b789ef2e7f Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Thu, 17 Jun 2021 15:29:19 +0800 Subject: [PATCH 500/550] Add macOS 12 to version name list (#1783) --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f1b2d633..32a8e4be 100755 --- a/neofetch +++ b/neofetch @@ -1151,6 +1151,7 @@ get_distro() { 10.15*) codename="macOS Catalina" ;; 10.16*) codename="macOS Big Sur" ;; 11.0*) codename="macOS Big Sur" ;; + 12.0*) codename="macOS Monterey" ;; *) codename=macOS ;; esac From bbbb68f8b2eb70651a6b33343f97eeb1b223a4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berk=20=C3=87akar?= Date: Tue, 22 Jun 2021 07:00:27 +0300 Subject: [PATCH 501/550] Added Pisi Linux support for Neofetch. (#1723) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added PiSi support * Add placeholder PiSi ascii art * Added actual PisiLinux logo * Colorize PisiLinux logo * Improvement in ascii art * Added Pisi to the list of supported distributions * Updated manpage * Fixed flaws in ascii art Co-authored-by: Berkan Şahin --- neofetch | 32 +++++++++++++++++++++++++++++--- neofetch.1 | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 55 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 32a8e4be..d0830a2b 100755 --- a/neofetch +++ b/neofetch @@ -798,7 +798,7 @@ image_source="auto" # Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, -# TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, +# TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, # Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, @@ -1554,6 +1554,7 @@ get_packages() { has alps && tot alps showinstalled has butch && tot butch list has swupd && tot swupd bundle-list --quiet + has pisi && tot pisi li # Using the dnf package cache is much faster than rpm. if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then @@ -5147,7 +5148,7 @@ ASCII: NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, - PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, + PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, @@ -5550,7 +5551,7 @@ ${c2} | GNU/Linux EOF ;; - + "Hash"*) set_colors 123 read -rd '' ascii_data <<'EOF' @@ -9490,6 +9491,31 @@ ${c1} PPPPPPPPPPPPPP EOF ;; + "Pisi"*) + set_colors 12 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} \Fv/!- `:?lzC +${c1} Q!::=zFx! ${c2}`;v6WBCicl;` ${c1},vCC\!::#. +${c1} ,%:::,'` ${c2}+#%@@FQ@@. ,cF%i${c1}``-',::a? +${c1} +m:,'```${c2}}3,/@@Q\@@ "af-${c1} `-'"7f + =o'.` ${c2}/m' :Q@:Qg ,kl${c1} `.|o + :k` '${c2}$+ 'Narm >d,${c1} ii + #`${c2}!p. `C , 'd+${c1} %' +${c2} !0m `6Kv + =a m+ + !A !\L|: :|L\! $: + .8` Q''%Q#' '#Q%''Q `0- + :6 E|.6QQu uQQ6.|E p: + i{ \jts9? ?9stj\ u\ + |a` -''. `e> + ,m+ ${c1}'^ !`${c2}s@@@@a${c1}'"`+`${c2} >e' + !3|${c1}`|=>>r- ${c2}'U%:${c1} '>>>=:`\3! + 'xopE| ${c2}`'${c1} `ledoz- + `;=>>+`${c2}`^llci/|==|/iclc;`${c1}'>>>>: + `^`+~ ${c2}````${c1} !!-^ +EOF + ;; + "PNM Linux"* | "WHPNM Linux"*) set_colors 33 9 15 202 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 39676dfb..0e5bffaa 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH NEOFETCH "1" "August 2020" "Neofetch 7.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.3. +.TH NEOFETCH "1" "April 2021" "Neofetch 7.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -152,6 +152,9 @@ URL to query for public IP \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 @@ -215,10 +218,6 @@ Length in spaces to make the bars. Colors to make the bar. Set in this order: elapsed, total .TP -\fB\-\-cpu_display\fR mode -Bar mode. -Possible values: bar, infobar, barinfo, off -.TP \fB\-\-memory_display\fR mode Bar mode. Possible values: bar, infobar, barinfo, off @@ -234,8 +233,8 @@ Possible values: bar, infobar, barinfo, off .TP \fB\-\-backend\fR backend Which image backend to use. -Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', -\&'off', 'sixel', 'tycat', 'w3m', 'kitty', 'ueberzug' +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. @@ -250,6 +249,9 @@ NEW: neofetch \fB\-\-ascii\fR "$(fortune | cowsay \fB\-W\fR 30)" \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 @@ -281,7 +283,10 @@ Shortcut to use 'tycat' backend. Shortcut to use 'w3m' backend. .TP \fB\-\-ueberzug\fR source -Shortcut to use 'ueberzug' backend. +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). @@ -314,15 +319,15 @@ Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, -TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, +TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, -Solus, 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, semc, Obarun, +Solus, 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, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -331,8 +336,8 @@ NOTE: Use '{distro name}_old' to use the old logos. .IP NOTE: Ubuntu has flavor variants. .TP -Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, -Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. +NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu\-GNOME, +Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors. .TP NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, @@ -358,6 +363,9 @@ in some terminals emulators when using image mode. 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 @@ -369,11 +377,11 @@ 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 and ueberzug. +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 and ueberzug. +window. This only works with w3m. .TP \fB\-\-bg_color\fR color Background color to display behind transparent image. From 8fc31ac001f800d4de1675e7af4caab096c28cde Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Wed, 23 Jun 2021 12:01:53 -0400 Subject: [PATCH 502/550] add windows 11 ascii art (#1793) --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index d0830a2b..315f4c7a 100755 --- a/neofetch +++ b/neofetch @@ -11072,6 +11072,29 @@ ${c1} ,;::::; EOF ;; + *"[Windows 11]"*|*"on Windows 11"*|\ + "Windows 11"* |"windows11") + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ + +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +EOF + ;; + *"[Windows 10]"*|*"on Windows 10"*|"Windows 8"*|\ "Windows 10"* |"windows10"|"windows8") set_colors 6 7 From cc39539c55c612ca8cfcd313cc8ccb84d89b0f82 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Fri, 25 Jun 2021 15:10:22 +0800 Subject: [PATCH 503/550] Better kitty terminal font detection (#1795) * Better kitty terminal font detection * Fix indent --- neofetch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 315f4c7a..c7f4860e 100755 --- a/neofetch +++ b/neofetch @@ -3428,11 +3428,9 @@ END ;; "kitty"*) - kitty_config="$(kitty --debug-config)" - [[ "$kitty_config" != *font_family* ]] && return - - term_font="$(awk '/^font_family|^font_size/ {$1="";gsub("^ *","",$0);print $0}' \ - <<< "$kitty_config")" + term_font="from kitty.cli import *; o = create_default_opts(); \ + print(f'{o.font_family} {o.font_size}')" + term_font="$(kitty +runpy ''"$term_font"'')" ;; "konsole" | "yakuake") From 1096b22c18088da5fed025eebdc96facdc8b2e66 Mon Sep 17 00:00:00 2001 From: Guangyuan Yang Date: Sat, 26 Jun 2021 00:39:07 -0400 Subject: [PATCH 504/550] Fixes GPU info read error on MINGW64 (#1799) Closes #1798. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index c7f4860e..f084d753 100755 --- a/neofetch +++ b/neofetch @@ -2611,7 +2611,7 @@ get_gpu() { ;; "Windows") - while read -r line; do + wmic path Win32_VideoController get caption | while read -r line; do line=$(trim "$line") case $line in @@ -2623,7 +2623,7 @@ get_gpu() { prin "${subtitle:+${subtitle}${gpu_name}}" "$line" ;; esac - done < <(wmic path Win32_VideoController get caption) + done ;; "Haiku") From dcd180cb6727fa8c8427a00694b82cd26764bceb Mon Sep 17 00:00:00 2001 From: lockheed3k <49485763+lockheed3k@users.noreply.github.com> Date: Sun, 27 Jun 2021 00:10:19 -0400 Subject: [PATCH 505/550] Update neofetch (#1801) Fix deformed Debian logo on line 6999 by adding 3 spaces before """Y$$.". --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f084d753..72357469 100755 --- a/neofetch +++ b/neofetch @@ -6996,7 +6996,7 @@ EOF read -rd '' ascii_data <<'EOF' ${c2} _,met$$$$$gg. ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". + ,g$$P" """Y$$.". ,$$P' `$$$. ',$$P ,ggs. `$$b: `d$$' ,$P"' ${c1}.${c2} $$$ From 5a436bd8be9248e4f6c839bfa1f3b8acfba2a039 Mon Sep 17 00:00:00 2001 From: Kevin Lapointe <80723850+klpnt@users.noreply.github.com> Date: Thu, 1 Jul 2021 01:10:34 -0300 Subject: [PATCH 506/550] Added new small Fedora ASCII art (#1806) --- neofetch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 72357469..28da670c 100755 --- a/neofetch +++ b/neofetch @@ -7359,16 +7359,16 @@ EOF ;; "fedora_small") - set_colors 4 7 1 + set_colors 12 read -rd '' ascii_data <<'EOF' -${c2} _____ - / __)${c1}\\${c2} - | / ${c1}\\ \\${c2} - ${c1}__${c2}_| |_${c1}_/ /${c2} - ${c1}/ ${c2}(_ _)${c1}_/${c2} -${c1}/ /${c2} | | -${c1}\\ \\${c2}__/ | - ${c1}\\${c2}(_____/ +${c1} ...... + .' .. : + : : :.: + .....: :.. +.' ..:: ..: +: : : : +'. '...' .' + '.....' EOF ;; From 07770633fb570156cb1a86665bd4d4b54d48c533 Mon Sep 17 00:00:00 2001 From: Kevin Lapointe <80723850+klpnt@users.noreply.github.com> Date: Fri, 2 Jul 2021 00:27:26 -0300 Subject: [PATCH 507/550] Modified small Fedora ASCII art (#1807) * Added new small Fedora ASCII art * Modified ASCII art for small fedora * modified --- neofetch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 28da670c..2743558a 100755 --- a/neofetch +++ b/neofetch @@ -7361,14 +7361,15 @@ EOF "fedora_small") set_colors 12 read -rd '' ascii_data <<'EOF' -${c1} ...... - .' .. : - : : :.: - .....: :.. -.' ..:: ..: -: : : : -'. '...' .' - '.....' +${c1} ,'''''. + | ,. | + | | "_" + ,....| |.. +.' ,.'| ..' +| | | | +| ',_,' | + '. ,' + ''''' EOF ;; From e6499671c10a74bf6a6cf03f294212003e267bfb Mon Sep 17 00:00:00 2001 From: bejelentkezni <67395204+bejelentkezni@users.noreply.github.com> Date: Fri, 2 Jul 2021 15:41:35 -0600 Subject: [PATCH 508/550] Add ascii art for glaucus (#1809) * Update neofetch * Update neofetch * Update neofetch * Update neofetch * Update neofetch * Update neofetch --- neofetch | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2743558a..fb64a865 100755 --- a/neofetch +++ b/neofetch @@ -7661,7 +7661,25 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; - + + "glaucus"*) + set_colors 5 + read -rd '' ascii_data <<'EOF' +${c1} ,, ,d88P + ,d8P ,ad8888* + ,888P d88888* ,,ad8888P* + d d888P a88888P* ,ad8888888* + .d8 d8888: d888888* ,d888888P* + .888; 88888b d8888888b8888888P + d8888J888888a88888888888888P* ,d + 88888888888888888888888888P ,,d8* + 888888888888888888888888888888888* + *8888888888888888888888888888888* + Y888888888P* `*``*888888888888* + *^888^* *Y888P** +EOF + ;; + "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' From 095fd04094a0bd0dd1f7e501cbe4085a631ffbf7 Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Mon, 5 Jul 2021 01:00:13 -0400 Subject: [PATCH 509/550] fix macos big sur and monterey not showing codenames (#1815) --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index fb64a865..f45cf061 100755 --- a/neofetch +++ b/neofetch @@ -1150,8 +1150,8 @@ get_distro() { 10.14*) codename="macOS Mojave" ;; 10.15*) codename="macOS Catalina" ;; 10.16*) codename="macOS Big Sur" ;; - 11.0*) codename="macOS Big Sur" ;; - 12.0*) codename="macOS Monterey" ;; + 11.*) codename="macOS Big Sur" ;; + 12.*) codename="macOS Monterey" ;; *) codename=macOS ;; esac From 798d587c9cbdf0b72afa0dfd496be2e97430f125 Mon Sep 17 00:00:00 2001 From: Kevin <80723850+klpnt@users.noreply.github.com> Date: Mon, 5 Jul 2021 14:14:42 -0400 Subject: [PATCH 510/550] minor ascii edit (#1816) --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index f45cf061..8a3fea96 100755 --- a/neofetch +++ b/neofetch @@ -7363,13 +7363,13 @@ EOF read -rd '' ascii_data <<'EOF' ${c1} ,'''''. | ,. | - | | "_" - ,....| |.. -.' ,.'| ..' -| | | | -| ',_,' | - '. ,' - ''''' + | | '_' + ,....| |.. +.' ,_;| ..' +| | | | +| ',_,' | + '. ,' + ''''' EOF ;; From 9e8ed741b38925455deb0ad1e6c31fe81074679f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 9 Jul 2021 10:52:10 +0300 Subject: [PATCH 511/550] neofetch: add -L to curl. Closes #1823 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8a3fea96..71a8043e 100755 --- a/neofetch +++ b/neofetch @@ -3903,7 +3903,7 @@ get_public_ip() { fi if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then - public_ip="$(curl --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")" + public_ip="$(curl -L --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")" fi if [[ -z "$public_ip" ]] && type -p wget >/dev/null; then From 65e01ab42131b849d10ac7212acf25ded9056159 Mon Sep 17 00:00:00 2001 From: zhullyb <43305366+zhullyb@users.noreply.github.com> Date: Wed, 14 Jul 2021 18:12:04 +0800 Subject: [PATCH 512/550] Update manjaro logo (#1825) Manjaro has changed its logo, see manjaro.org --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 71a8043e..4d4b677c 100755 --- a/neofetch +++ b/neofetch @@ -8475,8 +8475,8 @@ EOF "manjaro_small"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}||||||||| |||| -||||||||| |||| +${c1}|||| |||| +|||| |||| |||| |||| |||| |||| |||| |||| |||| |||| @@ -8488,10 +8488,10 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ +${c1}████████ ████████ +████████ ████████ +████████ ████████ +████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From c2c1cfbf4f6e34bf23dbb2df6740f32103ab3b32 Mon Sep 17 00:00:00 2001 From: zhullyb <43305366+zhullyb@users.noreply.github.com> Date: Wed, 14 Jul 2021 18:22:33 +0800 Subject: [PATCH 513/550] Fix manjaro logo (#1826) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4d4b677c..13f46438 100755 --- a/neofetch +++ b/neofetch @@ -8488,7 +8488,7 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}████████ ████████ +${c1}████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From 38cbfeca5ae9f7715f792a9681b6c522a3f99789 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 14 Jul 2021 14:37:28 +0300 Subject: [PATCH 514/550] Revert "Fix manjaro logo (#1826)" This reverts commit c2c1cfbf4f6e34bf23dbb2df6740f32103ab3b32. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 13f46438..4d4b677c 100755 --- a/neofetch +++ b/neofetch @@ -8488,7 +8488,7 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}████████ ████████ +${c1}████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From 7913ad35ffb5f76bec0b961d4ba94f3ad2eddf4a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 14 Jul 2021 14:37:30 +0300 Subject: [PATCH 515/550] Revert "Update manjaro logo (#1825)" This reverts commit 65e01ab42131b849d10ac7212acf25ded9056159. --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 4d4b677c..71a8043e 100755 --- a/neofetch +++ b/neofetch @@ -8475,8 +8475,8 @@ EOF "manjaro_small"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}|||| |||| -|||| |||| +${c1}||||||||| |||| +||||||||| |||| |||| |||| |||| |||| |||| |||| |||| |||| @@ -8488,10 +8488,10 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}████████ ████████ -████████ ████████ -████████ ████████ -████████ ████████ +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From 139b722c48f546ec2715d6b40c3756964fec0ed4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 19 Jul 2021 16:57:41 +0300 Subject: [PATCH 516/550] neofetch: fix #1832 --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index 0e5bffaa..f17a21be 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -341,7 +341,7 @@ Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors. .TP NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, -Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, +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. From 017aa041d86340f2b4f82c765ba84aaa096136ec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 19 Jul 2021 18:00:49 +0300 Subject: [PATCH 517/550] neofetch: Only try pkg if on a BSD. Closes #1834 --- neofetch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 71a8043e..ee193cfb 100755 --- a/neofetch +++ b/neofetch @@ -1608,13 +1608,15 @@ get_packages() { # TODO: Fix this somehow. has pkginfo && tot pkginfo -i - case $kernel_name in - FreeBSD|DragonFly) has pkg && tot pkg info ;; + case $os-$kernel_name in + BSD-FreeBSD|BSD-DragonFly) + has pkg && tot pkg info + ;; - *) + BSD-*) has pkg && dir /var/db/pkg/* - ((packages == 0)) && \ + ((packages == 0)) && has pkg && tot pkg list ;; esac From 0ce03cfd7e0899297403fbbb1f8db26a2c76dc4d Mon Sep 17 00:00:00 2001 From: omame Date: Mon, 26 Jul 2021 10:01:10 +0200 Subject: [PATCH 518/550] Update CyberOS logo to match downstream (#1846) Resolves #1845. --- neofetch | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index ee193cfb..ea17a5cb 100755 --- a/neofetch +++ b/neofetch @@ -6936,24 +6936,24 @@ o/${c2}--...::-:/::/:-......-::::::-/-...-${c1}:/o EOF ;; - "CyberOS"*) - set_colors 50 32 57 - read -rd '' ascii_data <<'EOF' -${c3} !M$EEEEEEEEEEEP - .MMMMM000000Nr. - ${c3}&MMMMMM${c2}MMMMMMMMMMMMM9 - ${c3}~MMM${c1}MMMM${c2}MMMMMMMMMMMMC - ${c1}" ${c3}M${c1}MMMMMMM${c2}MMMMMMMMMMs - ${c1}iM${c2}MMM&&${c1}MMMMMMMM${c2}MMMMMMMM\\ - ${c1}BMMM${c2}MMMMM${c1}MMMMMMM${c2}MMMMMM${c3}" -${c1}9MMMMM${c2}MMMMMMM${c1}MMMM${c2}MMMM${c3}MMMf- - ${c2}sMMMMMMMM${c1}MM${c2}M${c3}MMMMMMMMM3_ - ${c2}+ffffffff${c1}P${c3}MMMMMMMMMMMM0 - ${c2}CMMMMMMMMMMM - }MMMMMMMMM - ~MMMMMMM - "RMMMM - .PMB + "CyberOS"*) + set_colors 50 32 57 + read -rd '' ascii_data <<'EOF' +${c3} !M$EEEEEEEEEEEP + .MMMMM000000Nr. + ${c3}&MMMMMM${c2}MMMMMMMMMMMMM9 + ${c3}~MMM${c1}MMMM${c2}MMMMMMMMMMMMC + ${c1}" ${c3}M${c1}MMMMMMM${c2}MMMMMMMMMMs + ${c1}iM${c2}MMM&&${c1}MMMMMMMM${c2}MMMMMMMM\\ + ${c1}BMMM${c2}MMMMM${c1}MMMMMMM${c2}MMMMMM${c3}" + ${c1}9MMMMM${c2}MMMMMMM${c1}MMMM${c2}MMMM${c3}MMMf- + ${c2}sMMMMMMMM${c1}MM${c2}M${c3}MMMMMMMMM3_ + ${c2}+ffffffff${c1}P${c3}MMMMMMMMMMMM0 + ${c2}CMMMMMMMMMMM + }MMMMMMMMM + ~MMMMMMM + "RMMMM + .PMB EOF ;; From 07822a3c42ea39098caf9165037bcb3bc7d7d6ed Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Date: Thu, 5 Aug 2021 11:06:06 +0700 Subject: [PATCH 519/550] Add LangitKetujuh OS (#1824) --- neofetch | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index ea17a5cb..8bed79a5 100755 --- a/neofetch +++ b/neofetch @@ -806,8 +806,8 @@ image_source="auto" # Solus, 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, semc, Obarun, -# windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. +# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, +# Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -5156,8 +5156,8 @@ ASCII: Solus, 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, semc, Obarun, - windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. + Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, + Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -11050,6 +11050,27 @@ EOF ;; + "LangitKetujuh"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c1} + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L + 'L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L + L7L. 'L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L L7L7L7L7L7L7L7L7L7L7L7L + L7L7L7L 'L7L7L7L7L7L7L7L7L7L + L7L7L7L 'L7L7L7L7L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L. 'L7L + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L. + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L +${c2} +EOF + ;; + "semc"*) set_colors 2 8 1 read -rd '' ascii_data <<'EOF' From cf928f3b9b123cf8530114643d648a16e6d1941d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 5 Aug 2021 10:15:12 +0300 Subject: [PATCH 520/550] meta: fix makefile, closes #1858 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4adbd5f6..2b41f34f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -PREFIX ?= /usr -MANDIR ?= $(PREFIX)/share/man +PREFIX = /usr +MANDIR = $(PREFIX)/share/man all: @echo Run \'make install\' to install Neofetch. From bb272ac3e8ea534e50c1d716993f7670e3ae68eb Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 5 Aug 2021 16:02:29 +0200 Subject: [PATCH 521/550] Add Kaisen Linux (#1859) --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 8bed79a5..118c85f1 100755 --- a/neofetch +++ b/neofetch @@ -7974,6 +7974,30 @@ ${c1} cooo: ${c2}coooooooooooooooooool EOF ;; + "Kaisen"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ` + `:+oyyho. + `+:`sdddddd/ + `+` :ho oyo++ohds-` + .ho :dd. .: `sddddddhhyso+/- + ody.ddd-:yd- +hysssyhddddddddho` + yddddddhddd` ` `--` -+hddddddh. + hddy-+dddddy+ohh/..+sddddy/:::+ys + :ddd/sdddddddddd- oddddddd ` + `yddddddddddddddd/ /ddddddd/ +:. :ydddddddddddddddddo..sddddddy/` +odhdddddddo- `ddddh+-``....-+hdddddds. +-ddddddhd: /dddo -ydddddddhdddddddd- + /hdy:o - `:sddds .`./hdddddddddddddo + `/- `+hddyosy+ :dddddddy-.-od/ + :sydds -hddddddd` / + .+shd- `:ohddddddddd` + `:+ooooooooooooo: +EOF + ;; + "Kali"*) set_colors 4 8 read -rd '' ascii_data <<'EOF' From 733a7295391a917bf54eda595fa684795958dbc3 Mon Sep 17 00:00:00 2001 From: NeXT STEP <80169337+C47F15H@users.noreply.github.com> Date: Sat, 7 Aug 2021 08:29:50 +0530 Subject: [PATCH 522/550] Update CelOS (#1864) --- neofetch | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index 118c85f1..10a58414 100755 --- a/neofetch +++ b/neofetch @@ -6533,21 +6533,30 @@ EOF "CelOS"*) - set_colors 3 2 4 5 7 + set_colors 4 6 0 5 read -rd '' ascii_data <<'EOF' -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -@@@# @@@ -@@ ,#%%%%%(. (@ -@# %%%%%%%%%%%%%%# @ -@# %%%%%%%%# %%%/ @ -@# #%%%%%%%%. #%%%* @ -@# %%%%%%%%%%%* (%%%%%# @ -@# #%%%% %%%%%%%%%%%, @ -@# #%%%%%%%%%%%%%%%%%, @ -@# #%%%%%%%%%%%%%* @ -@@ *##%#(, @@ -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +${c4} .,cmmmmmmmmmmmc,. + .,cmMMMMMMMMMMMMMMMMMMMMmc. + .cMMMMMMMMMMMMMMMMMMMMMMMMMMMmc. + .cMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMc. + ,:MMM ${c3}####################################${c4} + cMMMMMMmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmc. + .MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM. + .MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMc + "******************************MMMMMMMMMMMMMc: +${c3}#################################### ${c4}MMMMMMMMMMMMMc + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM: + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM" + 'MMMMMMMMM*******************************: + \"MMMMMM ${c3}##################################### + ${c4}`:MMMMMMmmmmmmmmmmmmmmmmmmmmmmmmmmmmm; + `"MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM" + `":MMMMMMMMMMMMMMMMMMMMMMMMM;' + `":MMMMMMMMMMMMMMMMMMM:" + "************" + + EOF From 5db2127b7a24ee0978518f3aa954f954d8bdaa7a Mon Sep 17 00:00:00 2001 From: "Benjamin S. Osenbach" Date: Fri, 6 Aug 2021 23:00:17 -0400 Subject: [PATCH 523/550] fix issue #1757 (#1863) --- neofetch | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 10a58414..d96706df 100755 --- a/neofetch +++ b/neofetch @@ -784,7 +784,7 @@ image_source="auto" # 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, +# Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, # Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, @@ -5133,7 +5133,7 @@ ASCII: 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, + BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, @@ -6409,6 +6409,30 @@ ${c1} oMMNMMMMMMMMMMMMMMMMMMMMMM EOF ;; + "Bodhi"*) + set_colors 7 11 2 + read -rd '' ascii_data <<'EOF' +${c1}| ${c2},,mmKKKKKKKKWm,, + ${c1}' ${c2},aKKP${c1}LL**********|L*${c2}TKp, + ${c1}t ${c2}aKP${c1}L**``` ```**L${c2}*Kp + IX${c1}EL${c3}L,wwww, ${c1}``*||${c2}Kp + ,#P${c1}L|${c3}KKKpPP@IPPTKmw, ${c1}`*||${c2}K + ,K${c1}LL*${c3}{KKKKKKPPb$KPhpKKPKp ${c1}`||${c2}K + #${c1}PL ${c3}!KKKKKKPhKPPP$KKEhKKKKp ${c1}`||${c2}K +!H${c1}L* ${c3}1KKKKKKKphKbPKKKKKK$KKp ${c1}`|I${c2}W +$${c1}bL ${c3}KKKKKKKKBQKhKbKKKKKKKK ${c1}|I${c2}N +$${c1}bL ${c3}!KKKKKKKKKKNKKKKKKKPP` ${c1}|I${c2}b +TH${c1}L* ${c3}TKKKKKK##KKKN@KKKK^ ${c1}|I${c2}M + K@${c1}L ${c3}*KKKKKKKKKKKEKE5 ${c1}||${c2}K + `NL${c1}L ${c3}`KKKKKKKKKK"```|L ${c1}||${c2}#P + `K@${c1}LL ${c3}`"**"` ${c1}'. :||${c2}#P + Yp${c1}LL ${c1}' |L${c2}$M` + `Tp${c1}pLL, ,|||${c2}p'L + "Kpp${c1}LL++,., ,,|||$${c2}#K* ${c1}'. + ${c2}`"MKWpppppppp#KM"` ${c1}`h, +EOF + ;; + "bonsai"*) set_colors 6 2 3 read -rd '' ascii_data <<'EOF' From 547acd8d55b2e6b6c5b4f164756dbd336b72c4a4 Mon Sep 17 00:00:00 2001 From: RustedTerrier <58403628+RustedTerrier@users.noreply.github.com> Date: Wed, 11 Aug 2021 03:07:03 +0000 Subject: [PATCH 524/550] RiverWM support (#1870) * Feat: WM support for river. * Update neofetch --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index d96706df..e3ff4b50 100755 --- a/neofetch +++ b/neofetch @@ -1908,6 +1908,7 @@ get_wm() { -e orbital \ -e orbment \ -e perceptia \ + -e river \ -e rustland \ -e sway \ -e ulubis \ From 5dc9a2fa61719efc3e9614e44d9d8df5d9043c8d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 15 Aug 2021 11:14:57 +0200 Subject: [PATCH 525/550] song: Switch cmus to get_song_dbus (#1875) --- neofetch | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/neofetch b/neofetch index e3ff4b50..9fd88247 100755 --- a/neofetch +++ b/neofetch @@ -2883,6 +2883,7 @@ get_song() { "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; + "cmus"*) get_song_dbus "cmus" ;; "juk"*) get_song_dbus "juk" ;; "bluemindo"*) get_song_dbus "Bluemindo" ;; "guayadeque"*) get_song_dbus "guayadeque" ;; @@ -2918,14 +2919,6 @@ get_song() { song="$(xmms2 current -f "\${artist}"$' \n'"\${album}"$' \n'"\${title}")" ;; - "cmus"*) - # NOTE: cmus >= 2.8.0 supports mpris2 - song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; a=$0} - /tag album / {$1=$2=""; b=$0} - /tag title/ {$1=$2=""; t=$0} - END {print a " \n" b " \n" t}')" - ;; - "spotify"*) case $os in "Linux") get_song_dbus "spotify" ;; From aa026545b963e54e22740fc6bf625a409a47567c Mon Sep 17 00:00:00 2001 From: Crestwave <35413013+Crestwave@users.noreply.github.com> Date: Wed, 25 Aug 2021 12:42:08 +0800 Subject: [PATCH 526/550] packages: fix dpkg (#1888) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9fd88247..8ee14ba1 100755 --- a/neofetch +++ b/neofetch @@ -1541,7 +1541,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has dpkg && pac "$(dpkg --list | grep -c ^ii)" + has dpkg && tot dpkg-query -f '.\n' -W has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed From b3e21d89cd4acb09cc89b1ae4aca0929111176c7 Mon Sep 17 00:00:00 2001 From: Angelo F Date: Sun, 29 Aug 2021 18:21:15 +0800 Subject: [PATCH 527/550] Modify the two "Darwin" Apple logos (#1892) Make them more consistent with the actual Apple logo modified: neofetch --- neofetch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 8ee14ba1..a8c94984 100755 --- a/neofetch +++ b/neofetch @@ -8420,11 +8420,11 @@ EOF "mac"* | "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' -${c1} 'c. +${c1} c.' ,xNMM. .OMMMMo - OMMM0, - .;loddo:' loolloddol;. + lMM" + .;loddo:. .olloddol;. cKMMMMMMMMMMNWMMMMMMMMMM0: ${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. XMMMMMMMMMMMMMMMMMMMMMMMX. @@ -8432,11 +8432,11 @@ ${c3};MMMMMMMMMMMMMMMMMMMMMMMM: :MMMMMMMMMMMMMMMMMMMMMMMM: ${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c5}'XMMMMMMMMMMMMMMMMMMMMMMMMMMk + 'XMMMMMMMMMMMMMMMMMMMMMMMMK. ${c6}kMMMMMMMMMMMMMMMMMMMMMMd ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. + "cooc*" "*coo'" EOF ;; @@ -11336,11 +11336,11 @@ EOF "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' -${c1} 'c. +${c1} c.' ,xNMM. .OMMMMo - OMMM0, - .;loddo:' loolloddol;. + lMMM" + .;loddo:. .olloddol;. cKMMMMMMMMMMNWMMMMMMMMMM0: ${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. XMMMMMMMMMMMMMMMMMMMMMMMX. @@ -11348,11 +11348,11 @@ ${c3};MMMMMMMMMMMMMMMMMMMMMMMM: :MMMMMMMMMMMMMMMMMMMMMMMM: ${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c5}'XMMMMMMMMMMMMMMMMMMMMMMMMMMk + 'XMMMMMMMMMMMMMMMMMMMMMMMMK. ${c6}kMMMMMMMMMMMMMMMMMMMMMMd ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. + "cooc*" "*coo'" EOF ;; From 7f7d824b4421662aea74c6f2833b8f82da5f9605 Mon Sep 17 00:00:00 2001 From: "Benjamin S. Osenbach" Date: Wed, 1 Sep 2021 15:14:10 -0400 Subject: [PATCH 528/550] Fix Haiku logo (#1812) (#1898) * Fix Haiku logo (#1812) * fixed padding and color --- neofetch | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index a8c94984..616348d6 100755 --- a/neofetch +++ b/neofetch @@ -7858,25 +7858,22 @@ EOF ;; "Haiku"*) - set_colors 2 8 + set_colors 1 3 7 2 read -rd '' ascii_data <<'EOF' -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} +${c3} + + MMMM MMMM + MMMM MMMM + MMMM MMMM + MMMM MMMM + MMMM${c4} .ciO| /YMMMMM*" +${c3} MMMM${c4} .cOMMMMM|/MMMMM/` + , ,iMM|/MMMMMMMMMMMMMMM* + `*.__,-cMMMMMMMMMMMMMMMMM/`${c3}.MMM + MM${c4}MMMMMMM/`:MMM/ ${c3}MMMM + MMMM MMMM + MMMM MMMM + """" """" EOF ;; From 47f46834e788bfab383775ce9e2508c3d3827b28 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 4 Sep 2021 18:06:43 +0300 Subject: [PATCH 529/550] misc: nits --- neofetch | 53 ++++++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/neofetch b/neofetch index 8bed79a5..9eb6e518 100755 --- a/neofetch +++ b/neofetch @@ -780,7 +780,7 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, AmogOS, Anarchy, Android, instantOS, +# 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, @@ -5686,31 +5686,6 @@ dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd .:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. `.:+shNMMMMMh yMMMMMNhs+:`` `-+shy shs+:` -EOF - ;; - "AmogOS"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ' -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⣤⣤⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⠟⠉⠉⠉⠉⠉⠉⠉⠙⠻⢶⣄⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣷⡀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡟⠀⣠⣶⠛⠛⠛⠛⠛⠛⠳⣦⡀⠀⠘⣿⡄⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⠁⠀⢹⣿⣦⣀⣀⣀⣀⣀⣠⣼⡇⠀⠀⠸⣷⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠀⠀⠀⠉⠛⠿⠿⠿⠿⠛⠋⠁⠀⠀⠀⠀⣿⡄ -⠀⠀ ⠀⠀⢠⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⡇⠀ - ⠀⠀⣸⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡇⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣧⠀ -⠀⠀⠀⠀⠀⠀⠀⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣿⠀ -⠀⠀⠀⠀⠀⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠀⠀⠀⠀⠀⠀⠀⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠀⠀⠀⠀⠀⠀⢰⣿⠀⠀⠀⠀⣠⡶⠶⠿⠿⠿⠿⢷⣦⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠀⠀⣀⣀⣀⠀⣸⡇⠀⠀⠀⠀⣿⡀⠀⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⣿⠀ -⣠⡿⠛⠛⠛⠛⠻⠀⠀⠀⠀⠀⢸⣇⠀⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⠀⠀⠀⣿⠀ -⢻⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⡟⠀⠀⢀⣤⣤⣴⣿⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠈⠙⢷⣶⣦⣤⣤⣤⣴⣶⣾⠿⠛⠁⢀⣶⡟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡟⠀ - ⠀⠀⠀⠀⠈⣿⣆⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⡾⠃⠀ -⠀ ⠀⠀⠀⠀⠀⠀⠈⠛⠻⢿⣿⣾⣿⡿⠿⠟⠋⠁⠀⠀⠀ EOF ;; "Anarchy"*) @@ -7663,25 +7638,25 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; - + "glaucus"*) set_colors 5 read -rd '' ascii_data <<'EOF' -${c1} ,, ,d88P - ,d8P ,ad8888* +${c1} ,, ,d88P + ,d8P ,ad8888* ,888P d88888* ,,ad8888P* - d d888P a88888P* ,ad8888888* - .d8 d8888: d888888* ,d888888P* - .888; 88888b d8888888b8888888P - d8888J888888a88888888888888P* ,d - 88888888888888888888888888P ,,d8* - 888888888888888888888888888888888* - *8888888888888888888888888888888* - Y888888888P* `*``*888888888888* + d d888P a88888P* ,ad8888888* + .d8 d8888: d888888* ,d888888P* + .888; 88888b d8888888b8888888P + d8888J888888a88888888888888P* ,d + 88888888888888888888888888P ,,d8* + 888888888888888888888888888888888* + *8888888888888888888888888888888* + Y888888888P* `*``*888888888888* *^888^* *Y888P** EOF ;; - + "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' @@ -11124,7 +11099,7 @@ ${c1} ################ ################ ################ ################ ################ ################ - + ################ ################ ################ ################ ################ ################ From 1c62849a125fb48a30fd170fc8aa3ed8e0e919af Mon Sep 17 00:00:00 2001 From: Zayac-The-Engineer <50628024+Zayac-The-Engineer@users.noreply.github.com> Date: Sat, 11 Sep 2021 02:34:30 +0000 Subject: [PATCH 530/550] added pkgin to BSD case (#1906) --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index d4fe3d1b..aa93ec09 100755 --- a/neofetch +++ b/neofetch @@ -1549,6 +1549,7 @@ get_packages() { has lvu && tot lvu installed has tce-status && tot tce-status -i has pkg_info && tot pkg_info + has pkgin && tot pkgin list has tazpkg && pkgs_h=6 tot tazpkg list && ((packages-=6)) has sorcery && tot gaze installed has alps && tot alps showinstalled From 429499e9b9b39127a8a781d135cafb6babdea631 Mon Sep 17 00:00:00 2001 From: jnats Date: Mon, 13 Sep 2021 04:37:06 +0100 Subject: [PATCH 531/550] CrystalUX to Crystal Linux rebrand (#1907) --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index aa93ec09..268b10aa 100755 --- a/neofetch +++ b/neofetch @@ -786,7 +786,7 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, +# Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, @@ -5131,7 +5131,7 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, - CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, + Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, @@ -6887,7 +6887,7 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - *"CrystalUX"*) + *"Crystal Linux"*) set_colors 13 5 read -rd '' ascii_data <<'EOF' ${c1} mysssym From 4b91c94360e4981ef36a96eb3266c616dc000ba3 Mon Sep 17 00:00:00 2001 From: gitfib Date: Fri, 24 Sep 2021 08:35:23 +0300 Subject: [PATCH 532/550] Improve GPU Reading on Linux (#1916) GPUs that have subsystem name but no revision number can be processed correctly by using $(NF-1) instead of $7 in the awk --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 268b10aa..db47a471 100755 --- a/neofetch +++ b/neofetch @@ -2491,7 +2491,7 @@ get_gpu() { gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ '/"Display|"3D|"VGA/ { - a[$0] = $1 " " $3 " " ($7 ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $7) + a[$0] = $1 " " $3 " " ($(NF-1) ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $(NF-1)) } END { for (i in a) { if (!seen[a[i]]++) { From 222b1cd8d5203966e25a8f365d5ab21649a5fe04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=92riks=20Remess?= Date: Thu, 4 Nov 2021 05:20:01 +0200 Subject: [PATCH 533/550] /sys/devices/virtual/dmi/id/board_* for motherboard identification (#1943) --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index db47a471..f3907d32 100755 --- a/neofetch +++ b/neofetch @@ -1235,6 +1235,11 @@ get_model() { if [[ -d /system/app/ && -d /system/priv-app ]]; then model="$(getprop ro.product.brand) $(getprop ro.product.model)" + elif [[ -f /sys/devices/virtual/dmi/id/board_vendor || + -f /sys/devices/virtual/dmi/id/board_name ]]; then + model=$(< /sys/devices/virtual/dmi/id/board_vendor) + model+=" $(< /sys/devices/virtual/dmi/id/board_name)" + elif [[ -f /sys/devices/virtual/dmi/id/product_name || -f /sys/devices/virtual/dmi/id/product_version ]]; then model=$(< /sys/devices/virtual/dmi/id/product_name) From 3eb7e13e2757a003b7c6e9ea4f6d44d4532eb7f7 Mon Sep 17 00:00:00 2001 From: Th1nhhdk <58503327+th1nhhdk@users.noreply.github.com> Date: Mon, 8 Nov 2021 11:35:52 +0700 Subject: [PATCH 534/550] Added VNux GNU/Linux Neofetch Logo (#1937) --- neofetch | 31 +++++++++++++++++++++++++++++-- neofetch.1 | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index f3907d32..003ab119 100755 --- a/neofetch +++ b/neofetch @@ -806,7 +806,7 @@ image_source="auto" # Solus, 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, LangitKetujuh, semc, +# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, # Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. @@ -5156,7 +5156,7 @@ ASCII: Solus, 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, LangitKetujuh, semc, + Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -11078,6 +11078,33 @@ ${c1} -1vvnvv. `~+++` ++|+++ EOF ;; + + "VNux"*) + set_colors 11 8 15 1 7 + read -rd '' ascii_data <<'EOF' +${c1} ` + ^[XOx~. + ^_nwdbbkp0ti' + +${c2} _j>!vC1,, + ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" +`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ +'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; + ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' + ' ;^${c3}u$$$$$$$$^<${c2}:^ + ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: + `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": + ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` + <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< +${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ +!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< + ^x00J(" + ^" +EOF + + ;; "LangitKetujuh"*) set_colors 7 4 diff --git a/neofetch.1 b/neofetch.1 index f17a21be..b90b5781 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -327,7 +327,7 @@ SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, 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, semc, Obarun, +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. From 0d08c130ff689389005dc8f6b0705f95480f2b52 Mon Sep 17 00:00:00 2001 From: Nathan Thomas Date: Tue, 9 Nov 2021 19:41:10 -0800 Subject: [PATCH 535/550] Add support for nushell (#1878) * Add support for nushell * Update neofetch Co-authored-by: Tyler J Russell Co-authored-by: Tyler J Russell --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 003ab119..4d9015aa 100755 --- a/neofetch +++ b/neofetch @@ -1744,6 +1744,12 @@ get_shell() { shell=${shell/ Yet another shell} shell=${shell/Copyright*} ;; + + nu) + shell+=$("$SHELL" -c "version | get version") + shell=${shell/ $shell_name} + ;; + *) shell+=$("$SHELL" --version 2>&1) From e784522206f4f60b37a4186574ba6b3bc3163247 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 11 Nov 2021 06:10:54 +0200 Subject: [PATCH 536/550] neofetch: minor cleanup --- neofetch | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/neofetch b/neofetch index 4d9015aa..64fa042b 100755 --- a/neofetch +++ b/neofetch @@ -8,7 +8,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2015-2020 Dylan Araps +# Copyright (c) 2015-2021 Dylan Araps # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -1744,7 +1744,7 @@ get_shell() { shell=${shell/ Yet another shell} shell=${shell/Copyright*} ;; - + nu) shell+=$("$SHELL" -c "version | get version") shell=${shell/ $shell_name} @@ -11084,30 +11084,30 @@ ${c1} -1vvnvv. `~+++` ++|+++ EOF ;; - + "VNux"*) set_colors 11 8 15 1 7 read -rd '' ascii_data <<'EOF' -${c1} ` - ^[XOx~. - ^_nwdbbkp0ti' - -${c2} _j>!vC1,, - ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" -`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ -'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; - ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' - ' ;^${c3}u$$$$$$$$^<${c2}:^ - ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: - `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": - ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` - <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< -${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ -!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< +${c1} ` + ^[XOx~. + ^_nwdbbkp0ti' + +${c2} _j>!vC1,, + ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" +`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ +'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; + ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' + ' ;^${c3}u$$$$$$$$^<${c2}:^ + ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: + `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": + ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` + <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< +${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ +!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< ^x00J(" - ^" +?QOZmqqqpb${c2}t[run/?!${c1}0pwqqQj-, + ^:l<{nUUv> ^x00J(" + ^" EOF ;; From 24b1281f9a38d2ff94490adf7a7f720338e0eb15 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 14 Nov 2021 10:53:00 +0100 Subject: [PATCH 537/550] docs: update (#1956) --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index a4f19eb8..eeb066f7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2020 Dylan Araps +Copyright (c) 2015-2021 Dylan Araps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From d4070d515d25402da06c2aea8ea04fe8f0dc3148 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 25 Nov 2021 04:17:34 +0100 Subject: [PATCH 538/550] Update openEuler logo (#1966) --- neofetch | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 64fa042b..a15b0e54 100755 --- a/neofetch +++ b/neofetch @@ -9095,23 +9095,29 @@ EOF "openEuler"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} - (##### - (((######## ##### - ((( ########## __...__ - (((((((( ####### /((((((###\ - ((((((((((( ....... \(((((####/ - (((((( ((((######### ******* - %((((((# ((######## - /////((((( ### -/////(((((((# (((& - ((((((((((((( - (((((((((((( - ((((((((( ((((((### - /((((((###### - //((((((###### - /((((((##### - *********/ +${c1} `.cc.` + ``.cccccccc..` + `.cccccccccccccccc.` + ``.cccccccccccccccccccccc.`` + `..cccccccccccccccccccccccccccc..` +`.ccccccccccccccc${c2}/++/${c1}ccccccccccccccccc.` +.ccccccccccccccc${c2}mNMMNdo+oso+${c1}ccccccccccc. +.cccccccccc${c2}/++odms+//+mMMMMm/:+syso/${c1}cccc +.ccccccccc${c2}yNNMMMs:::/::+o+/:${c1}c${c2}dMMMMMm${c1}cccc +.ccccccc${c2}:+NmdyyhNNmNNNd:${c1}ccccc${c1}${c2}:oyyyo:${c1}cccc +.ccc${c2}:ohdmMs:${c1}cccc${c2}+mNMNmy${c1}ccccccccccccccccc +.cc${c2}/NMMMMMo////:${c1}c${c2}:///:${c1}cccccccccccccccccc +.cc${c2}:syysyNMNNNMNy${c1}ccccccccccccccccccccccc +.cccccccc${c2}+MMMMMNy${c1}c${c2}:/+++/${c1}cccccccccccccccc +.ccccccccc${c2}ohhhs/${c1}c${c2}omMMMMNh${c1}ccccccccccccccc +.ccccccccccccccc${c2}:MMMMMMMM/${c1}cccccccccccccc +.cccccccccccccccc${c2}sNNNNNd+${c1}cccccccccccccc. +`..cccccccccccccccc${c2}/+/:${c1}cccccccccccccc..` + ``.cccccccccccccccccccccccccccc.`` + `.cccccccccccccccccccccc.` + ``.cccccccccccccc.`` + `.cccccccc.` + `....` EOF ;; From c1c699378f6c94cd67be75aa2f20f2e4a79e4483 Mon Sep 17 00:00:00 2001 From: Stealth <67294868+ImNotStealth@users.noreply.github.com> Date: Sat, 27 Nov 2021 05:00:54 +0100 Subject: [PATCH 539/550] Added Qubyt OS Logo (#1969) --- neofetch | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index a15b0e54..69e9c1b5 100755 --- a/neofetch +++ b/neofetch @@ -799,7 +799,7 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, -# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, @@ -5155,7 +5155,7 @@ ASCII: openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, - Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, + Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, @@ -9837,6 +9837,27 @@ ${c1} `..--..` EOF ;; + "Qubyt"*) + set_colors 4 5 0 4 + read -rd '' ascii_data <<'EOF' +${c1} ########################${c2}(${c3}ooo +${c1} ########################${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}##${c3}o ${c2}((((${c3}ooo +${c1}###${c2}(${c3}ooo o${c2}((${c1}### ${c3}oooooo +${c1}###${c2}(${c3}ooo oo${c2}((${c1}###${c3}o +${c1}###${c2}(${c3}ooo ooo${c2}((${c1}### +${c1}################${c2}(${c3}oo oo${c2}((((${c3}o +${c2}(((((((((((((((((${c3}ooo ooooo + oooooooooooooooooo o +EOF + ;; + "Quibian"*) set_colors 3 7 read -rd '' ascii_data <<'EOF' From c4fba8bb0b8b0e362555e5a7431a9767205047ec Mon Sep 17 00:00:00 2001 From: alexcoder04 <70093931+alexcoder04@users.noreply.github.com> Date: Tue, 30 Nov 2021 04:12:04 +0100 Subject: [PATCH 540/550] add CBL Mariner ascii art (#1972) --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index 69e9c1b5..9fef38fe 100755 --- a/neofetch +++ b/neofetch @@ -6536,6 +6536,29 @@ ${c2} .......... EOF ;; + "CBL-Mariner"*) + set_colors 6 + read -rd '' ascii_data <<'EOF' +${c1} . + :- . + :==. .=: + :===: -==: + :-===: .====: + :-====- -=====: + -====== :=======: + -======. .=========: + -======: -==========. + -======- -===========. + :======- :===========. + :=======. .-==========. + :=======: -==========. + :=======- :==========. + :=======- .-========- +:--------. :========- + ..:::--=========- + ..::---================-=- +EOF + ;; "CelOS"*) set_colors 4 6 0 5 From aab631c7dd701ae35a70632a9672c8e9b18fe656 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Dec 2021 05:31:15 +0200 Subject: [PATCH 541/550] neofetch: Fix WSL windows version. Closes #1848 --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 9fef38fe..85ccb8db 100755 --- a/neofetch +++ b/neofetch @@ -1102,10 +1102,13 @@ get_distro() { fi if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then + windows_version=$(wmic os get Version) + windows_version=$(trim "${windows_version/Version}") + case $distro_shorthand in - on) distro+=" [Windows 10]" ;; - tiny) distro="Windows 10" ;; - *) distro+=" on Windows 10" ;; + on) distro+=" [Windows $windows_version]" ;; + tiny) distro="Windows ${windows_version::2}" ;; + *) distro+=" on Windows $windows_version" ;; esac elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then From 7b1f0c275eba9d5681c647def3f8d845f43941a6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Dec 2021 06:36:44 +0200 Subject: [PATCH 542/550] neofetch: Fix windows detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 85ccb8db..9db82184 100755 --- a/neofetch +++ b/neofetch @@ -1102,7 +1102,7 @@ get_distro() { fi if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then - windows_version=$(wmic os get Version) + windows_version=$(wmic.exe os get Version) windows_version=$(trim "${windows_version/Version}") case $distro_shorthand in From 3eaac2d9eec198e63e4904d46c6704ad7f5a2d87 Mon Sep 17 00:00:00 2001 From: The TwilightBlood Date: Wed, 8 Dec 2021 02:11:14 -0600 Subject: [PATCH 543/550] Add pacstall to package managers (#1979) * Add pacstall to package managers https://github.com/pacstall/pacstall * Fix indents on Pacstall * Fix tabbing again --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 9db82184..e6adbade 100755 --- a/neofetch +++ b/neofetch @@ -1564,6 +1564,7 @@ get_packages() { has butch && tot butch list has swupd && tot swupd bundle-list --quiet has pisi && tot pisi li + has pacstall && tot pacstall -L # Using the dnf package cache is much faster than rpm. if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then From 644f9d29eb9dd9f68b29f80f37fb4ad57236a67d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 10 Dec 2021 08:41:28 +0200 Subject: [PATCH 544/550] neofetch: Fix #1989 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9db82184..90bf0966 100755 --- a/neofetch +++ b/neofetch @@ -11577,7 +11577,7 @@ main() { err "Neofetch command: $0 $*" err "Neofetch version: $version" - [[ $verbose == on ]] && printf %b "$err" >&2 + [[ $verbose == on ]] && printf '%b\033[m' "$err" >&2 # If `--loop` was used, constantly redraw the image. while [[ $image_loop == on && $image_backend == w3m ]]; do From 983b4bed7554dcbc16c2d9fa60bf73e454bd6c86 Mon Sep 17 00:00:00 2001 From: mmdbalkhi Date: Sun, 6 Feb 2022 12:13:57 +0330 Subject: [PATCH 545/550] add parch logo --- neofetch | 39 ++++++++++++++++++++++++++++++++++++++- neofetch.1 | 2 +- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 48b96d21..d344f650 100755 --- a/neofetch +++ b/neofetch @@ -807,7 +807,7 @@ image_source="auto" # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, # Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, -# Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. +# Obarun, Parch, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -10792,6 +10792,43 @@ dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd 'l0Kk:. .;xK0l' 'lkK0xl:;,,,,;:ldO0kl' '^:ldxkkkkxdl:^' +EOF + ;; + "parch"* | "Parch"* | "PARCH"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' + + + ${c1} ,#/*%* + ${c1} #. ..,..,*,, + ${c1} ,/,,... ,. (/ ... + ${c1} ,/,........ .,. ./(/%/ .* #* + ${c1} .**,..... ...,%&. ., + ${c1} ,%,.... ., , + ${c1} ,&,... .,, &. . + ${c1} (%,... ..,& *. + ${c1} *&*..... &,,,,,,,#& ..,&/ *. / + ${c1} *&*,..... &***%&&**,& ...,&* / / + ${c1} *&,.... &,**,,,**,# ..,&/ . + ${c1} (/,... &***%%%(, ..,%( # + ${c1} %*... #,,,% ..*% . * + ${c1} %,.. .,% . / + ${c1} %,. ..,,. .% + ${c1} /,. ${c1} ..# .% + ${c1} .,. ${c2} @@@@@# ${c1} ./ ./. + ${c1} ,.. ${c2} #&%.%%@ ${c1} .#%&* +${c1} .,.. ${c2} @//(*(@, ${c1} .. + ${c1} ,.. ${c2} #@ /@@, ${c1} + ${c1} ... ${c2} &@ @@@ ${c1} + ${c1} ,,. ${c2} (# .@@#, ${c1} , + ${c1} /,.. ${c2} *****@% #****/ ${c1} . + ${c1} ((*....${c2} /***% %*** ${c1} .,.* + ${c1} /&&&**,.., ${c2}* **,*,,. ${c1} ...,(&%* + ${c1} %&&&#*(**,,,,,,,,,,,,,,,*//(&&&&# + ${c1} /, .,....... .,,***/(/,,/ + ${c1} ./*/#*,,***,,***///(#%%*. + + EOF ;; diff --git a/neofetch.1 b/neofetch.1 index b90b5781..ceb0b9de 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -319,7 +319,7 @@ Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, 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, +TrueOS,Parch,PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, From c02d375d7158071570f3c1b3947557d80e19d9be Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Tue, 14 Feb 2023 16:49:37 +0330 Subject: [PATCH 546/550] renewed parchlogo --- neofetch | 45 ++++++++++++++++----------------------------- neofetch.1 | 2 +- 2 files changed, 17 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index d344f650..a585e364 100755 --- a/neofetch +++ b/neofetch @@ -5157,7 +5157,7 @@ ASCII: Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, - OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, + OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parch, TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, @@ -10799,34 +10799,21 @@ EOF read -rd '' ascii_data <<'EOF' - ${c1} ,#/*%* - ${c1} #. ..,..,*,, - ${c1} ,/,,... ,. (/ ... - ${c1} ,/,........ .,. ./(/%/ .* #* - ${c1} .**,..... ...,%&. ., - ${c1} ,%,.... ., , - ${c1} ,&,... .,, &. . - ${c1} (%,... ..,& *. - ${c1} *&*..... &,,,,,,,#& ..,&/ *. / - ${c1} *&*,..... &***%&&**,& ...,&* / / - ${c1} *&,.... &,**,,,**,# ..,&/ . - ${c1} (/,... &***%%%(, ..,%( # - ${c1} %*... #,,,% ..*% . * - ${c1} %,.. .,% . / - ${c1} %,. ..,,. .% - ${c1} /,. ${c1} ..# .% - ${c1} .,. ${c2} @@@@@# ${c1} ./ ./. - ${c1} ,.. ${c2} #&%.%%@ ${c1} .#%&* -${c1} .,.. ${c2} @//(*(@, ${c1} .. - ${c1} ,.. ${c2} #@ /@@, ${c1} - ${c1} ... ${c2} &@ @@@ ${c1} - ${c1} ,,. ${c2} (# .@@#, ${c1} , - ${c1} /,.. ${c2} *****@% #****/ ${c1} . - ${c1} ((*....${c2} /***% %*** ${c1} .,.* - ${c1} /&&&**,.., ${c2}* **,*,,. ${c1} ...,(&%* - ${c1} %&&&#*(**,,,,,,,,,,,,,,,*//(&&&&# - ${c1} /, .,....... .,,***/(/,,/ - ${c1} ./*/#*,,***,,***///(#%%*. + ‌ :==+++****= + .=++====+:. + ++======* + .+*#+=====*. + .*===+======*. + *============*: + .*=============*= + -*=============-+= + :*===+=========+++ + #=*#+========**+=* + :+*==============*: + =+==============*: + =*============+* + .++=========+= + .=+++++++-. EOF diff --git a/neofetch.1 b/neofetch.1 index ceb0b9de..72cd4e93 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -318,7 +318,7 @@ Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, -osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, +osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parch, Parsix, TrueOS,Parch,PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, From 0033e31388b0bc66a54b1947905b6f0a36eefa30 Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Tue, 14 Feb 2023 16:54:31 +0330 Subject: [PATCH 547/550] parch logo fix --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a585e364..fc0c6b69 100755 --- a/neofetch +++ b/neofetch @@ -10799,7 +10799,7 @@ EOF read -rd '' ascii_data <<'EOF' - ‌ :==+++****= + ‌ ‌ :==+++****= .=++====+:. ++======* .+*#+=====*. From 2cda9e9b2ceec3c1b607f6edd04b342ca8478a0e Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Fri, 28 Apr 2023 14:37:05 +0330 Subject: [PATCH 548/550] fixed parchlinux art --- neofetch | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/neofetch b/neofetch index fc0c6b69..a4b23e7a 100755 --- a/neofetch +++ b/neofetch @@ -10799,21 +10799,25 @@ EOF read -rd '' ascii_data <<'EOF' - ‌ ‌ :==+++****= - .=++====+:. - ++======* - .+*#+=====*. - .*===+======*. - *============*: - .*=============*= - -*=============-+= - :*===+=========+++ - #=*#+========**+=* - :+*==============*: - =+==============*: - =*============+* - .++=========+= - .=+++++++-. +‌ ‌+s;;:o- + s/sssso+/-'+\ + +/ssssss/` + /ssssssss/ + \ 'sssssss: + `o+;ssssssso\ + /sssssssssssss\+ + ;ssssssssssssssss: + :sssssssssssssssssso; + /ssssssssssssssssssssss + `+ssssssssssssssssssssso\ + so+'+ssssssssssssssss+'` + '` +osssssoooooosssss++oo\ + /sssssssooooooosssssssso + `osssssssssoooossssssssso: + \sssssssssssssssssssss; + `+osssssssssssssss:/' + `\osssssssssso;+' + `\+;so:+-` EOF From 5bbaf0a65833d7affa1d221e9ee5d50a5b568ce3 Mon Sep 17 00:00:00 2001 From: komeil Parseh Date: Sun, 16 Jul 2023 10:21:39 +0330 Subject: [PATCH 549/550] Update neofetch Co-authored-by: Azalea --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a4b23e7a..0677b957 100755 --- a/neofetch +++ b/neofetch @@ -10800,7 +10800,7 @@ EOF ‌ ‌+s;;:o- - s/sssso+/-'+\ + s/sssso+/-'+\\ +/ssssss/` /ssssssss/ \ 'sssssss: From 2cbd8e440dc10cbaaf71194660b07c5aa79bb9aa Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Fri, 1 Dec 2023 20:56:47 +0330 Subject: [PATCH 550/550] changed parch neofetch logo --- neofetch | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 0677b957..3960a0e0 100755 --- a/neofetch +++ b/neofetch @@ -10795,29 +10795,35 @@ dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd EOF ;; "parch"* | "Parch"* | "PARCH"*) - set_colors 4 6 + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - -‌ ‌+s;;:o- - s/sssso+/-'+\\ - +/ssssss/` - /ssssssss/ - \ 'sssssss: - `o+;ssssssso\ - /sssssssssssss\+ - ;ssssssssssssssss: - :sssssssssssssssssso; - /ssssssssssssssssssssss - `+ssssssssssssssssssssso\ - so+'+ssssssssssssssss+'` - '` +osssssoooooosssss++oo\ - /sssssssooooooosssssssso - `osssssssssoooossssssssso: - \sssssssssssssssssssss; - `+osssssssssssssss:/' - `\osssssssssso;+' - `\+;so:+-` + +‌ ${c1} ,:lodddd. + .:clooood. + ;clllooooc + ;cclllllloo + .cccccllllll + . ,cccclllll + ':::;; ccccclll; + .:::cccccccccccll; + ;::::ccccllllllcll: + .;::::cccclllloool::; + ;;;::::cccclllolc::::;. + ;;;::::cccclllccc:::::;. + ;;;::::cccclccccc::::::;. + ;;;;::::::llcccccc:::::' + ;;;;:; ,clllccccccc:: + .;; .cllllllcccccc::;::::' + .'''''''''',:lddoooolll + '.....'''',cdddooooollll + ........':oddddoooolllllc + ....';ldddddooooolllllc: + ,cdddddddooooollllccc + :ddddddoooolllllccc + ;ddooooolllllcc. + :ooollllc. + c' EOF