diff --git a/.gitignore b/.gitignore
index 92d4648..cd5da31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,5 @@ integrationtests/workspaces/clangd/.cache
 CLAUDE.md*
 .mcp.json
 .goosehints
+
+/result
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..081117f
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1754725699,
+        "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..0d99ce4
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,67 @@
+{
+  description = "MCP Language Server - A Model Context Protocol server that runs and exposes a language server to LLMs";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        packages.default = pkgs.buildGoModule rec {
+          pname = "mcp-language-server";
+          version = "0.1.0";
+
+          src = ./.;
+
+          vendorHash = "sha256-WcYKtM8r9xALx68VvgRabMPq8XnubhTj6NAdtmaPa+g=";
+
+          # Only build the main package
+          subPackages = [ "." ];
+
+          ldflags = [
+            "-s"
+            "-w"
+            "-X main.version=${version}"
+          ];
+
+          meta = with pkgs.lib; {
+            description = "MCP server that runs and exposes a language server to LLMs";
+            homepage = "https://github.com/isaacphi/mcp-language-server";
+            license = licenses.bsd3;
+            maintainers = [ ];
+            platforms = platforms.unix;
+          };
+
+          # Skip tests for now as they require external language servers
+          doCheck = false;
+        };
+
+        apps.default = {
+          type = "app";
+          program = "${self.packages.${system}.default}/bin/mcp-language-server";
+        };
+
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            go
+            gopls
+            golangci-lint
+            delve
+            just
+          ];
+
+          shellHook = ''
+            echo "MCP Language Server development shell"
+            echo "Available commands:"
+            echo "  go build    - Build the binary"
+            echo "  go test     - Run tests"
+            echo "  just -l     - List available just recipes"
+          '';
+        };
+      });
+}
\ No newline at end of file