From d4de0e26faa1fd6cdd3b86a5944f684dd7315549 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Thu, 27 Jul 2023 23:26:57 +0800
Subject: [PATCH] feat: switch to discord-applemusic-rich-presence fork

---
 flake.lock                                    | 51 +++++++++----------
 flake.nix                                     |  6 +--
 home.nix                                      | 11 ++--
 overlays/discord-applemusic-rich-presence.nix | 38 --------------
 system.nix                                    |  6 +--
 5 files changed, 33 insertions(+), 79 deletions(-)
 delete mode 100644 overlays/discord-applemusic-rich-presence.nix

diff --git a/flake.lock b/flake.lock
index 4d30ec3..6291055 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,26 +54,6 @@
         "type": "github"
       }
     },
-    "caarlos0": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1687665384,
-        "narHash": "sha256-XARNmyXnmcWeBwfN5YXhiOWHsE3pPojasE1C2OieO7o=",
-        "owner": "caarlos0",
-        "repo": "nur",
-        "rev": "854c0826e775f5f44cc317c724ac6343c7c5d616",
-        "type": "github"
-      },
-      "original": {
-        "owner": "caarlos0",
-        "repo": "nur",
-        "type": "github"
-      }
-    },
     "catppuccin": {
       "inputs": {
         "flake-compat": [
@@ -127,6 +107,23 @@
         "type": "github"
       }
     },
+    "discord-applemusic-rich-presence": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1690471502,
+        "narHash": "sha256-iP3MWm0eRhFiHC+dN1O60IT2gp5OHMf6m3/E06UvevI=",
+        "type": "git",
+        "url": "file:../discord-applemusic-rich-presence"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:../discord-applemusic-rich-presence"
+      }
+    },
     "fenix": {
       "inputs": {
         "nixpkgs": [
@@ -186,11 +183,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690303752,
-        "narHash": "sha256-2YiwFHQERGoaORNORmsdmVlPD8CVVwlwbV2+f77sFhg=",
+        "lastModified": 1690476848,
+        "narHash": "sha256-PSmzyuEbMxEn2uwwLYUN2l1psoJXb7jm/kfHD12Sq0k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ba2c0737cc848db03470828fdb5e86df75ed42a8",
+        "rev": "8d243f7da13d6ee32f722a3f1afeced150b6d4da",
         "type": "github"
       },
       "original": {
@@ -221,11 +218,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1690378156,
-        "narHash": "sha256-rWRkHrW/ixoXXDiu5Z6NJ9QodUzufAxT6veTSELEFNA=",
+        "lastModified": 1690441914,
+        "narHash": "sha256-Ac+kJQ5z9MDAMyzSc0i0zJDx2i3qi9NjlW5Lz285G/I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fb4debd73182c203a69060cb84e63c9e779c3a49",
+        "rev": "db8672b8d0a2593c2405aed0c1dfa64b2a2f428f",
         "type": "github"
       },
       "original": {
@@ -239,8 +236,8 @@
       "inputs": {
         "agenix": "agenix",
         "attic": "attic",
-        "caarlos0": "caarlos0",
         "catppuccin": "catppuccin",
+        "discord-applemusic-rich-presence": "discord-applemusic-rich-presence",
         "fenix": "fenix",
         "flake-compat": "flake-compat",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index be46a94..c8a776d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,8 +38,8 @@
       inputs.flake-compat.follows = "flake-compat";
     };
 
-    caarlos0 = {
-      url = "github:caarlos0/nur";
+    discord-applemusic-rich-presence = {
+      url = "github:ryanccn/discord-applemusic-rich-presence";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -58,7 +58,7 @@
     fenix,
     attic,
     catppuccin,
-    caarlos0,
+    discord-applemusic-rich-presence,
     ...
   }: let
     configuration = {pkgs, ...}:
diff --git a/home.nix b/home.nix
index 16407e5..f858999 100644
--- a/home.nix
+++ b/home.nix
@@ -3,14 +3,14 @@
   config,
   agenixModule,
   ctpModule,
-  caarlosModule,
+  discord-applemusic-rich-presence,
   ...
 }: {
   home.stateVersion = "23.05";
   imports = [
     agenixModule
     ctpModule
-    caarlosModule
+    discord-applemusic-rich-presence
     ./programs/zsh.nix
     ./programs/fish.nix
     ./programs/starship.nix
@@ -27,11 +27,8 @@
     ryan-term-bin
   ];
 
-  services = {
-    discord-applemusic-rich-presence = {
-      enable = true;
-      package = pkgs.discord-applemusic-rich-presence;
-    };
+  services.discord-applemusic-rich-presence = {
+    enable = true;
   };
 
   catppuccin.flavour = "frappe";
diff --git a/overlays/discord-applemusic-rich-presence.nix b/overlays/discord-applemusic-rich-presence.nix
deleted file mode 100644
index 13a3439..0000000
--- a/overlays/discord-applemusic-rich-presence.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-(
-  _: prev: let
-    rev = "27ea39e67424003fcc79b9ae48c906d4b605b273";
-    hash = "sha256-6+SI8fj7GCykcA2D3wtE3GILfbtJc/pwcWQKkc+Nni8=";
-    vendorHash = "sha256-RFJTBfsfEyKn9OSvE2HLgjKiJC3Hs90+P9rm5GlIseo=";
-  in {
-    discord-applemusic-rich-presence = prev.callPackage ({
-      buildGoModule,
-      fetchFromGitHub,
-      lib,
-      stdenv,
-      ...
-    }:
-      buildGoModule rec {
-        pname = "discord-applemusic-rich-presence";
-        version = "0.5.0-dev.${lib.substring 0 8 rev}";
-
-        src = fetchFromGitHub {
-          owner = "caarlos0";
-          repo = "discord-applemusic-rich-presence";
-          inherit rev;
-          inherit hash;
-        };
-
-        inherit vendorHash;
-
-        ldflags = ["-s" "-w" "-X=main.version=${version}" "-X=main.builtBy=nixpkgs"];
-
-        meta = with lib; {
-          description = "Discord's Rich Presence from Apple Music";
-          homepage = "https://github.com/caarlos0/discord-applemusic-rich-presence";
-          license = licenses.mit;
-          platforms = platforms.darwin;
-          broken = stdenv.isLinux;
-        };
-      }) {};
-  }
-)
diff --git a/system.nix b/system.nix
index 7def963..4c92861 100644
--- a/system.nix
+++ b/system.nix
@@ -4,7 +4,7 @@
   agenix,
   fenix,
   catppuccin,
-  caarlos0,
+  discord-applemusic-rich-presence,
   ...
 }: {
   environment.systemPackages = with pkgs; [
@@ -68,7 +68,6 @@
     vivid
     xh
     zoxide
-    caarlos0.packages.${system}.fork-cleaner
   ];
 
   services.nix-daemon.enable = true;
@@ -96,7 +95,6 @@
       attic.overlays.default
       agenix.overlays.default
       fenix.overlays.default
-      (import ./overlays/discord-applemusic-rich-presence.nix)
       (import ./overlays/ryan-mono-bin.nix)
     ];
 
@@ -140,7 +138,7 @@
   home-manager.extraSpecialArgs = {
     agenixModule = agenix.homeManagerModules.age;
     ctpModule = catppuccin.homeManagerModules.catppuccin;
-    caarlosModule = caarlos0.homeManagerModules.default;
+    discord-applemusic-rich-presence = discord-applemusic-rich-presence.homeManagerModules.default;
   };
 
   users.users.ryanccn.home = "/Users/ryanccn";