From 60e64aad632b8861dde5f215d996d6156be3f743 Mon Sep 17 00:00:00 2001
From: joshashtondev <me@joshashton.dev>
Date: Thu, 24 Sep 2026 14:51:04 -0600
Subject: [PATCH] =?UTF-8?q?nixos:=20gen=2076=20@=20lilac=20=E2=80=94=20202?=
 =?UTF-8?q?6-09-24=2014:51=2026.05.20260918.cf9d2fb=20(Yarara)=20-----?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 home/programs/nvim.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/home/programs/nvim.nix b/home/programs/nvim.nix
index 39e777b..cc20b2a 100644
--- a/home/programs/nvim.nix
+++ b/home/programs/nvim.nix
@@ -129,6 +129,24 @@ in
 
       local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
+      -- rustaceanvim auto-starts rust-analyzer on FileType rust, picking it up
+      -- from PATH -- so per-project rust-analyzer pins (e.g. from a project's
+      -- flake devShell/direnv) are used automatically without extra config here.
+      vim.g.rustaceanvim = {
+        server = {
+          capabilities = capabilities,
+          on_attach = function(_, bufnr)
+            local map = function(k, f) vim.keymap.set("n", k, f, { buffer = bufnr, silent = true }) end
+            map("gd", vim.lsp.buf.definition)
+            map("gr", vim.lsp.buf.references)
+            map("K", vim.lsp.buf.hover)
+            map("<leader>rn", vim.lsp.buf.rename)
+            map("<leader>ca", vim.lsp.buf.code_action)
+            map("<leader>f", function() vim.lsp.buf.format({ async = true }) end)
+          end,
+        },
+      }
+
       local bundles = vim.fn.glob(
         "${javaDebug}/share/vscode/extensions/vscjava.vscode-java-debug/server/com.microsoft.java.debug.plugin-*.jar",
         true, true)