1
0
forked from nikkuss/pkgs

14 Commits

Author SHA1 Message Date
doloro be39398615 fix: hash 2026-05-30 12:54:18 +01:00
doloro c8274e668e lint: removed some comments 2026-05-30 12:48:07 +01:00
doloro 4a59b86a47 fix: vpkmerge and grimorie are using nvfetch now 2026-05-30 12:48:07 +01:00
nikkuss 8969f1cb5c bump nixpkgs 2026-05-30 12:48:07 +01:00
nikkuss 67ca4c6edb bump firwmware version 2026-05-30 12:48:07 +01:00
nikkuss 888d1338cd refactor(flightcore): consume source from nvfetcher generated.nix (#14)
Reviewed-on: nikkuss/pkgs#14
Co-authored-by: Nikkuss <Scuggo@pm.me>
Co-committed-by: Nikkuss <Scuggo@pm.me>
2026-05-30 12:48:07 +01:00
nikkuss 9927693901 bump firwmware version (#13)
Reviewed-on: nikkuss/pkgs#13
Co-authored-by: Nikkuss <Scuggo@pm.me>
Co-committed-by: Nikkuss <Scuggo@pm.me>
2026-05-30 12:48:06 +01:00
doloro c7c53eafae fix: uses rev from nvfetcher 2026-05-30 12:45:54 +01:00
doloro 8d618dff18 fix: bumped electron on grimoire 2026-05-30 12:40:33 +01:00
doloro cccc55ef78 lint: removed some comments 2026-05-29 14:35:07 +01:00
doloro 2917e84200 fix: vpkmerge and grimorie are using nvfetch now 2026-05-29 14:30:40 +01:00
doloro cb70ca0e90 add: vpkmerge (used by grimorie) 2026-05-29 14:30:17 +01:00
doloro c2e51153c5 lint 2026-05-29 12:02:03 +01:00
doloro 6a2f59785b add: grimorie (deadlock mod manager) 2026-05-29 11:47:53 +01:00
6 changed files with 14 additions and 97 deletions
+3 -24
View File
@@ -60,27 +60,6 @@
},
"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,
@@ -116,12 +95,12 @@
"name": null,
"owner": "Slush97",
"repo": "grimoire",
"rev": "v1.23.0",
"sha256": "sha256-GY1J/guggCc4fyEQKUoEHmRC8hMcSg6gBKU0maEYSPE=",
"rev": "v1.14.2",
"sha256": "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=",
"sparseCheckout": [],
"type": "github"
},
"version": "v1.23.0"
"version": "v1.14.2"
},
"neovide": {
"cargoLock": {
+3 -14
View File
@@ -45,17 +45,6 @@
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";
@@ -69,13 +58,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 = {
-4
View File
@@ -2,10 +2,6 @@
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"
-28
View File
@@ -1,28 +0,0 @@
{
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;
};
})
+6 -25
View File
@@ -14,8 +14,6 @@
vpkmerge,
sqlite,
callPackage,
makeDesktopItem,
copyDesktopItems,
}: let
sources = callPackage ../../../../_sources/generated.nix {};
@@ -34,15 +32,7 @@
pname = "grimoire";
inherit version src;
fetcherVersion = 3;
hash = "sha256-X7KLUag9HPHVit0l/tA3BxQZ2/Cj0A5KiG4Oevx2268=";
};
desktopItem = makeDesktopItem {
name = "grimoire";
exec = "grimoire %u";
desktopName = "Grimoire";
categories = ["Utility"];
mimeTypes = ["x-scheme-handler/grimoire"];
hash = "sha256-aSjELhEyEbQ7qT8fI5VfIDOHrsgHHL18Dsphm6sA8J4=";
};
in
stdenv.mkDerivation {
@@ -59,11 +49,8 @@ in
pkg-config
makeWrapper
electron_40
copyDesktopItems
];
desktopItems = [desktopItem];
buildInputs = [
sqlite
];
@@ -73,12 +60,6 @@ in
env.GRIMOIRE_SOCIAL_BASE_URL = "https://grimoire-social.slusheliott.workers.dev";
postPatch = ''
# The app is launched via electron directly (not an electron-builder
# package), so `app.isPackaged` is false and `is.dev` is true, which
# auto-opens DevTools on launch. Strip that call.
substituteInPlace electron/main/index.ts \
--replace-fail "mainWindow.webContents.openDevTools();" ""
cp -r ${grimoire-social-src} ../grimoire-social
chmod -R u+w ../grimoire-social
@@ -115,21 +96,21 @@ in
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
> $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"
[ -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
--add-flags "$out/lib/grimoire" \
--set ELECTRON_RESOURCES_PATH "$out/lib/grimoire" \
--set NODE_ENV production
runHook postInstall
'';
@@ -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