diff --git a/Droidnix/README.html b/Droidnix/README.html index d1a5d85e7..003254299 100644 --- a/Droidnix/README.html +++ b/Droidnix/README.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Droidnix: A Dendritic NixOS + Home Manager Configuration NixOS Configuration Structure @@ -204,129 +204,129 @@

Table of Contents

-
-

Shortcuts

-
+
+

Shortcuts

+

Introduction The Assets Folder @@ -342,25 +342,25 @@

Introduction   intro

-
-

What is Droidnix

-
+
+

What is Droidnix

+

Droidnix is a modular, declarative NixOS + Home Manager configuration system. with configurations managed via Emacs Org and Nix Flakes. The project is designed for reproducibility, maintainability, and cross-machine compatibility.

-
-

Installed components:

-
+
+

Installed components:

+
    -
  • Core
  • -
  • Hyprland
  • +
  • Core
  • +
  • Hyprland
-
-

Goals, project Structure, import hierarchy

-
+
+

Goals, project Structure, import hierarchy

+

This project uses a modular NixOS configuration with Hyprland support, designed for literate programming and cross-device reusability. The Droidnix repository is organized into two main parts: @@ -373,9 +373,9 @@ The Droidnix repository is organized into two main parts:

-
-

Root Level

-
+
+

Root Level

+
  • flake.nix is the entry point and imports:
      @@ -386,16 +386,16 @@ The Droidnix repository is organized into two main parts:
-
-

Generated Structure

-
+
+

Generated Structure

+

The generated/ directory contains all generated configurations, divided into three main groups: system, hyprland, and mangowc.

-
-

First Setup

-
+
+

First Setup

+
  1. Clone this repository.
  2. Run the setup script: ./setup_droid.
  3. @@ -416,9 +416,9 @@ The generated/ directory contains all generated configurations, div The .assets/ folder contains all static files, such as configs, scripts, and themes. These files are not generated and can be edited directly.

-
-

generated/assets/2_b_installed.conf

-
+
+

generated/assets/2_b_installed.conf

+

This is a list of additional apps to install

@@ -496,9 +496,9 @@ com.todoist.Todoist This section contains the Org blocks for tangling Nix code into the generated folders.

-
-

generated/flake.nix

-
+
+

generated/flake.nix

+

The Nix flake definition for Droidnix.

@@ -572,9 +572,9 @@ The Nix flake definition for Droidnix.
-
-

generated/modules/traveldroid/system/Colors.nix

-
+
+

generated/modules/traveldroid/system/Colors.nix

+

Setting the colors for Droidnix.

@@ -658,9 +658,9 @@ in
-
-

generated/hosts/traveldroid/boot.nix

-
+
+

generated/hosts/traveldroid/boot.nix

+
{ config, pkgs, lib, flakeRoot, ... }:
 
@@ -706,9 +706,9 @@ in
 
-
-

generated/hosts/traveldroid/hardware-configuration.nix

-
+
+

generated/hosts/traveldroid/hardware-configuration.nix

+
  1. Boot into NixOS Live ISO or your installed system.
  2. Open a terminal.
  3. @@ -766,9 +766,9 @@ in
-
-

generated/hosts/traveldroid/host.nix

-
+
+

generated/hosts/traveldroid/host.nix

+
{ lib, config, pkgs, flakeRoot, import-tree, home-manager, ... }:
 
@@ -827,13 +827,13 @@ in
 
-
-

generated/traveldroid/modules/apps

-
+
+

generated/traveldroid/modules/apps

+
-
-

generated/modules/traveldroid/apps/2_b_installed.nix

-
+
+

generated/modules/traveldroid/apps/2_b_installed.nix

+

This installs a list of apps

@@ -941,9 +941,9 @@ in {
-
-

generated/modules/traveldroid/apps/emacs/emacs.nix

-
+
+

generated/modules/traveldroid/apps/emacs/emacs.nix

+

This installs emacs

@@ -1039,9 +1039,9 @@ in
-
-

generated/modules/traveldroid/apps/flameshot.nix

-
+
+

generated/modules/traveldroid/apps/flameshot.nix

+

This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder

@@ -1080,9 +1080,9 @@ in
-
-

generated/modules/traveldroid/apps/kitty.nix

-
+
+

generated/modules/traveldroid/apps/kitty.nix

+

This file sets up Kitty terminal

@@ -1140,9 +1140,9 @@ in
-
-

generated/modules/traveldroid/apps/starship.nix

-
+
+

generated/modules/traveldroid/apps/starship.nix

+

This file sets up starship prompt

@@ -1181,9 +1181,9 @@ in
-
-

generated/modules/traveldroid/apps/thunar.nix

-
+
+

generated/modules/traveldroid/apps/thunar.nix

+

This is top file of this level which contains just an import statement for all relevant files and/or the subfolder in this folder

@@ -1224,9 +1224,9 @@ in
-
-

generated/modules/traveldroid/apps/wofi.nix

-
+
+

generated/modules/traveldroid/apps/wofi.nix

+

This is the install for Wofi, the launcher

@@ -1259,9 +1259,9 @@ in
-
-

generated/modules/traveldroid/apps/zenbrowser.nix

-
+
+

generated/modules/traveldroid/apps/zenbrowser.nix

+

This installs zen browser

@@ -1281,9 +1281,9 @@ in
-
-

generated/modules/traveldroid/apps/zsh.nix

-
+
+

generated/modules/traveldroid/apps/zsh.nix

+

This sets up the zsh in the terminal

@@ -1346,13 +1346,13 @@ in
-
-

generated/modules/traveldroid/desktop

-
+
+

generated/modules/traveldroid/desktop

+
-
-

generated/modules/traveldroid/desktop/fonts.nix

-
+
+

generated/modules/traveldroid/desktop/fonts.nix

+

This file installs and configures fonts

@@ -1370,9 +1370,9 @@ This file installs and configures fonts
-
-

generated/modules/traveldroid/desktop/gtk.nix

-
+
+

generated/modules/traveldroid/desktop/gtk.nix

+

Setting up GTK

@@ -1398,9 +1398,9 @@ in
-
-

generated/modules/traveldroid/desktop/hyprland.nix

-
+
+

generated/modules/traveldroid/desktop/hyprland.nix

+

Setting up Hyprland

@@ -1446,9 +1446,9 @@ in
-
-

generated/modules/traveldroid/desktop/stylix.nix

-
+
+

generated/modules/traveldroid/desktop/stylix.nix

+
{ lib, config, pkgs, flakeRoot, stylix, ... }:
 
@@ -1535,9 +1535,9 @@ in
 
-
-

generated/modules/traveldroid/desktop/wallpaper.nix

-
+
+

generated/modules/traveldroid/desktop/wallpaper.nix

+

Setting up wallpaper engine + wallpaper gui

@@ -1636,9 +1636,9 @@ in
-
-

generated/modules/traveldroid/desktop/waybar.nix

-
+
+

generated/modules/traveldroid/desktop/waybar.nix

+

This file installs and configures waybar

@@ -1705,9 +1705,9 @@ in
-
-

generated/modules/traveldroid/desktop/wayland.nix

-
+
+

generated/modules/traveldroid/desktop/wayland.nix

+
{ lib, config, pkgs, ... }:
 
@@ -1737,9 +1737,9 @@ in
 
-
-

generated/modules/traveldroid/desktop/xdg.nix

-
+
+

generated/modules/traveldroid/desktop/xdg.nix

+

This sets the XDG implementation

@@ -1793,13 +1793,13 @@ in
-
-

generated/modules/traveldroid/system

-
+
+

generated/modules/traveldroid/system

+
-
-

generated/modules/traveldroid/system/audio.nix

-
+
+

generated/modules/traveldroid/system/audio.nix

+
{ lib, config, pkgs, ... }:
 
@@ -1818,9 +1818,9 @@ in
 
-
-

generated/modules/traveldroid/system/bluetooth.nix

-
+
+

generated/modules/traveldroid/system/bluetooth.nix

+
{ lib, config, pkgs, home-manager, ... }:
 
@@ -1841,9 +1841,9 @@ in
 
-
-

generated/modules/traveldroid/system/copy_scripts.nix

-
+
+

generated/modules/traveldroid/system/copy_scripts.nix

+
{ lib, config, pkgs, flakeRoot, ... }:
 let
@@ -1881,9 +1881,9 @@ in
 
-
-

generated/modules/traveldroid/system/dbus.nix

-
+
+

generated/modules/traveldroid/system/dbus.nix

+

This sets the dbus implementation

@@ -1910,9 +1910,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/gnome-keyring.nix

-
+
+

generated/modules/traveldroid/system/gnome-keyring.nix

+

This sets the dbus implementation

@@ -1960,9 +1960,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/login-tuigreet.nix

-
+
+

generated/modules/traveldroid/system/login-tuigreet.nix

+

This sets up tuigreeter which is not fancy but imo fits the aesthetic I am aiming for

@@ -2016,9 +2016,9 @@ in
-
-

generated/modules/traveldroid/system/networking.nix

-
+
+

generated/modules/traveldroid/system/networking.nix

+

This sets the networking.

@@ -2083,9 +2083,9 @@ This sets the networking.
-
-

generated/modules/traveldroid/system/nix.nix

-
+
+

generated/modules/traveldroid/system/nix.nix

+
{ lib, config, ... }:
 
@@ -2101,9 +2101,9 @@ This sets the networking.
 
-
-

generated/modules/traveldroid/system/printing.nix

-
+
+

generated/modules/traveldroid/system/printing.nix

+

This sets the dbus implementation

@@ -2127,9 +2127,9 @@ This sets the dbus implementation
-
-

generated/modules/traveldroid/system/quickshell.nix

-
+
+

generated/modules/traveldroid/system/quickshell.nix

+

This sets the dbus implementation

@@ -2182,13 +2182,13 @@ in
-
-

generated/users

-
+
+

generated/users

+
-
-

generated/users/

-
+
+

generated/users/

+

This is the default user, just search and replace henrov another name if you want to change

@@ -2250,9 +2250,9 @@ in

These are all the prepared config files

-
-

generated/.config/emacs/early-init.el

-
+
+

generated/.config/emacs/early-init.el

+

This contaions emacs

@@ -2353,9 +2353,9 @@ package-archive-priorities '(("gnu" . 99)
-
-

generated/.config/emacs/init.el

-
+
+

generated/.config/emacs/init.el

+

This contaions emacs

@@ -2765,9 +2765,9 @@ the top of the file."
-
-

generated/.config/hypr/animations.conf

-
+
+

generated/.config/hypr/animations.conf

+

These are config files for .config/hypr

@@ -2788,9 +2788,9 @@ animations {
-
-

generated/.config/hypr/behaviour.conf

-
+
+

generated/.config/hypr/behaviour.conf

+

These are config files for .config/hypr

@@ -2804,9 +2804,9 @@ These are config files for .config/hypr
-
-

generated/.config/hypr/bindings.conf

-
+
+

generated/.config/hypr/bindings.conf

+

These are config files for .config/hypr

@@ -2970,9 +2970,9 @@ bind = $mainMod, U, exec, kitty -e bash -lc "$HOME/.config/scripts/update.sh"
-
-

generated/.config/hypr/exec-once.conf

-
+
+

generated/.config/hypr/exec-once.conf

+

These are config files for .config/hypr

@@ -2992,9 +2992,9 @@ exec-once = ~/.config/scripts/hypr-autocolwidth.sh
-
-

generated/.config/hypr/hypridle.conf

-
+
+

generated/.config/hypr/hypridle.conf

+

These are config files for .config/hypr

@@ -3019,9 +3019,9 @@ listener {
-
-

generated/.config/hypr/hyprland.conf

-
+
+

generated/.config/hypr/hyprland.conf

+

These are config files for .config/hypr

@@ -3067,9 +3067,9 @@ misc {
-
-

generated/.config/hypr/hyprlock.conf

-
+
+

generated/.config/hypr/hyprlock.conf

+

These are config files for .config/hypr

@@ -3110,9 +3110,9 @@ label {
-
-

generated/.config/hypr/layer-rules.conf

-
+
+

generated/.config/hypr/layer-rules.conf

+

These are config files for .config/hypr

@@ -3127,9 +3127,9 @@ layerrule = blur on, ignore_alpha 1, match:namespace swaync-notification-window
-
-

generated/.config/hypr/layout.conf

-
+
+

generated/.config/hypr/layout.conf

+

These are config files for .config/hypr

@@ -3144,9 +3144,9 @@ scrolling {
-
-

generated/.config/hypr/monitor-rules.conf

-
+
+

generated/.config/hypr/monitor-rules.conf

+

These are config files for .config/hypr

@@ -3157,9 +3157,9 @@ monitor=DP-1,3840x1080@144,1920x0,1
-
-

generated/.config/hypr/theming.conf

-
+
+

generated/.config/hypr/theming.conf

+

These are config files for .config/hypr

@@ -3209,9 +3209,9 @@ decoration {
-
-

generated/.config/hypr/window-rules.conf

-
+
+

generated/.config/hypr/window-rules.conf

+

These are config files for .config/hypr

@@ -3268,9 +3268,9 @@ windowrule {
-
-

generated/.config/hypr/workspace-rules.conf

-
+
+

generated/.config/hypr/workspace-rules.conf

+

These are config files for .config/hypr

@@ -3295,9 +3295,9 @@ workspace = 10
-
-

generated/.config/quickshell/media/shell.qml

-
+
+

generated/.config/quickshell/media/shell.qml

+

offers a adio widget

@@ -3605,9 +3605,9 @@ ShellRoot {
-
-

generated/.config/quickshell/powermenu/shell.qml

-
+
+

generated/.config/quickshell/powermenu/shell.qml

+

Provides a powermenu

@@ -3751,23 +3751,31 @@ ShellRoot {
-
-

generated/.config/scripts/media.sh

-
+
+

generated/.config/scripts/media.sh

+

Providing an media

-
player=$(playerctl -l 2>/dev/null | head -n1)
+
# Player selection — prefer actively playing player
+player=$(playerctl -l 2>/dev/null | while read -r p; do
+    st=$(playerctl --player="$p" status 2>/dev/null)
+    [ "$st" = "Playing" ] && echo "$p" && break
+done)
+[ -z "$player" ] && player=$(playerctl -l 2>/dev/null | head -n1)
+
 if [ -z "$player" ]; then
     jq -c -n '{text: "", tooltip: "", class: "inactive"}'
     exit 0
 fi
+
 status=$(playerctl --player="$player" status 2>/dev/null)
 if [ "$status" != "Playing" ] && [ "$status" != "Paused" ]; then
     jq -c -n '{text: "", tooltip: "", class: "inactive"}'
     exit 0
 fi
+
 artist=$(playerctl --player="$player" metadata artist 2>/dev/null)
 title=$(playerctl --player="$player" metadata title 2>/dev/null)
 album=$(playerctl --player="$player" metadata album 2>/dev/null)
@@ -3777,7 +3785,6 @@ position=$(playerctl --player="$player" position 2>/dev/null)
 
 # Progress percentage — pure bash, no bc needed
 if [ -n "$length" ] && [ -n "$position" ] && [ "$length" -gt 0 ] 2>/dev/null; then
-    # position is in seconds (float), length is in microseconds
     pos_us=$(echo "$position" | awk '{printf "%d", $1 * 1000000}')
     progress=$(( pos_us * 100 / length ))
 else
@@ -3790,12 +3797,6 @@ if [[ "$player" == *"spotify"* ]]; then
     device=$(playerctl --player="$player" metadata xesam:url 2>/dev/null | grep -o 'device=[^&]*' | cut -d= -f2)
 fi
 
-# Ticker text — truncate if long
-text="${artist} — ${title}"
-if [ ${#text} -gt 40 ]; then
-    text="${text:0:37}..."
-fi
-
 # Icon
 if [ "$status" = "Paused" ]; then
     icon="⏸ "
@@ -3803,6 +3804,34 @@ else
     icon="▶ "
 fi
 
+# Scrolling ticker
+CACHE_FILE="/tmp/waybar_media_scroll_${player//\//_}"
+full_text="${artist} — ${title}"
+text_len=${#full_text}
+display_len=30
+
+# Reset scroll offset when track changes
+TRACK_FILE="/tmp/waybar_media_track_${player//\//_}"
+last_track=""
+[ -f "$TRACK_FILE" ] && last_track=$(cat "$TRACK_FILE")
+if [ "$full_text" != "$last_track" ]; then
+    echo "0" > "$CACHE_FILE"
+    echo "$full_text" > "$TRACK_FILE"
+fi
+
+if [ "$text_len" -le "$display_len" ]; then
+    text="$full_text"
+else
+    offset=0
+    [ -f "$CACHE_FILE" ] && offset=$(cat "$CACHE_FILE")
+
+    padded="${full_text}    ${full_text}"
+    text="${padded:$offset:$display_len}"
+
+    next_offset=$(( (offset + 1) % (text_len + 4) ))
+    echo "$next_offset" > "$CACHE_FILE"
+fi
+
 # Build tooltip
 tooltip="${artist}\n${title}\n${album}"
 if [ -n "$device" ]; then
@@ -3820,9 +3849,9 @@ jq -c -n \
 
-
-

generated/.config/scripts/layout-selector.sh

-
+
+

generated/.config/scripts/layout-selector.sh

+

Choose your layout

@@ -3864,9 +3893,9 @@ hyprctl dispatch oSD "Layout: $LAYOUT_NAME" 2000
-
-

generated/.config/scripts/hypr-autocolwidth.sh

-
+
+

generated/.config/scripts/hypr-autocolwidth.sh

+

These are config files for .config/scripts

@@ -3920,9 +3949,9 @@ done
-
-

generated/.config/scripts/power.sh

-
+
+

generated/.config/scripts/power.sh

+

A file containing color variables

@@ -3978,9 +4007,9 @@ main
-
-

generated/.config/scripts/update.sh

-
+
+

generated/.config/scripts/update.sh

+

A file containing color variables

@@ -3999,9 +4028,9 @@ flatpak update -y
-
-

generated/.config/shared/Colors.css

-
+
+

generated/.config/shared/Colors.css

+

A file containing color variables

@@ -4041,9 +4070,9 @@ A file containing color variables
-
-

generated/.config/starship.toml

-
+
+

generated/.config/starship.toml

+

These are config files for Starship

@@ -4331,9 +4360,9 @@ crust = "#181926"
-
-

generated/.config/stylix/stylix.conf

-
+
+

generated/.config/stylix/stylix.conf

+

These are config files for .config/stylix

@@ -4370,9 +4399,9 @@ icons = {
-
-

generated/.config/stylix/palette.json

-
+
+

generated/.config/stylix/palette.json

+

These are config files for .config/stylix

@@ -4402,9 +4431,9 @@ These are config files for .config/stylix
-
-

generated/.config/stylix/palette.html

-
+
+

generated/.config/stylix/palette.html

+

These are config files for .config/stylix

@@ -4482,9 +4511,9 @@ These are config files for .config/stylix
-
-

generated/.config/waybar/config

-
+
+

generated/.config/waybar/config

+

These are config files for waybar

@@ -4604,7 +4633,7 @@ These are config files for waybar "custom/media": { "exec": "~/.config/scripts/media.sh", "interval": 2, - "return-type": "json","return-type": "json", + "return-type": "json", "on-click": "qs -c media", "max-length": 40, "scroll-step": 1, @@ -4749,9 +4778,9 @@ These are config files for waybar
-
-

generated/.config/waybar/style-dark.css

-
+
+

generated/.config/waybar/style-dark.css

+

This file contains all css for waybar

@@ -4976,9 +5005,9 @@ label#custom-media.module {
-
-

generated/.config/scripts/bluetooth-status.sh

-
+
+

generated/.config/scripts/bluetooth-status.sh

+

These are config files for waybar

@@ -5003,9 +5032,9 @@ printf '{"text": "%s", "tooltip": "%s"}\n' "$icon" "$tooltip"
-
-

generated/.config/scripts/hypr-workspaces.sh

-
+
+

generated/.config/scripts/hypr-workspaces.sh

+

These are config files for waybar

@@ -5047,9 +5076,9 @@ jq -c -n \
-
-

generated/.config/scripts/hypr-workspacesmenu.sh

-
+
+

generated/.config/scripts/hypr-workspacesmenu.sh

+

These are config files for waybar

@@ -5065,9 +5094,9 @@ hyprctl dispatch focuswindow address:$addr
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for waypaper

@@ -5104,9 +5133,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/waypaper/config.ini

-
+
+

generated/.config/waypaper/config.ini

+

These are config files for .config/waypaper

@@ -5142,9 +5171,9 @@ keybindings = ~/.config/waypaper/keybindings.ini
-
-

generated/.config/wofi/config

-
+
+

generated/.config/wofi/config

+

These are config files for .config/wofi

@@ -5193,9 +5222,9 @@ prompt = > ...
-
-

generated/.config/wofi/style.css

-
+
+

generated/.config/wofi/style.css

+

These are config files for .config/wofi

@@ -5290,9 +5319,9 @@ These are config files for .config/wofi
-
-

generated/.config/zed/settings.json

-
+
+

generated/.config/zed/settings.json

+

These are config files for Zed editor

@@ -5328,9 +5357,9 @@ These are config files for Zed editor
-
-

generated/.config/zsh/.zshrc

-
+
+

generated/.config/zsh/.zshrc

+

This sets up the zsh in the terminal

@@ -5355,7 +5384,7 @@ fi

Author: Henro Veijer

-

Created: 2026-04-13 ma 10:32

+

Created: 2026-04-13 ma 10:38

Validate

diff --git a/Droidnix/README.org b/Droidnix/README.org index 81f69462f..645a1e63c 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -3109,16 +3109,24 @@ ShellRoot { ** =generated/.config/scripts/media.sh= Providing an media #+BEGIN_SRC sh :tangle generated/.config/scripts/media.sh :shebang "#!/usr/bin/env bash" :noweb yes :mkdirp yes :eval never -player=$(playerctl -l 2>/dev/null | head -n1) +# Player selection — prefer actively playing player +player=$(playerctl -l 2>/dev/null | while read -r p; do + st=$(playerctl --player="$p" status 2>/dev/null) + [ "$st" = "Playing" ] && echo "$p" && break +done) +[ -z "$player" ] && player=$(playerctl -l 2>/dev/null | head -n1) + if [ -z "$player" ]; then jq -c -n '{text: "", tooltip: "", class: "inactive"}' exit 0 fi + status=$(playerctl --player="$player" status 2>/dev/null) if [ "$status" != "Playing" ] && [ "$status" != "Paused" ]; then jq -c -n '{text: "", tooltip: "", class: "inactive"}' exit 0 fi + artist=$(playerctl --player="$player" metadata artist 2>/dev/null) title=$(playerctl --player="$player" metadata title 2>/dev/null) album=$(playerctl --player="$player" metadata album 2>/dev/null) @@ -3128,7 +3136,6 @@ position=$(playerctl --player="$player" position 2>/dev/null) # Progress percentage — pure bash, no bc needed if [ -n "$length" ] && [ -n "$position" ] && [ "$length" -gt 0 ] 2>/dev/null; then - # position is in seconds (float), length is in microseconds pos_us=$(echo "$position" | awk '{printf "%d", $1 * 1000000}') progress=$(( pos_us * 100 / length )) else @@ -3141,12 +3148,6 @@ if [[ "$player" == *"spotify"* ]]; then device=$(playerctl --player="$player" metadata xesam:url 2>/dev/null | grep -o 'device=[^&]*' | cut -d= -f2) fi -# Ticker text — truncate if long -text="${artist} — ${title}" -if [ ${#text} -gt 40 ]; then - text="${text:0:37}..." -fi - # Icon if [ "$status" = "Paused" ]; then icon="⏸ " @@ -3154,6 +3155,34 @@ else icon="▶ " fi +# Scrolling ticker +CACHE_FILE="/tmp/waybar_media_scroll_${player//\//_}" +full_text="${artist} — ${title}" +text_len=${#full_text} +display_len=30 + +# Reset scroll offset when track changes +TRACK_FILE="/tmp/waybar_media_track_${player//\//_}" +last_track="" +[ -f "$TRACK_FILE" ] && last_track=$(cat "$TRACK_FILE") +if [ "$full_text" != "$last_track" ]; then + echo "0" > "$CACHE_FILE" + echo "$full_text" > "$TRACK_FILE" +fi + +if [ "$text_len" -le "$display_len" ]; then + text="$full_text" +else + offset=0 + [ -f "$CACHE_FILE" ] && offset=$(cat "$CACHE_FILE") + + padded="${full_text} ${full_text}" + text="${padded:$offset:$display_len}" + + next_offset=$(( (offset + 1) % (text_len + 4) )) + echo "$next_offset" > "$CACHE_FILE" +fi + # Build tooltip tooltip="${artist}\n${title}\n${album}" if [ -n "$device" ]; then @@ -3897,7 +3926,7 @@ These are config files for waybar "custom/media": { "exec": "~/.config/scripts/media.sh", "interval": 2, - "return-type": "json","return-type": "json", + "return-type": "json", "on-click": "qs -c media", "max-length": 40, "scroll-step": 1, diff --git a/Droidnix/generated/.config/scripts/media.sh b/Droidnix/generated/.config/scripts/media.sh index 5e810b2b0..fff9f3edc 100755 --- a/Droidnix/generated/.config/scripts/media.sh +++ b/Droidnix/generated/.config/scripts/media.sh @@ -1,15 +1,23 @@ #!/usr/bin/env bash # --- This file has been auto-generated. For permanent changes alter the appropriate block in the README.org. --- -player=$(playerctl -l 2>/dev/null | head -n1) +# Player selection — prefer actively playing player +player=$(playerctl -l 2>/dev/null | while read -r p; do + st=$(playerctl --player="$p" status 2>/dev/null) + [ "$st" = "Playing" ] && echo "$p" && break +done) +[ -z "$player" ] && player=$(playerctl -l 2>/dev/null | head -n1) + if [ -z "$player" ]; then jq -c -n '{text: "", tooltip: "", class: "inactive"}' exit 0 fi + status=$(playerctl --player="$player" status 2>/dev/null) if [ "$status" != "Playing" ] && [ "$status" != "Paused" ]; then jq -c -n '{text: "", tooltip: "", class: "inactive"}' exit 0 fi + artist=$(playerctl --player="$player" metadata artist 2>/dev/null) title=$(playerctl --player="$player" metadata title 2>/dev/null) album=$(playerctl --player="$player" metadata album 2>/dev/null) @@ -19,7 +27,6 @@ position=$(playerctl --player="$player" position 2>/dev/null) # Progress percentage — pure bash, no bc needed if [ -n "$length" ] && [ -n "$position" ] && [ "$length" -gt 0 ] 2>/dev/null; then - # position is in seconds (float), length is in microseconds pos_us=$(echo "$position" | awk '{printf "%d", $1 * 1000000}') progress=$(( pos_us * 100 / length )) else @@ -32,12 +39,6 @@ if [[ "$player" == *"spotify"* ]]; then device=$(playerctl --player="$player" metadata xesam:url 2>/dev/null | grep -o 'device=[^&]*' | cut -d= -f2) fi -# Ticker text — truncate if long -text="${artist} — ${title}" -if [ ${#text} -gt 40 ]; then - text="${text:0:37}..." -fi - # Icon if [ "$status" = "Paused" ]; then icon="⏸ " @@ -45,6 +46,34 @@ else icon="▶ " fi +# Scrolling ticker +CACHE_FILE="/tmp/waybar_media_scroll_${player//\//_}" +full_text="${artist} — ${title}" +text_len=${#full_text} +display_len=30 + +# Reset scroll offset when track changes +TRACK_FILE="/tmp/waybar_media_track_${player//\//_}" +last_track="" +[ -f "$TRACK_FILE" ] && last_track=$(cat "$TRACK_FILE") +if [ "$full_text" != "$last_track" ]; then + echo "0" > "$CACHE_FILE" + echo "$full_text" > "$TRACK_FILE" +fi + +if [ "$text_len" -le "$display_len" ]; then + text="$full_text" +else + offset=0 + [ -f "$CACHE_FILE" ] && offset=$(cat "$CACHE_FILE") + + padded="${full_text} ${full_text}" + text="${padded:$offset:$display_len}" + + next_offset=$(( (offset + 1) % (text_len + 4) )) + echo "$next_offset" > "$CACHE_FILE" +fi + # Build tooltip tooltip="${artist}\n${title}\n${album}" if [ -n "$device" ]; then diff --git a/Droidnix/generated/.config/waybar/config b/Droidnix/generated/.config/waybar/config index e82748ba6..04be5322e 100644 --- a/Droidnix/generated/.config/waybar/config +++ b/Droidnix/generated/.config/waybar/config @@ -113,7 +113,7 @@ "custom/media": { "exec": "~/.config/scripts/media.sh", "interval": 2, - "return-type": "json","return-type": "json", + "return-type": "json", "on-click": "qs -c media", "max-length": 40, "scroll-step": 1,