diff --git a/flake.lock b/flake.lock index 6e443dd..11378e6 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1745971833, - "narHash": "sha256-Hmt7smJEB2aKw3XW02Vzgr0bTULpM1CtSy1MTecmIxs=", + "lastModified": 1746087093, + "narHash": "sha256-UFTBJnKCGkRXxWQT4vi85SdI15I/sQf2Ldr63BftiHs=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "10919722f131dbac0413cdbd385ff0b634d3d7fe", + "rev": "3ce9324a2612bd84051d3dc30bb9d5a5a7804e95", "type": "github" }, "original": { @@ -352,11 +352,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1745971585, - "narHash": "sha256-v8QVD+V7CCVZ+QHk2mdT2X3U9FIe2vEoOVsgnQBjZ5I=", + "lastModified": 1746045191, + "narHash": "sha256-nqwo0TXEwYLTRjbj+akj30SkpXtVozEzaSAIyp41yTA=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "b3edc88010e38946072a58fe336081ed104c9d44", + "rev": "2b4f1f8b84ac7960ecd4b9d06bc11cf47f0b9ee9", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1745987135, - "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=", + "lastModified": 1746040799, + "narHash": "sha256-osgPX/SzIpkR50vev/rqoTEAVkEcOWXoQXmbzsaI4KU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e", + "rev": "5f217e5a319f6c186283b530f8c975e66c028433", "type": "github" }, "original": { @@ -486,11 +486,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1745943971, - "narHash": "sha256-syIS3vBo7DX/cP49bfZPYmw3vhMCmyrnD6HiUlOAvx8=", + "lastModified": 1746059639, + "narHash": "sha256-Ert1XJsjWZ+aFuH5dLBOZwQGOR+ZAY/f3NnhaNNcGfw=", "owner": "jj-vcs", "repo": "jj", - "rev": "3ab9e098d778969a91d46290615c436ab41d71f9", + "rev": "1b300fefa2170bfaf239d1e91c9085b6aa9bbeff", "type": "github" }, "original": { @@ -550,11 +550,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1745965399, - "narHash": "sha256-RxoK/Eo9cWGtGMl3enYu/LH/SAcFGR2PWuAifQm4dUc=", + "lastModified": 1746090057, + "narHash": "sha256-rjwQyWvMtXdE0QWyDOEyH8GYckZxJcu+zIXNclLRUm4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bc29338ba733e4c1b94c3ed134baabfea587627e", + "rev": "a6c4c6ac17e6cd0062ac7c4b73676a90f5600c7b", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1745913113, - "narHash": "sha256-/Iph65fWHox7tVyfzw0+AGyCqL2FGuHSt+xjFUsxbOk=", + "lastModified": 1746087578, + "narHash": "sha256-bPmkPoFqt1Fzrjm0YSnA6rYoVTbJvhBv7DRLzyq3Sw0=", "owner": "YaLTeR", "repo": "niri", - "rev": "5f117c61dc4dd91564e02b32836e98dd0e648246", + "rev": "68589cd5a1e043e1b49116c2add4a880dce93a3b", "type": "github" }, "original": { @@ -604,11 +604,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1745924915, - "narHash": "sha256-RuMUtaplJkaAtqkdG1+cD3trqmO2ykKqfK+3+HXPUVA=", + "lastModified": 1746023382, + "narHash": "sha256-AaT+V44rqEQbXvouwPnU7wJHiLR5Bq8uRvh7f+sOPgQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "329a9d639f0418cce05937a823f43b2b64191653", + "rev": "1d54ddac1e8db612bea4f279a0ea48ab35f420be", "type": "github" }, "original": { @@ -635,11 +635,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { @@ -682,11 +682,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1745921652, + "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", "type": "github" }, "original": { @@ -698,11 +698,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1745742390, - "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", + "lastModified": 1745921652, + "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", + "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", "type": "github" }, "original": { @@ -738,11 +738,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745459908, - "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=", + "lastModified": 1746056780, + "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "owner": "nix-community", "repo": "NUR", - "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035", + "rev": "d476cd0972dd6242d76374fcc277e6735715c167", "type": "github" }, "original": { @@ -754,11 +754,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1745752599, - "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=", + "lastModified": 1746072213, + "narHash": "sha256-ucL/XWOitrhH44UymaGhBYtEsr1DTqb1BDZuVOpGAYc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e", + "rev": "debaa11dba5904b70a4e9db1d9c68ae9a6f82ebd", "type": "gitlab" }, "original": { @@ -768,23 +768,6 @@ "type": "gitlab" } }, - "oskars-dotfiles": { - "flake": false, - "locked": { - "lastModified": 1743338345, - "narHash": "sha256-7eOm26Y7nybMFe6uNbw4yPFgMd+CLyZyByXvpAvqmUo=", - "owner": "oskardotglobal", - "repo": ".dotfiles", - "rev": "182de5a67cd6fd30a9450d6bb7d5dd4d41272c5f", - "type": "github" - }, - "original": { - "owner": "oskardotglobal", - "ref": "nix", - "repo": ".dotfiles", - "type": "github" - } - }, "root": { "inputs": { "betterfox-nix": "betterfox-nix", @@ -804,7 +787,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nur-rycee": "nur-rycee", - "oskars-dotfiles": "oskars-dotfiles", "sops-nix": "sops-nix", "stylix": "stylix" } @@ -859,11 +841,11 @@ ] }, "locked": { - "lastModified": 1745894113, - "narHash": "sha256-dxO3caQZMv/pMtcuXdi+SnAtyki6HFbSf1IpgQPXZYc=", + "lastModified": 1745980514, + "narHash": "sha256-CITAeiuXGjDvT5iZBXr6vKVWQwsUQLJUMFO91bfJFC4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e552fe1b16ffafd678ebe061c22b117e050769ed", + "rev": "7fbdae44b0f40ea432e46fd152ad8be0f8f41ad6", "type": "github" }, "original": { @@ -920,11 +902,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1745962538, - "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=", + "lastModified": 1746065148, + "narHash": "sha256-NR8JCOo9BrK0T7iPmNKR+fa/zS+do+GgAMVg4fwMvYM=", "owner": "danth", "repo": "stylix", - "rev": "764fd32955e79f2742a7975f0150175f93add2fb", + "rev": "b4d3137c5ce960073a991bd99a333cad1b233101", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cfe52c5..a0c0423 100644 --- a/flake.nix +++ b/flake.nix @@ -35,14 +35,6 @@ }; }; - oskars-dotfiles = { - type = "github"; - owner = "oskardotglobal"; - repo = ".dotfiles"; - ref = "nix"; - flake = false; - }; - betterfox-nix = { type = "github"; owner = "HeitorAugustoLN"; diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index c5054ec..e6e39b8 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -2,12 +2,12 @@ inherit (prev) lib; in [ - ./spotify.nix ./niri.nix ./ghostty.nix ./juicity.nix ./dae.nix ./jujutsu.nix + ./spotifyx.nix ] |> map (file: import file args) |> (overlays: (lib.composeManyExtensions overlays) final prev) diff --git a/overlays/modifications/spotify.nix b/overlays/modifications/spotify.nix deleted file mode 100644 index 1501605..0000000 --- a/overlays/modifications/spotify.nix +++ /dev/null @@ -1 +0,0 @@ -{inputs, ...}: import "${inputs.oskars-dotfiles}/overlays/spotx.nix" diff --git a/overlays/modifications/spotifyx.nix b/overlays/modifications/spotifyx.nix new file mode 100644 index 0000000..da92346 --- /dev/null +++ b/overlays/modifications/spotifyx.nix @@ -0,0 +1,6 @@ +{outputs, ...}: final: prev: let + inherit (final) stdenv; + inherit (stdenv.hostPlatform) system; +in { + spotify = outputs.packages."${system}".spotifyx; +} diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index 7cb57b5..7d9b5ea 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -92,7 +92,7 @@ }, "rime-ice": { "cargoLocks": null, - "date": "2025-04-22", + "date": "2025-05-01", "extract": null, "name": "rime-ice", "passthru": null, @@ -104,12 +104,33 @@ "name": null, "owner": "iDvel", "repo": "rime-ice", - "rev": "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2", - "sha256": "sha256-N7EDvQX598jxNILzwTwAeu/BY9wWVBRUuTApamf4nAY=", + "rev": "5322bcd86f47d18e0785cac4a5da239664b46235", + "sha256": "sha256-BFS/pMuUlZ6pQEITZ37hotl7YUMmU7kWoHA26L+y7Pc=", "sparseCheckout": [], "type": "github" }, - "version": "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2" + "version": "5322bcd86f47d18e0785cac4a5da239664b46235" + }, + "spotx": { + "cargoLocks": null, + "date": "2025-04-23", + "extract": null, + "name": "spotx", + "passthru": null, + "pinned": false, + "src": { + "deepClone": false, + "fetchSubmodules": false, + "leaveDotGit": false, + "name": null, + "owner": "SpotX-Official", + "repo": "SpotX-Bash", + "rev": "d5a23bfc64d75979373c5fddc81641dabff051aa", + "sha256": "sha256-gYr2b9oSOB/kuK6Em3T+gAALgzpRQxvSBJNWoaJ7yvg=", + "sparseCheckout": [], + "type": "github" + }, + "version": "d5a23bfc64d75979373c5fddc81641dabff051aa" }, "tree-sitter-idris": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 42df88b..1940202 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -1,10 +1,6 @@ # This file was generated by nvfetcher, please do not modify it manually. +{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { - fetchgit, - fetchurl, - fetchFromGitHub, - dockerTools, -}: { dioxionary = { pname = "dioxionary"; version = "4db80d458ff7494967c94ebb1db596abba0775b2"; @@ -14,12 +10,13 @@ fetchSubmodules = false; deepClone = false; leaveDotGit = false; - sparseCheckout = []; + sparseCheckout = [ ]; sha256 = "sha256-H5uMTtDX9hBV36MtiPPlHPaL//WM11J5kdtEhyJBZIU="; }; cargoLock."./Cargo.lock" = { lockFile = ./dioxionary-4db80d458ff7494967c94ebb1db596abba0775b2/./Cargo.lock; outputHashes = { + }; }; date = "2025-04-07"; @@ -33,7 +30,7 @@ fetchSubmodules = false; deepClone = false; leaveDotGit = false; - sparseCheckout = []; + sparseCheckout = [ ]; sha256 = "sha256-s/OYlW66mu/3MHwhZCxvQv8f/rNuCB4SLZ2jYPO5UQQ="; }; date = "2025-02-20"; @@ -48,7 +45,7 @@ fetchSubmodules = false; deepClone = false; leaveDotGit = false; - sparseCheckout = ["Sans/OTC"]; + sparseCheckout = [ "Sans/OTC" ]; sha256 = "sha256-UxbwdY2w3u6i1kBWwr5vMKvsnD3eCllN+kBrCH38KlY="; }; }; @@ -62,21 +59,33 @@ fetchSubmodules = false; deepClone = false; leaveDotGit = false; - sparseCheckout = ["Serif/OTC"]; + sparseCheckout = [ "Serif/OTC" ]; sha256 = "sha256-mfbBSdJrUCZiUUmsmndtEW6H3z6KfBn+dEftBySf2j4="; }; }; rime-ice = { pname = "rime-ice"; - version = "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2"; + version = "5322bcd86f47d18e0785cac4a5da239664b46235"; src = fetchFromGitHub { owner = "iDvel"; repo = "rime-ice"; - rev = "7f6f4880bd5f6b7a76195c515af2e64b88ce0ec2"; + rev = "5322bcd86f47d18e0785cac4a5da239664b46235"; fetchSubmodules = false; - sha256 = "sha256-N7EDvQX598jxNILzwTwAeu/BY9wWVBRUuTApamf4nAY="; + sha256 = "sha256-BFS/pMuUlZ6pQEITZ37hotl7YUMmU7kWoHA26L+y7Pc="; }; - date = "2025-04-22"; + date = "2025-05-01"; + }; + spotx = { + pname = "spotx"; + version = "d5a23bfc64d75979373c5fddc81641dabff051aa"; + src = fetchFromGitHub { + owner = "SpotX-Official"; + repo = "SpotX-Bash"; + rev = "d5a23bfc64d75979373c5fddc81641dabff051aa"; + fetchSubmodules = false; + sha256 = "sha256-gYr2b9oSOB/kuK6Em3T+gAALgzpRQxvSBJNWoaJ7yvg="; + }; + date = "2025-04-23"; }; tree-sitter-idris = { pname = "tree-sitter-idris"; @@ -87,7 +96,7 @@ fetchSubmodules = false; deepClone = false; leaveDotGit = false; - sparseCheckout = []; + sparseCheckout = [ ]; sha256 = "sha256-aOAxb0KjhSwlNX/IDvGwEysYvImgUEIDeNDOWRl1qNk="; }; name = "idris"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 0c57ffa..62853ee 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -12,6 +12,7 @@ in juicity = callPackage ./juicity.nix {}; rime-ice = callPackage ./rime-ice.nix {}; dioxionary = callPackage ./dioxionary.nix {}; + spotifyx = callPackage ./spotifyx.nix {}; noto-serif-cjk = callPackage ./noto-serif-cjk.nix {}; noto-sans-cjk = callPackage ./noto-sans-cjk.nix {}; diff --git a/pkgs/nvfetcher.toml b/pkgs/nvfetcher.toml index a405554..3fea7d4 100644 --- a/pkgs/nvfetcher.toml +++ b/pkgs/nvfetcher.toml @@ -25,3 +25,7 @@ git.sparseCheckout = ["Serif/OTC"] src.github = "notofonts/noto-cjk" fetch.github = "notofonts/noto-cjk" git.sparseCheckout = ["Sans/OTC"] + +[spotx] +src.git = "https://github.com/SpotX-Official/SpotX-Bash.git" +fetch.github = "SpotX-Official/SpotX-Bash" diff --git a/pkgs/spotifyx.nix b/pkgs/spotifyx.nix new file mode 100644 index 0000000..3238d33 --- /dev/null +++ b/pkgs/spotifyx.nix @@ -0,0 +1,26 @@ +{ + pkgs, + srcs, + ... +}: let + inherit (srcs) spotx; +in + pkgs.spotify.overrideAttrs (final: prev: { + version = prev.version + "_spotx-${spotx.version}"; + nativeBuildInputs = + prev.nativeBuildInputs + ++ (with pkgs; [ + unzip + zip + perl + ]); + spotx = spotx.src; + postUnpack = '' + cp $spotx/spotx.sh ./spotx.sh + chmod +x ./spotx.sh + patchShebangs --build ./spotx.sh + ''; + postInstall = '' + ./spotx.sh -P $out/share/spotify -h + ''; + })