Merge branch 'master' into spr

Author: iberniex

docs/CONFIG.md

@@ -22,6 +22,7 @@
   - [Kerberos TGT (krbtgt)](#Kerberos-TGT---up)
   - [kubernetes-context](#kubernetes-context---up)
   - [libreview](#libreview---up)
+  - [mac-player](#mac-player---up)
   - [mpc](#mpc---up)
   - [network](#network---up)
   - [network-bandwidth](#network-bandwidth---up)
@@ -379,6 +380,12 @@ Show remote tracking branch together with diverge/sync state
 set -g @dracula-git-show-remote-status true
 ```
 
+Show the current repository name in the status bar
+```bash
+# default is false
+set -g @dracula-git-show-repo-name true
+```
+
 ### gpu-info - [up](#table-of-contents)
 
 These widgets display the current computational, ram, and power usage of installed graphics cards.
@@ -510,6 +517,68 @@ set -g @dracula-kubernetes-eks-extract-account true
 This script retrieves and displays continuous glucose monitoring (CGM) data from the LibreView API.
 It caches the data to minimize API requests and displays the latest glucose level along with a trend indicator in a Tmux status bar.
 
+
+### mac-player - [up](#table-of-contents)
+
+This widget and script displays music information provided by the native macOS players.
+
+The current supported apps are:
+
+- Native Players:
+  - Spotify
+  - Music - Apple Music
+- Browser Players (active tab must match one of these URLs and requires Google Chrome or Safari):
+  - youtube.com/watch
+  - open.spotify.com
+
+It also has a remote-player feature.
+The supported remote players are:
+
+- Spotify
+- Music - Apple Music
+
+NOTE: `set -g @dracula-refresh-rate 5` affects this widget
+
+To change player icons:
+
+```bash
+set -g @dracula-mac-player-play-icon "♪ "
+set -g @dracula-mac-player-pause-icon "❚❚ "
+
+```
+
+To change length of the widget (length 25 by default):
+
+```bash
+set -g @dracula-mac-player-length 25
+```
+
+To activate the remote:
+
+```bash
+set -g @dracula-mac-player-remote true
+```
+
+To specify the app to use(`"Music"` or `"Spotify"`):
+
+```bash
+set -g @dracula-mac-player-app "Music"
+```
+
+The default keybinds are:
+
+- `<prefix> + P` - Play/Pause
+- `<prefix> + R` - Back to position 0/previous track
+- `<prefix> + N` - Next track
+
+To change the keybinds:
+
+```bash
+set -g @dracula-mac-player-remote-play-pause "P"
+set -g @dracula-mac-player-remote-back "R"
+set -g @dracula-mac-player-remote-next "N"
+```
+
 ### mpc - [up](#table-of-contents)
 
 This widget displays music information provided by mpc.
@@ -594,6 +663,7 @@ This widget tries to display whether a vpn is connected.
 Tailscale exit nodes are fully supported for Linux and MacOS.
 
 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
 ```
@@ -645,6 +715,7 @@ To limit the maximum length (0 means unlimited length):
 set -g @dracula-spotify-tui-max-len 30
 ```
 
+
 `set remote-g @dracula-refresh-rate 5` affects this widget
 
 ### spr - [up](#table-of-contents)
@@ -684,6 +755,9 @@ set -g @dracula-spr-remote-back "R"
 set -g @dracula-spr-remote-next "N"
 ```
 
+`set -g @dracula-refresh-rate 5` affects this widget
+
+
 ### ssh-session - [up](#table-of-contents)
 
 This widget displays the current username@host combination, both of the local machine as well as when connected via ssh.

scripts/dracula.sh

@@ -56,6 +56,7 @@ main() {
   green="#50fa7b"
   orange="#ffb86c"
   red="#ff5555"
+  purple="#b166cc"
   pink="#ff79c6"
   yellow="#f1fa8c"
 
@@ -268,6 +269,11 @@ main() {
       IFS=' ' read -r -a colors <<<$(get_tmux_option "@dracula-attached-clients-colors" "cyan dark_gray")
       script="#($current_dir/attached_clients.sh)"
 
+
+     elif [ $plugin = "mac-player" ]; then
+      IFS=' ' read -r -a colors  <<< $(get_tmux_option "@dracula-mac-player-colors" "purple dark_gray")
+      script="#($current_dir/mac-player.sh)"
+
     elif [ $plugin = "mpc" ]; then
       IFS=' ' read -r -a colors <<<$(get_tmux_option "@dracula-mpc-colors" "green dark_gray")
       script="#($current_dir/mpc.sh)"

scripts/git.sh

@@ -9,6 +9,7 @@ IFS=' ' read -r -a diff_symbol <<< $(get_tmux_option "@dracula-git-show-diff-sym
 IFS=' ' read -r -a no_repo_message <<< $(get_tmux_option "@dracula-git-no-repo-message" "")
 IFS=' ' read -r -a no_untracked_files <<< $(get_tmux_option "@dracula-git-no-untracked-files" "false")
 IFS=' ' read -r -a show_remote_status <<< $(get_tmux_option "@dracula-git-show-remote-status" "false")
+show_repo_name="$(get_tmux_option "@dracula-git-show-repo-name" "false")"
 
 # Get added, modified, updated and deleted files from git status
 getChanges()
@@ -129,36 +130,45 @@ getRemoteInfo()
     echo "$out"
 }
 
+getRepoName()
+{
+  if [ "$show_repo_name" = "true" ] && [ "$(checkForGitDir)" = "true" ]; then
+    repo="$(basename "$(git -C "$path" --no-optional-locks rev-parse --show-toplevel 2>/dev/null)")"
+    echo "$repo | "
+  fi
+}
+
 # return the final message for the status bar
 getMessage()
 {
     if [ $(checkForGitDir) == "true" ]; then
         branch="$(getBranch)"
+        repo_name="$(getRepoName)"
         output=""
 
         if [ $(checkForChanges) == "true" ]; then 
 
             changes="$(getChanges)" 
 
             if [ "${hide_status}" == "false" ]; then
-                if [ $(checkEmptySymbol $diff_symbol) == "true" ]; then
-		     output=$(echo "${changes} $branch")
+               if [ "$(checkEmptySymbol "${diff_symbol[0]}")" = "true" ]; then
+		     output="$repo_name${changes:+ ${changes}} $branch"
                 else
-		     output=$(echo "$diff_symbol ${changes} $branch")
+		     output="$repo_name${diff_symbol[0]} ${changes:+$changes }$branch"
                 fi
             else
-                if [ $(checkEmptySymbol $diff_symbol) == "true" ]; then
-		     output=$(echo "$branch")
+               if [ "$(checkEmptySymbol "${diff_symbol[0]}")" = "true" ]; then
+		     output=$(echo "$repo_name$branch")
                 else
-		     output=$(echo "$diff_symbol $branch")
+		     output=$(echo "$repo_name$diff_symbol $branch")
                 fi
             fi
 
         else
             if [ $(checkEmptySymbol $current_symbol) == "true" ]; then
-	         output=$(echo "$branch")
+	         output=$(echo "$repo_name$branch")
             else
-		 output=$(echo "$current_symbol $branch")
+		      output="$repo_name${current_symbol[0]} $branch"
             fi
         fi