mreow

Reviewed-on: nikkuss/pkgs#19
Co-authored-by: Doloro1978 <doloroo@proton.me>
Co-committed-by: Doloro1978 <doloroo@proton.me>

_sources/generated.json

@@ -60,6 +60,27 @@
         },
         "version": "v0.35.0"
     },
+    "claude-sync": {
+        "cargoLock": null,
+        "date": null,
+        "extract": null,
+        "name": "claude-sync",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "tawanorg",
+            "repo": "claude-sync",
+            "rev": "v1.9.0",
+            "sha256": "sha256-5waB01wmSsFUkBB/PmT9yY5b1J/aapZJCnm5O21q+Q4=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "v1.9.0"
+    },
     "flightcore": {
         "cargoLock": null,
         "date": null,
@@ -81,6 +102,27 @@
         },
         "version": "v3.2.0"
     },
+    "grimoire": {
+        "cargoLock": null,
+        "date": null,
+        "extract": null,
+        "name": "grimoire",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "Slush97",
+            "repo": "grimoire",
+            "rev": "v1.14.2",
+            "sha256": "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "v1.14.2"
+    },
     "neovide": {
         "cargoLock": {
             "Cargo.lock": [
@@ -106,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",
@@ -188,5 +251,31 @@
             "type": "github"
         },
         "version": "v5"
+    },
+    "vpkmerge": {
+        "cargoLock": {
+            "Cargo.lock": [
+                "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock",
+                {}
+            ]
+        },
+        "date": null,
+        "extract": null,
+        "name": "vpkmerge",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "Slush97",
+            "repo": "vpkmerge",
+            "rev": "v0.7.0",
+            "sha256": "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "v0.7.0"
     }
 }

_sources/generated.nix

@@ -45,6 +45,17 @@
       sha256 = "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo=";
     };
   };
+  claude-sync = {
+    pname = "claude-sync";
+    version = "v1.9.0";
+    src = fetchFromGitHub {
+      owner = "tawanorg";
+      repo = "claude-sync";
+      rev = "v1.9.0";
+      fetchSubmodules = false;
+      sha256 = "sha256-5waB01wmSsFUkBB/PmT9yY5b1J/aapZJCnm5O21q+Q4=";
+    };
+  };
   flightcore = {
     pname = "flightcore";
     version = "v3.2.0";
@@ -56,6 +67,17 @@
       sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
     };
   };
+  grimoire = {
+    pname = "grimoire";
+    version = "v1.14.2";
+    src = fetchFromGitHub {
+      owner = "Slush97";
+      repo = "grimoire";
+      rev = "v1.14.2";
+      fetchSubmodules = false;
+      sha256 = "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=";
+    };
+  };
   neovide = {
     pname = "neovide";
     version = "8c48a699e201aa5559227a96d879b2f57192b354";
@@ -76,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";
@@ -123,4 +156,21 @@
       sha256 = "sha256-w+0SKR0A/hcFU6iFEOgyG+vWwgAWF8h9D0/X7GSFm7w=";
     };
   };
+  vpkmerge = {
+    pname = "vpkmerge";
+    version = "v0.7.0";
+    src = fetchFromGitHub {
+      owner = "Slush97";
+      repo = "vpkmerge";
+      rev = "v0.7.0";
+      fetchSubmodules = false;
+      sha256 = "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=";
+    };
+    cargoLock."Cargo.lock" = {
+      lockFile = ./. + "/sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock";
+      outputHashes = {
+        
+      };
+    };
+  };
 }

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,
@@ -20,11 +64,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764897201,
+        "lastModified": 1780011192,
-        "narHash": "sha256-428X4sppU6k+tF2vxTy726E5BxbtoxoTRP+1FBbXqvM=",
+        "narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9cfae7bb77c5058a4cfa8006d0caf82af8e980dc",
+        "rev": "3242faf14b7611a62ce0f0071619438a08b65c12",
         "type": "github"
       },
       "original": {
@@ -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,48 +4,49 @@
   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,
     nixpkgs,
+    bun2nix,
     flake-utils,
-    }@inputs:
+  } @ inputs: (
-    (nixpkgs.lib.recursiveUpdate
+    nixpkgs.lib.recursiveUpdate
-      (flake-utils.lib.eachSystem
+    (
+      flake-utils.lib.eachSystem
       [
         "x86_64-linux"
         "aarch64-linux"
       ]
       (
-          system:
+        system: let
-          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 =
+          recursePackage = name: pkg: let
-              name: pkg:
-              let
             isDrv = lib.isDerivation pkg;
             isAttrs = lib.isAttrs pkg;
             isSameSystem = lib.meta.availableOn pkgs.stdenv.hostPlatform pkg;
           in
-              if !isSameSystem then
+            if !isSameSystem
-                [ ]
+            then []
-              else if isDrv then
+            else if isDrv
-                [
+            then [
               (lib.nameValuePair name pkg)
             ]
-              else if isAttrs then
+            else if isAttrs
-                lib.mapAttrsToList (nameNew: subPkg: recursePackage "${name}-${nameNew}" subPkg) pkg
+            then lib.mapAttrsToList (nameNew: subPkg: recursePackage "${name}-${nameNew}" subPkg) pkg
-              else
+            else [];
-                [ ];
           flatPackages = builtins.listToAttrs (
             lib.lists.flatten (lib.mapAttrsToList (name: pkg: recursePackage name pkg) scope)
           );
@@ -69,21 +70,19 @@
           # packageSets = lib.filterAttrsRecursive (k: v: v != null && k != "override") (
           #   lib.mapAttrs (name: pkg: recursePackageSets pkg) scope
           # );
-          in
+        in {
-          {
           overlays = final: prev: flatPackages;
           packages = flatPackages;
           checks = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") workingPackages;
           devShells.default = pkgs.mkShellNoCC {
-              packages = [ pkgs.nvfetcher ];
+            packages = [pkgs.nvfetcher];
           };
         }
       )
     )
     {
       overlays = {
-          default =
+        default = final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
-            final: prev: ((import "${nixpkgs}/pkgs/top-level/by-name-overlay.nix" ./pkgs/by-name) final prev);
       };
     }
   );

nvfetcher.toml

@@ -2,6 +2,10 @@
 src.github = "zed-industries/claude-code-acp"
 fetch.github = "zed-industries/claude-code-acp"
 
+[claude-sync]
+src.github = "tawanorg/claude-sync"
+fetch.github = "tawanorg/claude-sync"
+
 [flightcore]
 src.github = "R2NorthstarTools/FlightCore"
 fetch.github = "R2NorthstarTools/FlightCore"
@@ -36,3 +40,16 @@ src.git = "https://github.com/neovide/neovide.git"
 src.git_branch = "nightly"
 fetch.git = "https://github.com/neovide/neovide.git"
 cargo_lock = ["Cargo.lock"]
+
+[grimoire]
+src.github = "Slush97/grimoire"
+fetch.github = "Slush97/grimoire"
+
+[vpkmerge]
+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/cl/claude-sync/package.nix

@@ -0,0 +1,28 @@
+{
+  lib,
+  buildGoModule,
+  callPackage,
+}:
+let
+  sources = callPackage ../../../../_sources/generated.nix { };
+in
+buildGoModule (finalAttrs: {
+  pname = "claude-sync";
+  version = lib.removePrefix "v" sources.claude-sync.version;
+  inherit (sources.claude-sync) src;
+
+  vendorHash = "sha256-cHWP5m191QP4XxeOtgHaLsyavXWikUwViDivBMGP34M=";
+
+  subPackages = [ "cmd/claude-sync" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=${finalAttrs.version}"
+  ];
+
+  meta = {
+    mainProgram = "claude-sync";
+    platforms = lib.platforms.unix;
+  };
+})

pkgs/by-name/fl/flightcore/package.nix

@@ -13,17 +13,14 @@
   pkg-config,
   webkitgtk_4_1,
   wrapGAppsHook4,
-  fetchFromGitHub,
+  callPackage,
-}:
+}: let
-rustPlatform.buildRustPackage (finalAttrs: {
+  sources = callPackage ../../../../_sources/generated.nix {};
+in
+  rustPlatform.buildRustPackage (finalAttrs: {
     pname = "flightcore";
-  version = "3.2.0";
+    version = lib.removePrefix "v" sources.flightcore.version;
-  src = fetchFromGitHub {
+    inherit (sources.flightcore) src;
-    owner = "R2NorthstarTools";
-    repo = "FlightCore";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
-  };
     patches = [./cargo-lock.patch];
     cargoDeps = rustPlatform.fetchCargoVendor {
       src = finalAttrs.src;
@@ -70,4 +67,4 @@ rustPlatform.buildRustPackage (finalAttrs: {
       platforms = ["x86_64-linux"];
       description = "FlightCore A Northstar installer, updater, and mod-manager";
     };
-})
+  })

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

@@ -0,0 +1,135 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  nodejs_22,
+  pnpm,
+  python3,
+  gcc,
+  gnumake,
+  pkg-config,
+  makeWrapper,
+  electron_40,
+  vpkmerge,
+  sqlite,
+  callPackage,
+  makeDesktopItem,
+  copyDesktopItems,
+}: let
+  sources = callPackage ../../../../_sources/generated.nix {};
+
+  src = sources.grimoire.src;
+  version = src.rev;
+
+  # This would go into nvfetcher but it isnt versioned..
+  grimoire-social-src = fetchFromGitHub {
+    owner = "Slush97";
+    repo = "grimoire-social";
+    rev = "main";
+    hash = "sha256-f+wUZOR7dqigxd/IZtay1BrLS5rcSnaDage3NXxqsPE=";
+  };
+
+  pnpmDeps = pnpm.fetchDeps {
+    pname = "grimoire";
+    inherit version src;
+    fetcherVersion = 3;
+    hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "grimoire";
+    exec = "/bin/grimoire %u";
+    desktopName = "Grimoire";
+    categories = ["Utility"];
+    mimeTypes = ["x-scheme-handler/grimoire"];
+  };
+in
+  stdenv.mkDerivation {
+    pname = "grimoire";
+    inherit version src;
+
+    nativeBuildInputs = [
+      nodejs_22
+      pnpm
+      pnpm.configHook
+      python3
+      gcc
+      gnumake
+      pkg-config
+      makeWrapper
+      electron_40
+      copyDesktopItems
+    ];
+
+    desktopItems = [desktopItem];
+
+    buildInputs = [
+      sqlite
+    ];
+
+    inherit pnpmDeps;
+
+    env.GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev";
+
+    postPatch = ''
+      cp -r ${grimoire-social-src} ../grimoire-social
+      chmod -R u+w ../grimoire-social
+
+      mkdir -p resources/vpkmerge
+      cp ${vpkmerge}/bin/vpkmerge resources/vpkmerge/vpkmerge-linux-x86_64
+      chmod +x resources/vpkmerge/vpkmerge-linux-x86_64
+    '';
+
+    buildPhase = ''
+      runHook preBuild
+
+      mkdir -p ../grimoire-social/node_modules
+      ln -sfn "$(realpath node_modules/zod)" ../grimoire-social/node_modules/zod
+
+      (
+        cd node_modules/better-sqlite3
+        HOME="$TMPDIR" node \
+          "${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \
+          rebuild \
+          --nodedir="${electron_40.headers}"
+      )
+
+      pnpm exec electron-vite build
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/lib/grimoire
+      cp -r dist $out/lib/grimoire/dist
+
+      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
+
+      mkdir -p $out/bin
+      makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
+      --add-flags "$out/lib/grimoire" \
+      --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
+      --set NODE_ENV production
+
+      runHook postInstall
+    '';
+
+    meta = {
+      description = "Grimoire — Electron-based mod manager";
+      platforms = ["x86_64-linux"];
+    };
+  }

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/vp/vpkmerge/package.nix

@@ -0,0 +1,25 @@
+{
+  lib,
+  rustPlatform,
+  callPackage,
+  pkg-config,
+  dbus,
+  glib,
+  cairo,
+  gtk3,
+  libsoup_3,
+  webkitgtk_4_1,
+}: let
+  sources = callPackage ../../../../_sources/generated.nix {};
+  inherit (sources.vpkmerge) src cargoLock;
+in
+  rustPlatform.buildRustPackage (finalAttrs: {
+    pname = "vpkmerge";
+    version = src.rev;
+    src = src;
+    cargoLock = sources.vpkmerge.cargoLock."Cargo.lock";
+
+    nativeBuildInputs = [pkg-config dbus.dev];
+
+    buildInputs = [dbus glib cairo gtk3 libsoup_3 webkitgtk_4_1];
+  })

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

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