update flake inputs, remove oskars-dotfiles, patch spotify with spotx-bash

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,

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";

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 {};

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"

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
+    '';
+  })