diff --git a/devShells/default.nix b/devShells/default.nix
index e54bc93..848b086 100644
--- a/devShells/default.nix
+++ b/devShells/default.nix
@@ -17,4 +17,6 @@ in forAllSystems(system: let
     openfoam = import ./openfoam.nix { inherit pkgs bpkgs; };
 
     rust = import ./rust.nix { inherit pkgs cranelib; };
+
+    go = import ./go.nix { inherit pkgs; };
 })
diff --git a/devShells/go.nix b/devShells/go.nix
new file mode 100644
index 0000000..6f55fe7
--- /dev/null
+++ b/devShells/go.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+pkgs.mkShell {
+    buildInputs = with pkgs; [ go gopls gotools go-tools golangci-lint gnumake ];
+}