diff --git a/.github/workflows/update-nix-assets-hash.yaml b/.github/workflows/update-nix-assets-hash.yaml
index 7ce5a7ad6..365a7a971 100644
--- a/.github/workflows/update-nix-assets-hash.yaml
+++ b/.github/workflows/update-nix-assets-hash.yaml
@@ -12,9 +12,6 @@ on:
 permissions:
   contents: write
 
-concurrency:
-  group: nix-update
-
 jobs:
   update:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/update-nix-pnpm-deps-hash.yaml b/.github/workflows/update-nix-pnpm-deps-hash.yaml
index 280efd907..0d4502446 100644
--- a/.github/workflows/update-nix-pnpm-deps-hash.yaml
+++ b/.github/workflows/update-nix-pnpm-deps-hash.yaml
@@ -11,9 +11,6 @@ on:
 permissions:
   contents: write
 
-concurrency:
-  group: nix-update
-
 jobs:
   update:
     runs-on: ubuntu-latest
diff --git a/flake.lock b/flake.lock
index a7457cc94..ff7718ee3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1764517877,
-        "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
+        "lastModified": 1777268161,
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index bb18367f6..4f03f5125 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,7 @@
             inputsFrom = [ self.packages.${system}.airi ];
             packages = [
               nixd
-              nixfmt-rfc-style
+              nixfmt
               nixfmt-tree
               pnpm
               python314
diff --git a/nix/common.nix b/nix/common.nix
index f33065987..c1d6d9302 100644
--- a/nix/common.nix
+++ b/nix/common.nix
@@ -1,8 +1,10 @@
 {
   lib,
   stdenvNoCC,
+  fetchPnpmDeps,
 
-  pnpm,
+  pnpm_10,
+  pnpmConfigHook,
 
   cacert,
   gitMinimal,
@@ -24,9 +26,9 @@ stdenvNoCC.mkDerivation (final: {
       !isEditorMetadataDirectory;
   };
 
-  pnpmDeps = pnpm.fetchDeps {
+  pnpmDeps = fetchPnpmDeps {
     inherit (final) pname version src;
-    fetcherVersion = 2;
+    fetcherVersion = 3;
     hash = builtins.readFile ./pnpm-deps-hash.txt;
   };
 
@@ -39,7 +41,8 @@ stdenvNoCC.mkDerivation (final: {
       cacert # For network request
       gitMinimal # For unplugin-info
       nodejs
-      pnpm.configHook
+      pnpm_10
+      pnpmConfigHook
     ];
 
     buildPhase = ''
diff --git a/nix/package.nix b/nix/package.nix
index e45d648d7..a0745f2a4 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -6,7 +6,8 @@
   makeDesktopItem,
   makeWrapper,
   gitMinimal,
-  pnpm,
+  pnpm_10,
+  pnpmConfigHook,
 
   asar,
   electron,
@@ -20,7 +21,8 @@
     makeWrapper
     gitMinimal
     nodejs
-    pnpm.configHook
+    pnpm_10
+    pnpmConfigHook
   ];
 
   desktopItems = [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8a0774e4d..87bca7d91 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -17451,6 +17451,7 @@ packages:
 
   uuid@10.0.0:
     resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   uuid@13.0.0:
@@ -17459,11 +17460,12 @@ packages:
 
   uuid@3.4.0:
     resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
-    deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   valibot@1.2.0: