From d7f9d6998d5b824dbfc0838b1201ba571d016508 Mon Sep 17 00:00:00 2001
From: jschx <git.grz8p@simplelogin.com>
Date: Sat, 6 May 2017 00:38:23 -0500
Subject: [PATCH] Consistency fixes.

---
 README.md      |  2 +-
 ufetch-alpine  | 46 +++++++++++++++++-----------------
 ufetch-arch    | 46 +++++++++++++++++-----------------
 ufetch-crux    | 42 +++++++++++++++----------------
 ufetch-gentoo  | 67 +++++++++++++++++++++++++-------------------------
 ufetch-openbsd | 63 ++++++++++++++++++++++++-----------------------
 ufetch-void    | 46 +++++++++++++++++-----------------
 7 files changed, 157 insertions(+), 155 deletions(-)

diff --git a/README.md b/README.md
index 652ece4..881af79 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # ufetch
 
-Tiny system info for Linux distributions and \*BSDs.
\ No newline at end of file
+Tiny system info for Linux distributions and \*BSDs.
diff --git a/ufetch-alpine b/ufetch-alpine
index b364a80..140a575 100755
--- a/ufetch-alpine
+++ b/ufetch-alpine
@@ -1,25 +1,25 @@
 #!/bin/sh
 #
-# ufetch-void - tiny system info for void
+# ufetch-alpine - tiny system info for alpine linux
 #
 
 ## INFO
 
 # user is already defined
-HOST="$(hostname)"
-OS="Alpine Linux"
-KERNEL="$(uname -sr)"
-UPTIME="$(uptime -p | sed s:"up "::)"
-PACKAGES="$(apk info | wc -l)"
-# shell is already defined
-if [ -z "$WM" ]; then
-	WM="$(grep -v "^#" "${HOME}/.xinitrc" | tail -n 1 | cut -d " " -f2)"
+hostname="$(hostname)"
+os='Alpine Linux'
+kernel="$(uname -sr)"
+uptime="$(uptime -p | sed 's/up //')"
+packages="$(apk info | wc -l)"
+shell="$(basename ${SHELL})"
+if [ -z "${WM}" ]; then
+	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 fi
 
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"	# bold
+bc="$(tput bold)"		# bold
 c0="$(tput setaf 0)"	# black
 c1="$(tput setaf 1)"	# red
 c2="$(tput setaf 2)"	# green
@@ -28,25 +28,25 @@ c4="$(tput setaf 4)"	# blue
 c5="$(tput setaf 5)"	# magenta
 c6="$(tput setaf 6)"	# cyan
 c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"	# reset
+rc="$(tput sgr0)"		# reset
 
 # you can change these
-lc="${bc}${c4}"		# labels
-nc="${bc}${c4}"		# user and hostname
-tc="${bc}${c7}"		# text
-fc="${bc}${c2}"		# first color
-sc="${c2}"		# second color
+lc="${rc}${bc}${c4}"	# labels
+nc="${rc}${bc}${c4}"	# user and hostname
+ic="${rc}${bc}${c7}"	# info
+fc="${rc}${c4}"			# first color
+sc="${rc}${c7}"			# second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}${c4}     /\ /\       ${nc}${USER}${tc}@${nc}${HOST}${rc}
-${sc}${c4}    /${c7}/${c4} \  \      ${lc}OS:        ${tc}${OS}${rc}
-${sc}${c4}   /${c7}/${c4}   \  \     ${lc}KERNEL:    ${tc}${KERNEL}${rc}
-${sc}${c4}  /${c7}//${c4}    \  \    ${lc}UPTIME:    ${tc}${UPTIME}${rc}
-${sc}${c4}  ${c7}//${c4}      \  \   ${lc}PACKAGES:  ${tc}${PACKAGES}${rc}
-${sc}${c4}           \  \  ${lc}SHELL:     ${tc}${SHELL}${rc}
-${sc}${c4}            \    ${lc}WM:        ${tc}${WM}${rc}
+${fc}     /\ /\       ${nc}${USER}${ic}@${nc}${hostname}${rc}
+${fc}    /${sc}/${fc} \  \      ${lc}OS:        ${ic}${os}${rc}
+${fc}   /${sc}/${fc}   \  \     ${lc}KERNEL:    ${ic}${kernel}${rc}
+${fc}  /${sc}//${fc}    \  \    ${lc}UPTIME:    ${ic}${uptime}${rc}
+${fc}  ${sc}//${fc}      \  \   ${lc}PACKAGES:  ${ic}${packages}${rc}
+${fc}           \  \  ${lc}SHELL:     ${ic}${shell}${rc}
+${fc}            \    ${lc}WM:        ${ic}${WM}${rc}
 
 EOF
diff --git a/ufetch-arch b/ufetch-arch
index 0fefa56..3c54664 100755
--- a/ufetch-arch
+++ b/ufetch-arch
@@ -1,25 +1,25 @@
 #!/bin/sh
 #
-# ufetch-arch - tiny system info for arch
+# ufetch-arch - tiny system info for arch linux
 #
 
 ## INFO
 
 # user is already defined
-HOST="$(hostname)"
-OS="Arch Linux"
-KERNEL="$(uname -sr)"
-UPTIME="$(uptime -p | sed s:"up "::)"
-PACKAGES="$(pacman -Q | wc -l)"
-# shell is already defined
-if [ -z "$WM" ]; then
-	WM="$(grep -v "^#" "${HOME}/.xinitrc" | tail -n 1 | cut -d " " -f2)"
+hostname="$(hostname)"
+os='Arch Linux'
+kernel="$(uname -sr)"
+uptime="$(uptime -p | sed 's/up //')"
+packages="$(pacman -Q | wc -l)"
+shell="$(basename ${SHELL})"
+if [ -z "${WM}" ]; then
+	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 fi
 
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"	# bold
+bc="$(tput bold)"		# bold
 c0="$(tput setaf 0)"	# black
 c1="$(tput setaf 1)"	# red
 c2="$(tput setaf 2)"	# green
@@ -28,25 +28,25 @@ c4="$(tput setaf 4)"	# blue
 c5="$(tput setaf 5)"	# magenta
 c6="$(tput setaf 6)"	# cyan
 c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"	# reset
+rc="$(tput sgr0)"		# reset
 
 # you can change these
-lc="${bc}${c6}"		# labels
-nc="${bc}${c6}"		# user and hostname
-tc="${bc}${c7}"		# text
-fc="${bc}${c6}"		# first color
-sc="${c6}"		# second color
+lc="${rc}${bc}${c6}"	# labels
+nc="${rc}${bc}${c6}"	# user and hostname
+ic="${rc}${bc}${c7}"	# info
+fc="${rc}${bc}${c6}"	# first color
+sc="${rc}${c6}"			# second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}        /\\${rc}        ${nc}${USER}${rc}${tc}@${rc}${nc}${HOST}${rc}
-${fc}       /^^\\${rc}       ${lc}OS:${rc}       ${tc}${OS}${rc}
-${fc}      /\   \\${rc}      ${lc}KERNEL:${rc}   ${tc}${KERNEL}${rc}
-${fc}     /${rc}  ${sc}__  \\${rc}     ${lc}UPTIME:${rc}   ${tc}${UPTIME}${rc}
-${sc}    /  (  )  \\${rc}    ${lc}PACKAGES:${rc} ${tc}${PACKAGES}${rc}
-${sc}   / __|  |__\\\\${rc}   ${lc}SHELL:${rc}    ${tc}${SHELL}${rc}
-${sc}  ///        \\\\\\${rc}  ${lc}WM:${rc}       ${tc}${WM}${rc}
+${fc}        /\        ${nc}${USER}${ic}@${nc}${hostname}${rc}
+${fc}       /^^\       ${lc}OS:        ${ic}${os}${rc}
+${fc}      /\   \      ${lc}KERNEL:    ${ic}${kernel}${rc}
+${fc}     /  ${sc}__  \     ${lc}UPTIME:    ${ic}${uptime}${rc}
+${sc}    /  (  )  \    ${lc}PACKAGES:  ${ic}${packages}${rc}
+${sc}   / __|  |__\\\\   ${lc}SHELL:     ${ic}${shell}${rc}
+${sc}  ///        \\\\\  ${lc}WM:        ${ic}${WM}${rc}
 
 EOF
diff --git a/ufetch-crux b/ufetch-crux
index 462f393..194b6c9 100755
--- a/ufetch-crux
+++ b/ufetch-crux
@@ -6,20 +6,20 @@
 ## INFO
 
 # user is already defined
-HOST="$(hostname)"
-OS="$(crux)"
-KERNEL="$(uname -sr)"
-UPTIME="$(uptime -p | sed s:"up "::)"
-PACKAGES="$(pkginfo -i | wc -l)"
-# shell is already defined
-if [ -z "$WM" ]; then
-    WM="$(grep -v "^#" "${HOME}/.xinitrc" | tail -n 1 | cut -d " " -f2)"
+hostname="$(hostname)"
+os="$(crux)"
+kernel="$(uname -sr)"
+uptime="$(uptime -p | sed 's/up //')"
+packages="$(pkginfo -i | wc -l)"
+shell="$(basename ${SHELL})"
+if [ -z "${WM}" ]; then
+	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 fi
 
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"	# bold
+bc="$(tput bold)"		# bold
 c0="$(tput setaf 0)"	# black
 c1="$(tput setaf 1)"	# red
 c2="$(tput setaf 2)"	# green
@@ -28,24 +28,24 @@ c4="$(tput setaf 4)"	# blue
 c5="$(tput setaf 5)"	# magenta
 c6="$(tput setaf 6)"	# cyan
 c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"	# reset
+rc="$(tput sgr0)"		# reset
 
 # you can change these
-lc="${bc}${c6}"		# labels
-nc="${bc}${c6}"		# user and hostname
-tc="${bc}${c7}"		# text
-pc="${c6}"		# penguin
+lc="${rc}${bc}${c6}"	# labels
+nc="${rc}${bc}${c6}"	# user and hostname
+ic="${rc}${bc}${c7}"	# info
+pc="${rc}${c6}"			# penguin
 
 ## OUTPUT
 
 cat <<EOF
 
-${pc}      ___${rc}     ${nc}${USER}${rc}${tc}@${rc}${nc}${HOST}${rc}
-${pc}     (${rc}${c7}.·${rc} ${pc}|${rc}    ${lc}OS:${rc}       ${tc}${OS}${rc}
-${pc}     (${rc}${c3}<>${rc} ${pc}|${rc}    ${lc}KERNEL:${rc}   ${tc}${KERNEL}${rc}
-${pc}    /${rc} ${c7}__${rc}  ${pc}\\${rc}   ${lc}UPTIME:${rc}   ${tc}${UPTIME}${rc}
-${pc}   (${rc} ${c7}/  \\${rc} ${pc}/|${rc}  ${lc}PACKAGES:${rc} ${tc}${PACKAGES}${rc}
-${c3}  _${pc}/\\${rc} ${c7}__)${rc}${pc}/${rc}${c3}_${rc}${pc})${rc}  ${lc}SHELL:${rc}    ${tc}${SHELL}${rc}
-${c3}  \/${pc}-____${rc}${c3}\/${rc}   ${lc}WM:${rc}       ${tc}${WM}${rc}
+${pc}      ___     ${nc}${USER}${ic}@${nc}${hostname}${rc}
+${pc}     (${c7}.· ${pc}|    ${lc}OS:        ${ic}${os}${rc}
+${pc}     (${c3}<> ${pc}|    ${lc}KERNEL:    ${ic}${kernel}${rc}
+${pc}    / ${c7}__  ${pc}\\   ${lc}UPTIME:    ${ic}${uptime}${rc}
+${pc}   ( ${c7}/  \\ ${pc}/|  ${lc}PACKAGES:  ${ic}${packages}${rc}
+${c3}  _${pc}/\\ ${c7}__)${pc}/${c3}_${pc})  ${lc}SHELL:     ${ic}${shell}${rc}
+${c3}  \/${pc}-____${c3}\/   ${lc}WM:        ${ic}${WM}${rc}
 
 EOF
diff --git a/ufetch-gentoo b/ufetch-gentoo
index 077a95f..c76fc14 100755
--- a/ufetch-gentoo
+++ b/ufetch-gentoo
@@ -1,54 +1,55 @@
 #!/bin/sh
 #
-# ufetch-gentoo - tiny system info for gentoo
+# ufetch-gentoo - tiny system info for gentoo linux
 #
 
 ## INFO
 
 # user is already defined
-HOST="$(hostname)"
-OS='Gentoo Linux'
-KERNEL="$(uname -sr)"
-UPTIME="$(uptime -p | sed s:'up ':'':)"
-PACKAGES="$(ls -d /var/db/pkg/*/* | wc -l)"
-# shell is already defined
-if [ -z "$WM" ]; then
-	WM=$(tail -n 1 "$HOME/.xinitrc" | cut -d ' ' -f3)
+host="$(hostname)"
+os='Gentoo Linux'
+kernel="$(uname -sr)"
+uptime="$(uptime -p | sed 's/up //')"
+packages="$(ls -d /var/db/pkg/*/* | wc -l)"
+shell="$(basename ${SHELL})"
+if [ -z "${WM}" ]; then
+	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 fi
-CPU="$(uname -p)"
+cpu="$(uname -p)"
 
 ## DEFINE COLORS
 
-rc=$(tput sgr0)		# reset
-c0=$(tput setaf 0)	# black
-c1=$(tput setaf 1)	# red
-c2=$(tput setaf 2)	# green
-c3=$(tput setaf 3)	# yellow
-c4=$(tput setaf 4)	# blue
-c5=$(tput setaf 5)	# magenta
-c6=$(tput setaf 6)	# cyan
-c7=$(tput setaf 7)	# white
-bc=$(tput bold)		# bold
+# probably don't change these
+bc="$(tput bold)"		# bold
+c0="$(tput setaf 0)"	# black
+c1="$(tput setaf 1)"	# red
+c2="$(tput setaf 2)"	# green
+c3="$(tput setaf 3)"	# yellow
+c4="$(tput setaf 4)"	# blue
+c5="$(tput setaf 5)"	# magenta
+c6="$(tput setaf 6)"	# cyan
+c7="$(tput setaf 7)"	# white
+rc="$(tput sgr0)"		# reset
 
 # you can change these
-lc=${c5}		# labels
-nc=${c5}		# user and hostname
-tc=${rc}		# text
-pc=${bc}${c5}		# primary color
-sc=${c5}		# secondary color
+lc="${rc}${bc}${c5}"	# labels
+nc="${rc}${bc}${c5}"	# user and hostname
+ic="${rc}${bc}${c7}"	# info
+fc="${rc}${bc}${c5}"	# first color
+sc="${rc}${c5}"			# second color
 
 ## OUTPUT
 # art from gentoo prefix project's bootstrap-prefix.sh
 
 cat <<EOF
 
-${pc}     .vir.${rc}       ${nc}${USER}${rc}${tc}@${rc}${nc}${HOST}${rc}
-${pc}   .d\$\$\$\$${rc}${sc}\$\$b.${rc}    ${lc}OS:${rc}        ${tc}${OS}${rc}
-${pc}   \$\$\$\$${rc}${sc}( )${rc}${pc}\$${rc}${sc}\$\$b${rc}   ${lc}KERNEL:${rc}    ${tc}${KERNEL}${rc}
-${pc}   Q\$\$\$\$\$\$\$\$${rc}${sc}\$\$B${rc}  ${lc}UPTIME:${rc}    ${tc}${UPTIME}${rc}
-${pc}     "\$\$\$\$\$${rc}${sc}\$\$P${rc}   ${lc}PACKAGES:${rc}  ${tc}${PACKAGES}${rc}
-${pc}    d\$\$\$\$${rc}${sc}\$\$P"${rc}    ${lc}SHELL:${rc}     ${tc}${SHELL}${rc}
-${pc}  \$\$\$\$\$${rc}${sc}\$\$P${rc}       ${lc}WM:${rc}        ${tc}${WM}${rc}
-${pc}  \`Q\$\$${rc}${sc}P"${rc}         ${lc}CPU:       ${tc}${CPU}${rc}
+${fc}     .vir.       ${nc}${USER}${ic}@${nc}${host}${rc}
+${fc}   .d\$\$\$\$${sc}\$\$b.    ${lc}OS:        ${ic}${os}${rc}
+${fc}   \$\$\$\$${sc}( )${pc}\$${sc}\$\$b   ${lc}KERNEL:    ${ic}${kernel}${rc}
+${fc}   Q\$\$\$\$\$\$\$\$${sc}\$\$B  ${lc}UPTIME:    ${ic}${uptime}${rc}
+${fc}     "\$\$\$\$\$${sc}\$\$P   ${lc}PACKAGES:  ${ic}${packages}${rc}
+${fc}    d\$\$\$\$${sc}\$\$P"    ${lc}SHELL:     ${ic}${shell}${rc}
+${fc}  \$\$\$\$\$${sc}\$\$P       ${lc}WM:        ${ic}${WM}${rc}
+${fc}  \`Q\$\$${sc}P"         ${lc}CPU:       ${ic}${cpu}${rc}
 
 EOF
diff --git a/ufetch-openbsd b/ufetch-openbsd
index e1a1cce..aebbc53 100755
--- a/ufetch-openbsd
+++ b/ufetch-openbsd
@@ -6,48 +6,49 @@
 ## INFO
 
 # user is already defined
-HOST="$(hostname)"
-OS="$(uname -sr)"
-KERNEL="$(uname -v)"
-UPTIME="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
-PACKAGES="$(pkg_info -A | wc -l | sed -e 's/^[ \t]*//')"
-# shell is already defined
-if [ -z "$WM" ]; then
-	WM=$(tail -n 1 "$HOME/.xinitrc" | cut -d ' ' -f 2)
+host="$(hostname)"
+os="$(uname -sr)"
+kernel="$(uname -v)"
+uptime="$(uptime | awk -F, '{sub(".*up ",x,$1);print $1}' | sed -e 's/^[ \t]*//')"
+packages="$(pkg_info -A | wc -l | sed -e 's/^[ \t]*//')"
+shell="$(basename ${SHELL})"
+if [ -z "${WM}" ]; then
+	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 fi
 
 ## DEFINE COLORS
 
-rc=$(tput sgr0)		# reset
-c0=$(tput setaf 0)	# black
-c1=$(tput setaf 1)	# red
-c2=$(tput setaf 2)	# green
-c3=$(tput setaf 3)	# yellow
-c4=$(tput setaf 4)	# blue
-c5=$(tput setaf 5)	# magenta
-c6=$(tput setaf 6)	# cyan
-c7=$(tput setaf 7)	# white
-bc=$(tput bold)		# bold
+# probably don't change these
+bc="$(tput bold)"		# bold
+c0="$(tput setaf 0)"	# black
+c1="$(tput setaf 1)"	# red
+c2="$(tput setaf 2)"	# green
+c3="$(tput setaf 3)"	# yellow
+c4="$(tput setaf 4)"	# blue
+c5="$(tput setaf 5)"	# magenta
+c6="$(tput setaf 6)"	# cyan
+c7="$(tput setaf 7)"	# white
+rc="$(tput sgr0)"		# reset
 
 # you can change these
-lc=${rc}${bc}${c3}	# labels
-nc=${rc}${bc}${c3}	# user and hostname
-ic=${rc}		# info
-fc=${rc}${c3}		# first color
-sc=${rc}${c7}		# second color
-tc=${rc}${bc}${c3}	# third color
+lc="${rc}${bc}${c3}"	# labels
+nc="${rc}${bc}${c3}"	# user and hostname
+ic="${rc}${bc}${c7}"	# info
+fc="${rc}${c3}"			# first color
+sc="${rc}${c7}"			# second color
+tc="${rc}${bc}${c3}"	# third color
 
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}      _____       ${nc}${USER}${ic}@${nc}${HOST}${rc}
-${fc}    \-     -/     ${lc}OS:        ${ic}${OS}${rc}
-${fc} \_/         \    ${lc}KERNEL:    ${ic}${KERNEL}${rc}
-${fc} |        ${sc}O O${fc} |   ${lc}UPTIME:    ${ic}${UPTIME}${rc}
-${fc} |_  ${tc}<   ${fc})  ${tc}3 ${fc})   ${lc}PACKAGES:  ${ic}${PACKAGES}${rc}
-${fc} / \         /    ${lc}SHELL:     ${ic}${SHELL}${rc}
-${fc}    /-_____-\     ${lc}WM:        ${ic}${WM}${rc}
+${fc}       _____      ${nc}${USER}${ic}@${nc}${host}${rc}
+${fc}     \-     -/    ${lc}OS:        ${ic}${os}${rc}
+${fc}  \_/         \   ${lc}KERNEL:    ${ic}${kernel}${rc}
+${fc}  |        ${sc}O O${fc} |  ${lc}UPTIME:    ${ic}${uptime}${rc}
+${fc}  |_  ${tc}<   ${fc})  ${tc}3 ${fc})  ${lc}PACKAGES:  ${ic}${packages}${rc}
+${fc}  / \         /   ${lc}SHELL:     ${ic}${shell}${rc}
+${fc}     /-_____-\    ${lc}WM:        ${ic}${WM}${rc}
 
 EOF
diff --git a/ufetch-void b/ufetch-void
index 095f0ae..3da0ee5 100755
--- a/ufetch-void
+++ b/ufetch-void
@@ -1,25 +1,25 @@
 #!/bin/sh
 #
-# ufetch-void - tiny system info for void
+# ufetch-void - tiny system info for void linux
 #
 
 ## INFO
 
 # user is already defined
-HOST="$(hostname)"
-OS="Void Linux"
-KERNEL="$(uname -sr)"
-UPTIME="$(uptime -p | sed s:"up "::)"
-PACKAGES="$(xbps-query -l | wc -l)"
-# shell is already defined
-if [ -z "$WM" ]; then
-	WM="$(grep -v "^#" "${HOME}/.xinitrc" | tail -n 1 | cut -d " " -f2)"
+hostname="$(hostname)"
+os='Void Linux'
+kernel="$(uname -sr)"
+uptime="$(uptime -p | sed 's/up //')"
+packages="$(xbps-query -l | wc -l)"
+shell="$(basename ${SHELL})"
+if [ -z "${WM}" ]; then
+	WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
 fi
 
 ## DEFINE COLORS
 
 # probably don't change these
-bc="$(tput bold)"	# bold
+bc="$(tput bold)"		# bold
 c0="$(tput setaf 0)"	# black
 c1="$(tput setaf 1)"	# red
 c2="$(tput setaf 2)"	# green
@@ -28,25 +28,25 @@ c4="$(tput setaf 4)"	# blue
 c5="$(tput setaf 5)"	# magenta
 c6="$(tput setaf 6)"	# cyan
 c7="$(tput setaf 7)"	# white
-rc="$(tput sgr0)"	# reset
+rc="$(tput sgr0)"		# reset
 
 # you can change these
-lc="${bc}${c2}"		# labels
-nc="${bc}${c2}"		# user and hostname
-tc="${bc}${c7}"		# text
-fc="${bc}${c2}"		# first color
-sc="${c2}"		# second color
+lc="${rc}${bc}${c2}"	# labels
+nc="${rc}${bc}${c2}"	# user and hostname
+ic="${rc}${bc}${c7}"	# info
+fc="${rc}${bc}${c2}"	# first color
+sc="${rc}${c2}"			# second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${fc}      _______    ${nc}${USER}${tc}@${nc}${HOST}${rc}
-${sc}   _ ${fc}\______ -   ${lc}OS:        ${tc}${OS}${rc}
-${sc}  | \  ${fc}___  \ |  ${lc}KERNEL:    ${tc}${KERNEL}${rc}
-${sc}  | | ${fc}/   \ | |  ${lc}UPTIME:    ${tc}${UPTIME}${rc}
-${sc}  | | ${fc}\___/ | |  ${lc}PACKAGES:  ${tc}${PACKAGES}${rc}
-${sc}  | \______ ${fc}\_|  ${lc}SHELL:     ${tc}${SHELL}${rc}
-${sc}   -_______\     ${lc}WM:        ${tc}${WM}${rc}
+${fc}      _______    ${nc}${USER}${ic}@${nc}${hostname}${rc}
+${sc}   _ ${fc}\______ \   ${lc}OS:        ${ic}${os}${rc}
+${sc}  | \  ${fc}___  \ |  ${lc}KERNEL:    ${ic}${kernel}${rc}
+${sc}  | | ${fc}/   \ | |  ${lc}UPTIME:    ${ic}${uptime}${rc}
+${sc}  | | ${fc}\___/ | |  ${lc}PACKAGES:  ${ic}${packages}${rc}
+${sc}  | \______ ${fc}\_|  ${lc}SHELL:     ${ic}${shell}${rc}
+${sc}   \_______\     ${lc}WM:        ${ic}${WM}${rc}
 
 EOF