Merge branch 'master' of github.com:dylanaraps/neofetch

This commit is contained in:
Dylan Araps 2019-08-28 10:09:08 +00:00
commit 4c7678e43e
1 changed files with 35 additions and 4 deletions

View File

@ -925,8 +925,8 @@ get_distro() {
elif type -p guix >/dev/null; then elif type -p guix >/dev/null; then
case "$distro_shorthand" in case "$distro_shorthand" in
"on" | "tiny") distro="GuixSD" ;; "on" | "tiny") distro="Guix System" ;;
*) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')" *) distro="Guix System $(guix system -V | awk 'NR==1{printf $5}')"
esac esac
else else
@ -1339,6 +1339,7 @@ get_packages() {
has "sorcery" && tot gaze installed has "sorcery" && tot gaze installed
has "alps" && tot alps showinstalled has "alps" && tot alps showinstalled
has "butch" && tot butch list has "butch" && tot butch list
has "bonsai" && tot bonsai list
# Counting files/dirs. # Counting files/dirs.
# Variables need to be unquoted here. Only Bedrock Linux is affected. # Variables need to be unquoted here. Only Bedrock Linux is affected.
@ -1346,6 +1347,7 @@ get_packages() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
{ {
shopt -s nullglob shopt -s nullglob
has "brew" && dir "$(brew --cellar)"/*
has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/
has "Compile" && dir ${br_prefix}/Programs/*/ has "Compile" && dir ${br_prefix}/Programs/*/
has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/*
@ -1630,7 +1632,13 @@ get_wm() {
else else
case "$os" in case "$os" in
"Mac OS X") "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 \
-e "[S]pectacle" \
-e "[A]methyst" \
-e "[k]wm" \
-e "[c]hun[k]wm" \
-e "[y]abai" \
-e "[R]ectangle")"
case "$ps_line" in case "$ps_line" in
*"chunkwm"*) wm="chunkwm" ;; *"chunkwm"*) wm="chunkwm" ;;
@ -1638,6 +1646,7 @@ get_wm() {
*"yabai"*) wm="yabai" ;; *"yabai"*) wm="yabai" ;;
*"Amethyst"*) wm="Amethyst" ;; *"Amethyst"*) wm="Amethyst" ;;
*"Spectacle"*) wm="Spectacle" ;; *"Spectacle"*) wm="Spectacle" ;;
*"Rectangle"*) wm="Rectangle" ;;
*) wm="Quartz Compositor" ;; *) wm="Quartz Compositor" ;;
esac esac
;; ;;
@ -3865,7 +3874,7 @@ display_image() {
;; ;;
"chafa") "chafa")
chafa --size="$((width / font_width))x$((height / font_height))" "$image" chafa --stretch --size="$((width / font_width))x$((height / font_height))" "$image"
;; ;;
"jp2a") "jp2a")
@ -5460,6 +5469,28 @@ ${c1} oMMNMMMMMMMMMMMMMMMMMMMMMM
EOF 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") "BSD")
set_colors 1 7 4 3 6 set_colors 1 7 4 3 6
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'