From 3dbeba12d686fddcac1a9706275f681a98c4f8e0 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 23 Jul 2024 19:17:51 +0200 Subject: [PATCH] fix: switch to maintained spicetify --- config/basic/home-manager.nix | 4 +- flake.lock | 87 ++++++++++------------------- flake.nix | 5 +- users/common/programs/spicetify.nix | 4 +- 4 files changed, 36 insertions(+), 64 deletions(-) diff --git a/config/basic/home-manager.nix b/config/basic/home-manager.nix index 13a81a0..9569942 100644 --- a/config/basic/home-manager.nix +++ b/config/basic/home-manager.nix @@ -15,7 +15,7 @@ verbose = true; extraSpecialArgs = { inherit nodes; - spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default; + spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; }; sharedModules = [ { @@ -24,7 +24,7 @@ inputs.nix-index-database.hmModules.nix-index inputs.nixos-extra-modules.homeManagerModules.default inputs.nixvim.homeManagerModules.nixvim - inputs.spicetify-nix.homeManagerModule + inputs.spicetify-nix.homeManagerModules.default ]; }; # HM zsh needs this or else the startup order is fucked diff --git a/flake.lock b/flake.lock index 8d2bf97..d683c90 100644 --- a/flake.lock +++ b/flake.lock @@ -479,6 +479,22 @@ } }, "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_9": { "flake": false, "locked": { "lastModified": 1673956053, @@ -704,24 +720,6 @@ "type": "github" } }, - "flake-utils_9": { - "inputs": { - "systems": "systems_11" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -1444,22 +1442,6 @@ } }, "nixpkgs_4": { - "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" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -1663,7 +1645,7 @@ "pre-commit-hooks": "pre-commit-hooks_4", "spicetify-nix": "spicetify-nix", "stylix": "stylix", - "systems": "systems_12", + "systems": "systems_11", "templates": "templates" } }, @@ -1710,19 +1692,21 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_4" + "flake-compat": "flake-compat_8", + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1704167711, - "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=", - "owner": "the-argus", + "lastModified": 1721727694, + "narHash": "sha256-X3qaEUG5zgJi9G1ceLpjuvlC9euTVNGlnJilfCgWJu4=", + "owner": "Gerg-l", "repo": "spicetify-nix", - "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4", + "rev": "597ae057680ac250083166efab806dcc2e47dd6b", "type": "github" }, "original": { - "owner": "the-argus", + "owner": "Gerg-l", "repo": "spicetify-nix", "type": "github" } @@ -1736,10 +1720,10 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_9", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1720818679, @@ -1800,21 +1784,6 @@ "type": "github" } }, - "systems_12": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 07965ef..2339306 100644 --- a/flake.nix +++ b/flake.nix @@ -90,7 +90,10 @@ stylix.url = "github:danth/stylix"; - spicetify-nix.url = "github:the-argus/spicetify-nix"; + spicetify-nix = { + url = "github:Gerg-l/spicetify-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixvim = { url = "github:nix-community/nixvim"; diff --git a/users/common/programs/spicetify.nix b/users/common/programs/spicetify.nix index d6e8c7f..a4b5bdb 100644 --- a/users/common/programs/spicetify.nix +++ b/users/common/programs/spicetify.nix @@ -1,7 +1,7 @@ {spicePkgs, ...}: { programs.spicetify = { - #enable = true; - theme = spicePkgs.themes.RetroBlur; + enable = true; + theme = spicePkgs.themes.retroBlur; colorScheme = "Purple"; enabledExtensions = with spicePkgs.extensions; [