From 04ede28dbe0675d43224a6c4a7d7b3a92f611911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 2 Aug 2023 15:18:40 +0800 Subject: [PATCH] Logo: add more logos --- README.md | 2 +- src/logo/ascii/alpine2_small.txt | 6 +++ src/logo/ascii/alter.txt | 20 ++++++++ src/logo/ascii/amazon.txt | 19 ++++++++ src/logo/ascii/amogos.txt | 19 ++++++++ src/logo/ascii/anarchy.txt | 28 +++++++++++ src/logo/builtin.c | 81 ++++++++++++++++++++++++++++++-- 7 files changed, 171 insertions(+), 4 deletions(-) create mode 100644 src/logo/ascii/alpine2_small.txt create mode 100644 src/logo/ascii/alter.txt create mode 100644 src/logo/ascii/amazon.txt create mode 100644 src/logo/ascii/amogos.txt create mode 100644 src/logo/ascii/anarchy.txt diff --git a/README.md b/README.md index 69fb874bf..a7bbd959a 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ Battery, Bios, Bluetooth, Board, Break, Brightness, Colors, Command, CPU, CPUUsa ##### Builtin logos ``` -AIX, Asahi, AlmaLinux, Alpine, Android, Arch, Arco, Artix, Bedrock, BSD, CachyOS, CentOS, CRUX, Crystal, Debian, Deepin, Devuan, Elementary, Endeavour, Enso, Exherbo, Fedora, FreeBSD, Garuda, Garuda Dragon, Gentoo, GhostBSD, GNU, Gnome, Haiku, KDE Neon, KISS, Kubuntu, LangitKetujuh, Linux, LMDE, MacOS, Mandriva, Manjaro, NetBSD, Mint, Minix, MX, MSYS2, NixOS, Nobara, NomadBSD, OpenBSD, OpenKylin, OpenSUSE, OpenSUSE LEAP, OpenSUSE Tumbleweed, OpenWrt, Orchid, Oracle, Parabola, Pop!_OS, Raspbian, RebornOS, RedstarOS, Rocky, Rosa, Slackware, Solaris, Solus, SteamOS, Ubuntu, Ubuntu Kylin, UOS, Vanilla, Void, Windows, Windows 11, Windows 8, Windows 95, Zorin +AIX, Alter, Amazon, Amogos, Anarchy, Asahi, AlmaLinux, Alpine, Android, Arch, Arco, Artix, Bedrock, BSD, CachyOS, CentOS, CRUX, Crystal, Debian, Deepin, Devuan, Elementary, Endeavour, Enso, Exherbo, Fedora, FreeBSD, Garuda, Garuda Dragon, Gentoo, GhostBSD, GNU, Gnome, Haiku, KDE Neon, KISS, Kubuntu, LangitKetujuh, Linux, LMDE, MacOS, Mandriva, Manjaro, NetBSD, Mint, Minix, MX, MSYS2, NixOS, Nobara, NomadBSD, OpenBSD, OpenKylin, OpenSUSE, OpenSUSE LEAP, OpenSUSE Tumbleweed, OpenWrt, Orchid, Oracle, Parabola, Pop!_OS, Raspbian, RebornOS, RedstarOS, Rocky, Rosa, Slackware, Solaris, Solus, SteamOS, Ubuntu, Ubuntu Kylin, UOS, Vanilla, Void, Windows, Windows 11, Windows 8, Windows 95, Zorin ``` ##### Package managers diff --git a/src/logo/ascii/alpine2_small.txt b/src/logo/ascii/alpine2_small.txt new file mode 100644 index 000000000..8f231cc2b --- /dev/null +++ b/src/logo/ascii/alpine2_small.txt @@ -0,0 +1,6 @@ +${c1} /\\ /\\ + /${c2}/ ${c1}\\ \\ + /${c2}// ${c1}\\ \\ +/${c2}// ${c1}\\ \\ +${c2}// ${c1}\\ \\ + \\ diff --git a/src/logo/ascii/alter.txt b/src/logo/ascii/alter.txt new file mode 100644 index 000000000..990221c90 --- /dev/null +++ b/src/logo/ascii/alter.txt @@ -0,0 +1,20 @@ + %, + ^WWWw + 'wwwwww + !wwwwwwww + #`wwwwwwwww + @wwwwwwwwwwww + wwwwwwwwwwwwwww + wwwwwwwwwwwwwwwww + wwwwwwwwwwwwwwwwwww + wwwwwwwwwwwwwwwwwwww, + w~1i.wwwwwwwwwwwwwwwww, + 3~:~1lli.wwwwwwwwwwwwwwww. + :~~:~?ttttzwwwwwwwwwwwwwwww + #<~:~~~~?llllltO-.wwwwwwwwwww + #~:~~:~:~~?ltlltlttO-.wwwwwwwww + @~:~~:~:~:~~(zttlltltlOda.wwwwwww + @~:~~: ~:~~:~:(zltlltlO a,wwwwww + 8~~:~~:~~~~:~~~~_1ltltu ,www + 5~~:~~:~~:~~:~~:~~~_1ltq N,, + g~:~~:~~~:~~:~~:~:~~~~1q N, diff --git a/src/logo/ascii/amazon.txt b/src/logo/ascii/amazon.txt new file mode 100644 index 000000000..e995cfdff --- /dev/null +++ b/src/logo/ascii/amazon.txt @@ -0,0 +1,19 @@ + `-/oydNNdyo:.` + `.:+shmMMMMMMMMMMMMMMmhs+:.` + -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- +.`` -/+shmNNMMMMMMNNmhs+/- ``. +dNmhs+:. `.:/oo/:.` .:+shmNd +dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd +dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. + `.:+shNMMMMMh yMMMMMNhs+:`` + `-+shy shs+:` diff --git a/src/logo/ascii/amogos.txt b/src/logo/ascii/amogos.txt new file mode 100644 index 000000000..4b1919133 --- /dev/null +++ b/src/logo/ascii/amogos.txt @@ -0,0 +1,19 @@ +${c1} ___________ + / \ + / ${c2}______${c1} \ + / ${c2}/ \${c1} \ + | ${c2}( )${c1} \ + / ${c2}\______/${c1} | + | | + / \ + | | + | | + / | + | | + | _______ | + ____/ / \ | + / | | | + | / ____/ | + \_________/ / | + \ __/ + \_______/ diff --git a/src/logo/ascii/anarchy.txt b/src/logo/ascii/anarchy.txt new file mode 100644 index 000000000..76b74cd35 --- /dev/null +++ b/src/logo/ascii/anarchy.txt @@ -0,0 +1,28 @@ + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 7370801b3..a470a58c4 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -72,13 +72,83 @@ static const FFlogo* getLogoAlpineSmall(void) FF_LOGO_NAMES("alpine_small", "alpine-linux-small") FF_LOGO_LINES(FASTFETCH_DATATEXT_LOGO_ALPINE_SMALL) FF_LOGO_COLORS( - "34" //blue + "34", //blue + "37" //white ) FF_LOGO_COLOR_KEYS("35"); //magenta FF_LOGO_COLOR_TITLE("34"); //blue FF_LOGO_RETURN } +static const FFlogo* getLogoAlpine2Small(void) +{ + FF_LOGO_INIT_SMALL + FF_LOGO_NAMES("alpine2_small", "alpine-linux2-small") + FF_LOGO_LINES(FASTFETCH_DATATEXT_LOGO_ALPINE2_SMALL) + FF_LOGO_COLORS( + "34", //blue + "37" //white + ) + FF_LOGO_COLOR_KEYS("35"); //magenta + FF_LOGO_COLOR_TITLE("34"); //blue + FF_LOGO_RETURN +} + +static const FFlogo* getLogoAlter(void) +{ + FF_LOGO_INIT + FF_LOGO_NAMES("Alter") + FF_LOGO_LINES(FASTFETCH_DATATEXT_LOGO_ALTER) + FF_LOGO_COLORS( + "36" //cyan + ) + FF_LOGO_COLOR_KEYS("36"); //cyan + FF_LOGO_COLOR_TITLE("36"); //cyan + FF_LOGO_RETURN +} + +static const FFlogo* getLogoAmazon(void) +{ + FF_LOGO_INIT + FF_LOGO_NAMES("Amazon") + FF_LOGO_LINES(FASTFETCH_DATATEXT_LOGO_AMAZON) + FF_LOGO_COLORS( + "33", //yellow + "37" //white + ) + FF_LOGO_COLOR_KEYS("33"); //yellow + FF_LOGO_COLOR_TITLE("37"); //white + FF_LOGO_RETURN +} + +static const FFlogo* getLogoAmogOS(void) +{ + FF_LOGO_INIT + FF_LOGO_NAMES("AmogOS") + FF_LOGO_LINES(FASTFETCH_DATATEXT_LOGO_AMOGOS) + FF_LOGO_COLORS( + "37", //white + "36" //cyan + ) + FF_LOGO_COLOR_KEYS("37"); //white + FF_LOGO_COLOR_TITLE("36"); //cyan + FF_LOGO_RETURN +} + +static const FFlogo* getLogoAnarchy(void) +{ + FF_LOGO_INIT + FF_LOGO_NAMES("Anarchy") + FF_LOGO_LINES(FASTFETCH_DATATEXT_LOGO_ANARCHY) + FF_LOGO_COLORS( + "37", //white + "34" //blue + ) + FF_LOGO_COLOR_KEYS("37"); //white + FF_LOGO_COLOR_TITLE("34"); //blue + FF_LOGO_RETURN +} + static const FFlogo* getLogoAndroid(void) { FF_LOGO_INIT @@ -109,7 +179,7 @@ static const FFlogo* getLogoAndroidSmall(void) static const FFlogo* getLogoArch(void) { FF_LOGO_INIT - FF_LOGO_NAMES("arch", "archlinux", "arch-linux") + FF_LOGO_NAMES("arch", "archlinux", "arch-linux", "archmerge") FF_LOGO_LINES(FASTFETCH_DATATEXT_LOGO_ARCH) FF_LOGO_COLORS( "36", //cyan @@ -506,7 +576,7 @@ static const FFlogo* getLogoFedoraOld(void) static const FFlogo* getLogoFreeBSD(void) { FF_LOGO_INIT - FF_LOGO_NAMES("freebsd") + FF_LOGO_NAMES("freebsd", "HardenedBSD") FF_LOGO_LINES(FASTFETCH_DATATEXT_LOGO_FREEBSD) FF_LOGO_COLORS( "37", //white @@ -1750,6 +1820,11 @@ GetLogoMethod* ffLogoBuiltinGetAll(void) getLogoAlmaLinux, getLogoAlpine, getLogoAlpineSmall, + getLogoAlpine2Small, + getLogoAlter, + getLogoAmazon, + getLogoAmogOS, + getLogoAnarchy, getLogoAndroid, getLogoAndroidSmall, getLogoArch,