diff --git a/flake.lock b/flake.lock
index 7d5572ee2..0ea08ba43 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,43 +1,43 @@
 {
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1641404362,
-        "narHash": "sha256-8j21rw0xwwuiz8uOybm6gbeQIfAga/cwovzr3z1xzOg=",
+        "lastModified": 1651114127,
+        "narHash": "sha256-/lLC0wkMZkAdA5e1W76SnJzbhfOGDvync3VRHJMtAKk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "defafc9a220440180a34f923be9772d9c89a8197",
+        "rev": "6766fb6503ae1ebebc2a9704c162b2aef351f921",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
         "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
         "utils": "utils"
       }
     },
     "utils": {
       "locked": {
         "lastModified": 1638122382,
         "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
         "owner": "numtide",
         "repo": "flake-utils",
         "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
         "type": "github"
       },
       "original": {
         "owner": "numtide",
         "repo": "flake-utils",
         "type": "github"
       }
     }
   },
   "root": "root",
   "version": 7
 }
diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix
index adfc94d66..cd0f81665 100644
--- a/nix/dev-shell.nix
+++ b/nix/dev-shell.nix
@@ -1,33 +1,66 @@
 { mkShell
 , stdenv
 , lib
+, amqp-cpp
 , arcanist
+, cargo
+, cmake
+, cryptopp
 , darwin
+, grpc
+, libuv
 , nodejs-16_x
-, protobuf3_15
+, pkg-config
+, protobuf_3_15_cmake
+, python2
+, python3
+, watchman
+, rustfmt
 , yarn
 }:
 
 mkShell {
 
   # programs which are meant to be executed should go here
   nativeBuildInputs = [
+    # generic development
     arcanist
+
+    # node development
     nodejs-16_x
-    protobuf3_15
     yarn
+    watchman # react native
+    python2
+    python3
+
+    # native dependencies
+    # C/CXX toolchains are already brought in with mkShell
+    # Identity Service
+    cargo # includes rustc
+    rustfmt
+
+    # Tunnelbroker + CMake
+    amqp-cpp
+    cryptopp
+    cmake
+    libuv
+    pkg-config
+    protobuf_3_15_cmake
+    grpc
+
   ];
 
   # include any libraries buildInputs
   buildInputs = [
-    protobuf3_15 # exposes both a library and a command, thus should appear in both inputs
+    protobuf_3_15_cmake # exposes both a library and a command, thus should appear in both inputs
   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     CoreFoundation
+    CoreServices
     Security
   ]);
 
   # shell commands to be ran upon entering shell
   shellHook = ''
     echo "Welcome to Comm dev environment! :)"
   '';
 }