Merge branch 'master' into mac-player

Author: iberniex

docs/CONFIG.md

@@ -198,6 +198,14 @@ which will display the battery charge and whether its charging (or just drawing
 set -g @dracula-battery-label false
 set -g @dracula-show-battery-status true
 ```
+these settings will introduce the following icons:
+- the battery is discharging and at the current level: `󰂎` `󰁺` `󰁻` `󰁼` `󰁽` `󰁾` `󰁿` `󰂀` `󰂁` `󰂂` `󰁹`
+- the battery is charging and at the current level: `󰢟` `󰢜` `󰂆` `󰂇` `󰂈` `󰢝` `󰂉` `󰢞` `󰂊` `󰂋` `󰂅`
+- power is being drawn from AC, but the battery is neither charging nor discharging: ``
+- we were able to determine that the battery is charging/ discharging, but something about the percentage went wrong: `󰂃`
+- we don't know the status of the battery: ``
+
+
 
 if you have no battery and would like the widget to hide in that case, set the following:
 
@@ -643,13 +651,18 @@ set -g @dracula-ping-rate 5
 
 ### network-vpn - [up](#table-of-contents)
 
-This widget displays whether a vpn is connected.
+This widget tries to display whether a vpn is connected.
+Tailscale exit nodes are fully supported for Linux and MacOS.
 
-These options are not available yet.
+Set verbose to true in order to see the VPNs IP or name of Tailscale exit node.
 
 ```bash
 set -g @dracula-network-vpn-verbose true
-set -g @dracula-network-vpn-label
+```
+
+Set the widgets label like so:
+```bash
+set -g @dracula-network-vpn-label "󰌘 "
 ```
 
 ### playerctl - [up](#table-of-contents)

scripts/battery.sh

@@ -126,8 +126,11 @@ battery_status()
       )
       echo "${battery_labels[$((bat_perc/10*10))]:-󰂃}"
       ;;
-    ACattached)
+    ACattached|Notcharging|"Not charging")
       # drawing from AC but not charging
+      # ACattached - MacOS
+      # Not charging - Linux without acpi
+      # Notcharging - Linux with acpi
       echo ''
       ;;
     finishingcharge)

scripts/network_vpn.sh

@@ -13,14 +13,20 @@ vpn_function() {
 
     verbose=$(get_tmux_option "@dracula-network-vpn-verbose" false)
 
-    #Show IP of tun0 if connected
+    # Show IP of tun0 if connected
     vpn=$(ip -o -4 addr show dev tun0 | awk '{print $4}' | cut -d/ -f1)
 
     which -s tailscale > /dev/null
     tailscale_installed=$?
 
     if [[ $vpn =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
-      echo $vpn
+      if $verbose; then
+        vpn_label=$(get_tmux_option "@dracula-network-vpn-label" "󰌘 ")
+        echo "$vpn_label$vpn"
+      else
+        vpn_label=$(get_tmux_option "@dracula-network-vpn-label" "VPN-ON")
+        echo "$vpn_label"
+      fi
     elif [ $tailscale_installed ]; then
       # if tailscale is installed
       #