diff --git a/README.md b/README.md index 0be21e7..630f72e 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,8 @@ Configuration and options can be found at [draculatheme.com/tmux](https://dracul - RAM usage - GPU usage - Custom status texts from external scripts +- GPU VRAM usage +- GPU power draw - Color code based on if prefix is active or not - List of windows with current window highlighted - When prefix is enabled smiley face turns from green to yellow diff --git a/scripts/dracula.sh b/scripts/dracula.sh index 67ad439..a2bff10 100755 --- a/scripts/dracula.sh +++ b/scripts/dracula.sh @@ -152,6 +152,14 @@ main() IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-gpu-usage-colors" "pink dark_gray") script="#($current_dir/gpu_usage.sh)" + elif [ $plugin = "gpu-ram-usage" ]; then + IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-gpu-ram-usage-colors" "cyan dark_gray") + script="#($current_dir/gpu_ram_info.sh)" + + elif [ $plugin = "gpu-power-draw" ]; then + IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-gpu-power-draw-colors" "green dark_gray") + script="#($current_dir/gpu_power.sh)" + elif [ $plugin = "cpu-usage" ]; then IFS=' ' read -r -a colors <<< $(get_tmux_option "@dracula-cpu-usage-colors" "orange dark_gray") script="#($current_dir/cpu_info.sh)" diff --git a/scripts/gpu_power.sh b/scripts/gpu_power.sh new file mode 100755 index 0000000..c97e6ee --- /dev/null +++ b/scripts/gpu_power.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash +# setting the locale, some users have issues with different locales, this forces the correct one +export LC_ALL=en_US.UTF-8 + +current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +source $current_dir/utils.sh + +get_platform() +{ + case $(uname -s) in + Linux) + gpu=$(lspci -v | grep VGA | head -n 1 | awk '{print $5}') + echo $gpu + ;; + + Darwin) + # TODO - Darwin/Mac compatability + ;; + + CYGWIN*|MINGW32*|MSYS*|MINGW*) + # TODO - windows compatability + ;; + esac +} + +get_gpu() +{ + gpu=$(get_platform) + if [[ "$gpu" == NVIDIA ]]; then + usage=$(nvidia-smi --query-gpu=power.draw,power.limit --format=csv,noheader,nounits | awk '{ draw += $0; max +=$2 } END { printf("%dW/%dW\n", draw, max) }') + + else + usage='unknown' + fi + normalize_percent_len $usage +} + +main() +{ + # storing the refresh rate in the variable RATE, default is 5 + RATE=$(get_tmux_option "@dracula-refresh-rate" 5) + gpu_label=$(get_tmux_option "@dracula-gpu-usage-label" "GPU") + gpu_usage=$(get_gpu) + echo "$gpu_label $gpu_usage" + sleep $RATE +} + +# run the main driver +main diff --git a/scripts/gpu_ram_info.sh b/scripts/gpu_ram_info.sh new file mode 100755 index 0000000..07de6df --- /dev/null +++ b/scripts/gpu_ram_info.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash +# setting the locale, some users have issues with different locales, this forces the correct one +export LC_ALL=en_US.UTF-8 + +current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +source $current_dir/utils.sh + +get_platform() +{ + case $(uname -s) in + Linux) + gpu=$(lspci -v | grep VGA | head -n 1 | awk '{print $5}') + echo $gpu + ;; + + Darwin) + # TODO - Darwin/Mac compatability + ;; + + CYGWIN*|MINGW32*|MSYS*|MINGW*) + # TODO - windows compatability + ;; + esac +} + +get_gpu() +{ + gpu=$(get_platform) + if [[ "$gpu" == NVIDIA ]]; then + usage=$(nvidia-smi --query-gpu=memory.used,memory.total --format=csv,noheader,nounits | awk '{ used += $0; total +=$2 } END { printf("%dGB/%dGB\n", used / 1024, total / 1024) }') + else + usage='unknown' + fi + normalize_percent_len $usage +} + +main() +{ + # storing the refresh rate in the variable RATE, default is 5 + RATE=$(get_tmux_option "@dracula-refresh-rate" 5) + gpu_label=$(get_tmux_option "@dracula-gpu-usage-label" "VRAM") + gpu_usage=$(get_gpu) + echo "$gpu_label $gpu_usage" + sleep $RATE +} + +# run the main driver +main diff --git a/scripts/spotify-tui.sh b/scripts/spotify-tui.sh index dc07206..33ff32f 100755 --- a/scripts/spotify-tui.sh +++ b/scripts/spotify-tui.sh @@ -15,7 +15,8 @@ main() exit 1 fi - spotify_playback=$(spt playback) + FORMAT=$(get_tmux_option "@dracula-spotify-tui-format" "%f %s %t - %a") + spotify_playback=$(spt playback -f "${FORMAT}") echo ${spotify_playback} }