From 74f672b39beb7c27ad2d4d7dfc6253449694f8d1 Mon Sep 17 00:00:00 2001 From: Shubham Saini Date: Sun, 16 Feb 2020 13:49:33 +0530 Subject: shifted to void --- bin/.local/bin/fetch | 91 ++++++++++++++++++++++++++++---------------------- bin/.local/bin/lock | 6 ++++ bin/.local/bin/unblock | 2 +- 3 files changed, 59 insertions(+), 40 deletions(-) create mode 100755 bin/.local/bin/lock (limited to 'bin/.local') diff --git a/bin/.local/bin/fetch b/bin/.local/bin/fetch index 609850c..05cb71e 100755 --- a/bin/.local/bin/fetch +++ b/bin/.local/bin/fetch @@ -1,63 +1,76 @@ #!/bin/sh # -# ufetch-arch - tiny system info for arch +# ufetch-void - tiny system info for void ## INFO # user is already defined host="$(hostname)" -os='Arch Linux' +os='Void Linux' kernel="$(uname -sr)" uptime="$(uptime -p | sed 's/up //')" -packages="$(pacman -Q | wc -l)" -shell="$(basename ${SHELL})" - -if [ -z "${WM}" ]; then - if [ "${XDG_CURRENT_DESKTOP}" ]; then - envtype='DE' - WM="${XDG_CURRENT_DESKTOP}" - elif [ "${DESKTOP_SESSION}" ]; then - envtype='DE' - WM="${DESKTOP_SESSION}" - else - envtype='WM' - WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)" - fi +packages="$(xbps-query -l | wc -l)" +shell="$(basename "$SHELL")" + +## UI DETECTION + +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 [ -f "${HOME}/.xinitrc" ]; then + ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)" + uitype='WM' +elif [ -f "${HOME}/.xsession" ]; then + ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)" + uitype='WM' else - envtype='WM' + ui='unknown' + uitype='UI' fi ## DEFINE COLORS # probably don't change these -bold="$(tput bold)" -black="$(tput setaf 0)" -red="$(tput setaf 1)" -green="$(tput setaf 2)" -yellow="$(tput setaf 3)" -blue="$(tput setaf 4)" -magenta="$(tput setaf 5)" -cyan="$(tput setaf 6)" -white="$(tput setaf 7)" -reset="$(tput sgr0)" +if [ -x "$(command -v tput)" ]; then + bold="$(tput bold)" + black="$(tput setaf 0)" + red="$(tput setaf 1)" + green="$(tput setaf 2)" + yellow="$(tput setaf 3)" + blue="$(tput setaf 4)" + magenta="$(tput setaf 5)" + cyan="$(tput setaf 6)" + white="$(tput setaf 7)" + reset="$(tput sgr0)" +fi # you can change these -lc="${reset}${bold}${cyan}" # labels -nc="${reset}${bold}${cyan}" # user and hostname -ic="${reset}${bold}${white}" # info -c0="${reset}${bold}${cyan}" # first color -c1="${reset}${cyan}" # second color +lc="${reset}${bold}${green}" # labels +nc="${reset}${bold}${green}" # user and hostname +ic="${reset}" # info +c0="${reset}${bold}${green}" # first color +c1="${reset}${green}" # second color ## OUTPUT cat <