From 49a1c3f6c37946a3bfd125e7db1b6143be4163cc Mon Sep 17 00:00:00 2001
From: Guido Kraemer <guido.kraemer@uni-leipzig.de>
Date: Wed, 26 Apr 2023 13:31:03 +0200
Subject: [PATCH 1/7] add gpu ram info plugin

---
 scripts/dracula.sh      |  4 ++++
 scripts/gpu_ram_info.sh | 48 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100755 scripts/gpu_ram_info.sh

diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index 08980e4..e841aa5 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -141,6 +141,10 @@ 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" "pink dark_gray")
+      script="#($current_dir/gpu_ram_info.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_ram_info.sh b/scripts/gpu_ram_info.sh
new file mode 100755
index 0000000..f04d895
--- /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" "GPU RAM")
+  gpu_usage=$(get_gpu)
+  echo "$gpu_label $gpu_usage"
+  sleep $RATE
+}
+
+# run the main driver
+main

From a588a9d5179ff11b0b3a8e6eefde011884f2109b Mon Sep 17 00:00:00 2001
From: Guido Kraemer <guido.kraemer@uni-leipzig.de>
Date: Wed, 26 Apr 2023 13:44:09 +0200
Subject: [PATCH 2/7] fix gpu memory

---
 scripts/dracula.sh      | 2 +-
 scripts/gpu_ram_info.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index e841aa5..b5b02d5 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -142,7 +142,7 @@ main()
       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" "pink dark_gray")
+      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 = "cpu-usage" ]; then
diff --git a/scripts/gpu_ram_info.sh b/scripts/gpu_ram_info.sh
index f04d895..07de6df 100755
--- a/scripts/gpu_ram_info.sh
+++ b/scripts/gpu_ram_info.sh
@@ -27,7 +27,7 @@ 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) }')
+    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
@@ -38,7 +38,7 @@ 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 RAM")
+  gpu_label=$(get_tmux_option "@dracula-gpu-usage-label" "VRAM")
   gpu_usage=$(get_gpu)
   echo "$gpu_label $gpu_usage"
   sleep $RATE

From 0f345b2deddeb0d3efd193dc2bf2f013225de91a Mon Sep 17 00:00:00 2001
From: Guido Kraemer <guido.kraemer@uni-leipzig.de>
Date: Wed, 26 Apr 2023 16:16:55 +0200
Subject: [PATCH 3/7] add gpu power usage monitor

---
 scripts/dracula.sh   |  4 ++++
 scripts/gpu_power.sh | 49 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100755 scripts/gpu_power.sh

diff --git a/scripts/dracula.sh b/scripts/dracula.sh
index b5b02d5..7ded8a7 100755
--- a/scripts/dracula.sh
+++ b/scripts/dracula.sh
@@ -145,6 +145,10 @@ main()
       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..8ea5d13
--- /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,no header,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

From d7fce8ee744538e723cbaf8b81ee9c993c356048 Mon Sep 17 00:00:00 2001
From: Guido Kraemer <guido.kraemer@uni-leipzig.de>
Date: Wed, 26 Apr 2023 16:21:38 +0200
Subject: [PATCH 4/7] fix gpu power monitor

---
 scripts/gpu_power.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gpu_power.sh b/scripts/gpu_power.sh
index 8ea5d13..c97e6ee 100755
--- a/scripts/gpu_power.sh
+++ b/scripts/gpu_power.sh
@@ -27,7 +27,7 @@ get_gpu()
 {
   gpu=$(get_platform)
   if [[ "$gpu" == NVIDIA ]]; then
-    usage=$(nvidia-smi --query-gpu=power.draw,power.limit --format=csv,no header,nounits | awk '{ draw += $0; max +=$2 } END { printf("%dW/%dW\n", draw, max) }')
+    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'

From d1e93ccc3a662ca08038ffcc7fe47d410dd6149b Mon Sep 17 00:00:00 2001
From: Guido Kraemer <guido.kraemer@uni-leipzig.de>
Date: Wed, 26 Apr 2023 16:52:25 +0200
Subject: [PATCH 5/7] add new features to README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index fb80867..110a2b6 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,8 @@ Configuration and options can be found at [draculatheme.com/tmux](https://dracul
 - CPU usage (percentage or load average)
 - RAM usage
 - GPU usage
+- 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

From 8ee569dd6aa5db3837b3f491ea4d1cc2d7190e3d Mon Sep 17 00:00:00 2001
From: Jumscrafteur <hsansane@gmail.com>
Date: Wed, 26 Apr 2023 17:08:06 +0200
Subject: [PATCH 6/7] Add dracula-spotify-tui-format

---
 scripts/spotify-tui.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/spotify-tui.sh b/scripts/spotify-tui.sh
index dc07206..61352ef 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" "%t - %a")
+  spotify_playback=$(spt playback -f "${FORMAT}")
   echo ${spotify_playback}
 
 }

From 15ce3968c861ec5ce1a79d3581dd5f49eadd460b Mon Sep 17 00:00:00 2001
From: Jumscrafteur <hsansane@gmail.com>
Date: Wed, 26 Apr 2023 17:21:32 +0200
Subject: [PATCH 7/7] Change default format to spt's default

---
 scripts/spotify-tui.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/spotify-tui.sh b/scripts/spotify-tui.sh
index 61352ef..33ff32f 100755
--- a/scripts/spotify-tui.sh
+++ b/scripts/spotify-tui.sh
@@ -15,7 +15,7 @@ main()
     exit 1
   fi
 
-  FORMAT=$(get_tmux_option "@dracula-spotify-tui-format" "%t - %a")
+  FORMAT=$(get_tmux_option "@dracula-spotify-tui-format" "%f %s %t - %a")
   spotify_playback=$(spt playback -f "${FORMAT}")
   echo ${spotify_playback}