From 773a5f2c28b2c6fa323d2f6c41b6ae67835f1ec0 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Fri, 31 Mar 2023 10:26:13 +0200
Subject: [PATCH] Add mpd-mpris

---
 flake.lock              | 50 ++++++++++++++++++++++++++++++++++++-----
 flake.nix               | 11 ++++++++-
 home/kagami-pc-home.nix |  2 +-
 overlay.nix             |  2 ++
 4 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index c9534f4..406dc2a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -141,6 +141,21 @@
       }
     },
     "flake-utils_3": {
+      "locked": {
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
       "locked": {
         "lastModified": 1659877975,
         "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -155,7 +170,7 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
+    "flake-utils_5": {
       "locked": {
         "lastModified": 1659877975,
         "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@@ -245,6 +260,28 @@
         "type": "github"
       }
     },
+    "mpd-mpris": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1679908565,
+        "narHash": "sha256-OYi/6VQYk+oAINJfTtvWu3ppB2PK5t1UnezWMKeFcIA=",
+        "owner": "natsukagami",
+        "repo": "mpd-mpris",
+        "rev": "c6f62000a7946c6e5215f1f0e7ca6ec272879ce0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "natsukagami",
+        "ref": "nix",
+        "repo": "mpd-mpris",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -498,6 +535,7 @@
         "home-manager-unstable": "home-manager-unstable",
         "kak-lsp": "kak-lsp",
         "kakoune": "kakoune",
+        "mpd-mpris": "mpd-mpris",
         "nix-gaming": "nix-gaming",
         "nixos-m1": "nixos-m1",
         "nixpkgs": "nixpkgs_4",
@@ -553,7 +591,7 @@
     },
     "secrets": {
       "inputs": {
-        "flake-utils": "flake-utils_3"
+        "flake-utils": "flake-utils_4"
       },
       "locked": {
         "lastModified": 1669915544,
@@ -675,7 +713,7 @@
     },
     "youmubot": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
         "naersk": "naersk_2",
         "nixpkgs": [
           "nixpkgs"
@@ -684,11 +722,11 @@
         "nixpkgs-unstable": "nixpkgs-unstable_2"
       },
       "locked": {
-        "lastModified": 1676639986,
-        "narHash": "sha256-MF17tKyZrKG3O9i1cEI06teOPGnBl6y1vIBrYduCQ3g=",
+        "lastModified": 1679740713,
+        "narHash": "sha256-tOIkserfyV/gkT/RzVocNG3XC70cGGOK0OuA7+yfa8w=",
         "owner": "natsukagami",
         "repo": "youmubot",
-        "rev": "3a9a252a1d0a4d26f288f0655eac125933df9f69",
+        "rev": "5d69a434c0bd240e0c736073e3a8341810390a20",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a1b4f96..dd99a30 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,10 @@
       url = github:WillPower3309/swayfx;
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+    mpd-mpris = {
+      url = github:natsukagami/mpd-mpris/nix;
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # --- Sources
     kakoune.url = github:mawww/kakoune;
@@ -126,7 +130,12 @@
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.nki = import ./home/kagami-pc-home.nix;
+            home-manager.users.nki = { ... }: {
+              imports = [
+                inputs.mpd-mpris.homeManagerModules.default
+                ./home/kagami-pc-home.nix
+              ];
+            };
           }
           inputs.secrets.nixosModules.x86_64-linux.common
         ];
diff --git a/home/kagami-pc-home.nix b/home/kagami-pc-home.nix
index b8c3652..faf81f0 100644
--- a/home/kagami-pc-home.nix
+++ b/home/kagami-pc-home.nix
@@ -80,7 +80,7 @@
   services.mpd.musicDirectory = "${config.home.homeDirectory}/Music";
   services.mpd-discord-rpc.enable = true;
   services.mpd-discord-rpc.package = pkgs.unstable.mpd-discord-rpc;
-  services.mpdris2.enable = true;
+  services.mpd-mpris.enable = true;
   # ncmpcpp
   programs.ncmpcpp.enable = true;
   programs.ncmpcpp.bindings = [
diff --git a/overlay.nix b/overlay.nix
index df36c8b..cdde1de 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -65,6 +65,8 @@ in
 
   (import ./packages/common)
 
+  inputs.mpd-mpris.overlays.default
+
   # Bug fixes
 ] # we assign the overlay created before to the overlays of nixpkgs.