Merge remote-tracking branch 'origin/master' into riir

This commit is contained in:
Teoh Han Hui 2024-08-30 00:14:04 +08:00
commit b2f7a3cee9
No known key found for this signature in database
GPG key ID: D43E2BABAF97DCAE
4 changed files with 382 additions and 39 deletions

View file

@ -317,8 +317,8 @@ 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,
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,

View file

@ -2,25 +2,30 @@
from . import AsciiArt
biglinux = AsciiArt(match=r'''"BigLinux"*''', color='6 11 4', ascii=r"""
${c1} ...
:OWMMMNd.
:NMMMMMMMMWc
okkl. kMMMMMW0xdOWMl
: xMMMMMW. kMMMMNc lW.
:x NMMMMMO ,MMMM0. 'l
Xx "lkk" kMMMX .okx,
${c2}.MX .cc;. .xXKx. KMMM: .OMMMMMl
:MM' 'KMMMMWK: 0MMMMk xMMM. lWMMMMMMM'
cMMN:;xMMMMk::MMO oMMMMX .XMM. .KMMMWOOMMMd
'MMMMMMMMN, NMMx OMMMMl .kM0OMMMMk. ;MMd
xMMMMMMd .MMMW :NMMMd .ckKKx' KMc
dWMNd. oMMMN lkNMX, oM.
;. ;MMMMx "MM:. cO
${c3} .X. oMMMMW. l.
dMk:..;xWMMMMW,
kMMMMMMMMMMX.
:XMMMMMMK:
':MM:" Made in Brazil
biglinux = AsciiArt(match=r'''"BigLinux"*''', color='2 3 4 7', ascii=r"""
${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:,.
""")

View file

@ -689,6 +689,187 @@ PRESETS: dict[str, ColorProfile] = {
'#FFFFFF',
'#636363',
]),
'kenochoric': ColorProfile([
'#000000',
'#2E1569',
'#824DB7',
'#C7A1D6',
]),
'veldian': ColorProfile([
'#D182A8',
'#FAF6E0',
'#69ACBE',
'#5D448F',
'#3A113E',
]),
'solian': ColorProfile([
'#FFF8ED',
'#FFE7A8',
'#F1B870',
'#A56058',
'#46281E',
]),
'lunian': ColorProfile([
'#2F0E62',
'#6F41B1',
'#889FDF',
'#7DDFD5',
'#D2F2E2',
]),
# Start of Extras by Jaida Corvera
# polyamorous flag colors pulled from https://polyamproud.com/flag
'polyam' : ColorProfile([
"#FFFFFF",
"#FCBF00",
"#009FE3",
"#E50051",
"#340C46",
]),
'sapphic' : ColorProfile([
"#FD8BA8",
"#FBF2FF",
"#C76BC5",
"#FDD768",
"#C76BC5",
"#FBF2FF",
"#FD8BA8"
]),
'androgyne' : ColorProfile([
"#FE007F",
"#9832FF",
"#00B8E7",
]),
"genderflux" : ColorProfile([
"#F57694",
"#F2A3B9",
"#CFCFCF",
"#7BE1F5",
"#3ECDFA",
"#FFF48C",
]),
'interprogress' : ColorProfile([
"#FFD800",
"#7902AA",
"#FFFFFF",
"#FFAFC8",
"#74D7EE",
"#613915",
"#000000",
'#E50000',
'#FF8D00',
'#FFEE00',
'#028121',
'#004CFF',
'#770088'
]),
'progress' : ColorProfile ([
"#FFFFFF",
"#FFAFC8",
"#74D7EE",
"#613915",
"#000000",
'#E50000',
'#FF8D00',
'#FFEE00',
'#028121',
'#004CFF',
'#770088'
]),
'intersex' : ColorProfile([
"#FFD800",
"#FFD800",
"#7902AA",
"#FFD800",
"#FFD800"
]),
'old-polyam' : ColorProfile([
"#0000FF",
"#FF0000",
"#FFFF00",
"#FF0000",
"#000000"
]),
'equal-rights' : ColorProfile([
"#0000FF",
"#0000FF",
"#FFFF00",
"#0000FF",
"#0000FF",
"#FFFF00",
"#0000FF",
"#0000FF"
]),
'drag' : ColorProfile([
"#CC67FF",
"#FFFFFF",
"#FFA3E3",
"#FFFFFF",
"#3366FF"
]),
# Pronoun Flags
'pronounfluid' : ColorProfile([
"#ffb3f9",
"#ffffff",
"#d1fdcb",
"#c7b0ff",
"#000000",
"#b8ccff"
]),
'pronounflux' : ColorProfile([
"#fdb3f8",
"#b6ccfa",
"#18ddd3",
"#64ff89",
"#ff7690",
"#ffffff"
]),
'exipronoun' : ColorProfile([
"#1c3d34",
"#ffffff",
"#321848",
"#000000"
]),
'neopronoun' : ColorProfile ([
"#bcec64",
"#ffffff",
"#38077a"
]),
'neofluid' : ColorProfile ([
"#ffeca0",
"#ffffff",
"#ffeca0",
"#38087a",
"#bcec64"
]),
'genderqueer' : ColorProfile ([
"#b57edc",
"#b57edc",
"#ffffff",
"#ffffff",
"#4a8123",
"#4a8123"
]),
# Meme flags
'beiyang': ColorProfile([

189
neofetch
View file

@ -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
@ -6560,8 +6588,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,
@ -6579,7 +6607,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
@ -7278,24 +7306,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
;;
@ -7654,6 +7682,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'
@ -8135,6 +8192,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
;;
@ -11080,6 +11166,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'
@ -11304,6 +11416,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'
@ -11498,6 +11634,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'