diff --git a/README.org b/README.org
index 45a7a2d..84af4dc 100644
--- a/README.org
+++ b/README.org
@@ -211,6 +211,8 @@ mkShell {
   buildInputs = [
     go
     gopls
+    protoc-gen-go
+    protoc-gen-go-grpc
   ];
   shellHook = ''
     export GO111MODULE=on
@@ -284,6 +286,7 @@ mkShell {
     grpc
     grpcui
     grpcurl
+    grpc-tools
   ];
   shellHook = ''
   '';
@@ -307,9 +310,7 @@ mkShell {
     ccls
     cmake
     gnumake
-    libstdcxx5
     gcc-unwrapped
-    llvmPackages.libcxx
   ];
   shellHook = ''
   '';
diff --git a/shells/cc.nix b/shells/cc.nix
index e6c62e4..9bef1bc 100644
--- a/shells/cc.nix
+++ b/shells/cc.nix
@@ -8,9 +8,7 @@ mkShell {
     ccls
     cmake
     gnumake
-    libstdcxx5
     gcc-unwrapped
-    llvmPackages.libcxx
   ];
   shellHook = ''
   '';
diff --git a/shells/go.nix b/shells/go.nix
index fce3d44..1fd770a 100644
--- a/shells/go.nix
+++ b/shells/go.nix
@@ -6,6 +6,8 @@ mkShell {
   buildInputs = [
     go
     gopls
+    protoc-gen-go
+    protoc-gen-go-grpc
   ];
   shellHook = ''
     export GO111MODULE=on
diff --git a/shells/grpc.nix b/shells/grpc.nix
index 1d3a87d..1a43913 100644
--- a/shells/grpc.nix
+++ b/shells/grpc.nix
@@ -7,6 +7,7 @@ mkShell {
     grpc
     grpcui
     grpcurl
+    grpc-tools
   ];
   shellHook = ''
   '';