3 files changed, 34 insertions, 26 deletions

diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 574aac8..aed3ecc 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -43,6 +43,8 @@
     ungoogled-chromium
     audacity
     speedtest-cli
+    kid3
+    feishin
   ];
 
   home.sessionVariables = {
diff --git a/modules/home-manager/hypr/binds.nix b/modules/home-manager/hypr/binds.nix
index 865ac33..00cc3ce 100644
--- a/modules/home-manager/hypr/binds.nix
+++ b/modules/home-manager/hypr/binds.nix
@@ -65,15 +65,15 @@
       ];
 
       bindl = [
-        ", XF86AudioPrev, exec, playerctl --player=spotify_player,spotify previous"
-        ", XF86AudioNext, exec, playerctl --player=spotify_player,spotify next"
-        ", XF86AudioPause, exec, playerctl --player=spotify_player,spotify play-pause"
-        ", XF86AudioPlay, exec, playerctl --player=spotify_player,spotify play-pause"
-        "$mod, XF86AudioPrev, exec, playerctl --player=spotify_player,spotify loop none"
-        "$mod, XF86AudioPause, exec, playerctl --player=spotify_player,spotify loop playlist"
-        "$mod, XF86AudioPlay, exec, playerctl --player=spotify_player,spotify loop playlist"
-        "$mod, XF86AudioNext, exec, playerctl --player=spotify_player,spotify loop track"
-        "$mod, XF86AudioStop, exec, playerctl --player=spotify_player,spotify shuffle toggle"
+        ", XF86AudioPrev, exec, playerctl --player=Feishin previous"
+        ", XF86AudioNext, exec, playerctl --player=Feishin next"
+        ", XF86AudioPause, exec, playerctl --player=Feishin play-pause"
+        ", XF86AudioPlay, exec, playerctl --player=Feishin play-pause"
+        "$mod, XF86AudioPrev, exec, playerctl --player=Feishin loop none"
+        "$mod, XF86AudioPause, exec, playerctl --player=Feishin loop playlist"
+        "$mod, XF86AudioPlay, exec, playerctl --player=Feishin loop playlist"
+        "$mod, XF86AudioNext, exec, playerctl --player=Feishin loop track"
+        "$mod, XF86AudioStop, exec, playerctl --player=Feishin shuffle toggle"
         ", XF86AudioStop, exec, playerctl -a stop"
 
         "$mod SHIFT, L, exec, hyprctl dispatch dpms toggle"
diff --git a/modules/home-manager/hypr/waybar-hyprland.nix b/modules/home-manager/hypr/waybar-hyprland.nix
index 7941170..ebbae3a 100644
--- a/modules/home-manager/hypr/waybar-hyprland.nix
+++ b/modules/home-manager/hypr/waybar-hyprland.nix
@@ -12,7 +12,7 @@
         
         modules-left = [ "hyprland/workspaces" "idle_inhibitor" ];
         modules-center = [ "hyprland/window" ];
-        modules-right = [ "custom/spotify" "pulseaudio" "battery" "clock" ];
+        modules-right = [ "custom/feishin" "pulseaudio" "battery" "clock" ];
 
         battery =  {
           interval = 60;
@@ -51,18 +51,18 @@
           };
         };
 
-        "custom/spotify" = {
+        "custom/feishin" = {
           format = "{}";
           escape = true;
-          exec-if = "pgrep spotify";
+          exec-if = "pgrep -f 'feishin'";
           interval = 1;
-          on-click = "playerctl --player=spotify_player,spotify play-pause";
-          on-click-right = "playerctl --player=spotify_player,spotify loop track";
-          on-double-click-right = "playerctl --player=spotify_player,spotify loop playlist";
-          on-click-middle = "playerctl --player=spotify_player,spotify shuffle toggle";
-          on-scroll-up = "playerctl --player=spotify_player,spotify next";
-          on-scroll-down = "playerctl --player=spotify_player,spotify previous";
-          exec = "${pkgs.writeShellScriptBin "spotify-module-script" ''
+          on-click = "playerctl --player=,Feishin play-pause";
+          on-click-right = "playerctl --player=,Feishin loop track";
+          on-double-click-right = "playerctl --player=,Feishin loop playlist";
+          on-click-middle = "playerctl --player=,Feishin shuffle toggle";
+          on-scroll-up = "playerctl --player=,Feishin next";
+          on-scroll-down = "playerctl --player=,Feishin previous";
+          exec = "${pkgs.writeShellScriptBin "feishin-module-script" ''
             shorten() {
               if [ ''${#1} -le 12 ]; then
                 printf "%s" "$1"
@@ -75,12 +75,12 @@
               fi
             }
 
-            player_status=$(playerctl --player=spotify_player,spotify status 2> /dev/null)
-            artist="$(shorten "$(playerctl --player=spotify_player,spotify metadata artist)")"
-            title="$(shorten "$(playerctl --player=spotify_player,spotify metadata title)")"
+            player_status=$(playerctl --player=,Feishin status 2> /dev/null)
+            artist="$(shorten "$(playerctl --player=,Feishin metadata artist)")"
+            title="$(shorten "$(playerctl --player=,Feishin metadata title)")"
             info="$artist - $title"
 
-            if [ "$(playerctl --player=spotify_player,spotify shuffle)" = "On" ]; then
+            if [ "$(playerctl --player=,Feishin shuffle)" = "On" ]; then
               info="$info  "
             fi
 
@@ -88,12 +88,12 @@
               info="$info  "
             fi
 
-            if [ "$(playerctl --player=spotify_player,spotify loop)" = "Track" ]; then
+            if [ "$(playerctl --player=,Feishin loop)" = "Track" ]; then
               info="$info 󱍸 "
             fi
 
-            echo "$info  "
-          ''}/bin/spotify-module-script";
+            echo "$info  "
+          ''}/bin/feishin-module-script";
         };
       };
     };
@@ -115,8 +115,14 @@
       }
 
       #workspaces button {
+        background: #141617;
         color: #D4BE98;
       }
+
+      #workspaces button active {
+        background: #D4BE98;
+        color: #141617;
+      }
     '';
   };
 }