diff --git a/flake.lock b/flake.lock
index 222e5fb..912f88c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1714635257,
@@ -35,7 +53,44 @@
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
-        "nvim_plugin-chrisgrieser/nvim-early-retirement": "nvim_plugin-chrisgrieser/nvim-early-retirement"
+        "nvim_plugin-chrisgrieser/nvim-early-retirement": "nvim_plugin-chrisgrieser/nvim-early-retirement",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1715566659,
+        "narHash": "sha256-OpI0TnN+uE0vvxjPStlTzf5RTohIXVSMwrP9NEgMtaY=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "6c465248316cd31502c82f81f1a3acf2d621b01c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index d3eb750..da3766b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,11 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # Names should always be `nvim_plugin-[lazy plugin name]`
     # Only need to add plugins as flake inputs if they are:
     # - Missing in nixpkgs
@@ -39,7 +44,9 @@
     withSystem (
       system:
       let
-        pkgs = nixpkgs.legacyPackages.${system};
+        # pkgs = nixpkgs.legacyPackages.${system};
+        overlays = [ (import inputs.rust-overlay) ];
+        pkgs = import nixpkgs { inherit system overlays; };
 
         # Plugins provided in nixpkgs, match the naming scheme above for keys
         lazyPath = pkgs.vimPlugins.lazy-nvim;
@@ -140,12 +147,21 @@
           pyright
           rust-analyzer
           marksman # markdown
-          taplo #toml
+          taplo # toml
           yaml-language-server
           lemminx # xml
           # Other
           # typescript
           nodejs_20
+          clang
+          zig
+          (pkgs.rust-bin.stable.latest.default.override
+          {
+            extensions = [
+              "rust-src"
+              "rust-analyzer"
+            ];
+          })
         ];
       in
       {