Merge branch 'master' into 'master'

Remove net-tools package dependency in Arch Linux

See merge request jschx/ufetch!63

LICENSE

@@ -1,19 +1,13 @@
-Copyright (c) 2015 J Schillinger
+Copyright (c) 2018, 2019 Joe Schillinger <me@schil.li>
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+Permission to use, copy, modify, and distribute this software for any
-of this software and associated documentation files (the "Software"), to deal
+purpose with or without fee is hereby granted, provided that the above
-in the Software without restriction, including without limitation the rights
+copyright notice and this permission notice appear in all copies.
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-copies or substantial portions of the Software.
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

Pkgfile

@@ -0,0 +1,23 @@
+# Description: Tiny system info for CRUX.
+# URL:         https://github.com/jschx/ufetch
+# Maintainer:  Joe Schillinger, me at schil dot li
+# Depends on:
+
+name=ufetch
+version=git
+release=1
+source=()
+
+build() {
+	cd "${PKGMK_SOURCE_DIR}"
+
+	if cd "${name}"; then
+		git fetch -q
+		git reset --hard origin/master
+	else
+		git clone https://github.com/jschx/ufetch "${name}"
+		cd "${name}"
+	fi
+
+	install -Dm755 ufetch-crux "${PKG}/usr/bin/ufetch"
+}

README.md

@@ -2,4 +2,4 @@
 
 Tiny system info for Unix-like operating systems.
 
-![ufetch](https://jschx.gitlab.io/images/ufetch.png)
+![ufetch-openbsd](ufetch-openbsd.png)

ufetch-alpine

@@ -10,21 +10,10 @@ os='Alpine Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
 packages="$(apk info | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,27 +26,32 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
-bold='\033[1m'
+# probably don't change these
-black='\033[0;30m'
+if [ -x "$(command -v tput)" ]; then
-red='\033[0;31m'
+	bold="$(tput bold)"
-green='\033[0;32m'
+	black="$(tput setaf 0)"
-yellow='\033[0;33m'
+	red="$(tput setaf 1)"
-blue='\033[0;34m'
+	green="$(tput setaf 2)"
-magenta='\033[0;35m'
+	yellow="$(tput setaf 3)"
-cyan='\033[0;36m'
+	blue="$(tput setaf 4)"
-white='\033[0;37m'
+	magenta="$(tput setaf 5)"
-reset='\033[0m'
+	cyan="$(tput setaf 6)"
+	white="$(tput setaf 7)"
+	reset="$(tput sgr0)"
+fi
 
 # you can change these
 lc="${reset}${bold}${blue}"         # labels
@@ -67,7 +61,8 @@ c0="${reset}${blue}"                # first color
 
 ## OUTPUT
 
-printf "
+cat <<EOF
+
 ${c0}        /\\            ${nc}${USER}${ic}@${nc}${host}${reset}
 ${c0}       /  \\           ${lc}OS:        ${ic}${os}${reset}
 ${c0}      / /\\ \\  /\\      ${lc}KERNEL:    ${ic}${kernel}${reset}
@@ -76,4 +71,4 @@ ${c0}    / /    \\ \\/\\ \\    ${lc}PACKAGES:  ${ic}${packages}${reset}
 ${c0}   / / /|   \\ \\ \\ \\   ${lc}SHELL:     ${ic}${shell}${reset}
 ${c0}  /_/ /_|    \\_\\ \\_\\  ${lc}${uitype}:        ${ic}${ui}${reset}
 
-"
+EOF

ufetch-antergos

@@ -10,21 +10,10 @@ os='Antergos'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-arch

@@ -10,21 +10,10 @@ os='Arch Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-archbang

@@ -10,21 +10,10 @@ os='ArchBang'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-arco

@@ -10,21 +10,10 @@ os='ArcoLinux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-artix

@@ -10,21 +10,10 @@ os='Artix Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-aux

@@ -10,7 +10,7 @@ os=`uname -sr`
 kernel=`uname -v`
 uptime=`uptime | awk '{print $3" "$4}' | tr -d ,`
 packages='unknown'
-shell=`basename "${SHELL}"`
+shell=`basename "$SHELL"`
 
 ## UI DETECTION
 
@@ -20,8 +20,8 @@ uitype='UI'
 ## DEFINE COLORS
 
 # probably don't change these
-bold=`tput bold 2> /dev/null`
+bold=`tput bold`
-reset=`tput sgr0 2> /dev/null`
+reset=`tput sgr0`
 
 # you can change these
 lc="${reset}${bold}"                # labels

ufetch-centos

@@ -10,21 +10,10 @@ os="$(cat /etc/centos-release | sed 's/release //')"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(yum list installed | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-crux

@@ -10,21 +10,10 @@ os="$(crux)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pkginfo -i | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-debian

@@ -10,21 +10,10 @@ os="Debian $(cat /etc/debian_version)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | grep -c ^i)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,47 +26,56 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+elif [ -h /etc/alternatives/x-session-manager ]; then
+	ui="$(update-alternatives --query x-session-manager | awk -F'/' '/Value/{print $4}')"
+	uitype='DE'
+elif [ -h /etc/alternatives/x-window-manager ]; then
+	ui="$(update-alternatives --query x-window-manager | awk -F'/' '/Value/{print $4}')"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these
 lc="${reset}${bold}${red}"          # labels
 nc="${reset}${bold}${red}"          # user and hostname
 ic="${reset}"                       # info
-c0="${reset}${red}"                 # first color
+c0="${reset}${bold}${red}"          # first color
+c1="${reset}${red}"                 # second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c0}     ,---._   ${nc}${USER}${ic}@${nc}${host}${reset}
+${c0}    _____    ${nc}${USER}${ic}@${nc}${host}${reset}
-${c0}   /\`  __  \\  ${lc}OS:        ${ic}${os}${reset}
+${c0}   /  __ \\   ${lc}OS:        ${ic}${os}${reset}
-${c0}  |   /    |  ${lc}KERNEL:    ${ic}${kernel}${reset}
+${c0}  |  /    |  ${lc}KERNEL:    ${ic}${kernel}${reset}
-${c0}  |   ${c1}\`.__.\`  ${lc}UPTIME:    ${ic}${uptime}${reset}
+${c0}  |  ${c1}\\___-   ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c0}   \          ${lc}PACKAGES:  ${ic}${packages}${reset}
+${c1}  -_         ${lc}PACKAGES:  ${ic}${packages}${reset}
-${c0}    \`-,_      ${lc}SHELL:     ${ic}${shell}${reset}
+${c1}    --_      ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}              ${lc}${uitype}:        ${ic}${ui}${reset}
+${c0}             ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF

ufetch-devuan

@@ -1,84 +0,0 @@
-#!/bin/sh
-#
-# ufetch-devuan - tiny system info for devuan
-
-## INFO
-
-# user is already defined
-host="$(hostname)"
-os="Devuan $(cat /etc/devuan_version)"
-kernel="$(uname -sr)"
-uptime="$(uptime -p | sed 's/up //')"
-packages="$(dpkg -l | grep -c ^i)"
-shell="$(basename "${SHELL}")"
-
-## UI DETECTION
-
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
-if [ -n "${DE}" ]; then
-	ui="${DE}"
-	uitype='DE'
-elif [ -n "${WM}" ]; then
-	ui="${WM}"
-	uitype='WM'
-elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
-	ui="${XDG_CURRENT_DESKTOP}"
-	uitype='DE'
-elif [ -n "${DESKTOP_SESSION}" ]; then
-	ui="${DESKTOP_SESSION}"
-	uitype='DE'
-elif [ -n "${rcwm}" ]; then
-	ui="${rcwm}"
-	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
-	ui="${XDG_SESSION_TYPE}"
-fi
-
-ui="$(basename "${ui}")"
-
-## DEFINE COLORS
-
-# probably don't change these
-if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
-	black="$(tput setaf 0 2> /dev/null)"
-	red="$(tput setaf 1 2> /dev/null)"
-	green="$(tput setaf 2 2> /dev/null)"
-	yellow="$(tput setaf 3 2> /dev/null)"
-	blue="$(tput setaf 4 2> /dev/null)"
-	magenta="$(tput setaf 5 2> /dev/null)"
-	cyan="$(tput setaf 6 2> /dev/null)"
-	white="$(tput setaf 7 2> /dev/null)"
-	reset="$(tput sgr0 2> /dev/null)"
-fi
-
-# you can change these
-lc="${reset}${bold}${magenta}"          # labels
-nc="${reset}${bold}${magenta}"          # user and hostname
-ic="${reset}"                       # info
-c0="${reset}${bold}${magenta}"          # first color
-c1="${reset}${magenta}"                 # second color
-
-## OUTPUT
-
-cat <<EOF
-
-${c1}  -.,            ${nc}${USER}${ic}@${nc}${host}${reset}
-${c1}     \`'-.,       ${lc}OS:        ${ic}${os}${reset}
-${c1}          \`':.   ${lc}KERNEL:    ${ic}${kernel}${reset}
-${c1}             ::  ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c1}        __--\`:\`  ${lc}PACKAGES:  ${ic}${packages}${reset}
-${c0}   _,--\` _.-\`    ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}  :_,--\`\`        ${lc}${uitype}:        ${ic}${ui}${reset}
-
-EOF

ufetch-elementary

@@ -10,21 +10,10 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-fedora

@@ -9,22 +9,11 @@ host="$(hostname)"
 os="$(cat /etc/fedora-release)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
-packages="$(dnf list --installed | sed '1d' | wc -l)"
+packages="$(yum list installed | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-freebsd

@@ -10,21 +10,10 @@ os="$(uname -sr)"
 kernel="$(uname -iK)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
 packages="$(pkg info | wc -l | sed -e 's/^[ \t]*//')"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput md 2> /dev/null)"
+	bold="$(tput md)"
-	black="$(tput AF 0 2> /dev/null)"
+	black="$(tput AF 0)"
-	red="$(tput AF 1 2> /dev/null)"
+	red="$(tput AF 1)"
-	green="$(tput AF 2 2> /dev/null)"
+	green="$(tput AF 2)"
-	yellow="$(tput AF 3 2> /dev/null)"
+	yellow="$(tput AF 3)"
-	blue="$(tput AF 4 2> /dev/null)"
+	blue="$(tput AF 4)"
-	magenta="$(tput AF 5 2> /dev/null)"
+	magenta="$(tput AF 5)"
-	cyan="$(tput AF 6 2> /dev/null)"
+	cyan="$(tput AF 6)"
-	white="$(tput AF 7 2> /dev/null)"
+	white="$(tput AF 7)"
-	reset="$(tput me 2> /dev/null)"
+	reset="$(tput me)"
 fi
 
 # you can change these

ufetch-gentoo

@@ -10,21 +10,10 @@ os='Gentoo Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(ls -d /var/db/pkg/*/* | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-gnewsense

@@ -10,21 +10,10 @@ os='gNewSense'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-guix

@@ -10,21 +10,10 @@ os='Guix System'
 kernel="$(uname -sr)"
 uptime="$(uptime | sed 's/.*up \([^,]*\).*/\1/')"
 packages="$(guix package --list-installed | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-hyperbola

@@ -10,21 +10,10 @@ os='Hyperbola GNU/Linux-libre'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-instantos

@@ -1,83 +0,0 @@
-#!/bin/sh
-#
-# ufetch-instantos - tiny system info for instantOS
-
-## INFO
-
-# user is already defined
-host="$(cat /etc/hostname)"
-os='instantOS'
-kernel="$(uname -sr)"
-uptime="$(uptime -p | sed 's/up //')"
-packages="$(pacman -Q | wc -l)"
-shell="$(basename "${SHELL}")"
-
-## UI DETECTION
-
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
-if [ -n "${DE}" ]; then
-	ui="${DE}"
-	uitype='DE'
-elif [ -n "${WM}" ]; then
-	ui="${WM}"
-	uitype='WM'
-elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
-	ui="${XDG_CURRENT_DESKTOP}"
-	uitype='DE'
-elif [ -n "${DESKTOP_SESSION}" ]; then
-	ui="${DESKTOP_SESSION}"
-	uitype='DE'
-elif [ -n "${rcwm}" ]; then
-	ui="${rcwm}"
-	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
-	ui="${XDG_SESSION_TYPE}"
-fi
-
-ui="$(basename "${ui}")"
-
-## DEFINE COLORS
-
-# probably don't change these
-if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
-	black="$(tput setaf 0 2> /dev/null)"
-	red="$(tput setaf 1 2> /dev/null)"
-	green="$(tput setaf 2 2> /dev/null)"
-	yellow="$(tput setaf 3 2> /dev/null)"
-	blue="$(tput setaf 4 2> /dev/null)"
-	magenta="$(tput setaf 5 2> /dev/null)"
-	cyan="$(tput setaf 6 2> /dev/null)"
-	white="$(tput setaf 7 2> /dev/null)"
-	reset="$(tput sgr0 2> /dev/null)"
-fi
-
-# you can change these
-lc="${reset}${bold}${cyan}"         # labels
-nc="${reset}${bold}${blue}"         # user and hostname
-ic="${reset}"                       # info
-c0="${reset}${white}"               # first color
-
-## OUTPUT
-
-cat <<EOF
-
-${c0}   ,-''-,       ${nc}${USER}${ic}@${nc}${host}${reset}
-${c0}  : .''. :      ${lc}OS:        ${ic}${os}${reset}
-${c0}  : ',,' :      ${lc}KERNEL:    ${ic}${kernel}${reset}
-${c0}   '-____:__    ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c0}         :  \`.  ${lc}PACKAGES:  ${ic}${packages}${reset}
-${c0}         \`._.'  ${lc}SHELL:     ${ic}${shell}${reset}
-${c0}                ${lc}${uitype}:        ${ic}${ui}${reset}
-
-EOF

ufetch-linux

@@ -10,21 +10,10 @@ os='Linux'	# I'd just like to interject for a moment...
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
 packages='unknown'
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-linuxlite

@@ -10,21 +10,10 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-macos

@@ -5,21 +5,19 @@
 ## INFO
 
 # user is already defined
-host="$(hostname -s)"
+host="$(hostname)"
 os="$(sw_vers -productName) $(sw_vers -productVersion)"
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## PACKAGE MANAGER DETECTION
 
-if [ -x "$(command -v nix-info)" ]; then
+if [ -x "$(command -v pkgin)" ]; then
-	packages="$(ls -d -1 /nix/store/*/ | wc -l)"
-elif [ -x "$(command -v pkgin)" ]; then
 	packages="$(pkgin list | wc -l)"
 elif [ -x "$(command -v brew)" ]; then
-	brew_packages="$(brew list --formulae | wc -l)"
+	brew_packages="$(brew list | wc -l)"
-	cask_packages="$(brew list --cask 2> /dev/null | wc -l)"
+	cask_packages="$(brew cask list 2> /dev/null | wc -l)"
 	packages="$(( ${brew_packages} + ${cask_packages} ))"
 elif [ -x "$(command -v port)" ]; then
 	packages="$(port installed | wc -l)"
@@ -27,7 +25,7 @@ else
 	packages='unknown'
 fi
 
-packages="$(echo "${packages}" | sed -e 's/^[ /t]*//')"
+packages="$(echo ${packages} | sed -e 's/^[ /t]*//')"
 
 ## UI DETECTION
 
@@ -42,22 +40,20 @@ else
 	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-mageia

@@ -10,21 +10,10 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(yum list installed | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-manjaro

@@ -10,21 +10,10 @@ os='Manjaro'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-mint

@@ -10,21 +10,10 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-mx

@@ -10,21 +10,10 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-netbsd

@@ -10,21 +10,10 @@ os="$(uname -sr)"
 kernel="$(uname -r)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
 packages="$(pkg_info | wc -l | sed -e 's/^[ \t]*//')"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-nixos

@@ -9,27 +9,11 @@ host="$(hostname)"
 os="$(nixos-version)"
 kernel="$(uname -sr)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
-shell="$(basename "${SHELL}")"
+packages="$(ls -d -1 /nix/store/*/ | wc -l)"
-
+shell="$(basename "$SHELL")"
-for profile in $NIX_PROFILES; do
-	if [ -d "$profile" ]; then
-		packages="$((packages + $( (nix-store -q --requisites "$profile" 2>/dev/null || printf '') | wc -l)))"
-	fi
-done
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -42,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-openbsd

@@ -10,21 +10,10 @@ os="$(uname -sr)"
 kernel="$(uname -v)"
 uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
 packages="$(ls -d /var/db/pkg/* | wc -l | sed -e 's/^[ \t]*//')"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null 0 0 2>/dev/null)"
+	black="$(tput setaf 0 0 0 2>/dev/null)"
-	red="$(tput setaf 1 2> /dev/null 0 0 2>/dev/null)"
+	red="$(tput setaf 1 0 0 2>/dev/null)"
-	green="$(tput setaf 2 2> /dev/null 0 0 2>/dev/null)"
+	green="$(tput setaf 2 0 0 2>/dev/null)"
-	yellow="$(tput setaf 3 2> /dev/null 0 0 2>/dev/null)"
+	yellow="$(tput setaf 3 0 0 2>/dev/null)"
-	blue="$(tput setaf 4 2> /dev/null 0 0 2>/dev/null)"
+	blue="$(tput setaf 4 0 0 2>/dev/null)"
-	magenta="$(tput setaf 5 2> /dev/null 0 0 2>/dev/null)"
+	magenta="$(tput setaf 5 0 0 2>/dev/null)"
-	cyan="$(tput setaf 6 2> /dev/null 0 0 2>/dev/null)"
+	cyan="$(tput setaf 6 0 0 2>/dev/null)"
-	white="$(tput setaf 7 2> /dev/null 0 0 2>/dev/null)"
+	white="$(tput setaf 7 0 0 2>/dev/null)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-parabola

@@ -10,21 +10,10 @@ os='Parabola GNU/Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(pacman -Q | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-popos

@@ -10,21 +10,10 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-pureos

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# ufetch-pureos - tiny system info for pureos
+# ufetch-pureos - tiny system info for debian
 
 ## INFO
 
@@ -10,21 +10,10 @@ os='PureOS'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-raspbian

@@ -1,30 +1,19 @@
 #!/bin/sh
 #
-# ufetch-raspberrypios - tiny system info for raspberry pi os
+# ufetch-raspbian - tiny system info for raspbian
 
 ## INFO
 
 # user is already defined
 host="$(hostname)"
-os="$(lsb_release -ds)"
+os='Raspbian'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-slackware

@@ -10,21 +10,10 @@ os="$(cat /etc/slackware-version)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(ls /var/log/packages | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-suse

@@ -10,21 +10,10 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(rpm -qa --last | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-ubuntu

@@ -10,21 +10,10 @@ os="$(lsb_release -ds)"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-void

@@ -10,21 +10,10 @@ os='Void Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(xbps-query -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these

ufetch-voyager

@@ -10,21 +10,10 @@ os="Voyager Live $(lsb_release -r | awk '{print $2}')"
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
 packages="$(dpkg -l | wc -l)"
-shell="$(basename "${SHELL}")"
+shell="$(basename "$SHELL")"
 
 ## UI DETECTION
 
-parse_rcs() {
-	for f in "${@}"; do
-		wm="$(tail -n 1 "${f}" 2> /dev/null | cut -d ' ' -f 2)"
-		[ -n "${wm}" ] && echo "${wm}" && return
-	done
-}
-
-rcwm="$(parse_rcs "${HOME}/.xinitrc" "${HOME}/.xsession")"
-
-ui='unknown'
-uitype='UI'
 if [ -n "${DE}" ]; then
 	ui="${DE}"
 	uitype='DE'
@@ -37,29 +26,31 @@ elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
 elif [ -n "${DESKTOP_SESSION}" ]; then
 	ui="${DESKTOP_SESSION}"
 	uitype='DE'
-elif [ -n "${rcwm}" ]; then
+elif [ -f "${HOME}/.xinitrc" ]; then
-	ui="${rcwm}"
+	ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 	uitype='WM'
-elif [ -n "${XDG_SESSION_TYPE}" ]; then
+elif [ -f "${HOME}/.xsession" ]; then
-	ui="${XDG_SESSION_TYPE}"
+	ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+	uitype='WM'
+else
+	ui='unknown'
+	uitype='UI'
 fi
 
-ui="$(basename "${ui}")"
-
 ## DEFINE COLORS
 
 # probably don't change these
 if [ -x "$(command -v tput)" ]; then
-	bold="$(tput bold 2> /dev/null)"
+	bold="$(tput bold)"
-	black="$(tput setaf 0 2> /dev/null)"
+	black="$(tput setaf 0)"
-	red="$(tput setaf 1 2> /dev/null)"
+	red="$(tput setaf 1)"
-	green="$(tput setaf 2 2> /dev/null)"
+	green="$(tput setaf 2)"
-	yellow="$(tput setaf 3 2> /dev/null)"
+	yellow="$(tput setaf 3)"
-	blue="$(tput setaf 4 2> /dev/null)"
+	blue="$(tput setaf 4)"
-	magenta="$(tput setaf 5 2> /dev/null)"
+	magenta="$(tput setaf 5)"
-	cyan="$(tput setaf 6 2> /dev/null)"
+	cyan="$(tput setaf 6)"
-	white="$(tput setaf 7 2> /dev/null)"
+	white="$(tput setaf 7)"
-	reset="$(tput sgr0 2> /dev/null)"
+	reset="$(tput sgr0)"
 fi
 
 # you can change these