From 65b88e8c55906db3a20029eb56e46fd5f302618d Mon Sep 17 00:00:00 2001
From: soraefir <soraefir+git@helcel>
Date: Sun, 14 Jun 2026 11:30:36 +0200
Subject: [PATCH] More cleaning

---
 modules/home/gui/theme/default.nix                   | 2 +-
 modules/home/wayland/apps/eww/bar/scripts/media      | 2 ++
 modules/home/wayland/apps/eww/bar/windows/radio.yuck | 6 +++---
 modules/home/wayland/apps/eww/default.nix            | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 modules/home/wayland/apps/eww/bar/scripts/media

diff --git a/modules/home/gui/theme/default.nix b/modules/home/gui/theme/default.nix
index 57ff645..4df364d 100755
--- a/modules/home/gui/theme/default.nix
+++ b/modules/home/gui/theme/default.nix
@@ -46,7 +46,7 @@ in {
           print "img:" $0 ":text:" image_file;
       }')
 
-      IMG=$WPDIR/$(echo "$RES" | wofi --dmenu --allow-images show-icons true -theme-str '#window { width: 50%; }' -p "Choose wallpaper:")
+      IMG=$WPDIR/$(echo "$RES" | ${pkgs.wofi}/bin/wofi --dmenu --allow-images show-icons true -theme-str '#window { width: 50%; }' -p "Choose wallpaper:")
       IMG=$(echo "$IMG" | awk -F ':' '{print $2}')
       ${pkgs.awww}/bin/awww img $IMG
     '';
diff --git a/modules/home/wayland/apps/eww/bar/scripts/media b/modules/home/wayland/apps/eww/bar/scripts/media
new file mode 100644
index 0000000..e86b587
--- /dev/null
+++ b/modules/home/wayland/apps/eww/bar/scripts/media
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+playerctl "$@"
diff --git a/modules/home/wayland/apps/eww/bar/windows/radio.yuck b/modules/home/wayland/apps/eww/bar/windows/radio.yuck
index 590fba3..8b692d3 100644
--- a/modules/home/wayland/apps/eww/bar/windows/radio.yuck
+++ b/modules/home/wayland/apps/eww/bar/windows/radio.yuck
@@ -40,13 +40,13 @@
         :orientation "v" :space-evenly false :class "radio-controls"
         (box :orientation "h" :space-evenly true :halign "center"
           (button :visible {radio.is_paused == 1 && radio.media.status != "Stopped"}
-            :class "radio-ctrl-btn" :timeout "2s" :onclick "playerctl previous"
+            :class "radio-ctrl-btn" :timeout "2s" :onclick "scripts/media previous"
             (label :text "󰒮"))
           (button :class "radio-ctrl-btn" :timeout "2s"
-            :onclick {radio.is_paused == 1 && radio.media.status != "Stopped" ? "playerctl play-pause" : "scripts/radio toggle"}
+            :onclick {radio.is_paused == 1 && radio.media.status != "Stopped" ? "scripts/media play-pause" : "scripts/radio toggle"}
             (label :text {radio.is_paused == 0 ? "󰏥" : (radio.media.status == "Playing" ? "󰏥" : "󰐌")}))
           (button :visible {radio.is_paused == 1 && radio.media.status != "Stopped"}
-            :class "radio-ctrl-btn" :timeout "2s" :onclick "playerctl next"
+            :class "radio-ctrl-btn" :timeout "2s" :onclick "scripts/media next"
             (label :text "󰒭")))
         (vol-row
           :icon "󰕾"
diff --git a/modules/home/wayland/apps/eww/default.nix b/modules/home/wayland/apps/eww/default.nix
index 22347ab..1028e31 100755
--- a/modules/home/wayland/apps/eww/default.nix
+++ b/modules/home/wayland/apps/eww/default.nix
@@ -27,6 +27,7 @@ let
     "scripts/power-save"   = mkScript "power-save"   ./bar/scripts/power-save   [ pkgs.eww ];
     "scripts/radio"        = mkScript "radio"        ./bar/scripts/radio        [ pkgs.eww pkgs.jq pkgs.curl pkgs.mpv pkgs.playerctl ];
     "scripts/color-pick"   = mkScript "color-pick"   ./bar/scripts/color-pick   [ pkgs.eww pkgs.hyprpicker ];
+    "scripts/media"        = mkScript "media"        ./bar/scripts/media        [ pkgs.playerctl ];
     "scripts/lock"         = mkScript "lock"         ./bar/scripts/lock         [ pkgs.eww pkgs.swaylock-effects ];
     "scripts/screenshot"   = mkScript "screenshot"   ./bar/scripts/screenshot   [ pkgs.eww pkgs.hyprshot pkgs.satty pkgs.wl-clipboard ];
     "scripts/sys/gpu"      = mkScript "gpu"          ./bar/scripts/sys/gpu      [ pkgs.custom.amdgpu_top pkgs.jq ];