diff --git a/user/modules/neovim/default.nix b/user/modules/neovim/default.nix
index 2c81e51..37640e5 100644
--- a/user/modules/neovim/default.nix
+++ b/user/modules/neovim/default.nix
@@ -3,6 +3,7 @@
 with lib;
 let
   cfg = config.modules.user.neovim;
+  nvimConfigPath = "${config.home.homeDirectory}/nixos/user/modules/neovim/nvim";
 
 in
 { options.modules.user.neovim = { enable = mkEnableOption "user.neovim"; };
@@ -31,7 +32,9 @@ in
     };
 
     home.file.".config/nvim" = {
-      source = config.lib.file.mkOutOfStoreSymlink ./nvim;
+      # Keep Neovim's config writable. In a flake, `./nvim` is copied into
+      # /nix/store before Home Manager can create an out-of-store symlink.
+      source = config.lib.file.mkOutOfStoreSymlink nvimConfigPath;
       recursive = true;
     };
   };
diff --git a/user/modules/neovim/nvim b/user/modules/neovim/nvim
index 376b9c5..87403b7 160000
--- a/user/modules/neovim/nvim
+++ b/user/modules/neovim/nvim
@@ -1 +1 @@
-Subproject commit 376b9c5c16b9d8b121b73516219082e57b397bc9
+Subproject commit 87403b7d6fdc8b71da8d5d9b2f81f62e0e587006
diff --git a/user/modules/pi/default.nix b/user/modules/pi/default.nix
index aa3bf51..c053378 100644
--- a/user/modules/pi/default.nix
+++ b/user/modules/pi/default.nix
@@ -4,7 +4,7 @@ with lib;
 let
   cfg = config.modules.user.pi;
   npmGlobal = "${config.home.homeDirectory}/.npm-global";
-  piVersion = "0.70.5";
+  piVersion = "0.72.0";
 
 in
 { options.modules.user.pi = { enable = mkEnableOption "user.pi"; };