Merge branch 'dracula:master' into feature/custom-colors

Author: Theoreticallyhugo

scripts/battery.sh

@@ -41,7 +41,7 @@ battery_percent()
   case $(uname -s) in
     Linux)
       percent=$(linux_acpi percent)
-      [ -n "$percent" ] && echo " $percent"
+      [ -n "$percent" ] && echo "$percent%"
       ;;
 
     Darwin)
@@ -112,17 +112,17 @@ battery_status()
     charging|Charging)
       # charging from AC
       declare -A battery_labels=(
-        [0]="󰂎"
-        [10]="󰁺"
-        [20]="󰁻"
-        [30]="󰁼"
-        [40]="󰁽"
-        [50]="󰁾"
-        [60]="󰁿"
-        [70]="󰂀"
-        [80]="󰂁"
-        [90]="󰂂"
-        [100]="󰁹"
+        [0]="󰢟"
+        [10]="󰢜"
+        [20]="󰂆"
+        [30]="󰂇"
+        [40]="󰂈"
+        [50]="󰢝"
+        [60]="󰂉"
+        [70]="󰢞"
+        [80]="󰂊"
+        [90]="󰂋"
+        [100]="󰂅"
       )
       echo "${battery_labels[$((bat_perc/10*10))]:-󰂃}"
       ;;
@@ -131,7 +131,7 @@ battery_status()
       echo ''
       ;;
     finishingcharge)
-      echo '󰁹'
+      echo '󰂅'
       ;;
     *)
       # something wrong...
@@ -175,4 +175,3 @@ main()
 
 #run main driver program
 main
-

scripts/dracula.sh

@@ -9,6 +9,7 @@ main()
 {
   # set configuration option variables
   show_kubernetes_context_label=$(get_tmux_option "@dracula-kubernetes-context-label" "")
+  show_only_kubernetes_context=$(get_tmux_option "@dracula-show-only-kubernetes-context" "")
   eks_hide_arn=$(get_tmux_option "@dracula-kubernetes-eks-hide-arn" false)
   eks_extract_account=$(get_tmux_option "@dracula-kubernetes-eks-extract-account" false)
   hide_kubernetes_user=$(get_tmux_option "@dracula-kubernetes-hide-user" false)
@@ -231,7 +232,7 @@ main()
 
     elif [ $plugin = "kubernetes-context" ]; then
       IFS=' ' read -r -a colors <<<$(get_tmux_option "@dracula-kubernetes-context-colors" "cyan dark_gray")
-      script="#($current_dir/kubernetes_context.sh $eks_hide_arn $eks_extract_account $hide_kubernetes_user $show_kubernetes_context_label)"
+      script="#($current_dir/kubernetes_context.sh $eks_hide_arn $eks_extract_account $hide_kubernetes_user $show_only_kubernetes_context $show_kubernetes_context_label)"
 
     elif [ $plugin = "terraform" ]; then
       IFS=' ' read -r -a colors <<<$(get_tmux_option "@dracula-terraform-colors" "light_purple dark_gray")
@@ -253,7 +254,7 @@ main()
         if $show_day_month && $show_military ; then # military time and dd/mm
           script="%a %d/%m %R ${timezone} "
         elif $show_military; then # only military time
-          script="%a %m/%d %R ${timezone} "
+          script="%R ${timezone} "
         elif $show_day_month; then # only dd/mm
           script="%a %d/%m %I:%M %p ${timezone} "
         else

scripts/gpu_power.sh

@@ -9,32 +9,48 @@ get_platform()
 {
   case $(uname -s) in
     Linux)
-      # use this option for when you know that there is an NVIDIA gpu, but you cant use lspci to determine
-      ignore_lspci=$(get_tmux_option "@dracula-ignore-lspci" false)
-      if [[ "$ignore_lspci" = true ]]; then
-        echo "NVIDIA"
+      # use this option for when your gpu isn't detected
+      gpu_label=$(get_tmux_option "@dracula-force-gpu" false)
+      if [[ "$gpu_label" != false ]]; then
+        echo $gpu_label
       else
+        # attempt to detect the gpu
         gpu=$(lspci -v | grep VGA | head -n 1 | awk '{print $5}')
-        echo $gpu
+        if [[ -n $gpu ]]; then
+          # if a gpu is detected, return it
+          echo $gpu
+        elif type -a nvidia-smi >> /dev/null; then
+          # if no gpu was detected, and nvidia-smi is installed, we'll still try nvidia
+          echo "NVIDIA"
+        fi
       fi
       ;;
 
     Darwin)
-      # TODO - Darwin/Mac compatability
+      # WARNING: for this to work the powermetrics command needs to be run without password
+      #   add this to the sudoers file, replacing the username and omitting the quotes.
+      #   be mindful of the tabs: "username		ALL = (root) NOPASSWD: /usr/bin/powermetrics"
+      echo "apple"
       ;;
 
     CYGWIN*|MINGW32*|MSYS*|MINGW*)
       # TODO - windows compatability
       ;;
   esac
 }
-
 get_gpu()
 {
   gpu=$(get_platform)
+  gpu_power_percent=$(get_tmux_option "@dracula-gpu-power-percent" false)
   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) }')
+    if $gpu_power_percent; then
+      usage=$(nvidia-smi --query-gpu=power.draw,power.limit --format=csv,noheader,nounits | awk '{ draw += $0; max +=$2 } END { printf("%d%%\n", draw / max * 100) }')
+  else
+      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) }')
+    fi
 
+  elif [[ "$gpu" == apple ]]; then
+    usage="$(sudo powermetrics --samplers gpu_power -i500 -n 1 | grep 'GPU Power' | sed 's/GPU Power: \(.*\) \(.*\)/\1\2/g')"
   else
     usage='unknown'
   fi
@@ -45,7 +61,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")
+  gpu_label=$(get_tmux_option "@dracula-gpu-power-label" "GPU")
   gpu_usage=$(get_gpu)
   echo "$gpu_label $gpu_usage"
   sleep $RATE

scripts/gpu_ram_info.sh

@@ -9,13 +9,20 @@ get_platform()
 {
   case $(uname -s) in
     Linux)
-      # use this option for when you know that there is an NVIDIA gpu, but you cant use lspci to determine
-      ignore_lspci=$(get_tmux_option "@dracula-ignore-lspci" false)
-      if [[ "$ignore_lspci" = true ]]; then
-        echo "NVIDIA"
+      # use this option for when your gpu isn't detected
+      gpu_label=$(get_tmux_option "@dracula-force-gpu" false)
+      if [[ "$gpu_label" != false ]]; then
+        echo $gpu_label
       else
+        # attempt to detect the gpu
         gpu=$(lspci -v | grep VGA | head -n 1 | awk '{print $5}')
-        echo $gpu
+        if [[ -n $gpu ]]; then
+          # if a gpu is detected, return it
+          echo $gpu
+        elif type -a nvidia-smi >> /dev/null; then
+          # if no gpu was detected, and nvidia-smi is installed, we'll still try nvidia
+          echo "NVIDIA"
+        fi
       fi
       ;;
 
@@ -32,19 +39,29 @@ get_platform()
 get_gpu()
 {
   gpu=$(get_platform)
+  gpu_vram_percent=$(get_tmux_option "@dracula-gpu-vram-percent" false)
   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) }')
+    if $gpu_vram_percent; then
+      usage=$(nvidia-smi --query-gpu=memory.used,memory.total --format=csv,noheader,nounits | awk '{ used += $0; total +=$2 } END { printf("%d%%\n", used / total * 100 ) }')
+    normalize_percent_len $usage
+    exit 0
+    else
+      # to add finer grained info
+      used_accuracy=$(get_tmux_option "@dracula-gpu-vram-used-accuracy" "d")
+      total_accuracy=$(get_tmux_option "@dracula-gpu-vram-total-accuracy" "d")
+      usage=$(nvidia-smi --query-gpu=memory.used,memory.total --format=csv,noheader,nounits | awk "{ used += \$0; total +=\$2 } END { printf(\"%${used_accuracy}GB/%${total_accuracy}GB\n\", used / 1024, total / 1024) }")
+    fi
   else
     usage='unknown'
   fi
-  normalize_percent_len $usage
+  echo $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_label=$(get_tmux_option "@dracula-gpu-vram-label" "VRAM")
   gpu_usage=$(get_gpu)
   echo "$gpu_label $gpu_usage"
   sleep $RATE

scripts/gpu_usage.sh

@@ -9,18 +9,28 @@ get_platform()
 {
   case $(uname -s) in
     Linux)
-      # use this option for when you know that there is an NVIDIA gpu, but you cant use lspci to determine
-      ignore_lspci=$(get_tmux_option "@dracula-ignore-lspci" false)
-      if [[ "$ignore_lspci" = true ]]; then
-        echo "NVIDIA"
+      # use this option for when your gpu isn't detected
+      gpu_label=$(get_tmux_option "@dracula-force-gpu" false)
+      if [[ "$gpu_label" != false ]]; then
+        echo $gpu_label
       else
+        # attempt to detect the gpu
         gpu=$(lspci -v | grep VGA | head -n 1 | awk '{print $5}')
-        echo $gpu
+        if [[ -n $gpu ]]; then
+          # if a gpu is detected, return it
+          echo $gpu
+        elif type -a nvidia-smi >> /dev/null; then
+          # if no gpu was detected, and nvidia-smi is installed, we'll still try nvidia
+          echo "NVIDIA"
+        fi
       fi
       ;;
 
     Darwin)
-      # TODO - Darwin/Mac compatability
+      # WARNING: for this to work the powermetrics command needs to be run without password
+      #   add this to the sudoers file, replacing the username and omitting the quotes.
+      #   be mindful of the tabs: "username		ALL = (root) NOPASSWD: /usr/bin/powermetrics"
+      echo "apple"
       ;;
 
     CYGWIN*|MINGW32*|MSYS*|MINGW*)
@@ -34,6 +44,8 @@ get_gpu()
   gpu=$(get_platform)
   if [[ "$gpu" == NVIDIA ]]; then
     usage=$(nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits | awk '{ sum += $0 } END { printf("%d%%\n", sum / NR) }')
+  elif [[ "$gpu" == apple ]]; then
+    usage="$(sudo powermetrics --samplers gpu_power -i500 -n 1 | grep 'active residency' | sed 's/[^0-9.%]//g' | sed 's/[%].*$//g')%"
   else
     usage='unknown'
   fi

scripts/kubernetes_context.sh

@@ -5,7 +5,8 @@ export LC_ALL=en_US.UTF-8
 hide_arn_from_cluster=$1
 extract_account=$2
 hide_user=$3
-label=$4
+just_current_context=$4
+label=$5
 
 current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $current_dir/utils.sh
@@ -34,6 +35,19 @@ main()
   # storing the refresh rate in the variable RATE, default is 5
   RATE=$(get_tmux_option "@dracula-refresh-rate" 5)
   OUTPUT_STRING=""
+
+  if [ "$just_current_context" = "true" ]
+  then
+    echo "$current_context"
+  else
+    getFullMessage
+  fi
+
+  sleep $RATE
+}
+
+getFullMessage()
+{
   if [ ! -z "$current_account_id" ]
   then
       OUTPUT_STRING="${current_account_id}/"
@@ -65,8 +79,6 @@ main()
   else
     echo "${label} ${OUTPUT_STRING}"
   fi
-
-  sleep $RATE
 }
 
 # run the main driver

scripts/network.sh

@@ -2,7 +2,11 @@
 # setting the locale, some users have issues with different locales, this forces the correct one
 export LC_ALL=en_US.UTF-8
 
-HOSTS="google.com github.com example.com"
+current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source $current_dir/utils.sh
+
+# set your own hosts so that a wifi is recognised even without internet access
+HOSTS=$(get_tmux_option "@dracula-network-hosts" "google.com github.com example.com")
 
 get_ssid()
 {
@@ -11,17 +15,18 @@ get_ssid()
     Linux)
       SSID=$(iw dev | sed -nr 's/^\t\tssid (.*)/\1/p')
       if [ -n "$SSID" ]; then
-        printf '%s' "$SSID"
+        printf '%s' "$wifi_label$SSID"
       else
-        echo 'Ethernet'
+        echo "$(get_tmux_option "@dracula-network-ethernet-label" "Ethernet")"
       fi
       ;;
 
     Darwin)
       if networksetup -getairportnetwork en0 | cut -d ':' -f 2 | sed 's/^[[:blank:]]*//g' &> /dev/null; then
-        echo "$(networksetup -getairportnetwork en0 | cut -d ':' -f 2)" | sed 's/^[[:blank:]]*//g'
+        wifi_label=$(get_tmux_option "@dracula-network-wifi-label" "")
+        echo "$wifi_label$(networksetup -getairportnetwork en0 | cut -d ':' -f 2)" | sed 's/^[[:blank:]]*//g'
       else
-        echo 'Ethernet'
+        echo "$(get_tmux_option "@dracula-network-ethernet-label" "Ethernet")"
       fi
       ;;
 
@@ -37,7 +42,7 @@ get_ssid()
 
 main()
 {
-  network="Offline"
+  network="$(get_tmux_option "@dracula-network-offline-label" "Offline")"
   for host in $HOSTS; do
     if ping -q -c 1 -W 1 $host &>/dev/null; then
       network="$(get_ssid)"

scripts/network_bandwidth.sh

@@ -112,7 +112,7 @@ main() {
     IFS=" " read -ra bandwidth <<<"$(get_bandwidth "$network_name")"
 
     if [[ $show_interface == "true" ]]; then echo -n "[$network_name] "; fi
-    echo "↓ $(bandwidth_to_unit "${bandwidth[$DOWNLOAD]}") • ↑ $(bandwidth_to_unit "${bandwidth[$UPLOAD]}")"
+    printf "↓ %6s %-4s • ↑ %6s %-4s\n" $(bandwidth_to_unit "${bandwidth[$DOWNLOAD]}") $(bandwidth_to_unit "${bandwidth[$UPLOAD]}")
 
     ((counter = counter - 1))
     sleep "$interval_update"