EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Dylan Araps 2019-06-07 20:02:32 +03:00
parent 9320275a6e df520a0a45
commit f01ebe4ac8
1 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
neofetch
View File

@ -2135,9 +2135,9 @@ get_gpu() {
case "$os" in case "$os" in
"Linux") "Linux")
# Read GPUs into array. # Read GPUs into array.
gpu_cmd="$(lspci -mm | awk -F '\\"|\\" \\"|\\(' \ gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \
'/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END {for(i in a) '/"Display|"3D|"VGA/ {a[$0] = $1 " " $3 " " $4}
{if(!seen[a[i]]++) print a[i]}}')" END {for(i in a) {if(!seen[a[i]]++) print a[i]}}')"
IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd" IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd"
# Remove duplicate Intel Graphics outputs. # Remove duplicate Intel Graphics outputs.
@ -2981,7 +2981,8 @@ END
kitty_config="$(kitty --debug-config)" kitty_config="$(kitty --debug-config)"
[[ "$kitty_config" != *font_family* ]] && return [[ "$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") "konsole" | "yakuake")
@ -3371,6 +3372,11 @@ get_public_ip() {
[[ "$public_ip" =~ ^\; ]] && unset public_ip [[ "$public_ip" =~ ^\; ]] && unset public_ip
fi 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 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 --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")"
fi fi
@ -6437,25 +6443,33 @@ WW W
EOF EOF
;; ;;
"januslinux"*|"janus"*) "januslinux"*|"janus"*|"Ataraxia Linux"*|"Ataraxia"*)
set_colors 4 7 4 set_colors 4 5 6 2
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1}oooooooooooooooooooooooooooooooo ${c1} 'l:
oooooooooooooooooooooooooooooooo loooooo
oooooooooooooooooooooooooooooooo loooo coooool
ooooooooooooo${c2}dOWWOd${c1}ooooooooooooo looooooooooooooooooool
oooooooooood${c2}0WMMMMWkd${c1}ooooooooooo looooooooooooooooo
oooooooood${c2}0WMMMMMX0KN0d${c1}oooolllll lool cooo
ooooooo${c2}xKWMMMMWKxKWMMMWKx${c3}lllllll coooooooloooooooo
ooooo${c2}xXMMMMMW0doooOWMMMMMXx${c3}lllll clooooo ;lood cloooo
ooooo${c2}xXMMMMMW0doloONMMMMMXx${c3}lllll :loooocooo cloo loooo
ooooooo${c2}xKWMMMWXO0WMMMMMKx${c3}lllllll loooo :ooooool loooo
ooooooooo${c2}d0NX0KWMMMMW0d${c3}lllllllll looo cooooo cooooo
oooooooooooo${c2}xWMMMMW0o${c3}llllllccccc looooooooooooo ;loooooo ${c2}looooooc
oooooooooooll${c2}o0WW0o${c3}lllllcccccccc ${c1}looooooooo loo cloooooool ${c2}looooc
ooooooooooollll${c2}oo${c3}llllllccccccccc ${c1} cooo cooooooooooo ${c2}looolooooool
oooooooooollllllllllllcccccccccc ${c1} cooo: ${c2}coooooooooooooooooool
oooooooooollllllllllllcccccccccc loooooooooooolc: loooc;
cooo: loooooooooooc
;oool looooooo:
coool olc,
looooc ,,
coooooc loc
:oooool, coool:, looool:,
looool: ooooooooooooooo:
cooolc .ooooooooooool
EOF EOF
;; ;;