Merge branch 'master' into better-pm
This commit is contained in:
Azalea
GitHub
commit
5e11110c66
15 changed files with 687 additions and 106 deletions
210
neofetch
210
neofetch
|
|
@ -867,8 +867,8 @@ image_source="auto"
|
|||
#
|
||||
# NOTE: Adélie, aerOS, Afterglow, AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, Android,
|
||||
# Antergos, antiX, AOSC OS, Aperio GNU/Linux, Aperture, Apricity, Arch, ArchBox, Archcraft,
|
||||
# archcraft_ascii, archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike, ArcoLinux, ArseLinux, Artix,
|
||||
# Arya, Asahi, AsteroidOS, astOS, Astra Linux, Athena, azos, Bedrock, BigLinux, Bitrig, BlackArch,
|
||||
# archcraft_ascii, archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike, ArcoLinux, Arkane, ArseLinux,
|
||||
# Artix, Arya, Asahi, AsteroidOS, astOS, Astra Linux, Athena, azos, Bedrock, BigLinux, Bitrig, BlackArch,
|
||||
# BlackMesa, blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, CachyOS, Calculate,
|
||||
# CalinixOS, Carbs, CBL-Mariner, CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, Chimera, ChonkySealOS,
|
||||
# Chrom, Cleanjaro, Clear Linux OS, ClearOS, Clover, Cobalt, Condres, Container Linux by CoreOS,
|
||||
|
|
@ -880,7 +880,7 @@ image_source="auto"
|
|||
# Haiku, HamoniKR, HarDClanZ, Hash, Huayra, Hybrid, HydroOS, Hyperbola, iglunix, instantOS, Interix,
|
||||
# IRIX, Ironclad, Itc, januslinux, Kaisen, Kali, KaOS, KDE, Kibojoe, Kogaion, Korora, KrassOS,
|
||||
# KSLinux, Kubuntu, LainOS, LangitKetujuh, LaxerOS, LEDE, LibreELEC, Linspire, Linux, Linux Lite,
|
||||
# Linux Mint, Linux Mint Old, Live Raizo, LMDE, Lubuntu, Lunar, mac, Mageia, MagpieOS, MainsailOS,
|
||||
# Linux Mint, Linux Mint Old, Live Raizo, LMDE, Lubuntu, Lunar, mac, Mageia, Magix, MagpieOS, MainsailOS,
|
||||
# Mandriva, Manjaro, MassOS, MatuusOS, Maui, Meowix, Mer, Minix, MIRACLE LINUX, MX, Namib, NekOS,
|
||||
# Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nobara, NomadBSD, Nurunner, NuTyX, Obarun, OBRevenge,
|
||||
# OmniOS, Open Source Media Center, OpenBSD, openEuler, OpenIndiana, openKylin, openmamba,
|
||||
|
|
@ -1698,6 +1698,34 @@ get_model() {
|
|||
iMac11,2): "iMac (21.5-inch, Mid 2010)" ;;
|
||||
iMac10,1): "iMac (27/21.5-inch, Late 2009)" ;;
|
||||
iMac9,1): "iMac (24/20-inch, Early 2009)" ;;
|
||||
PowerMac12,1): "iMac G5 (20/17-inch, iSight)" ;;
|
||||
PowerMac11,2): "Power Macintosh G5" ;;
|
||||
PowerMac8,2): "iMac G5 (20/17-inch, ALS)" ;;
|
||||
PowerMac8,1): "iMac G5 (20/17-inch)" ;;
|
||||
PowerMac7,[2-3]): "Power Macintosh G5 (PCI/PCI-X)" ;;
|
||||
PowerMac6,4): "eMac G4" ;;
|
||||
PowerMac6,3): "iMac G4 (20/17/15-inch, USB 2.0)" ;;
|
||||
PowerMac6,1): "iMac G4 (17-inch, Flat Panel)" ;;
|
||||
PowerMac5,1): "Power Macintosh G4 Cube" ;;
|
||||
PowerMac4,5): "iMac G4 (17-inch, Flat Panel)" ;;
|
||||
PowerMac4,4): "eMac G4" ;;
|
||||
PowerMac4,1): "iMac G3" ;;
|
||||
PowerMac3,6): "Power Macintosh G4 (MDD/FW800)" ;;
|
||||
PowerMac3,5): "Power Macintosh G4 (Quicksilver)" ;;
|
||||
PowerMac3,4): "Power Macintosh G4 (Digital Audio)" ;;
|
||||
PowerMac3,3): "Power Macintosh G4 (Gigabit)" ;;
|
||||
PowerMac3,1): "Power Macintosh G4 (AGP)" ;;
|
||||
PowerBook6,8 | PowerBook6,4 | PowerBook6,1): "PowerBook G4 (17/15/12-inch, Al)" ;;
|
||||
PowerBook6,7 | PowerBook6,5 | PowerBook6,3): "iBook G4 (14/12-inch)" ;;
|
||||
PowerBook6,2): "PowerBook G4 (12-inch, DVI - Al)" ;;
|
||||
PowerBook5,[8-9]): "PowerBook G4 (17/15-inch, DLSD/HR - Al)" ;;
|
||||
PowerBook5,[3-7] | PowerBook5,1): "PowerBook G4 (17/15/12-inch, Al)" ;;
|
||||
PowerBook5,2): "PowerBook G4 (15-inch, FW800 - Al)" ;;
|
||||
PowerBook4,[1-3]): "iBook G3" ;;
|
||||
PowerBook3,5): "PowerBook G4 (Ti)" ;;
|
||||
PowerBook3,4): "PowerBook G4 (DVI - Ti)" ;;
|
||||
PowerBook3,3): "PowerBook G4 (Gigabit - Ti)" ;;
|
||||
PowerBook3,2): "PowerBook G4 (Original - Ti)" ;;
|
||||
*): "$model" ;;
|
||||
esac
|
||||
|
||||
|
|
@ -2163,6 +2191,7 @@ get_packages() {
|
|||
# https://github.com/birb-linux/birb
|
||||
has birb && tot birb --list-installed
|
||||
|
||||
has port && pkgs_h=1 tot port installed && ((packages-=1))
|
||||
|
||||
# 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
|
||||
|
|
@ -3421,15 +3450,6 @@ get_gpu() {
|
|||
|
||||
IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd"
|
||||
|
||||
# Remove duplicate Intel Graphics outputs.
|
||||
# This fixes cases where the outputs are both
|
||||
# Intel but not entirely identical.
|
||||
#
|
||||
# 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]"
|
||||
|
||||
for gpu in "${gpus[@]}"; do
|
||||
# GPU shorthand tests.
|
||||
[[ "$gpu_type" == "dedicated" && "$gpu" == *Intel* ]] || \
|
||||
|
|
@ -3820,11 +3840,18 @@ get_network() {
|
|||
ActiveNetwork=$(route get default | grep interface | awk '{print $2}')
|
||||
ActiveNetworkName=$(networksetup -listallhardwareports | grep -B 1 "$ActiveNetwork" | awk '/Hardware Port/{print}'| awk '{print $3}')
|
||||
if [[ $ActiveNetworkName == "Wi-Fi" ]]; then
|
||||
LinkSpeed="$(/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -I | awk '/maxRate/{print}' | awk '{print $2}' )Mbps"
|
||||
temp_plist="/tmp/neofetch_system_profiler_SPAirPortDataType.xml" # PlistBuddy doesn't support reading from /dev/stdin
|
||||
system_profiler -detailLevel basic -xml SPAirPortDataType > "$temp_plist"
|
||||
|
||||
PhyMode="$(PlistBuddy -c "Print 0:_items:0:spairport_airport_interfaces:0:spairport_current_network_information:spairport_network_phymode" "$temp_plist")" 2>/dev/null
|
||||
LinkSpeed="$(PlistBuddy -c "Print 0:_items:0:spairport_airport_interfaces:0:spairport_current_network_information:spairport_network_rate" "$temp_plist")" 2>/dev/null
|
||||
[ -n "$LinkSpeed" ] && LinkSpeed="$LinkSpeed Mbps"
|
||||
else
|
||||
LinkSpeed="$(ifconfig "$ActiveNetwork" | awk '/media/{print}' | sed -E "s/.*\((.*)\).*/\1/")"
|
||||
fi
|
||||
network="$ActiveNetwork: $ActiveNetworkName@$LinkSpeed"
|
||||
network="$ActiveNetwork: $ActiveNetworkName"
|
||||
[ -n "$PhyMode" ] && network+=" ($PhyMode)"
|
||||
[ -n "$LinkSpeed" ] && network+=" @ $LinkSpeed"
|
||||
;;
|
||||
esac
|
||||
while IFS=' ' read -r n i; do
|
||||
|
|
@ -6580,8 +6607,8 @@ ASCII:
|
|||
Amazon, AmogOS, Anarchy, Android, Antergos, antiX, AOSC OS, Aperio
|
||||
GNU/Linux, Aperture, Apricity, Arch, ArchBox, Archcraft,
|
||||
archcraft_ascii, archcraft_minimal, ARCHlabs, ArchMerge, ArchStrike,
|
||||
ArcoLinux, ArseLinux, Artix, Arya, Asahi, AsteroidOS, astOS, Astra
|
||||
Linux, Athena, azos, Bedrock, BigLinux, Bitrig, BlackArch,
|
||||
ArcoLinux, Arkane, ArseLinux, Artix, Arya, Asahi, AsteroidOS, astOS,
|
||||
Astra Linux, Athena, azos, Bedrock, BigLinux, Bitrig, BlackArch,
|
||||
blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD,
|
||||
BunsenLabs, CachyOS, Calculate, CalinixOS, Carbs, CBL-Mariner,
|
||||
CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau, Chimera, ChonkySealOS,
|
||||
|
|
@ -6599,7 +6626,7 @@ ASCII:
|
|||
KaOS, KDE, Kibojoe, Kogaion, Korora, KrassOS, KSLinux, Kubuntu,
|
||||
LainOS, LangitKetujuh, LaxerOS, LEDE, LibreELEC, Linspire, Linux,
|
||||
Linux Lite, Linux Mint, Linux Mint Old, Live Raizo, LMDE, Lubuntu,
|
||||
Lunar, mac, Mageia, MagpieOS, MainsailOS, Mandriva, Manjaro, MassOS,
|
||||
Lunar, mac, Mageia, Magix,MagpieOS, MainsailOS, Mandriva, Manjaro, MassOS,
|
||||
MatuusOS, Maui, Meowix, Mer, Minix, MIRACLE LINUX, MX, Namib, NekOS,
|
||||
Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nobara, NomadBSD,
|
||||
Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, Open Source Media
|
||||
|
|
@ -7298,24 +7325,24 @@ EOF
|
|||
set_colors 15 6
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1} ___________
|
||||
/ \
|
||||
/ ${c2}______${c1} \
|
||||
/ ${c2}/ \${c1} \
|
||||
| ${c2}( )${c1} \
|
||||
/ ${c2}\______/${c1} |
|
||||
/ \\
|
||||
/ ${c2}______${c1} \\
|
||||
/ ${c2}/ \\${c1} \\
|
||||
| ${c2}( )${c1} \\
|
||||
/ ${c2}\\______/${c1} |
|
||||
| |
|
||||
/ \
|
||||
/ \\
|
||||
| |
|
||||
| |
|
||||
/ |
|
||||
| |
|
||||
| _______ |
|
||||
____/ / \ |
|
||||
____/ / \\ |
|
||||
/ | | |
|
||||
| / ____/ |
|
||||
\_________/ / |
|
||||
\ __/
|
||||
\_______/
|
||||
\\_________/ / |
|
||||
\\ __/
|
||||
\\_______/
|
||||
EOF
|
||||
;;
|
||||
|
||||
|
|
@ -7674,6 +7701,35 @@ ooooooooo. ${c1}-ooooooooo${c2}
|
|||
EOF
|
||||
;;
|
||||
|
||||
"Arkane"*)
|
||||
set_colors 7 130 237
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c3} .:..
|
||||
..:::......
|
||||
${c2}.${c3} .${c2}.${c3}.....
|
||||
${c2}+=${c3}...${c2}==${c3}....
|
||||
......:.${c1}:-${c2}:${c3}..${c1}+*${c2}=${c3}....
|
||||
${c2}:----::${c3}......
|
||||
${c2}.=***##*+=: ${c3}..
|
||||
${c2}=${c1}***######*${c2}=
|
||||
${c2}.${c1}-*######+
|
||||
${c2}:+${c1}###%%%###${c3}:
|
||||
${c2}-+*${c1}########+${c3}.
|
||||
${c2}=++*${c1}#######${c3}-
|
||||
${c2}-+=+**${c1}*####${c3}=
|
||||
${c3}.${c2}-=++==***${c1}##*${c1}-
|
||||
${c2}-++++++==++++=
|
||||
.-+++**+++=+===${c3}.
|
||||
${c2}:---===++++=-=--${c3}.
|
||||
${c2}-===============${c3}-==--:
|
||||
${c2}.-==+++***++*${c1}*#########${c3}=:::.
|
||||
${c2}.-=++++*++++**${c1}#######%%###${c3}=
|
||||
${c2}.:==++++++**${c1}#############${c3}:
|
||||
${c2}.${c3}-+*++*+++==${c1}###${c3}+
|
||||
-${c1}*+${c3}:
|
||||
EOF
|
||||
;;
|
||||
|
||||
"arch_small")
|
||||
set_colors 6 7 1
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
|
|
@ -8155,6 +8211,35 @@ ${c1}--------------------------------------
|
|||
--------------------------------------
|
||||
--------------------------------------
|
||||
--------------------------------------
|
||||
EOF
|
||||
;;
|
||||
|
||||
"BigLinux_large"*)
|
||||
set_colors 2 3 4 7
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c4}
|
||||
${c3}.cd0KXXX${c4}0${c3}x;
|
||||
${c3}.oXM${c4}M${c3}MMMMMMMMMWo
|
||||
${c2}... ${c3}dWMMMM${c4}M${c3}MMMMMMMMMMN,
|
||||
${c2}c0WMMMW0: ${c3}.XMMMM${c4}M${c3}MMMKdc;,;cxNMM:
|
||||
${c1}x, ${c2}.XMMMMMMMMM: ${c3}'W${c3}MMMMMMWo. ;KW.
|
||||
${c1}dM. ${c2}.WMMMMMMMM0 ${c3}N${c3}MMMM${c4}M${c3}Mk. dd
|
||||
${c1}.MM. ${c2}.lOKXKOl. ${c3}oMMMMMMd .l${c4}x${c3}kd: .
|
||||
${c1}kMM: .'.. ${c2}:xOOxc. ${c3}O${c4}M${c3}MMMM0 lXMMMMM${c4}M${c3}N;
|
||||
${c1}WMM0 lKMMMMMW0o. ${c2}KMMMMMMN. ${c3}xMM${c4}M${c3}M, .dWMMMMMMMMMM;
|
||||
${c1}.MMMMx .oWMMMMMMOl0MMX; ${c2}NMMMMMMM; ${c3}.NMMMM. .dWMMMM${c4}M${c3}MMMMMMMN
|
||||
${c1}.MMMMMNOKMMMMMMMk. 'MMMMx ${c2};MMMMMMMO ${c3}.KMMMl .oWMMMMMWk:,lWMMMM.
|
||||
${c1}xMMMMMMMMMMMMk. .MMMMMc ${c2}'XMMMMMMx ${c3}:0MMNMMMM${c4}M${c3}MWx. .WM${c4}M${c3}M.
|
||||
${c1}0MMMMMMMMWx. :MMMMMK ${c2}cKMMMMMX: ${c3},ok0K0x:. oMMN
|
||||
${c1}oNMMMM0c. .NMMMMMO ${c2}.lOWMMMX: ${c3}.M${c4}M${c3}o
|
||||
${c1}c. .'. .KMMMMMM: ${c2}.';clc. ${c3}MN
|
||||
${c1}:N; cWMMMMMMO ${c3}.W;
|
||||
${c1}0M0: 'dNMMMMMMM0 ${c3}',
|
||||
${c1}0MMMX0O0XMMMMMMMMMMo
|
||||
${c1}oWMMMMMMMMMMMMMMk.
|
||||
${c1}.oXMMMMMMMMW0c.
|
||||
${c1}.;ccc:,.
|
||||
|
||||
EOF
|
||||
;;
|
||||
|
||||
|
|
@ -11100,6 +11185,32 @@ ${c3}#######${c2}#${c1}#####${c2}#${c3}#######
|
|||
${c3} #####${c2}#######${c3}#####
|
||||
EOF
|
||||
;;
|
||||
|
||||
"LinuxFromScratch" | *"LFS" | "linux-from-scratch" | "linux_from_scratch")
|
||||
set_colors fg 8 3
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c2} .:@:.
|
||||
${c2} :@@@@@@@:
|
||||
${c2} @@@@@@@@@-
|
||||
${c2} .:%. @@@@@@@@@+. @%
|
||||
${c2} *@@@%+: :@@@@@@@%=: .=%@@@@@@=
|
||||
${c2} :@@@@@@##@@@@@@@@@%*+%@%+@@@@@@@+
|
||||
${c2} @@#${c1}####${c2}+@@@@@@@%:${c1}######${c2}=@@@@@@@@@-
|
||||
${c2} *@%${c1}######${c2}.@@@@@#${c1}#########${c2}-@@@@@@@@#.
|
||||
${c2} %@-${c1}#${c2}.@${c1}=${c2}:${c1}##${c2}+@@@@-${c1}###${c2}%@${c1}:${c2}=${c1}###${c2}*@#*+=-+#:
|
||||
${c2} @@.${c1}#${c2}@@*${c1}=${c2}:${c1}#${c2}-%%**-${c1}##${c2}%@@%${c1}*${c2}*${c1}###${c2}#=-
|
||||
${c2} @@-${c1}#${c2}@@@@+.-${c3}...${c2}:=.${c1}#${c2}%@@@@%${c1}###${c2}#-
|
||||
${c2} %@%${c1}##${c2}*#:${c3}.o.....o...${c2}-%@+${c1}###${c2}#@+ -:
|
||||
${c2} +@@*${c1}#${c3}....................${c2}+@@@@@@@@+
|
||||
${c2} @%:${c3}....................._:${c2}@@@@@@@=.
|
||||
${c2} .=:${c3}...............__*-=`.${c2}=@@@@@@#=.
|
||||
${c2} :+:${c3}....:==*__*-=`:..==-:${c2}#@@@@@%+:
|
||||
${c2} .--=-: ${c3}+..::.....-: ${c2}=%@*=:
|
||||
${c2} :........-
|
||||
${c2} .:...--.
|
||||
EOF
|
||||
;;
|
||||
|
||||
"Linux_small")
|
||||
set_colors fg 8 3
|
||||
read -rd '' ascii_data << 'EOF'
|
||||
|
|
@ -11324,6 +11435,30 @@ lOO. .OO:
|
|||
EOF
|
||||
;;
|
||||
|
||||
"Magix"*)
|
||||
set_colors 206 39
|
||||
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
|
||||
;;
|
||||
"MagpieOS"*)
|
||||
set_colors 2 1 3 5
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
|
|
@ -11518,6 +11653,27 @@ ${c1} `.-://////:--`
|
|||
EOF
|
||||
;;
|
||||
|
||||
"Mauna"*)
|
||||
set_colors 4 6
|
||||
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} .=++++++++++++++: ${c2}+++++= ${c1}.
|
||||
${c2} .=+++++++++= :=+++++=
|
||||
.:::--- -+++++++-
|
||||
:-==++==-.
|
||||
EOF
|
||||
;;
|
||||
|
||||
"Meowix"*)
|
||||
set_colors 1 3 3 4
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue