home: enable playerctld

5 files changed, 14 insertions, 15 deletions

diff --git a/modules/home/desktop/components/eww/default.nix b/modules/home/desktop/components/eww/default.nix
index 226ccc0..aedacba 100644
--- a/modules/home/desktop/components/eww/default.nix
+++ b/modules/home/desktop/components/eww/default.nix
@@ -35,7 +35,7 @@ in {
                           ${pkgs.ffmpeg}/bin/ffmpeg -y -v quiet -i "$cmus_path" -c:v copy -f mjpeg ~/$OUTFILE
                       fi
                   else
-                      mpris=$(${pkgs.playerctl}/bin/playerctl --player=cmus,firefox,%any metadata mpris:artUrl)
+                      mpris=$(${pkgs.playerctl}/bin/playerctl --player=playerctld,cmus,firefox,%any metadata mpris:artUrl)
 
                       if [[ $mpris == data:image* ]]; then
                           echo $mpris | sed s/.*,//g | base64 --decode > ~/$OUTFILE
diff --git a/modules/home/desktop/components/eww/eww/panels/music.yuck b/modules/home/desktop/components/eww/eww/panels/music.yuck
index feae96a..4c4b0dd 100644
--- a/modules/home/desktop/components/eww/eww/panels/music.yuck
+++ b/modules/home/desktop/components/eww/eww/panels/music.yuck
@@ -55,19 +55,19 @@
 
                     (button :class "icon"
                         :width 36
-                        :onclick `playerctl --player=cmus,firefox,%any previous`
+                        :onclick `playerctl --player=playerctld,cmus,firefox,%any previous`
                         
                         "󰒮"
                     )
                     (button :class "icon"
-                        :onclick `playerctl --player=cmus,firefox,%any play-pause`
+                        :onclick `playerctl --player=playerctld,cmus,firefox,%any play-pause`
                         :width 36
 
                         { song.status == "Playing" ? "󰏤" : "󰐊" }
                     )
                     (button :class "icon"
                         :width 36
-                        :onclick `playerctl --player=cmus,firefox,%any next`
+                        :onclick `playerctl --player=playerctld,cmus,firefox,%any next`
 
                         "󰒭"
                     )
@@ -89,14 +89,14 @@
 )
 
 (deflisten song-cover
-    `playerctl --player=cmus,firefox,%any -F metadata title | get-album-art`
+    `playerctl --player=playerctld,cmus,firefox,%any -F metadata title | get-album-art`
 )
 
 (deflisten song
-    `playerctl --player=cmus,firefox,%any -F metadata --format='{"title": "{{title}}", "album": "{{album}}", "artist": "{{artist}}", "status": "{{status}}", "length": "{{mpris:length}}"}'`
+    `playerctl --player=playerctld,cmus,firefox,%any -F metadata --format='{"title": "{{title}}", "album": "{{album}}", "artist": "{{artist}}", "status": "{{status}}", "length": "{{mpris:length}}"}'`
 )
 
 (defpoll song-position
     :interval "0.2s"
-    `playerctl --player=cmus,firefox,%any position`
+    `playerctl --player=playerctld,cmus,firefox,%any position`
 )
diff --git a/modules/home/desktop/components/i3/default.nix b/modules/home/desktop/components/i3/default.nix
index cf9ed91..add418c 100644
--- a/modules/home/desktop/components/i3/default.nix
+++ b/modules/home/desktop/components/i3/default.nix
@@ -144,11 +144,11 @@ in {
           "XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
           "XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
   
-          "XF86AudioPlay" = "exec --no-startup-id \"playerctl --player=cmus,firefox,%any play-pause\"";
-          "XF86AudioPause" = "exec --no-startup-id \"playerctl --player=cmus,firefox,%any play-pause\"";
-          "XF86AudioStop" = "exec --no-startup-id \"playerctl --player=cmus,firefox,%any stop\"";
-          "XF86AudioNext" = "exec --no-startup-id \"playerctl --player=cmus,firefox,%any next\"";
-          "XF86AudioPrev" = "exec --no-startup-id \"playerctl --player=cmus,firefox,%any previous\"";
+          "XF86AudioPlay" = "exec --no-startup-id \"playerctl --player=playerctld,cmus,firefox,%any play-pause\"";
+          "XF86AudioPause" = "exec --no-startup-id \"playerctl --player=playerctld,cmus,firefox,%any play-pause\"";
+          "XF86AudioStop" = "exec --no-startup-id \"playerctl --player=playerctld,cmus,firefox,%any stop\"";
+          "XF86AudioNext" = "exec --no-startup-id \"playerctl --player=playerctld,cmus,firefox,%any next\"";
+          "XF86AudioPrev" = "exec --no-startup-id \"playerctl --player=playerctld,cmus,firefox,%any previous\"";
   
           # Media controller widget
           "${mod}+m" = "exec --no-startup-id eww-toggle music --arg pos=center --arg gaps=false";
diff --git a/modules/home/desktop/components/polybar/default.nix b/modules/home/desktop/components/polybar/default.nix
index d7ee363..f6b81db 100644
--- a/modules/home/desktop/components/polybar/default.nix
+++ b/modules/home/desktop/components/polybar/default.nix
@@ -89,7 +89,7 @@ in {
         "module/music" = {
           type = "custom/script";
 
-          exec = "playerctl --player=cmus,firefox,%any -F metadata --format='{{title}} - {{artist}}'";
+          exec = "playerctl --player=playerctld,cmus,firefox,%any -F metadata --format='{{title}} - {{artist}}'";
           tail = true;
 
           format = {
diff --git a/modules/nixos/apps/playerctl/default.nix b/modules/nixos/apps/playerctl/default.nix
index 9bf95d7..db4fe80 100644
--- a/modules/nixos/apps/playerctl/default.nix
+++ b/modules/nixos/apps/playerctl/default.nix
@@ -12,7 +12,6 @@ in {
       playerctl
     ];
 
-    #TODO: enable, eventually
-    services.playerctld.enable = false;
+    services.playerctld.enable = true;
   };
 }