diff --git a/hostcontrol/shell.nix b/hostcontrol/shell.nix
index 31cd001..935429c 100644
--- a/hostcontrol/shell.nix
+++ b/hostcontrol/shell.nix
@@ -1,7 +1,22 @@
-with import <nixpkgs> {};
-
+{
+  pkgs ? import <nixpkgs> { },
+}:
 pkgs.mkShell {
-  LD_LIBRARY_PATH = [
+  buildInputs = with pkgs; [
+    cargo
+
+    # Useful tools
+    clippy
+    rustfmt
+    rust-analyzer
+
+    # minimal git
+    git
+    less
+    cacert # For cargo downloads and git to verify certs
+  ];
+  LD_LIBRARY_PATH = with pkgs; [
+    # TODO: needed ?
     "${xorg.libX11}/lib;${xorg.libXcursor}/lib;${xorg.libXi}/lib;${libxkbcommon}/lib"
   ];
 }