From 1316df5df843fabeca511ba26188ddc7b59d7be3 Mon Sep 17 00:00:00 2001 From: Renzix Date: Thu, 20 Jun 2019 13:19:55 -0400 Subject: [PATCH] Moved guix check below /etc/os-release check --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 042a2414..efcac0d2 100755 --- a/neofetch +++ b/neofetch @@ -883,12 +883,6 @@ get_distro() { *) distro="GoboLinux $(< /etc/GoboLinuxVersion)" esac - elif type -p guix >/dev/null; then - case "$distro_shorthand" in - "on" | "tiny") distro="GuixSD" ;; - *) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')" - esac - elif type -p crux >/dev/null; then distro="$(crux)" case "$distro_shorthand" in @@ -928,6 +922,13 @@ get_distro() { "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; esac + + elif type -p guix >/dev/null; then + case "$distro_shorthand" in + "on" | "tiny") distro="GuixSD" ;; + *) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')" + esac + else for release_file in /etc/*-release; do distro+="$(< "$release_file")"