diff --git a/flake.nix b/flake.nix
index c6602de..4d95af9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -97,7 +97,7 @@
       defaultAttrs = {
         user = {
           name = common.username;
-          password = "temp";
+          password = "temp"; # TODO
         };
         version = common.system.version;
         wayland.enable = true;
diff --git a/hosts/pi4/development.nix b/hosts/pi4/development.nix
index 68e9a29..8784f42 100644
--- a/hosts/pi4/development.nix
+++ b/hosts/pi4/development.nix
@@ -1,12 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
+  imports = [
+    (lib.custom.relativeToRoot "shared/modules/development/formatters.nix")
+  ];
+
   environment.systemPackages = with pkgs; [
-    # Tools
     just
-    # Formatters
-    treefmt
-    shfmt
-    nodePackages.prettier
- ];
+  ];
 }
diff --git a/shared/modules/development/default.nix b/shared/modules/development/default.nix
index 11daf6f..a98231d 100644
--- a/shared/modules/development/default.nix
+++ b/shared/modules/development/default.nix
@@ -4,6 +4,7 @@
   imports = [
     ./docker.nix
     ./dotnet.nix
+    ./formatters.nix
     ./nix.nix
     ./node.nix
     ./ollama.nix
@@ -17,8 +18,5 @@
     git
     just
     unstable.libpq # Required for PostgreSQL
-    # Formatters
-    treefmt
-    shfmt
   ];
 }
diff --git a/shared/modules/development/formatters.nix b/shared/modules/development/formatters.nix
new file mode 100644
index 0000000..7f271ce
--- /dev/null
+++ b/shared/modules/development/formatters.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    nodePackages.prettier
+    treefmt
+    shfmt
+  ];
+}