Skip to content

Add Exherbo logo and package manager count #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 20, 2023
Merged

Add Exherbo logo and package manager count #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcb5e60
Add Exherbo logo
tombriden Jul 20, 2023
e17183b
Add paludis (exherbo) package count
tombriden Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ 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
```
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
Expand Down
2 changes: 1 addition & 1 deletion presets/verbose
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Expand Down
1 change: 1 addition & 0 deletions src/detection/packages/packages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/detection/packages/packages_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions src/fastfetch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"))
Expand Down
39 changes: 39 additions & 0 deletions src/logo/builtin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -2690,6 +2728,7 @@ GetLogoMethod* ffLogoBuiltinGetAll(void)
getLogoDeepin,
getLogoEndeavour,
getLogoEnso,
getLogoExherbo,
getLogoFedora,
getLogoFedoraSmall,
getLogoFedoraOld,
Expand Down
1 change: 1 addition & 0 deletions src/modules/packages/packages.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down