7 Commits

Author SHA1 Message Date
nikkuss f4c78d4916 claude-sync
check / build (push) Successful in 15m9s
check / build (pull_request) Successful in 18s
2026-06-01 03:10:04 +04:00
doloro af49f7b7c7 bump: electron 40 (#16)
cache / build (push) Successful in 36s
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
2026-05-29 18:18:03 +04:00
nikkuss bc24d47b6c bump firwmware version
cache / build (push) Has been cancelled
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
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
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
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
8 changed files with 124 additions and 78 deletions
+21
View File
@@ -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,
+11
View File
@@ -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";
Generated
+3 -3
View File
@@ -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": {
+4 -4
View File
@@ -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"
@@ -41,10 +45,6 @@ cargo_lock = ["Cargo.lock"]
src.github = "Slush97/grimoire"
fetch.github = "Slush97/grimoire"
# [grimoire-social]
# src.github = "Slush97/grimoire-social"
# fetch.github = "Slush97/grimoire-social"
[vpkmerge]
src.github = "Slush97/vpkmerge"
fetch.github = "Slush97/vpkmerge"
+28
View File
@@ -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;
};
})
+47 -50
View File
@@ -13,61 +13,58 @@
pkg-config,
webkitgtk_4_1,
wrapGAppsHook4,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "flightcore";
version = "3.2.0";
src = fetchFromGitHub {
owner = "R2NorthstarTools";
repo = "FlightCore";
rev = "v${finalAttrs.version}";
sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
};
patches = [./cargo-lock.patch];
cargoDeps = rustPlatform.fetchCargoVendor {
src = finalAttrs.src;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
hash = "sha256-Jh0DAX4fGy2Z1+hpq+bkU/VYy2JAL2u+neUIsQ2QXBU=";
patchFlags = "-p2";
inherit (finalAttrs) patches;
};
postPatch = ''
jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
'';
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
src = "${finalAttrs.src}/src-vue";
hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
};
callPackage,
}: let
sources = callPackage ../../../../_sources/generated.nix {};
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "flightcore";
version = lib.removePrefix "v" sources.flightcore.version;
inherit (sources.flightcore) src;
patches = [./cargo-lock.patch];
cargoDeps = rustPlatform.fetchCargoVendor {
src = finalAttrs.src;
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
hash = "sha256-Jh0DAX4fGy2Z1+hpq+bkU/VYy2JAL2u+neUIsQ2QXBU=";
patchFlags = "-p2";
inherit (finalAttrs) patches;
};
postPatch = ''
jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
'';
npmDeps = fetchNpmDeps {
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
src = "${finalAttrs.src}/src-vue";
hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
};
nativeBuildInputs =
[
cargo-tauri.hook
nativeBuildInputs =
[
cargo-tauri.hook
nodejs
npmHooks.npmConfigHook
nodejs
npmHooks.npmConfigHook
pkg-config
pkg-config
jq
moreutils
]
++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4];
jq
moreutils
]
++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
openssl
webkitgtk_4_1
];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
glib-networking
openssl
webkitgtk_4_1
];
cargoRoot = "src-tauri";
npmRoot = "src-vue";
cargoRoot = "src-tauri";
npmRoot = "src-vue";
buildAndTestSubdir = finalAttrs.cargoRoot;
buildAndTestSubdir = finalAttrs.cargoRoot;
meta = {
platforms = ["x86_64-linux"];
description = "FlightCore A Northstar installer, updater, and mod-manager";
};
})
meta = {
platforms = ["x86_64-linux"];
description = "FlightCore A Northstar installer, updater, and mod-manager";
};
})
+8 -19
View File
@@ -10,23 +10,17 @@
gnumake,
pkg-config,
makeWrapper,
electron_39,
electron_40,
vpkmerge,
sqlite,
callPackage,
}: let
version = "1.13.1";
sources = callPackage ../../../../_sources/generated.nix {};
src = sources.grimoire.src;
# src = fetchFromGitHub {
# owner = "Slush97";
# repo = "grimoire";
# rev = "v${version}";
# hash = "sha256-GSl0whxFtw6tHKBLB3yOulpQGAw8Hqn+2ipj+1zQHLY=";
# };
version = src.rev;
# grimoire-social-src = sources.grimoire-social.src;
# This would go into nvfetcher but it isnt versioned..
grimoire-social-src = fetchFromGitHub {
owner = "Slush97";
repo = "grimoire-social";
@@ -37,14 +31,9 @@
pnpmDeps = pnpm.fetchDeps {
pname = "grimoire";
inherit version src;
fetcherVersion = 2;
hash = "sha256-ARJihXqqSVpzrA7qLGUFoQRW0ydgcIAunZJeFB3WN5s=";
fetcherVersion = 3;
hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
};
# Put into its own flake
# vpkmerge-bin = fetchurl {
# url = "https://github.com/Slush97/vpkmerge/releases/download/v0.4.0/vpkmerge-linux-x86_64";
# sha256 = "6860a989335afec0aa19544cf30cbebac9dc6b88af3f3a8d9c3340a6435fa045";
# };
in
stdenv.mkDerivation {
pname = "grimoire";
@@ -59,7 +48,7 @@ in
gnumake
pkg-config
makeWrapper
electron_39
electron_40
];
buildInputs = [
@@ -90,7 +79,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
@@ -118,7 +107,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
@@ -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