bump(vpkmerge): 0.9.0

bump(grimoire): 1.23.0 (#20 )
![image.png](/attachments/ad8e7979-c93b-4def-8346-832f3832d3ae) Reviewed-on: nikkuss/pkgs#20 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>
2026-07-13 13:59:06 +01:00 · 2026-07-13 16:23:52 +04:00 · 2026-07-01 21:59:45 +04:00
10 changed files with 314 additions and 2457 deletions
@@ -116,12 +116,12 @@
            "name": null,
            "owner": "Slush97",
            "repo": "grimoire",
-            "rev": "v1.14.2",
-            "sha256": "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=",
+            "rev": "v1.23.0",
+            "sha256": "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "v1.14.2"
+        "version": "v1.23.0"
    },
    "neovide": {
        "cargoLock": {
@@ -148,27 +148,6 @@
        },
        "version": "8c48a699e201aa5559227a96d879b2f57192b354"
    },
-    "oh-my-pi": {
-        "cargoLock": null,
-        "date": null,
-        "extract": null,
-        "name": "oh-my-pi",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "owner": "can1357",
-            "repo": "oh-my-pi",
-            "rev": "v15.10.1",
-            "sha256": "sha256-SPVour0OyZmJ+G+p7SFAjB0vdTWuvUAQH82InOvSVZc=",
-            "sparseCheckout": [],
-            "type": "github"
-        },
-        "version": "v15.10.1"
-    },
    "qebspil": {
        "cargoLock": null,
        "date": "2025-10-25",
@@ -255,7 +234,7 @@
    "vpkmerge": {
        "cargoLock": {
            "Cargo.lock": [
-                "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock",
+                "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock",
                {}
            ]
        },
@@ -271,11 +250,11 @@
            "name": null,
            "owner": "Slush97",
            "repo": "vpkmerge",
-            "rev": "v0.7.0",
-            "sha256": "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=",
+            "rev": "v0.19.0",
+            "sha256": "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=",
            "sparseCheckout": [],
            "type": "github"
        },
-        "version": "v0.7.0"
+        "version": "v0.19.0"
    }
 }
@@ -69,13 +69,13 @@
  };
  grimoire = {
    pname = "grimoire";
-    version = "v1.14.2";
+    version = "v1.23.0";
    src = fetchFromGitHub {
      owner = "Slush97";
      repo = "grimoire";
-      rev = "v1.14.2";
+      rev = "v1.23.0";
      fetchSubmodules = false;
-      sha256 = "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=";
+      sha256 = "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE=";
    };
  };
  neovide = {
@@ -98,17 +98,6 @@
    };
    date = "2026-05-16";
  };
-  oh-my-pi = {
-    pname = "oh-my-pi";
-    version = "v15.10.1";
-    src = fetchFromGitHub {
-      owner = "can1357";
-      repo = "oh-my-pi";
-      rev = "v15.10.1";
-      fetchSubmodules = false;
-      sha256 = "sha256-SPVour0OyZmJ+G+p7SFAjB0vdTWuvUAQH82InOvSVZc=";
-    };
-  };
  qebspil = {
    pname = "qebspil";
    version = "8e4d9e676a3b3afe136cda9b953a2139ff1a32d0";
@@ -158,16 +147,16 @@
  };
  vpkmerge = {
    pname = "vpkmerge";
-    version = "v0.7.0";
+    version = "v0.19.0";
    src = fetchFromGitHub {
      owner = "Slush97";
      repo = "vpkmerge";
-      rev = "v0.7.0";
+      rev = "v0.19.0";
      fetchSubmodules = false;
-      sha256 = "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=";
+      sha256 = "sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=";
    };
    cargoLock."Cargo.lock" = {
-      lockFile = ./. + "/sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock";
+      lockFile = ./. + "/sha256-DjGEiL6Zfm1chawjeT23KXKvmncCjDssFzguPmHNWUw=/Cargo.lock";
      outputHashes = {
        
      };
@@ -8,6 +8,23 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"

+[[package]]
+name = "adler32"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
+
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom 0.2.17",
+ "once_cell",
+ "version_check",
+]
+
 [[package]]
 name = "aho-corasick"
 version = "1.1.4"
@@ -536,6 +553,25 @@ dependencies = [
 "crossbeam-utils",
 ]

+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -816,6 +852,12 @@ version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"

+[[package]]
+name = "either"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
+
 [[package]]
 name = "embed-resource"
 version = "3.0.9"
@@ -869,6 +911,32 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"

+[[package]]
+name = "fbxcel"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f9e966e38cb462819635792e0a9ee1d6cc5fff9bcdbf7baefb350221a7ae3df"
+dependencies = [
+ "indextree",
+ "libflate",
+ "log",
+ "string-interner",
+]
+
+[[package]]
+name = "fbxcel-dom"
+version = "0.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84d1dcac5735ee4aa4b56758ae8446c55ee6f00b2041e31f5303c338b8e0ec6a"
+dependencies = [
+ "anyhow",
+ "fbxcel",
+ "log",
+ "mint",
+ "rgb",
+ "string-interner",
+]
+
 [[package]]
 name = "fdeflate"
 version = "0.3.7"
@@ -1373,6 +1441,15 @@ dependencies = [
 "zerocopy",
 ]

+[[package]]
+name = "hashbrown"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+dependencies = [
+ "ahash",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1697,6 +1774,30 @@ dependencies = [
 "serde_core",
 ]

+[[package]]
+name = "indextree"
+version = "4.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cee462cd93b03891663339b59a21246cc5fc2cc95060d0bb5059e25cd50edc4"
+dependencies = [
+ "indextree-macros",
+]
+
+[[package]]
+name = "indextree-macros"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f85dac6c239acc85fd61934c572292d93adfd2de459d9c032aa22b553506e915"
+dependencies = [
+ "either",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "strum",
+ "syn 2.0.117",
+ "thiserror 2.0.18",
+]
+
 [[package]]
 name = "infer"
 version = "0.19.0"
@@ -1743,6 +1844,15 @@ dependencies = [
 "num_cpus",
 ]

+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.18"
@@ -1912,6 +2022,26 @@ dependencies = [
 "pkg-config",
 ]

+[[package]]
+name = "libflate"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18"
+dependencies = [
+ "adler32",
+ "crc32fast",
+ "libflate_lz77",
+]
+
+[[package]]
+name = "libflate_lz77"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf"
+dependencies = [
+ "rle-decode-fast",
+]
+
 [[package]]
 name = "libloading"
 version = "0.7.4"
@@ -2012,6 +2142,12 @@ dependencies = [
 "simd-adler32",
 ]

+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+
 [[package]]
 name = "mio"
 version = "1.2.0"
@@ -2025,7 +2161,7 @@ dependencies = [

 [[package]]
 name = "morphic"
-version = "0.3.0"
+version = "0.10.0"
 dependencies = [
 "bcdec_rs",
 "bitflags 2.11.1",
@@ -2037,6 +2173,7 @@ dependencies = [
 "image",
 "intel_tex_2",
 "lz4_flex",
+ "rayon",
 "ruzstd",
 "serde",
 "serde_json",
@@ -2661,6 +2798,26 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"

+[[package]]
+name = "rayon"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -2788,6 +2945,21 @@ dependencies = [
 "windows-sys 0.60.2",
 ]

+[[package]]
+name = "rgb"
+version = "0.8.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "rle-decode-fast"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422"
+
 [[package]]
 name = "rustc-hash"
 version = "2.1.2"
@@ -3190,6 +3362,16 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"

+[[package]]
+name = "string-interner"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e2531d8525b29b514d25e275a43581320d587b86db302b9a7e464bac579648"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.11.2",
+]
+
 [[package]]
 name = "string_cache"
 version = "0.9.0"
@@ -3220,6 +3402,27 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"

+[[package]]
+name = "strum"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "swift-rs"
 version = "1.0.7"
@@ -4136,21 +4339,28 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"

 [[package]]
 name = "vpkmerge-cli"
-version = "0.7.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
 "clap",
 "serde",
 "serde_json",
+ "tempfile",
 "vpkmerge-core",
 ]

 [[package]]
 name = "vpkmerge-core"
-version = "0.7.0"
+version = "0.19.0"
 dependencies = [
 "anyhow",
+ "fbxcel",
+ "fbxcel-dom",
+ "gltf",
+ "image",
 "morphic",
+ "quick-xml",
+ "serde",
 "serde_json",
 "tempfile",
 "valve_pak",
@@ -4158,7 +4368,7 @@ dependencies = [

 [[package]]
 name = "vpkmerge-gui"
-version = "0.6.0"
+version = "0.17.1"
 dependencies = [
 "base64 0.22.1",
 "half",
@@ -4169,6 +4379,7 @@ dependencies = [
 "tauri",
 "tauri-build",
 "tauri-plugin-dialog",
+ "tempfile",
 "valve_pak",
 "vpkmerge-core",
 ]
@@ -1,52 +1,8 @@
 {
  "nodes": {
-    "bun2nix": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1778446047,
-        "narHash": "sha256-oQvcadh2BCkrog+SGrG6YffKJrveYpjj3TdQJWaKhaM=",
-        "owner": "nix-community",
-        "repo": "bun2nix",
-        "rev": "f2bc12af1a6369648aac41041ceeaa0b866599c6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "bun2nix",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "bun2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1777988971,
-        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -80,7 +36,6 @@
    },
    "root": {
      "inputs": {
-        "bun2nix": "bun2nix",
        "flake-utils": "flake-utils",
        "nixpkgs": "nixpkgs"
      }
@@ -99,42 +54,6 @@
        "repo": "default",
        "type": "github"
      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "bun2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1775636079,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
    }
  },
  "root": "root",
@@ -4,86 +4,87 @@
  inputs = {
    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
    flake-utils.url = "github:numtide/flake-utils";
-    # Added for oh-my-pi
-    bun2nix.url = "github:nix-community/bun2nix";
-    bun2nix.inputs.nixpkgs.follows = "nixpkgs";
  };

-  outputs = {
-    self,
-    nixpkgs,
-    bun2nix,
-    flake-utils,
-  } @ inputs: (
-    nixpkgs.lib.recursiveUpdate
-    (
-      flake-utils.lib.eachSystem
-      [
-        "x86_64-linux"
-        "aarch64-linux"
-      ]
-      (
-        system: let
-          pkgs = import nixpkgs {
-            inherit system;
-            overlays = [bun2nix.overlays.default];
-            config = {
-              allowUnfree = true;
-            };
-          };
-          inherit (pkgs) lib;
-          scope = lib.makeScope pkgs.newScope (final: self.overlays.default (pkgs // final) pkgs);
-          recursePackage = name: pkg: let
-            isDrv = lib.isDerivation pkg;
-            isAttrs = lib.isAttrs pkg;
-            isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
-          in
-            if !isSameSystem
-            then []
-            else if isDrv
-            then [
-              (lib.nameValuePair name pkg)
-            ]
-            else if isAttrs
-            then lib.mapAttrsToList (nameNew: subPkg: recursePackage "${name}-${nameNew}" subPkg) pkg
-            else [];
-          flatPackages = builtins.listToAttrs (
-            lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope)
-          );
-          workingPackages = lib.filterAttrs (_: pkg: !pkg.meta.broken) flatPackages;
-          # Disable for now
-          # recursePackageSets =
-          #   pkg:
-          #   let
-          #     isDrv = lib.isDerivation pkg;
-          #     isAttrs = lib.isAttrs pkg;
-          #     isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
-          #   in
-          #   if isDrv && isSameSystem then
-          #     pkg
-          #   else if isAttrs then
-          #     lib.mapAttrs (_: subPkg: recursePackageSets subPkg) pkg
-          #   else
-          #     null;
-          #
-          # # Recursively filter out nulls and remove overrides (probably a btter way to do this but it works for now)
-          # packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") (
-          #   lib.mapAttrs (name: pkg: recursePackageSets pkg) scope
-          # );
-        in {
-          overlays = final: prev: flatPackages;
-          packages = flatPackages;
-          checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
-          devShells.default = pkgs.mkShellNoCC {
-            packages = [pkgs.nvfetcher];
-          };
-        }
-      )
-    )
+  outputs =
    {
-      overlays = {
-        default = final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
-      };
-    }
-  );
+      self,
+      nixpkgs,
+      flake-utils,
+    }@inputs:
+    (nixpkgs.lib.recursiveUpdate
+      (flake-utils.lib.eachSystem
+        [
+          "x86_64-linux"
+          "aarch64-linux"
+        ]
+        (
+          system:
+          let
+            pkgs = import nixpkgs {
+              inherit system;
+              config = {
+                allowUnfree = true;
+              };
+            };
+            inherit (pkgs) lib;
+            scope = lib.makeScope pkgs.newScope (final: self.overlays.default (pkgs // final) pkgs);
+            recursePackage =
+              name: pkg:
+              let
+                isDrv = lib.isDerivation pkg;
+                isAttrs = lib.isAttrs pkg;
+                isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
+              in
+              if !isSameSystem then
+                [ ]
+              else if isDrv then
+                [
+                  (lib.nameValuePair name pkg)
+                ]
+              else if isAttrs then
+                lib.mapAttrsToList (nameNew: subPkg: recursePackage "${name}-${nameNew}" subPkg) pkg
+              else
+                [ ];
+            flatPackages = builtins.listToAttrs (
+              lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope)
+            );
+            workingPackages = lib.filterAttrs (_: pkg: !pkg.meta.broken) flatPackages;
+            # Disable for now
+            # recursePackageSets =
+            #   pkg:
+            #   let
+            #     isDrv = lib.isDerivation pkg;
+            #     isAttrs = lib.isAttrs pkg;
+            #     isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
+            #   in
+            #   if isDrv && isSameSystem then
+            #     pkg
+            #   else if isAttrs then
+            #     lib.mapAttrs (_: subPkg: recursePackageSets subPkg) pkg
+            #   else
+            #     null;
+            #
+            # # Recursively filter out nulls and remove overrides (probably a btter way to do this but it works for now)
+            # packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") (
+            #   lib.mapAttrs (name: pkg: recursePackageSets pkg) scope
+            # );
+          in
+          {
+            overlays = final: prev: flatPackages;
+            packages = flatPackages;
+            checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
+            devShells.default = pkgs.mkShellNoCC {
+              packages = [ pkgs.nvfetcher ];
+            };
+          }
+        )
+      )
+      {
+        overlays = {
+          default =
+            final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
+        };
+      }
+    );
 }
@@ -49,7 +49,3 @@ fetch.github = "Slush97/grimoire"
 src.github = "Slush97/vpkmerge"
 fetch.github = "Slush97/vpkmerge"
 cargo_lock = ["Cargo.lock"]
-
-[oh-my-pi]
-src.github = "can1357/oh-my-pi"
-fetch.github = "can1357/oh-my-pi"
@@ -34,12 +34,12 @@
    pname = "grimoire";
    inherit version src;
    fetcherVersion = 3;
-    hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
+    hash = "sha256-X7KLUag9HPHVit0l/tA3BxQZ2/Cj0A5KiG4Oevx2268=";
  };

  desktopItem = makeDesktopItem {
    name = "grimoire";
-    exec = "/bin/grimoire %u";
+    exec = "grimoire %u";
    desktopName = "Grimoire";
    categories = ["Utility"];
    mimeTypes = ["x-scheme-handler/grimoire"];
@@ -1,38 +0,0 @@
-{
-  lib,
-  callPackage,
-  stdenv,
-  bun2nix,
-}: let
-  sources = callPackage ../../../../_sources/generated.nix {};
-in
-  stdenv.mkDerivation {
-    pname = "oh-my-pi";
-    version = "unstable-${sources.oh-my-pi.version}";
-
-    inherit (sources.oh-my-pi) src;
-
-    nativeBuildInputs = [
-      bun2nix.hook
-    ];
-
-    bunDeps = bun2nix.fetchBunDeps {
-      bunNix = ./bun.nix;
-    };
-
-    preBuild = ''
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      description = "UEFI boot driver to start co-processors on Qualcomm platforms late during the boot process";
-      homepage = "https://github.com/can1357/oh-my-pi";
-      license = licenses.mit;
-      platforms = ["aarch64-linux" "x86_64-linux"];
-      mainProgram = "omp";
-    };
-  }
@@ -27,11 +27,11 @@ stdenv.mkDerivation (

  rec {
    name = "x1e80100-firmware";
-    version = "26100_26.033.32430.0";
+    version = "26100_26.053.36539.0";
    src = fetchurl {
      # https://www.microsoft.com/en-us/download/details.aspx?id=106120
      url = "https://download.microsoft.com/download/b7ca2c3f-d320-4795-be0f-529a0117abb4/SurfaceLaptop7_ARM_Win11_${version}.msi";
-      hash = "sha256-KyHgMGk/oytVctE5AhdXer+x7mJk2uP8Vgc7v78wSRc=";
+      hash = "sha256-ZrbhrOfl8BvFks1MmueKowu7DgSrV0kc0D7CqqbhIps=";
    };
    nativeBuildInputs = [
      msitools
Author	SHA1	Message	Date
doloro	16927f0e7e	bump(vpkmerge): 0.9.0	2026-07-13 13:59:06 +01:00
doloro	d1c6469384	bump(grimoire): 1.23.0 (#20 ) ![image.png](/attachments/ad8e7979-c93b-4def-8346-832f3832d3ae) Reviewed-on: nikkuss/pkgs#20 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>	2026-07-13 16:23:52 +04:00
nikkuss	6331a7c8ec	bump firmware	2026-07-01 21:59:45 +04:00