diff --git a/flake.nix b/flake.nix
index 823fda0..ed60755 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,10 +29,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    mpv-sponsorblock = {
-      url = "github:lavafroth/mpv-sponsorblock-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
@@ -44,7 +40,6 @@
       nix-on-droid,
       nix-index-database,
       stylix,
-      mpv-sponsorblock,
       ...
     }:
 
@@ -53,7 +48,6 @@
         ./hosts/default/configuration.nix
         ./cachix/nix-community.nix
         home-manager.nixosModules.home-manager
-        ./mpv-sponsorblock/overlay.nix
         ./hosts/default/stylix.nix
         stylix.nixosModules.stylix
         nix-index-database.nixosModules.nix-index
diff --git a/hosts/default/home/default.nix b/hosts/default/home/default.nix
index b56452d..d253933 100644
--- a/hosts/default/home/default.nix
+++ b/hosts/default/home/default.nix
@@ -24,6 +24,7 @@
     ./shell.nix
     ./video-editing.nix
     ./media-playback.nix
+    ./mpv.nix
   ];
 
   home = {
@@ -36,9 +37,6 @@
         source = ./sources/kitty;
         recursive = true;
       };
-      ".config/mpv/scripts/sponsorblock.so" = {
-        source = "${pkgs.sponsorblock-lib.out}/lib/libmpv_sponsorblock.so";
-      };
     };
 
     sessionVariables = {
diff --git a/hosts/default/home/media-playback.nix b/hosts/default/home/media-playback.nix
index 30993f1..224e5ab 100644
--- a/hosts/default/home/media-playback.nix
+++ b/hosts/default/home/media-playback.nix
@@ -1,6 +1,7 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
-    mpv
+    # mpv
     yt-dlp
     jellyfin-media-player
   ];
diff --git a/hosts/default/home/mpv.nix b/hosts/default/home/mpv.nix
new file mode 100644
index 0000000..a7ed964
--- /dev/null
+++ b/hosts/default/home/mpv.nix
@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+{
+  programs.mpv = {
+    enable = true;
+
+    package = (
+      pkgs.mpv-unwrapped.wrapper {
+        mpv = pkgs.mpv-unwrapped.override {
+          waylandSupport = true;
+        };
+
+        scripts = with pkgs.mpvScripts; [
+          sponsorblock
+          skipsilence
+        ];
+      }
+    );
+  };
+}
diff --git a/mpv-sponsorblock/overlay.nix b/mpv-sponsorblock/overlay.nix
deleted file mode 100644
index f3594c3..0000000
--- a/mpv-sponsorblock/overlay.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ inputs, ... }:
-{
-  nixpkgs.overlays = [
-    (_: _: { sponsorblock-lib = inputs.mpv-sponsorblock.defaultPackage.x86_64-linux; })
-  ];
-}