diff --git a/.local/bin/tools/statusbar/cpu b/.local/bin/tools/statusbar/cpu index 4f87915..ae0e78f 100755 --- a/.local/bin/tools/statusbar/cpu +++ b/.local/bin/tools/statusbar/cpu @@ -1,12 +1,23 @@ #!/bin/sh -icon="^b#282828^^c#dfdfdf^  ^d^ " +gpu_temp="" -if [ "$1" = "amd" ]; then +if command -v nvidia-smi > /dev/null; then + gpu_temp=$(nvidia-smi --query-gpu=temperature.gpu --format=csv,noheader) + gpu_temp=$(printf %3s $(echo ${gpu_temp##*+} | sed "s/\..*//") | tr ' ' ' ') + gpu_temp=" | $gpu_temp°C" +fi + +model=$(cat /proc/cpuinfo | grep "model name" | head -n1) + +icon="^b#282828^^c#dfdfdf^  ^d^" + +if printf "$model " | grep -Fqe "AMD"; then temp=$(sensors | awk '/Tctl/ {print $2}') -elif [ "$1" = "intel" ]; then +else temp=$(sensors | awk '/Package id 0/ {print $4}') fi temp=$(printf %3s $(echo ${temp##*+} | sed "s/\..*//") | tr ' ' ' ') -echo "$icon$temp°C" + +echo "$icon $temp°C$gpu_temp " diff --git a/.local/bin/tools/statusbar/disk b/.local/bin/tools/statusbar/disk index 5543e16..7621eef 100755 --- a/.local/bin/tools/statusbar/disk +++ b/.local/bin/tools/statusbar/disk @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/bin/sh # Status bar module for disk space # $1 should be drive mountpoint diff --git a/.local/bin/tools/statusbar/internet b/.local/bin/tools/statusbar/internet index b5a0e22..368822e 100755 --- a/.local/bin/tools/statusbar/internet +++ b/.local/bin/tools/statusbar/internet @@ -1,4 +1,4 @@ -!/usr/bin/env sh +#!/bin/sh wifipercent=" ___"