diff --git a/.gitignore b/.gitignore index 4a61744..8cc2912 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ result/ /.idea/vcs.xml /.idea/workspace.xml /goGoFetch +/gogofetch \ No newline at end of file diff --git a/src/providers/packages.go b/src/providers/packages.go index 96de6fd..8748068 100644 --- a/src/providers/packages.go +++ b/src/providers/packages.go @@ -25,11 +25,12 @@ func GetPkgs() string { var pkgs string haveNix := checkNix() if strings.HasPrefix(id, "arch") { - entries, err := os.ReadDir("/run/current-system/sw/bin") - if err != nil { - return "can't get nix packages" + out, _ := exec.Command("sh", "-c", "pacman -Qq | wc -l").Output() + pkgs = strings.TrimSpace(string(out)) + " (pacman)" + if haveNix { + pkgs = strings.TrimSpace(pkgs + ", " + addNix()) } - return strconv.Itoa(len(entries)) + " (nix)" + return pkgs } if strings.HasPrefix(id, "debian") { out, _ := exec.Command("sh", "-c", "dpkg -l | grep ^ii | wc -l").Output()