Merge branch 'master' of https://github.com/dylanaraps/neofetch
Merge upstream changes.
This commit is contained in:
Syphist
commit
1456af01ba
1 changed files with 77 additions and 48 deletions
119
neofetch
119
neofetch
|
|
@ -512,6 +512,7 @@ disk_percent="on"
|
|||
# guayadeque
|
||||
# io.elementary.music
|
||||
# iTunes
|
||||
# Music
|
||||
# juk
|
||||
# lollypop
|
||||
# MellowPlayer
|
||||
|
|
@ -1521,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
|
||||
|
|
@ -1534,6 +1535,10 @@ get_packages() {
|
|||
has sorcery && tot gaze installed
|
||||
has alps && tot alps showinstalled
|
||||
has butch && tot butch list
|
||||
has swupd && tot swupd bundle-list --quiet
|
||||
|
||||
# 'mine' conflicts with minesweeper games.
|
||||
[[ -f /etc/SDE-VERSION ]] &&
|
||||
has mine && tot mine -q
|
||||
|
||||
# Counting files/dirs.
|
||||
|
|
@ -1564,9 +1569,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.
|
||||
|
|
@ -1605,8 +1614,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
|
||||
}
|
||||
;;
|
||||
|
||||
|
|
@ -2727,6 +2740,7 @@ get_song() {
|
|||
"guayadeque"
|
||||
"io.elementary.music"
|
||||
"iTunes"
|
||||
"Music"
|
||||
"juk"
|
||||
"lollypop"
|
||||
"MellowPlayer"
|
||||
|
|
@ -2842,6 +2856,12 @@ get_song() {
|
|||
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 |\
|
||||
awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2}
|
||||
|
|
@ -3334,7 +3354,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/')"
|
||||
|
|
@ -3586,7 +3606,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 +3614,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
|
||||
|
||||
|
|
@ -4345,15 +4370,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
|
||||
;;
|
||||
|
|
@ -4798,6 +4822,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)) {
|
||||
|
|
@ -7304,26 +7332,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
|
||||
|
||||
|
|
@ -8565,7 +8594,7 @@ EOF
|
|||
"NixOS"*)
|
||||
set_colors 4 6
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1} ▗██▙ ${c2}▜███▙ ▟██▖
|
||||
${c1} ▗▄▄▄ ${c2}▗▄▄▄▄ ▄▄▄▖
|
||||
${c1} ▜███▙ ${c2}▜███▙ ▟███▛
|
||||
${c1} ▜███▙ ${c2}▜███▙▟███▛
|
||||
${c1} ▜███▙ ${c2}▜██████▛
|
||||
|
|
@ -8584,7 +8613,7 @@ ${c2} ▜▛ ${c1}▟████▙ ${c2}▜█████████
|
|||
${c1} ▟██████▙ ${c2}▜███▙
|
||||
${c1} ▟███▛▜███▙ ${c2}▜███▙
|
||||
${c1} ▟███▛ ▜███▙ ${c2}▜███▙
|
||||
${c1} ▝██▛ ▜███▙ ${c2}▜██▘
|
||||
${c1} ▝▀▀▀ ▀▀▀▀▘ ${c2}▀▀▀▘
|
||||
EOF
|
||||
;;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue