diff --git a/user/modules/bash/default.nix b/user/modules/bash/default.nix
index 631890b..a1420a7 100644
--- a/user/modules/bash/default.nix
+++ b/user/modules/bash/default.nix
@@ -13,7 +13,7 @@ in
     };
 
     home.file.".config/bash" = {
-      source = config.lib.file.mkOutOfStoreSymlink ./bash;
+      source = ./bash;
       recursive = true;
     };
 
diff --git a/user/modules/git/default.nix b/user/modules/git/default.nix
index aa2ff58..8d95730 100644
--- a/user/modules/git/default.nix
+++ b/user/modules/git/default.nix
@@ -20,7 +20,7 @@ in
         git-crypt
       ];
       file.".config/git" = {
-        source = config.lib.file.mkOutOfStoreSymlink ./git;
+        source = ./git;
         recursive = true;
       };
     };
diff --git a/user/modules/neovim/default.nix b/user/modules/neovim/default.nix
index 37640e5..4944d31 100644
--- a/user/modules/neovim/default.nix
+++ b/user/modules/neovim/default.nix
@@ -3,7 +3,6 @@
 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"; };
@@ -34,7 +33,7 @@ in
     home.file.".config/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;
+      source = ./nvim;
       recursive = true;
     };
   };
diff --git a/user/modules/pi/agent b/user/modules/pi/agent
index c50b944..7f6fe43 160000
--- a/user/modules/pi/agent
+++ b/user/modules/pi/agent
@@ -1 +1 @@
-Subproject commit c50b9445bc365fa1d1f6aedb2e0fc34e7221e775
+Subproject commit 7f6fe43a9f70018bcbaea4f468729650a2606a15
diff --git a/user/modules/vim/default.nix b/user/modules/vim/default.nix
index 05a1ce4..68aed8a 100644
--- a/user/modules/vim/default.nix
+++ b/user/modules/vim/default.nix
@@ -16,7 +16,7 @@ in
         vim
        ];
       file.".vim" = {
-        source = config.lib.file.mkOutOfStoreSymlink ./vim;
+        source = ./vim;
         recursive = true;
       };
     };
diff --git a/user/modules/vim/vim b/user/modules/vim/vim
index c5b93f1..e3b54f9 160000
--- a/user/modules/vim/vim
+++ b/user/modules/vim/vim
@@ -1 +1 @@
-Subproject commit c5b93f1225c1434e93f4be88bb1e8686e94add79
+Subproject commit e3b54f994a2bf14fa81d50351d341b12e1e287b7