From 3f64ef0876e875a659d00c479cb384b913943361 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Sat, 12 Feb 2022 12:13:02 +0100
Subject: [PATCH] Show emerge packages earlier in list

---
 presets/verbose        |  2 +-
 src/fastfetch.c        |  6 +++---
 src/modules/packages.c | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/presets/verbose b/presets/verbose
index 094b18c9c..7a2c0e336 100644
--- a/presets/verbose
+++ b/presets/verbose
@@ -5,7 +5,7 @@
 --kernel-format "Sysname: {}; Release: {}; Version: {}"
 --uptime-format "Days: {}; Hours: {}; Minutes: {}; Seconds: {}"
 --processes-format "Count: {}"
---packages-format "All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; xbps: {}; flatpak: {}; snap: {}; emerge: {}"
+--packages-format "All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; xbps: {}; flatpak: {}; snap: {}"
 --shell-format "Process name: {}; Process path: {}; Process exe: {}; Process version: {}; User path: {}; User exe: {}; User version: {}"
 --resolution-format "Width: {}; Height: {}; Refresh rate: {}"
 --de-format "Session desktop: {}; Process name: {}; Pretty name: {}; Version: {}"
diff --git a/src/fastfetch.c b/src/fastfetch.c
index f38f5ad16..e368e50b5 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -95,16 +95,16 @@ static inline void printCommandHelp(const char* command)
     }
     else if(strcasecmp(command, "packages-format") == 0)
     {
-        constructAndPrintCommandHelpFormat("packages", "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (xps), {7}, (flatpak), {8} (snap), {9} (emerge)", 9,
+        constructAndPrintCommandHelpFormat("packages", "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (xps), {8}, (flatpak), {9} (snap)", 9,
             "Number of all packages",
             "Number of pacman packages",
             "Pacman branch on manjaro",
             "Number of dpkg packages",
             "Number of rpm packages",
+            "Number of emerge packages",
             "Number of xbps packages",
             "Number of flatpak packages",
-            "Number of snap packages",
-            "Number of emerge packages"
+            "Number of snap packages"
         );
     }
     else if(strcasecmp(command, "shell-format") == 0)
diff --git a/src/modules/packages.c b/src/modules/packages.c
index 570a08845..fb581da0c 100644
--- a/src/modules/packages.c
+++ b/src/modules/packages.c
@@ -151,16 +151,16 @@ void ffPrintPackages(FFinstance* instance)
         uint32_t rpm = 0;
     #endif
 
+    uint32_t emerge = countFilesIn("/var/db/pkg", "SIZE");
     uint32_t xbps = getNumElements("/var/db/xbps", DT_REG);
     uint32_t flatpak = getNumElements("/var/lib/flatpak/app", DT_DIR);
     uint32_t snap = getNumElements("/snap", DT_DIR);
-    uint32_t emerge = countFilesIn("/var/db/pkg", "SIZE");
 
     //Accounting for the /snap/bin folder
     if(snap > 0)
         --snap;
 
-    uint32_t all = pacman + dpkg + rpm + xbps + flatpak + snap + emerge;
+    uint32_t all = pacman + dpkg + rpm + emerge + xbps + flatpak + snap;
 
     if(all == 0)
     {
@@ -196,10 +196,10 @@ void ffPrintPackages(FFinstance* instance)
 
         FF_PRINT_PACKAGE(dpkg)
         FF_PRINT_PACKAGE(rpm)
+        FF_PRINT_PACKAGE(emerge)
         FF_PRINT_PACKAGE(xbps)
         FF_PRINT_PACKAGE(flatpak)
         FF_PRINT_PACKAGE(snap)
-        FF_PRINT_PACKAGE(emerge)
 
         //Fix linter warning of unused value of all
         (void) all;
@@ -216,10 +216,10 @@ void ffPrintPackages(FFinstance* instance)
             {FF_FORMAT_ARG_TYPE_STRBUF, &manjaroBranch},
             {FF_FORMAT_ARG_TYPE_UINT, &dpkg},
             {FF_FORMAT_ARG_TYPE_UINT, &rpm},
+            {FF_FORMAT_ARG_TYPE_UINT, &emerge},
             {FF_FORMAT_ARG_TYPE_UINT, &xbps},
             {FF_FORMAT_ARG_TYPE_UINT, &flatpak},
-            {FF_FORMAT_ARG_TYPE_UINT, &snap},
-            {FF_FORMAT_ARG_TYPE_UINT, &emerge},
+            {FF_FORMAT_ARG_TYPE_UINT, &snap}
         });
     }