From 17efde7895761ee5c90023daaa64edd4abe3c341 Mon Sep 17 00:00:00 2001 From: moons-14 Date: Mon, 1 Dec 2025 15:59:55 +0900 Subject: [PATCH] rust --- modules/home/vscode.nix | 4 ++++ shells/next-web.nix | 20 +++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/modules/home/vscode.nix b/modules/home/vscode.nix index 8edf628..f38e9a9 100644 --- a/modules/home/vscode.nix +++ b/modules/home/vscode.nix @@ -140,6 +140,10 @@ let "java.eclipse.downloadSources" = true; "maven.executable.path" = "${pkgs.maven}/bin/mvn"; + + "[java]" = { + "editor.defaultFormatter" = "redhat.java"; + }; }; }; diff --git a/shells/next-web.nix b/shells/next-web.nix index 24f8ae2..04fca14 100644 --- a/shells/next-web.nix +++ b/shells/next-web.nix @@ -9,24 +9,34 @@ pkgs.mkShell { node pnpm zsh + openssl + pkg-config + jq ]; NODE_ENV = "development"; - COREPACK_HOME = "$PWD/.corepack"; - shellHook = '' - set -e + # corepack store under repo (avoid polluting home) + export COREPACK_HOME="$PWD/.corepack" + + # Prisma engines from nixpkgs (avoid binaries.prisma.sh fetch on NixOS) + export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig" + export PRISMA_SCHEMA_ENGINE_BINARY="${pkgs.prisma-engines}/bin/schema-engine" + export PRISMA_QUERY_ENGINE_BINARY="${pkgs.prisma-engines}/bin/query-engine" + export PRISMA_QUERY_ENGINE_LIBRARY="${pkgs.prisma-engines}/lib/libquery_engine.node" + export PRISMA_FMT_BINARY="${pkgs.prisma-engines}/bin/prisma-fmt" # ---- show tool versions if command -v node >/dev/null; then - echo "🌱 next-web shell → node $(node -v)" + echo "next-web shell -> node $(node -v)" fi if command -v pnpm >/dev/null; then echo " pnpm $(pnpm --version)" fi + + # Activate packageManager from package.json if present. if command -v corepack >/dev/null 2>&1; then - echo " corepack available" if [ -f package.json ] && command -v jq >/dev/null 2>&1 && jq -e '.packageManager' package.json >/dev/null; then COREPACK_ENABLE_DOWNLOADS=1 corepack prepare --activate || true fi