diff --git a/flake.lock b/flake.lock index 569176a..8d8a3f6 100644 --- a/flake.lock +++ b/flake.lock @@ -846,29 +846,13 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, - "nixpkgs-master": { - "locked": { - "lastModified": 1738943717, - "narHash": "sha256-KabzClxx6dREJyxZ+gffuBL1us/ZOcFJ8ZjgNtlM6yU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a503a26038e1f3e868bb67269c1e96d169de1374", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { - "lastModified": 1738940519, - "narHash": "sha256-WXGiqZn8u+ynRzIywjwF6eVR38DSVvQCVqjZ6sHQMe8=", + "lastModified": 1741951773, + "narHash": "sha256-OGEqTkGdx9MUENEPwU3NSKHECKt0ObW3GaD8L9zgMSw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b30cff4b9ac9dcf891534791fc92f2f425a80454", + "rev": "b5a00ebfb32ff0480ad90a213cfed6938ef04920", "type": "github" }, "original": { @@ -3838,7 +3822,6 @@ "hyprland": "hyprland", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", - "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "nvf": "nvf", diff --git a/flake.nix b/flake.nix index 55ca9fc..ef01178 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,8 @@ users.tx0 = import ./home; extraSpecialArgs = {inherit system inputs u;}; }; + + nixpkgs.overlays = [(import ./overlays/spotx.nix)]; } ]; }; @@ -48,7 +50,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.11"; - nixpkgs-master.url = "github:nixos/nixpkgs/master"; nur = { url = "github:nix-community/NUR"; diff --git a/home/system/packages/default.nix b/home/system/packages/default.nix index 61d7975..3ef1abb 100644 --- a/home/system/packages/default.nix +++ b/home/system/packages/default.nix @@ -70,6 +70,7 @@ pinta hoppscotch jetbrains.pycharm-community-bin + spotify # de hyprpaper diff --git a/overlays/spotx.nix b/overlays/spotx.nix new file mode 100644 index 0000000..320d265 --- /dev/null +++ b/overlays/spotx.nix @@ -0,0 +1,36 @@ +final: prev: let + spotx = prev.fetchurl { + url = "https://raw.githubusercontent.com/SpotX-Official/SpotX-Bash/21481cea97bac720590c2aad8b1fc2c58c9ec8f9/spotx.sh"; + hash = "sha256-1k1sEEnT1SE6RAWrfd1qFY1gFrUVNh7zUQJLu3DODlU="; + }; +in { + spotify = prev.spotify.overrideAttrs (old: { + nativeBuildInputs = + old.nativeBuildInputs + ++ (with prev; [ + util-linux + perl + unzip + zip + curl + ]); + + unpackPhase = + builtins.replaceStrings ["runHook postUnpack"] [ + '' + patchShebangs --build ${spotx} + runHook postUnpack + '' + ] + old.unpackPhase; + + installPhase = + builtins.replaceStrings ["runHook postInstall"] [ + '' + bash ${spotx} -f -P "$out/share/spotify" + runHook postInstall + '' + ] + old.installPhase; + }); +}