diff --git a/flake.lock b/flake.lock index 4579855..7cdee51 100644 --- a/flake.lock +++ b/flake.lock @@ -1,20 +1,18 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, + "flake-compat": { + "flake": false, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "edolstra", + "repo": "flake-compat", "type": "github" } }, @@ -25,11 +23,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1721135958, + "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", "type": "github" }, "original": { @@ -54,22 +52,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1686020360, - "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", @@ -79,37 +61,24 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1704167711, - "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=", - "owner": "the-argus", + "lastModified": 1721103144, + "narHash": "sha256-vHGUl/kagv0/QsPXMW+caSPyuvHvMUJSV80cbe+0/2M=", + "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4", + "rev": "085ddf8abc78a7f1682c99715584e8735f4903cf", "type": "github" }, "original": { - "owner": "the-argus", + "owner": "Gerg-L", "repo": "spicetify-nix", "type": "github" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index ce6174c..0609f41 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - spicetify-nix.url = "github:the-argus/spicetify-nix"; + spicetify-nix = { + url = "github:Gerg-L/spicetify-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/programs/spotify/default.nix b/programs/spotify/default.nix index 87b53bb..9ae1c18 100644 --- a/programs/spotify/default.nix +++ b/programs/spotify/default.nix @@ -1,15 +1,13 @@ { pkgs, spicetify-nix, ... }: let - spicePkgs = spicetify-nix.packages.${pkgs.system}.default; + spicePkgs = spicetify-nix.legacyPackages.${pkgs.system}; in { - imports = [ spicetify-nix.homeManagerModule ]; - - home.packages = with pkgs; [ spotify ]; + imports = [ spicetify-nix.homeManagerModules.default ]; programs.spicetify = { - enable = false; # Currently broken, see https://github.com/the-argus/spicetify-nix/issues/62 + enable = true; theme = spicePkgs.themes.catppuccin; colorScheme = "frappe";