diff --git a/flake.nix b/flake.nix
index 7dcdf21..8b37dbf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -128,6 +128,10 @@
         pkgs.mkShell {
           inherit (checks.${system}.pre-commit-check) shellHook;
           buildInputs = checks.${system}.pre-commit-check.enabledPackages;
+          nativeBuildInputs = with pkgs; [
+            nil
+            nixfmt-rfc-style
+          ];
         };
     };
 }
diff --git a/hosts/garden/default.nix b/hosts/garden/default.nix
index f22a9fb..61a9838 100644
--- a/hosts/garden/default.nix
+++ b/hosts/garden/default.nix
@@ -7,7 +7,7 @@
     ../../users/root.nix
     ../../roles/tailscale.nix
     ../../roles/caddy.nix
-    ../../roles/vscode-remote.nix
+    ../../roles/nix-ld.nix
     ../../roles/syncthing.nix
   ];
 
diff --git a/hosts/hub/default.nix b/hosts/hub/default.nix
index e32c8c7..7a5a574 100644
--- a/hosts/hub/default.nix
+++ b/hosts/hub/default.nix
@@ -19,7 +19,7 @@
     ../../roles/authelia.nix
     ../../roles/podman.nix
     ../../roles/caddy.nix
-    ../../roles/vscode-remote.nix
+    ../../roles/nix-ld.nix
     ../../roles/postgres.nix
     ../../roles/syncthing.nix
     ./apps/grafana.nix
diff --git a/hosts/nixbox/default.nix b/hosts/nixbox/default.nix
index efbbfa2..c45936b 100644
--- a/hosts/nixbox/default.nix
+++ b/hosts/nixbox/default.nix
@@ -12,7 +12,7 @@
     ../../roles/networkmanager.nix
     ../../roles/tailscale.nix
     ../../roles/minio.nix
-    ../../roles/vscode-remote.nix
+    ../../roles/nix-ld.nix
     ../../roles/mate.nix
     ../../roles/media-pc.nix
   ];
diff --git a/hosts/router/default.nix b/hosts/router/default.nix
index 0ff6dbd..2364358 100644
--- a/hosts/router/default.nix
+++ b/hosts/router/default.nix
@@ -10,7 +10,7 @@
     ../../users/root.nix
     ../../roles/espeakup.nix
     ../../roles/tailscale.nix
-    ../../roles/vscode-remote.nix
+    ../../roles/nix-ld.nix
     # ../../roles/caddy.nix
   ];
 
diff --git a/roles/vscode-remote.nix b/roles/vscode-remote.nix
deleted file mode 100644
index ecd2da3..0000000
--- a/roles/vscode-remote.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./nix-ld.nix
-  ];
-
-  environment.systemPackages = with pkgs; [
-    nil
-    nixfmt-rfc-style
-  ];
-}