diff --git a/docs/neofetch.1 b/docs/neofetch.1 index 950f8959..c6079490 100644 --- a/docs/neofetch.1 +++ b/docs/neofetch.1 @@ -361,9 +361,9 @@ Linux, Linux Lite, Linux Mint, Linux Mint Old, LinuxFromScratch, Live Raizo, LMDE, Lubuntu, Lunar, mac, MacaroniOS, Mageia, Magix, MagpieOS, MainsailOS, Mandriva, Manjaro, MassOS, MatuusOS, Maui, Mauna, Meowix, Mer, MidOS, Minix, MIRACLE LINUX, MX, Namib, NekOS, -Neptune, NetBSD, Netrunner, Nitrux, NixOS, nixos_colorful, Nobara, NomadBSD, -Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, Open Source Media -Center, OpenBSD, openEuler, OpenIndiana, openKylin, openmamba, +Neptune, NetBSD, Netrunner, Nitrux, NixOS, nixos_colorful, NixOwOS, +Nobara, NomadBSD, Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, Open Source +Media Center, OpenBSD, openEuler, OpenIndiana, openKylin, openmamba, OpenMandriva, OpenSolaris, OpenStage, openSUSE, openSUSE Leap, openSUSE Tumbleweed, openSUSE Tumbleweed\-Slowroll, OPNsense, Oracle, orchid, OS Elbrus, PacBSD, Panwah, Parabola, parch, Pardus, Parrot, diff --git a/hyfetch/data/distros/nixowos.ascii b/hyfetch/data/distros/nixowos.ascii new file mode 100644 index 00000000..6d2395ad --- /dev/null +++ b/hyfetch/data/distros/nixowos.ascii @@ -0,0 +1,21 @@ +{"match": "\"NixOwOS\"*", "color": "#5277c3' '#7ebae4' '#df90af' '#2d789e' '#5f92d3"} +${c1} ▗▄▄▄ ${c2}▗▄▄▄▄ ▄▄▄▖ +${c1} ▜███▙ ${c2}▜███▙ ▟███▛ +${c1} ▜███▙ ${c2}▜███▙▟███▛ ${c1}▗ +${c1} ▐▄ ▜███▙ ${c2}▜██████▛ ${c1}▄▄▞▀▛ +${c1} ▜▀▀▀▄▄ ▜█████████▙ ${c2}▜████▛ ${c1}▄█▛▀ ▗▘ +${c1} ▌ ▀█▄▟██████████▙ ${c2}▜███▙${c1}▟█▛ ▗▞ +${c1} ▐ ▙▖▟${c2}▙▄▄▖ ${c2}▜████${c1}▙▄▟▘ ▟▘ +${c1} ▜▖▝█${c2}███▛ ${c2}▜██▛${c1}██▄▄▄▞▘ +${c1} ▝${c2}▟███▛ ${c4}▀▚▄ ▄▞▀ ${c2}▜▛ ${c1}▟███▛ +${c2} ▟███████████▛ ${c4}▗▄▄▞▘ ▝▚▄▄▖ ${c1}▟██████████▙ +${c2} ▜██████████▛ ${c3}/// ${c4}▟▘ ▄ ▝▙ ${c3}/// ${c1}▟███████████▛ +${c2} ▟███▛ ${c1}▟▙ ${c4}▜▄▟▀▙▄▛ ${c1}▟███▛ +${c2} ▟███▛ ${c1}▟██▙ ${c1}▟███▛ ${c5}▄ +${c2} ▟███▛ ${c1}▜███▙ ${c1}▝▀▀▀▀ ${c5}▗▄▛▀▀ +${c2} ▜██▛ ▗▌${c1}▜███▙ ${c2}▜██████████████████▛ +${c2} ▜▛ ▗▛ ${c1}▟████▙ ${c2}▜████████████████▛ +${c2} ▝▌${c1}▟██████▙ ${c5}▄▄${c2}▜███▙ +${c1} ▟███▛▜███▙${c2}▄▄▟${c5}▀▘ ${c2}▜███▙ +${c1} ▟███▛${c2}▄▄${c1}▜███▙ ${c2}▜███▙ +${c1} ▝▀▀▀ ▀▀▀▀▘ ${c2}▀▀▀▘ diff --git a/neofetch b/neofetch index e81e4d86..346f0017 100755 --- a/neofetch +++ b/neofetch @@ -921,7 +921,7 @@ image_source="auto" # LinuxFromScratch, Live Raizo, LMDE, Lubuntu, Lunar, mac, MacaroniOS, Mageia, Magix, MagpieOS, # MainsailOS, Mandriva, Manjaro, MassOS, MatuusOS, Maui, Mauna, Meowix, Mer, MidOS, Minix, # MIRACLE LINUX, MX, Namib, NekOS, Neptune, NetBSD, Netrunner, Nitrux, NixOS, nixos_colorful, -# Nobara, NomadBSD, +# NixOwOS, Nobara, NomadBSD, # Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, Open Source Media Center, OpenBSD, openEuler, # OpenIndiana, openKylin, openmamba, OpenMandriva, OpenSolaris, OpenStage, openSUSE, openSUSE # Leap, openSUSE Tumbleweed, openSUSE Tumbleweed-Slowroll, OPNsense, Oracle, orchid, OS Elbrus, @@ -1168,10 +1168,11 @@ get_distro() { esac elif [[ -f /etc/NIXOS ]]; then + . /etc/os-release case $distro_shorthand in - on) distro="NixOS $(nixos-version | awk '{print substr($1,0,5),$2}')" ;; - tiny) distro="NixOS" ;; - *) distro="NixOS $(nixos-version)" ;; + on) distro="${NAME} ${VERSION}" ;; + tiny) distro="${NAME}" ;; + *) distro="${NAME} $(nixos-version)" ;; esac elif [[ -f /etc/linspire-version ]]; then @@ -7063,9 +7064,9 @@ ASCII: Live Raizo, LMDE, Lubuntu, Lunar, mac, MacaroniOS, Mageia, Magix, MagpieOS, MainsailOS, Mandriva, Manjaro, MassOS, MatuusOS, Maui, Mauna, Meowix, Mer, MidOS, Minix, MIRACLE LINUX, MX, Namib, NekOS, - Neptune, NetBSD, Netrunner, Nitrux, NixOS, nixos_colorful, Nobara, NomadBSD, - Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, Open Source Media - Center, OpenBSD, openEuler, OpenIndiana, openKylin, openmamba, + Neptune, NetBSD, Netrunner, Nitrux, NixOS, nixos_colorful, NixOwOS, + Nobara, NomadBSD, Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, Open Source + Media Center, OpenBSD, openEuler, OpenIndiana, openKylin, openmamba, OpenMandriva, OpenSolaris, OpenStage, openSUSE, openSUSE Leap, openSUSE Tumbleweed, openSUSE Tumbleweed-Slowroll, OPNsense, Oracle, orchid, OS Elbrus, PacBSD, Panwah, Parabola, parch, Pardus, @@ -12751,6 +12752,32 @@ ${c1} ▝▀▀▀ ▀▀▀▀▘ ${c2}▀▀▀▘ EOF ;; + "NixOwOS"*) + set_colors "#5277c3" "#7ebae4" "#df90af" "#2d789e" "#5f92d3" + read -rd '' ascii_data <<'EOF' +${c1} ▗▄▄▄ ${c2}▗▄▄▄▄ ▄▄▄▖ +${c1} ▜███▙ ${c2}▜███▙ ▟███▛ +${c1} ▜███▙ ${c2}▜███▙▟███▛ ${c1}▗ +${c1} ▐▄ ▜███▙ ${c2}▜██████▛ ${c1}▄▄▞▀▛ +${c1} ▜▀▀▀▄▄ ▜█████████▙ ${c2}▜████▛ ${c1}▄█▛▀ ▗▘ +${c1} ▌ ▀█▄▟██████████▙ ${c2}▜███▙${c1}▟█▛ ▗▞ +${c1} ▐ ▙▖▟${c2}▙▄▄▖ ${c2}▜████${c1}▙▄▟▘ ▟▘ +${c1} ▜▖▝█${c2}███▛ ${c2}▜██▛${c1}██▄▄▄▞▘ +${c1} ▝${c2}▟███▛ ${c4}▀▚▄ ▄▞▀ ${c2}▜▛ ${c1}▟███▛ +${c2} ▟███████████▛ ${c4}▗▄▄▞▘ ▝▚▄▄▖ ${c1}▟██████████▙ +${c2} ▜██████████▛ ${c3}/// ${c4}▟▘ ▄ ▝▙ ${c3}/// ${c1}▟███████████▛ +${c2} ▟███▛ ${c1}▟▙ ${c4}▜▄▟▀▙▄▛ ${c1}▟███▛ +${c2} ▟███▛ ${c1}▟██▙ ${c1}▟███▛ ${c5}▄ +${c2} ▟███▛ ${c1}▜███▙ ${c1}▝▀▀▀▀ ${c5}▗▄▛▀▀ +${c2} ▜██▛ ▗▌${c1}▜███▙ ${c2}▜██████████████████▛ +${c2} ▜▛ ▗▛ ${c1}▟████▙ ${c2}▜████████████████▛ +${c2} ▝▌${c1}▟██████▙ ${c5}▄▄${c2}▜███▙ +${c1} ▟███▛▜███▙${c2}▄▄▟${c5}▀▘ ${c2}▜███▙ +${c1} ▟███▛${c2}▄▄${c1}▜███▙ ${c2}▜███▙ +${c1} ▝▀▀▀ ▀▀▀▀▘ ${c2}▀▀▀▘ +EOF + ;; + "Nobara"*) set_colors "#999999" "#d80a0a" "#e5b90b"