feat(grimoire): desktop file (#19 )

Reviewed-on: #19 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>
claude-sync (#17 )
2026-06-05 12:46:04 +04:00 · 2026-06-01 03:10:25 +04:00 · 2026-05-30 16:21:08 +04:00 · 2026-05-29 18:18:03 +04:00 · 2026-05-29 17:42:50 +04:00 · 2026-05-29 17:39:57 +04:00
10 changed files with 5437 additions and 77 deletions
@@ -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": [
@@ -188,5 +230,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"
    }
 }
@@ -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";
@@ -123,4 +145,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 = {
+        
+      };
+    };
+  };
 }
@@ -20,11 +20,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1764897201,
-        "narHash": "sha256-428X4sppU6k+tF2vxTy726E5BxbtoxoTRP+1FBbXqvM=",
+        "lastModified": 1780011192,
+        "narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "9cfae7bb77c5058a4cfa8006d0caf82af8e980dc",
+        "rev": "3242faf14b7611a62ce0f0071619438a08b65c12",
        "type": "github"
      },
      "original": {
@@ -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,12 @@ 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"]
@@ -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;
+  };
+})
@@ -13,17 +13,14 @@
  pkg-config,
  webkitgtk_4_1,
  wrapGAppsHook4,
-  fetchFromGitHub,
-}:
-rustPlatform.buildRustPackage (finalAttrs: {
+  callPackage,
+}: let
+  sources = callPackage ../../../../_sources/generated.nix {};
+in
+  rustPlatform.buildRustPackage (finalAttrs: {
    pname = "flightcore";
-  version = "3.2.0";
-  src = fetchFromGitHub {
-    owner = "R2NorthstarTools";
-    repo = "FlightCore";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
-  };
+    version = lib.removePrefix "v" sources.flightcore.version;
+    inherit (sources.flightcore) src;
    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";
    };
-})
+  })
@@ -10,18 +10,19 @@
  gnumake,
  pkg-config,
  makeWrapper,
-  electron_39,
+  electron_40,
+  vpkmerge,
  sqlite,
+  callPackage,
+  makeDesktopItem,
+  copyDesktopItems,
 }: let
-  version = "1.13.1";
+  sources = callPackage ../../../../_sources/generated.nix {};

-  src = fetchFromGitHub {
-    owner = "Slush97";
-    repo = "grimoire";
-    rev = "v${version}";
-    hash = "sha256-GSl0whxFtw6tHKBLB3yOulpQGAw8Hqn+2ipj+1zQHLY=";
-  };
+  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";
@@ -32,13 +33,16 @@
  pnpmDeps = pnpm.fetchDeps {
    pname = "grimoire";
    inherit version src;
-    fetcherVersion = 2;
-    hash = "sha256-iFxXEb5iKRM0Bp+YrQZhsGXHa0pfPMWQDah/SUBJVBE=";
+    fetcherVersion = 3;
+    hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
  };

-  vpkmerge-bin = fetchurl {
-    url = "https://github.com/Slush97/vpkmerge/releases/download/v0.4.0/vpkmerge-linux-x86_64";
-    sha256 = "6860a989335afec0aa19544cf30cbebac9dc6b88af3f3a8d9c3340a6435fa045";
+  desktopItem = makeDesktopItem {
+    name = "grimoire";
+    exec = "/bin/grimoire %u";
+    desktopName = "Grimoire";
+    categories = ["Utility"];
+    mimeTypes = ["x-scheme-handler/grimoire"];
  };
 in
  stdenv.mkDerivation {
@@ -54,9 +58,12 @@ in
      gnumake
      pkg-config
      makeWrapper
-      electron_39
+      electron_40
+      copyDesktopItems
    ];

+    desktopItems = [desktopItem];
+
    buildInputs = [
      sqlite
    ];
@@ -70,7 +77,7 @@ in
      chmod -R u+w ../grimoire-social

      mkdir -p resources/vpkmerge
-      cp ${vpkmerge-bin} resources/vpkmerge/vpkmerge-linux-x86_64
+      cp ${vpkmerge}/bin/vpkmerge resources/vpkmerge/vpkmerge-linux-x86_64
      chmod +x resources/vpkmerge/vpkmerge-linux-x86_64
    '';

@@ -85,7 +92,7 @@ in
        HOME="$TMPDIR" node \
          "${nodejs_22}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" \
          rebuild \
-          --nodedir="${electron_39.headers}"
+          --nodedir="${electron_40.headers}"
      )

      pnpm exec electron-vite build
@@ -113,7 +120,7 @@ in
      done

      mkdir -p $out/bin
-      makeWrapper ${electron_39}/bin/electron $out/bin/grimoire \
+      makeWrapper ${electron_40}/bin/electron $out/bin/grimoire \
      --add-flags "$out/lib/grimoire" \
      --set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
      --set NODE_ENV production
@@ -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];
+  })
@@ -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
Author	SHA1	Message	Date
doloro	5ae28029ef	feat(grimoire): desktop file (#19 ) cache / build (push) Successful in 36s Details Reviewed-on: #19 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>	2026-06-05 12:46:04 +04:00
nikkuss	142a4e46cb	claude-sync (#17 ) cache / build (push) Successful in 21s Details Reviewed-on: #17 Co-authored-by: Nikkuss <Scuggo@pm.me> Co-committed-by: Nikkuss <Scuggo@pm.me>	2026-06-01 03:10:25 +04:00
doloro	af49f7b7c7	bump: electron 40 (#16 ) cache / build (push) Successful in 36s Details Reviewed-on: #16 Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>	2026-05-30 16:21:08 +04:00
nikkuss	563375e7a0	bump nixpkgs cache / build (push) Failing after 19s Details	2026-05-29 18:18:03 +04:00
nikkuss	bc24d47b6c	bump firwmware version cache / build (push) Has been cancelled Details	2026-05-29 17:42:50 +04:00
nikkuss	c4626c6b94	refactor(flightcore): consume source from nvfetcher generated.nix (#14 ) cache / build (push) Has been cancelled Details Reviewed-on: #14 Co-authored-by: Nikkuss <Scuggo@pm.me> Co-committed-by: Nikkuss <Scuggo@pm.me>	2026-05-29 17:39:57 +04:00
nikkuss	6489e22306	bump firwmware version (#13 ) cache / build (push) Has been cancelled Details Reviewed-on: #13 Co-authored-by: Nikkuss <Scuggo@pm.me> Co-committed-by: Nikkuss <Scuggo@pm.me>	2026-05-29 17:39:21 +04:00
doloro	e4244532c3	feat: grimorie (deadlock mod manager) (#12 ) cache / build (push) Has been cancelled Details Reviewed-on: #12 Reviewed-by: nikkuss <Scuggo@pm.me> Co-authored-by: Doloro1978 <doloroo@proton.me> Co-committed-by: Doloro1978 <doloroo@proton.me>	2026-05-29 17:36:14 +04:00