3 files changed, 59 insertions, 40 deletions

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 <<EOF
 
-${c0}        /\        ${nc}${USER}${ic}@${nc}${host}${reset}
-${c0}       /^^\       ${lc}OS:        ${ic}${os}${reset}
-${c0}      /\   \      ${lc}KERNEL:    ${ic}${kernel}${reset}
-${c0}     /  ${c1}__  \     ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c1}    /  (  )  \    ${lc}PACKAGES:  ${ic}${packages}${reset}
-${c1}   / __|  |__\\\\   ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}  ///        \\\\\  ${lc}${envtype}:        ${ic}${WM}${reset}
+${c0}      _______      ${nc}${USER}${ic}@${nc}${host}${reset}
+${c1}      ${c0}\_____ \`-    ${lc}OS:        ${ic}${os}${reset}
+${c1}   /\   ${c0}___ \`- \   ${lc}KERNEL:    ${ic}${kernel}${reset}
+${c1}  | |  ${c0}/   \  | |  ${lc}UPTIME:    ${ic}${uptime}${reset}
+${c1}  | |  ${c0}\___/  | |  ${lc}PACKAGES:  ${ic}${packages}${reset}
+${c1}   \ \`-_____  ${c0}\/   ${lc}SHELL:     ${ic}${shell}${reset}
+${c1}    \`-______\      ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
+
diff --git a/bin/.local/bin/lock b/bin/.local/bin/lock
new file mode 100755
index 0000000..d7dc632
--- /dev/null
+++ b/bin/.local/bin/lock
@@ -0,0 +1,6 @@
+#!/bin/bash
+scrot /tmp/screen.png
+convert /tmp/screen.png -scale 10% -scale 1000% /tmp/screen.png
+[[ -f $1 ]] && convert /tmp/screen.png $1 -gravity center -composite -matte /tmp/screen.png
+i3lock -u -i /tmp/screen.png
+rm /tmp/screen.png
diff --git a/bin/.local/bin/unblock b/bin/.local/bin/unblock
index cf3aa81..1d0ea7f 100755
--- a/bin/.local/bin/unblock
+++ b/bin/.local/bin/unblock
@@ -4,6 +4,6 @@ set -e
 printf "\033[0;35mSetting wlo1 down....\033[0m\n"
 sudo ip link set wlo1 down
 printf "\033[0;36mChanging MAC address....\033[0m\n"
-sudo macchanger --mac=60:8E:08:B2:38:77 wlo1
+sudo macchanger -a wlo1
 printf "\033[0;32mEnjoy....\033[0m\n"