Skip to content

Commit c021689

Browse files
Better nix package sorting
#195
1 parent 2ac2762 commit c021689

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/fastfetch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ static inline void printCommandHelp(const char* command)
114114
"Number of rpm packages",
115115
"Number of emerge packages",
116116
"Number of xbps packages",
117-
"Number of nix-user packages",
118117
"Number of nix-system packages",
118+
"Number of nix-user packages",
119119
"Number of nix-default packages",
120120
"Number of flatpak packages",
121121
"Number of snap packages"

src/modules/packages.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -345,17 +345,17 @@ void ffPrintPackages(FFinstance* instance)
345345
FF_PRINT_PACKAGE(rpm)
346346
FF_PRINT_PACKAGE(emerge)
347347

348-
if(nixUser > 0)
348+
if(counts.nixSystem > 0)
349349
{
350-
printf("%u (nix-user)", nixUser);
351-
if((all = all - nixUser) > 0)
350+
printf("%u (nix-system)", counts.nixSystem);
351+
if((all = all - counts.nixSystem) > 0)
352352
printf(", ");
353353
}
354354

355-
if(counts.nixSystem > 0)
355+
if(nixUser > 0)
356356
{
357-
printf("%u (nix-system)", counts.nixSystem);
358-
if((all = all - counts.nixSystem) > 0)
357+
printf("%u (nix-user)", nixUser);
358+
if((all = all - nixUser) > 0)
359359
printf(", ");
360360
}
361361

@@ -386,8 +386,8 @@ void ffPrintPackages(FFinstance* instance)
386386
{FF_FORMAT_ARG_TYPE_UINT, &counts.rpm},
387387
{FF_FORMAT_ARG_TYPE_UINT, &counts.emerge},
388388
{FF_FORMAT_ARG_TYPE_UINT, &counts.xbps},
389-
{FF_FORMAT_ARG_TYPE_UINT, &nixUser},
390389
{FF_FORMAT_ARG_TYPE_UINT, &counts.nixSystem},
390+
{FF_FORMAT_ARG_TYPE_UINT, &nixUser},
391391
{FF_FORMAT_ARG_TYPE_UINT, &counts.nixDefault},
392392
{FF_FORMAT_ARG_TYPE_UINT, &counts.flatpak},
393393
{FF_FORMAT_ARG_TYPE_UINT, &counts.snap}

0 commit comments

Comments
 (0)