update, clean

ofetch.sh

@@ -22,21 +22,18 @@ $C_CYAN /_-''    ''-_\\ $C_GRAY/$C_RESET
 # all the info fields
 USER=$USER
 HOSTNAME=$(cat /etc/hostname)
-#CPU_MODELNAME=$(cat /proc/cpuinfo | awk '/model name\t:/' | awk -F ": " '{print $2}' | head -1)
-CPU_MODELNAME="i5-8365U"
+CPU_MODELNAME=$(cat /proc/cpuinfo | awk -F ":" '/model name/ {print $2}' | awk -F " " '{print $3}' | head -1)
 CPU_THREADS_NUM=$(nproc)
 
 RAM_TOTAL=$(awk '/MemTotal:/ { printf "%.1f\n", $2 / 1000000 }' /proc/meminfo)
 RAM_FREE=$(awk '/MemAvailable:/ { printf "%.1f\n", $2 / 1000000 }' /proc/meminfo)
 RAM="$(awk -v total="${RAM_TOTAL}" -v free="${RAM_FREE}" 'BEGIN { print (total - free) }') G / ${RAM_TOTAL} G"
 
-#GPU=$(cat /sys/class/drm/card1/device/{vendor,device} | tr '\n' ':' | head -c -1)
-#GPU="Intel(R) UHD Graphics 620"
 UPTIME=$(awk '{ s=int($1); printf "%dd %dh %dm\n", s/86400, (s%86400)/3600, (s%3600)/60 }' /proc/uptime)
 KERNEL=$(uname -r)
-WM="dwm"
+WM=$WM
 TERM=$TERM
-SHELL=$SHELL
+SHELL=$(echo -n $SHELL | awk -F "/" '{print $NF}')
 
 
 horizontal_n=$((${#USER} + ${#HOSTNAME} + 3))
@@ -53,14 +50,14 @@ mapfile -t LOGO_LINES <<< "$LOGO"
 INFO_LINES=(
 "${C_BYELLOW_BOLD}$USER${C_BWHITE_BOLD} @ ${C_BYELLOW_BOLD}$HOSTNAME${C_RESET}"
 ${C_GRAY}$HORIZONTAL_SEPARATOR${C_RESET}
-"${C_CYAN}CPU${C_DIMYELLOW_ITALIC} : $CPU_MODELNAME ($CPU_THREADS_NUM threads)"
-"${C_CYAN}RAM${C_DIMYELLOW_ITALIC} : $RAM"
+"${C_CYAN}${C_DIMYELLOW_ITALIC} : $CPU_MODELNAME ($CPU_THREADS_NUM threads)"
+"${C_CYAN}${C_DIMYELLOW_ITALIC} : $RAM"
 #"GPU: $GPU"
-"  ${C_CYAN}${C_DIMYELLOW_ITALIC} : $UPTIME"
-"  ${C_CYAN}${C_DIMYELLOW_ITALIC} : $KERNEL"
-"  ${C_CYAN}${C_DIMYELLOW_ITALIC} : $WM"
-"  ${C_CYAN}${C_DIMYELLOW_ITALIC} : $TERM"
-"  ${C_CYAN}${C_DIMYELLOW_ITALIC} : $SHELL"
+"${C_CYAN}${C_DIMYELLOW_ITALIC} : $UPTIME"
+"${C_CYAN}${C_DIMYELLOW_ITALIC} : $KERNEL"
+"${C_CYAN}${C_DIMYELLOW_ITALIC} : $WM"
+"${C_CYAN}${C_DIMYELLOW_ITALIC} : $TERM"
+"${C_CYAN}${C_DIMYELLOW_ITALIC} : $SHELL"
 )
 
 for i in "${!LOGO_LINES[@]}"; do