diff --git a/justfile b/justfile
index c03df42..023f33a 100644
--- a/justfile
+++ b/justfile
@@ -9,6 +9,6 @@ fmt:
 run *ARGS:
     cargo run {{ARGS}}
 
-# Run 'cargo watch' to run the project (auto-recompiles)
+# Run 'bacon' to run the project (auto-recompiles)
 watch *ARGS:
-    cargo watch -x "run -- {{ARGS}}"
\ No newline at end of file
+	bacon --job run -- -- {{ ARGS }}
diff --git a/nix/modules/devshell.nix b/nix/modules/devshell.nix
index 100a51a..f1bd49d 100644
--- a/nix/modules/devshell.nix
+++ b/nix/modules/devshell.nix
@@ -10,7 +10,7 @@
       packages = with pkgs; [
         just
         nixd # Nix language server
-        cargo-watch
+        bacon
         config.process-compose.cargo-doc-live.outputs.package
       ];
     };