mreow

_sources/generated.json

@@ -116,12 +116,12 @@
             "name": null,
             "owner": "Slush97",
             "repo": "grimoire",
-            "rev": "v1.23.0",
+            "rev": "v1.14.2",
-            "sha256": "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE=",
+            "sha256": "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "v1.23.0"
+        "version": "v1.14.2"
     },
     "neovide": {
         "cargoLock": {
@@ -148,6 +148,27 @@
         },
         "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",

_sources/generated.nix

@@ -69,13 +69,13 @@
   };
   grimoire = {
     pname = "grimoire";
-    version = "v1.23.0";
+    version = "v1.14.2";
     src = fetchFromGitHub {
       owner = "Slush97";
       repo = "grimoire";
-      rev = "v1.23.0";
+      rev = "v1.14.2";
       fetchSubmodules = false;
-      sha256 = "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE=";
+      sha256 = "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=";
     };
   };
   neovide = {
@@ -98,6 +98,17 @@
     };
     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";

flake.lock

@@ -1,8 +1,52 @@
 {
   "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"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -36,6 +80,7 @@
     },
     "root": {
       "inputs": {
+        "bun2nix": "bun2nix",
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
@@ -54,6 +99,42 @@
         "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",

flake.nix

@@ -4,87 +4,86 @@
   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 =
+  outputs = {
-    {
+    self,
-      self,
+    nixpkgs,
-      nixpkgs,
+    bun2nix,
-      flake-utils,
+    flake-utils,
-    }@inputs:
+  } @ inputs: (
-    (nixpkgs.lib.recursiveUpdate
+    nixpkgs.lib.recursiveUpdate
-      (flake-utils.lib.eachSystem
+    (
-        [
+      flake-utils.lib.eachSystem
-          "x86_64-linux"
+      [
-          "aarch64-linux"
+        "x86_64-linux"
-        ]
+        "aarch64-linux"
-        (
+      ]
-          system:
+      (
-          let
+        system: let
-            pkgs = import nixpkgs {
+          pkgs = import nixpkgs {
-              inherit system;
+            inherit system;
-              config = {
+            overlays = [bun2nix.overlays.default];
-                allowUnfree = true;
+            config = {
-              };
+              allowUnfree = true;
             };
-            inherit (pkgs) lib;
+          };
-            scope = lib.makeScope pkgs.newScope (final: self.overlays.default (pkgs // final) pkgs);
+          inherit (pkgs) lib;
-            recursePackage =
+          scope = lib.makeScope pkgs.newScope (final: self.overlays.default (pkgs // final) pkgs);
-              name: pkg:
+          recursePackage = name: pkg: let
-              let
+            isDrv = lib.isDerivation pkg;
-                isDrv = lib.isDerivation pkg;
+            isAttrs = lib.isAttrs pkg;
-                isAttrs = lib.isAttrs pkg;
+            isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform 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
-          {
+            if !isSameSystem
-            overlays = final: prev: flatPackages;
+            then []
-            packages = flatPackages;
+            else if isDrv
-            checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
+            then [
-            devShells.default = pkgs.mkShellNoCC {
+              (lib.nameValuePair name pkg)
-              packages = [ pkgs.nvfetcher ];
+            ]
-            };
+            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 =
+      overlays = {
-            final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
+        default = final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
-        };
+      };
-      }
+    }
-    );
+  );
 }

nvfetcher.toml

@@ -49,3 +49,7 @@ 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"

pkgs/by-name/gr/grimorie/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchurl,
   nodejs_22,
   pnpm,
   python3,
@@ -33,12 +34,12 @@
     pname = "grimoire";
     inherit version src;
     fetcherVersion = 3;
-    hash = "sha256-X7KLUag9HPHVit0l/tA3BxQZ2/Cj0A5KiG4Oevx2268=";
+    hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
   };
 
   desktopItem = makeDesktopItem {
     name = "grimoire";
-    exec = "grimoire %u";
+    exec = "/bin/grimoire %u";
     desktopName = "Grimoire";
     categories = ["Utility"];
     mimeTypes = ["x-scheme-handler/grimoire"];
@@ -69,12 +70,7 @@ in
 
     inherit pnpmDeps;
 
-    env = {
+    env.GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev";
-      GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev";
-      # electron-builder must not try to fetch an Electron binary over the
-      # network; we hand it the Nix one via --config.electronDist below.
-      ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
-    };
 
     postPatch = ''
       cp -r ${grimoire-social-src} ../grimoire-social
@@ -91,9 +87,6 @@ in
       mkdir -p ../grimoire-social/node_modules
       ln -sfn "$(realpath node_modules/zod)" ../grimoire-social/node_modules/zod
 
-      # Rebuild the better-sqlite3 native addon against the Electron ABI. We do
-      # this ourselves (and disable electron-builder's own rebuild below) so no
-      # network fetch of Electron headers is needed inside the sandbox.
       (
         cd node_modules/better-sqlite3
         HOME="$TMPDIR" node \
@@ -102,19 +95,7 @@ in
           --nodedir="${electron_40.headers}"
       )
 
-      # Package the app the same way upstream CI does (release.yml):
-      # `electron-vite build && electron-builder`. We stop at the unpacked
-      # `--dir` output instead of building AppImage/deb installers, then wrap
-      # the Nix Electron around the produced app.asar. Building through
-      # electron-builder (rather than launching Electron on the raw dist/)
-      # makes `app.isPackaged` true, which is what disables the dev-only
-      # DevTools auto-open and the dev vpkmerge lookup path.
-      export HOME="$TMPDIR"
       pnpm exec electron-vite build
-      pnpm exec electron-builder --linux dir \
-        --config.npmRebuild=false \
-        --config.electronDist=${electron_40.dist} \
-        --config.electronVersion=${electron_40.version}
 
       runHook postBuild
     '';
@@ -123,17 +104,26 @@ in
       runHook preInstall
 
       mkdir -p $out/lib/grimoire
-      # electron-builder emits the packaged app (app.asar, app.asar.unpacked,
+      cp -r dist $out/lib/grimoire/dist
-      # and extraResources such as vpkmerge) under release/linux-unpacked/resources.
+
-      cp -r release/linux-unpacked/resources $out/lib/grimoire/resources
+      mkdir -p $out/lib/grimoire/resources
+      cp -r resources/vpkmerge $out/lib/grimoire/resources/vpkmerge
+      echo '{"name":"grimoire","version":"${version}","main":"dist/main/index.js"}' \
+      > $out/lib/grimoire/package.json
+
+      cp -r node_modules $out/lib/grimoire/node_modules
+
+      rm -rf "$out/lib/grimoire/node_modules/@grimoire"
+
+      find "$out/lib/grimoire/node_modules" -type l | while read -r link; do
+      [ -e "$link" ] || rm -f "$link"
+      done
 
-      # Launch the Nix Electron against the packaged asar. process.resourcesPath
-      # resolves to the directory holding app.asar, so the bundled vpkmerge at
-      # resources/vpkmerge/ is found at runtime.
       mkdir -p $out/bin
       makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
-        --add-flags "$out/lib/grimoire/resources/app.asar" \
+      --add-flags "$out/lib/grimoire" \
-        --set NODE_ENV production
+      --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
+      --set NODE_ENV production
 
       runHook postInstall
     '';

pkgs/by-name/oh/oh-my-pi/package.nix

@@ -0,0 +1,38 @@
+{
+  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";
+    };
+  }

pkgs/by-name/x1/x1e80100-firmware/package.nix

@@ -27,11 +27,11 @@ stdenv.mkDerivation (
 
   rec {
     name = "x1e80100-firmware";
-    version = "26100_26.053.36539.0";
+    version = "26100_26.033.32430.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-ZrbhrOfl8BvFks1MmueKowu7DgSrV0kc0D7CqqbhIps=";
+      hash = "sha256-KyHgMGk/oytVctE5AhdXer+x7mJk2uP8Vgc7v78wSRc=";
     };
     nativeBuildInputs = [
       msitools