update

4 files changed, 58 insertions, 50 deletions

diff --git a/flake.lock b/flake.lock
index a3ee14e..57bbc2f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767889970,
-        "narHash": "sha256-evSHa1OjJT4eL1yIRGOOycHK8FUrU2ywmvjwr9R4B8I=",
+        "lastModified": 1768131442,
+        "narHash": "sha256-X+2RxD4+F8LBqvJNRh6FduRLU4a2SnZQ8a9BCN6Ty1E=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "6dc987cd53c48621100b4926de6eace1b18e0fe9",
+        "rev": "046af28ffb4d719e3c360b3986750f187866d4a8",
         "type": "github"
       },
       "original": {
@@ -85,11 +85,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768068402,
-        "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=",
+        "lastModified": 1768366276,
+        "narHash": "sha256-NUdsaB6H1wvbOC7oh1UZ7Ojg1I+mYBQv8ovlMB6FbHk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c",
+        "rev": "4e235a8746b195e335306d898f0cc93ad6c4564c",
         "type": "github"
       },
       "original": {
@@ -189,11 +189,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767892417,
-        "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
+        "lastModified": 1768127708,
+        "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
         "type": "github"
       },
       "original": {
@@ -221,11 +221,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1767379071,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "lastModified": 1767892417,
+        "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
         "type": "github"
       },
       "original": {
@@ -261,11 +261,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768093331,
-        "narHash": "sha256-8pL/pTI55DcQVr47NQUIfUy7Y81wTrboLZ5LMxyC+/o=",
+        "lastModified": 1768368328,
+        "narHash": "sha256-YKKk8oHnVvyBr1AFh6zvqYsmfqaOZpObHoGJR2wBBjs=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "12703a3e3df960f1df9ac8e75590f17ad321625a",
+        "rev": "a22fe18a52560314d741a0d37565548926ca1104",
         "type": "github"
       },
       "original": {
@@ -286,11 +286,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1767992839,
-        "narHash": "sha256-qDcSFxMs6d/WjaVD1RtvFKtlv3FKEt8U10AFMSz+wvE=",
+        "lastModified": 1768307761,
+        "narHash": "sha256-Y4Y5wa75ft5Ix7ydiZc5aMzfQdAuxOsC2mSQ+qWWOHU=",
         "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "5b5548d2182063aa81e1e2dd0f0bc8cbb055179b",
+        "rev": "b985468159a02513773b3f9256bde9c85c5d8626",
         "type": "github"
       },
       "original": {
@@ -319,11 +319,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1767502559,
-        "narHash": "sha256-om0IPjW850vhhIrNZ5tiXjsYuqyoI44IdE+I9AwZ96I=",
+        "lastModified": 1768107098,
+        "narHash": "sha256-mSthw4k7jkB5S8+NYZwrQFItLj+17Se7Wn0pIfdASbc=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "806c1fdeb7af3e013215d14f5d9f06685fa6650f",
+        "rev": "2e40e07527f9d724b1578f0af590ab345e836ec3",
         "type": "github"
       },
       "original": {
@@ -370,11 +370,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768083628,
-        "narHash": "sha256-6M+vlMGur7UgzkHucgA61pjq3gtjGH9OywxJM/KHL8I=",
+        "lastModified": 1768329214,
+        "narHash": "sha256-ASI9j+Fgj7TzB4mj+IBIBrV5mH9P/D/vjKLyVDZWZOw=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "5c9624f3d0176727284678aebf677770dd1375b2",
+        "rev": "2357b84ef617772c012397a7e8b4542bd5e4bab8",
         "type": "github"
       },
       "original": {
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;
+      }
     '';
   };
 }