diff --git a/flake.lock b/flake.lock index 1d1e3a4..5fac24c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1693926605, - "narHash": "sha256-JSdYc8r2tRtxvRePWkcW9tvIq4o5S28TBs7TLfFwum8=", + "lastModified": 1694095112, + "narHash": "sha256-+Ci6CwhCRuMxeNquf2xl3HPE+eKcszTAJ40KeRIPHaU=", "owner": "ryanccn", "repo": "am", - "rev": "0d9424417c9edfea3891fc9a07fb9552fbb88cdf", + "rev": "3264bd999479965623f45a7864ddd74ee1af25c9", "type": "github" }, "original": { @@ -119,26 +119,6 @@ "type": "github" } }, - "discord-applemusic-rich-presence": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1693896317, - "narHash": "sha256-jHM/N4Zrl+o38FHRTZ+jJjbm6x3ZQnVnzL+u0HWRcH8=", - "owner": "ryanccn", - "repo": "discord-applemusic-rich-presence", - "rev": "ceb7d2ff3734eb86b363ee1909e0afbd526fb62b", - "type": "github" - }, - "original": { - "owner": "ryanccn", - "repo": "discord-applemusic-rich-presence", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -147,11 +127,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1693981270, - "narHash": "sha256-5Yv8grfUb5OAkSwuqmU9Ab+uusraku/Rmt2o8accn9I=", + "lastModified": 1694067629, + "narHash": "sha256-fUmpkM5z2CL81uHYnV77hsLbNJ53416z8yJ8pWEG5+Y=", "owner": "nix-community", "repo": "fenix", - "rev": "b2f49e4f86582a8e3015f9cc4b869a9c9a28b3cf", + "rev": "4a2b238e9de609f5f04a0bd883771baa8a0a7165", "type": "github" }, "original": { @@ -228,11 +208,11 @@ ] }, "locked": { - "lastModified": 1693859358, - "narHash": "sha256-r3Pak/ao3p8weTzR+Ry3qQrfRsmSOwWW5sAe73mrYKs=", + "lastModified": 1693972774, + "narHash": "sha256-Dt9UZs0/DaIex598quYRYFuGabUbvFdNrHuvGc6HjBc=", "owner": "nix-community", "repo": "home-manager", - "rev": "886ea1d213efd1082f419d066e89ef37635dc970", + "rev": "b22d7bab30076bbb73744867d6c5bf7d6380570c", "type": "github" }, "original": { @@ -248,11 +228,11 @@ ] }, "locked": { - "lastModified": 1692351612, - "narHash": "sha256-KTGonidcdaLadRnv9KFgwSMh1ZbXoR/OBmPjeNMhFwU=", + "lastModified": 1694081375, + "narHash": "sha256-vzJXOUnmkMCm3xw8yfPP5m8kypQ3BhAIRe4RRCWpzy8=", "owner": "nix-community", "repo": "naersk", - "rev": "78789c30d64dea2396c9da516bbcc8db3a475207", + "rev": "3f976d822b7b37fc6fb8e6f157c2dd05e7e94e89", "type": "github" }, "original": { @@ -283,11 +263,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693844670, - "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", + "lastModified": 1694032533, + "narHash": "sha256-I8cfCV/4JNJJ8KHOTxTU1EphKT8ARSb4s9pq99prYV0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", + "rev": "efd23a1c9ae8c574e2ca923c2b2dc336797f4cc4", "type": "github" }, "original": { @@ -322,7 +302,6 @@ "catppuccin": "catppuccin", "crane": "crane", "darwin-custom-icons": "darwin-custom-icons", - "discord-applemusic-rich-presence": "discord-applemusic-rich-presence", "fenix": "fenix", "fh": "fh", "flake-compat": "flake-compat", @@ -338,11 +317,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1693944114, - "narHash": "sha256-FqQkL3OX6hapF2wSay6VJQNuJRK8Q3VfEukwLI7d4Pg=", + "lastModified": 1694036562, + "narHash": "sha256-F2za9TfLZQUPPNS8gzKiDws43xyN767bTLnobq/bv5Y=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "b9a9722bda8f1ff7d8691701b98a753f74e70c06", + "rev": "d04cff6102d48a3d1ecfa05f4516d339e251945b", "type": "github" }, "original": { @@ -362,11 +341,11 @@ ] }, "locked": { - "lastModified": 1693879802, - "narHash": "sha256-f+ceOsPpyiuExQIubKkLkyTZZiza1qJQGou4FZu9q1A=", + "lastModified": 1694052649, + "narHash": "sha256-+eBEU3dw3/fCfi8ZHFNutINxehMazGkQxqNcpeNbTo4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8a1d1bbe4c13eeb518e6159dd122c4f721f7543e", + "rev": "a795148ffbcc77f2b592d50ceebe36147e623a77", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c278ed8..223ad1b 100644 --- a/flake.nix +++ b/flake.nix @@ -31,11 +31,6 @@ inputs.flake-compat.follows = "flake-compat"; }; - discord-applemusic-rich-presence = { - url = "github:ryanccn/discord-applemusic-rich-presence"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - am = { url = "github:ryanccn/am"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/default.nix b/home/default.nix index dc8aef3..b5c7fbd 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,14 +1,14 @@ { config, ctpModule, - discordAppleMusicModule, + amDiscordModule, ... }: { home.stateVersion = "23.05"; imports = [ ctpModule - discordAppleMusicModule + amDiscordModule ./variables.nix ./fonts.nix @@ -29,9 +29,9 @@ programs.home-manager.enable = true; - services.discord-applemusic-rich-presence = { + services.am-discord-rich-presence = { enable = true; - logFile = "${config.home.homeDirectory}/Library/Logs/discord-applemusic-rich-presence.log"; + logFile = "${config.home.homeDirectory}/Library/Logs/am-discord-rich-presence.log"; }; catppuccin.flavour = "frappe"; diff --git a/modules/nix.nix b/modules/nix.nix index a0cc866..3ed7366 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -26,7 +26,6 @@ in { nixpkgs = { overlays = [ inputs.attic.overlays.default - inputs.discord-applemusic-rich-presence.overlays.default inputs.nyoom.overlays.default inputs.am.overlays.default inputs.fh.overlays.default diff --git a/system.nix b/system.nix index ce4f899..b8fea76 100644 --- a/system.nix +++ b/system.nix @@ -37,7 +37,7 @@ extraSpecialArgs = { ctpModule = inputs.catppuccin.homeManagerModules.catppuccin; - discordAppleMusicModule = inputs.discord-applemusic-rich-presence.homeManagerModules.default; + amDiscordModule = inputs.am.homeManagerModules.default; }; users.ryanccn = import ./home;