From fcb5e608d43c53364e7a8fe77a02b4c39e935467 Mon Sep 17 00:00:00 2001 From: Tom Briden Date: Thu, 20 Jul 2023 16:14:54 +0100 Subject: [PATCH 1/2] Add Exherbo logo --- README.md | 2 +- src/logo/builtin.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 71d14b7504..809c3007e0 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ Battery, Bios, Bluetooth, Board, Break, Brightness, Colors, Command, CPU, CPUUsa ##### Builtin logos ``` -AlmaLinux, Alpine, Android, Arch, Arco, Artix, Bedrock, BSD, CachyOS, CentOS, CRUX, Crystal, Debian, Deepin, Devuan, Endeavour, Enso, Fedora, FreeBSD, Garuda, Gentoo, GhostBSD, KDE Neon, KISS, Kubuntu, LangitKetujuh, Linux, MacOS, Manjaro, Mint, MSYS2, NixOS, Nobara, OpenSUSE, OpenSUSE LEAP, OpenSUSE Tumbleweed, Parabola, Pop!_OS, Raspbian, RebornOS, RedstarOS, Rocky, Rosa, Slackware, Solus, SteamOS, Ubuntu, Vanilla, Void, Windows, Windows 11, Windows 8, Zorin +AlmaLinux, Alpine, Android, Arch, Arco, Artix, Bedrock, BSD, CachyOS, CentOS, CRUX, Crystal, Debian, Deepin, Devuan, Endeavour, Enso, Exherbo, Fedora, FreeBSD, Garuda, Gentoo, GhostBSD, KDE Neon, KISS, Kubuntu, LangitKetujuh, Linux, MacOS, Manjaro, Mint, MSYS2, NixOS, Nobara, OpenSUSE, OpenSUSE LEAP, OpenSUSE Tumbleweed, Parabola, Pop!_OS, Raspbian, RebornOS, RedstarOS, Rocky, Rosa, Slackware, Solus, SteamOS, Ubuntu, Vanilla, Void, Windows, Windows 11, Windows 8, Zorin ``` ##### Package managers diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 4efbc5d4ff..fcd755e635 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -819,6 +819,44 @@ static const FFlogo* getLogoEnso(void) FF_LOGO_RETURN } +static const FFlogo* getLogoExherbo(void) +{ + FF_LOGO_INIT + FF_LOGO_NAMES("exherbo", "exherbo-linux") + FF_LOGO_LINES( + "$2 ,\n" + "OXo.\n" + "NXdX0: .cok0KXNNXXK0ko:.\n" + "KX '0XdKMMK;.xMMMk, .0MMMMMXx; ...\n" + "'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd.\n" + " cNMk NK .oXM. OMMMMO. 0MMNo kW.\n" + " lMc o: ., .oKNk; ;NMMWlxW'\n" + " ;Mc .. .,,' .0M$1g;$2WMN'dWMMMMMMO\n" + " XX ,WMMMMW. cM$1cfli$2WMKlo. .kMk\n" + ".Mo .WM$1GD$2MW. XM$1WO0$2MMk oMl\n" + ",M: ,XMMWx::,''oOK0x; NM.\n" + "'Ml ,kNKOxxxxxkkO0XXKOd:. oMk\n" + " NK .0Nxc$3:::::::::::::::$2fkKNk, .MW\n" + " ,Mo .NXc$3::$2qXWXb$3::::::::::$2oo$3::$2lNK. .MW\n" + " ;Wo oMd$3:::$2oNMNP$3::::::::$2oWMMMx$3:$2c0M; lMO\n" + " 'NO;W0c$3:::::::::::::::$2dMMMMO$3::$2lMk .WM'\n" + " xWONXdc$3::::::::::::::$2oOOo$3::$2lXN. ,WMd\n" + " 'KWWNXXK0Okxxo,$3:::::::$2,lkKNo xMMO\n" + " :XMNxl,';:lodxkOO000Oxc. .oWMMo\n" + " 'dXMMXkl;,. .,o0MMNo'\n" + " ':d0XWMMMMWNNNNMMMNOl'\n" + " ':okKXWNKkl'\n" + ) + FF_LOGO_COLORS( + "34", //blue + "37", //white + "31" //red + ) + FF_LOGO_COLOR_KEYS("34"); //blue + FF_LOGO_COLOR_TITLE("34"); //blue + FF_LOGO_RETURN +} + static const FFlogo* getLogoFedora(void) { FF_LOGO_INIT @@ -2690,6 +2728,7 @@ GetLogoMethod* ffLogoBuiltinGetAll(void) getLogoDeepin, getLogoEndeavour, getLogoEnso, + getLogoExherbo, getLogoFedora, getLogoFedoraSmall, getLogoFedoraOld, From e17183bf58818dcbb45dc243d288b41a70fc97f9 Mon Sep 17 00:00:00 2001 From: Tom Briden Date: Thu, 20 Jul 2023 16:43:29 +0100 Subject: [PATCH 2/2] Add paludis (exherbo) package count --- README.md | 2 +- presets/verbose | 2 +- src/detection/packages/packages.h | 1 + src/detection/packages/packages_linux.c | 1 + src/fastfetch.c | 5 +++-- src/modules/packages/packages.c | 1 + 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 809c3007e0..36a8c74621 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ AlmaLinux, Alpine, Android, Arch, Arco, Artix, Bedrock, BSD, CachyOS, CentOS, CR ##### Package managers ``` -apk, brew, Chocolatey, dpkg, emerge, eopkg, Flatpak, MacPorts, nix, Pacman, pkg, pkgtool, rpm, scoop, Snap, xbps +apk, brew, Chocolatey, dpkg, emerge, eopkg, Flatpak, MacPorts, nix, Pacman, paludis, pkg, pkgtool, rpm, scoop, Snap, xbps ``` ##### WM themes diff --git a/presets/verbose b/presets/verbose index 833cfd4d93..3ed020f193 100644 --- a/presets/verbose +++ b/presets/verbose @@ -3,7 +3,7 @@ --kernel-format Sysname: {}; Release: {}; Version: {} --uptime-format Days: {}; Hours: {}; Minutes: {}; Seconds: {} --processes-format Count: {} ---packages-format All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; eopkg: {}; xbps: {}; apk: {}; flatpak-system: {}; flatpak-user: {}; snap: {}; brew: {}; brew-cask: {}; port: {}; scoop: {}; choco: {}; pkgtool: {} +--packages-format All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; eopkg: {}; xbps: {}; apk: {}; flatpak-system: {}; flatpak-user: {}; snap: {}; brew: {}; brew-cask: {}; port: {}; scoop: {}; choco: {}; pkgtool: {}; paludis {} --shell-format Process name: {}; Process path: {}; Process exe: {}; Process version: {}; User path: {}; User exe: {}; User version: {} --display-format Width: {}; Height: {}; Refresh rate: {}; ScaledWith: {}; ScaledHeight: {} --de-format Process name: {}; Pretty name: {}; Version: {} diff --git a/src/detection/packages/packages.h b/src/detection/packages/packages.h index 59b1d1ef67..77f8e68121 100644 --- a/src/detection/packages/packages.h +++ b/src/detection/packages/packages.h @@ -20,6 +20,7 @@ typedef struct FFPackagesResult uint32_t nixSystem; uint32_t nixUser; uint32_t pacman; + uint32_t paludis; uint32_t pkg; uint32_t pkgtool; uint32_t port; diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index 1c12ad14d6..7dd4061b4a 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -276,6 +276,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts) packageCounts->xbps += getXBPS(baseDir, "/var/db/xbps"); packageCounts->brewCask += getNumElements(baseDir, "/home/linuxbrew/.linuxbrew/Caskroom", DT_DIR); packageCounts->brew += getNumElements(baseDir, "/home/linuxbrew/.linuxbrew/Cellar", DT_DIR); + packageCounts->paludis += countFilesRecursive(baseDir, "/var/db/paludis/repositories", "environment.bz2"); } static void getPackageCountsRegular(FFstrbuf* baseDir, FFPackagesResult* packageCounts) diff --git a/src/fastfetch.c b/src/fastfetch.c index 25a7a448e1..9c41dc3c78 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -141,7 +141,7 @@ static inline void printCommandHelp(const char* command) } else if(ffStrEqualsIgnCase(command, "packages-format")) { - constructAndPrintCommandHelpFormat("packages", "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (eopkg), {8} (xbps), {9} (nix-system), {10} (nix-user), {11} (nix-default), {12} (apk), {13} (pkg), {14} (flatpak-system), {15} (flatpack-user), {16} (snap), {17} (brew), {18} (brew-cask), {19} (port), {20} (scoop), {21} (choco), {22} (pkgtool)", 22, + constructAndPrintCommandHelpFormat("packages", "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (eopkg), {8} (xbps), {9} (nix-system), {10} (nix-user), {11} (nix-default), {12} (apk), {13} (pkg), {14} (flatpak-system), {15} (flatpack-user), {16} (snap), {17} (brew), {18} (brew-cask), {19} (port), {20} (scoop), {21} (choco), {22} (pkgtool), {23} (paludis)", 23, "Number of all packages", "Number of pacman packages", "Pacman branch on manjaro", @@ -163,7 +163,8 @@ static inline void printCommandHelp(const char* command) "Number of macports packages", "Number of scoop packages", "Number of choco packages", - "Number of pkgtool packages" + "Number of pkgtool packages", + "Number of paludis packages" ); } else if(ffStrEqualsIgnCase(command, "shell-format")) diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 0866cfb05f..0fa86f31ce 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -62,6 +62,7 @@ void ffPrintPackages(FFPackagesOptions* options) FF_PRINT_PACKAGE(scoop) FF_PRINT_PACKAGE(choco) FF_PRINT_PACKAGE(pkgtool) + FF_PRINT_PACKAGE(paludis) putchar('\n'); }