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
10 changed files with 5530 additions and 55 deletions
+68
View File
@@ -60,6 +60,27 @@
}, },
"version": "v0.35.0" "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": { "flightcore": {
"cargoLock": null, "cargoLock": null,
"date": null, "date": null,
@@ -81,6 +102,27 @@
}, },
"version": "v3.2.0" "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": { "neovide": {
"cargoLock": { "cargoLock": {
"Cargo.lock": [ "Cargo.lock": [
@@ -188,5 +230,31 @@
"type": "github" "type": "github"
}, },
"version": "v5" "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"
} }
} }
+39
View File
@@ -45,6 +45,17 @@
sha256 = "sha256-xb6D4J+EmbK5XCrZCyv1LWYdfmaNDcw7Hk4nHg76uAo="; 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 = { flightcore = {
pname = "flightcore"; pname = "flightcore";
version = "v3.2.0"; version = "v3.2.0";
@@ -56,6 +67,17 @@
sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI="; 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 = { neovide = {
pname = "neovide"; pname = "neovide";
version = "8c48a699e201aa5559227a96d879b2f57192b354"; version = "8c48a699e201aa5559227a96d879b2f57192b354";
@@ -123,4 +145,21 @@
sha256 = "sha256-w+0SKR0A/hcFU6iFEOgyG+vWwgAWF8h9D0/X7GSFm7w="; 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 = {
};
};
};
} }
File diff suppressed because it is too large Load Diff
Generated
+3 -3
View File
@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764897201, "lastModified": 1780011192,
"narHash": "sha256-428X4sppU6k+tF2vxTy726E5BxbtoxoTRP+1FBbXqvM=", "narHash": "sha256-luHrZG6I7Mwdt413XoDOYBpp9z1z6X23/5SNktwjM+k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9cfae7bb77c5058a4cfa8006d0caf82af8e980dc", "rev": "3242faf14b7611a62ce0f0071619438a08b65c12",
"type": "github" "type": "github"
}, },
"original": { "original": {
+13
View File
@@ -2,6 +2,10 @@
src.github = "zed-industries/claude-code-acp" src.github = "zed-industries/claude-code-acp"
fetch.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] [flightcore]
src.github = "R2NorthstarTools/FlightCore" src.github = "R2NorthstarTools/FlightCore"
fetch.github = "R2NorthstarTools/FlightCore" fetch.github = "R2NorthstarTools/FlightCore"
@@ -36,3 +40,12 @@ src.git = "https://github.com/neovide/neovide.git"
src.git_branch = "nightly" src.git_branch = "nightly"
fetch.git = "https://github.com/neovide/neovide.git" fetch.git = "https://github.com/neovide/neovide.git"
cargo_lock = ["Cargo.lock"] 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"]
+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, pkg-config,
webkitgtk_4_1, webkitgtk_4_1,
wrapGAppsHook4, wrapGAppsHook4,
fetchFromGitHub, callPackage,
}: }: let
rustPlatform.buildRustPackage (finalAttrs: { sources = callPackage ../../../../_sources/generated.nix {};
pname = "flightcore"; in
version = "3.2.0"; rustPlatform.buildRustPackage (finalAttrs: {
src = fetchFromGitHub { pname = "flightcore";
owner = "R2NorthstarTools"; version = lib.removePrefix "v" sources.flightcore.version;
repo = "FlightCore"; inherit (sources.flightcore) src;
rev = "v${finalAttrs.version}"; patches = [./cargo-lock.patch];
sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI="; cargoDeps = rustPlatform.fetchCargoVendor {
}; src = finalAttrs.src;
patches = [./cargo-lock.patch]; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
cargoDeps = rustPlatform.fetchCargoVendor { hash = "sha256-Jh0DAX4fGy2Z1+hpq+bkU/VYy2JAL2u+neUIsQ2QXBU=";
src = finalAttrs.src; patchFlags = "-p2";
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}"; inherit (finalAttrs) patches;
hash = "sha256-Jh0DAX4fGy2Z1+hpq+bkU/VYy2JAL2u+neUIsQ2QXBU="; };
patchFlags = "-p2"; postPatch = ''
inherit (finalAttrs) patches; jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
}; '';
postPatch = '' npmDeps = fetchNpmDeps {
jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
''; src = "${finalAttrs.src}/src-vue";
npmDeps = fetchNpmDeps { hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; };
src = "${finalAttrs.src}/src-vue";
hash = "sha256-QhUPkCBK1kcAF7gByFxlg8Ca9PLF3evCl0QYEPP/Q2c=";
};
nativeBuildInputs = nativeBuildInputs =
[ [
cargo-tauri.hook cargo-tauri.hook
nodejs nodejs
npmHooks.npmConfigHook npmHooks.npmConfigHook
pkg-config pkg-config
jq jq
moreutils moreutils
] ]
++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4]; ++ lib.optionals stdenv.hostPlatform.isLinux [wrapGAppsHook4];
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
glib-networking glib-networking
openssl openssl
webkitgtk_4_1 webkitgtk_4_1
]; ];
cargoRoot = "src-tauri"; cargoRoot = "src-tauri";
npmRoot = "src-vue"; npmRoot = "src-vue";
buildAndTestSubdir = finalAttrs.cargoRoot; buildAndTestSubdir = finalAttrs.cargoRoot;
meta = { meta = {
platforms = ["x86_64-linux"]; platforms = ["x86_64-linux"];
description = "FlightCore A Northstar installer, updater, and mod-manager"; description = "FlightCore A Northstar installer, updater, and mod-manager";
}; };
}) })
+122
View File
@@ -0,0 +1,122 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
nodejs_22,
pnpm,
python3,
gcc,
gnumake,
pkg-config,
makeWrapper,
electron_40,
vpkmerge,
sqlite,
callPackage,
}: 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=";
};
in
stdenv.mkDerivation {
pname = "grimoire";
inherit version src;
nativeBuildInputs = [
nodejs_22
pnpm
pnpm.configHook
python3
gcc
gnumake
pkg-config
makeWrapper
electron_40
];
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"];
};
}
+25
View File
@@ -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 { rec {
name = "x1e80100-firmware"; name = "x1e80100-firmware";
version = "26100_26.011.9344.0"; version = "26100_26.033.32430.0";
src = fetchurl { src = fetchurl {
# https://www.microsoft.com/en-us/download/details.aspx?id=106120 # 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"; 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 = [ nativeBuildInputs = [
msitools msitools