diff --git a/modules/programs/nvim/plugins/default.nix b/modules/programs/nvim/plugins/default.nix
index 9d4c4fe..68088b8 100644
--- a/modules/programs/nvim/plugins/default.nix
+++ b/modules/programs/nvim/plugins/default.nix
@@ -123,7 +123,6 @@ with builtins;
           ];
         }
         { plugin = which-key-nvim; }
-        { plugin = lspkind-nvim; }
         { plugin = lsp_lines-nvim; }
         {
           plugin = nvim-ufo;
@@ -131,6 +130,19 @@ with builtins;
             { plugin = promise-async; }
           ];
         }
+        {
+          plugin = neodev-nvim;
+          conf = /* lua */ ''
+            require("neodev").setup({
+              override = function(root_dir, library)
+                  if root_dir:find("/home/moritz/.dotfiles/", 1, true) == 1 then
+                    library.enabled = true
+                    library.plugins = true
+                  end
+                end,
+            })
+          '';
+        }
       ];
     }
     {
diff --git a/modules/programs/nvim/plugins/nvim-lspconfig.lua b/modules/programs/nvim/plugins/nvim-lspconfig.lua
index d2ab5b5..7fbc917 100644
--- a/modules/programs/nvim/plugins/nvim-lspconfig.lua
+++ b/modules/programs/nvim/plugins/nvim-lspconfig.lua
@@ -107,9 +107,13 @@ local on_attach_def = function(client, bufnr)
   }, { buffer = bufnr, silent = true })
 
   if client.server_capabilities.inlayHintProvider then
+    local slow_lsp_servers = {
+      "rust_analyzer",
+    }
+    local timeout = vim.tbl_contains(slow_lsp_servers, client.name, {}) and 500 or 0
     vim.defer_fn(function()
       vim.lsp.inlay_hint(bufnr, true)
-    end, 1000)
+    end, timeout)
   end
 end
 
@@ -156,6 +160,7 @@ lspconfig_setup("lua_ls", {
       runtime = {
         -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
         version = "LuaJIT",
+        path = vim.split(package.path, ";"),
       },
       diagnostics = {
         -- Get the language server to recognize the `vim` global
@@ -173,6 +178,9 @@ lspconfig_setup("lua_ls", {
       format = {
         enable = false,
       },
+      hint = {
+        enable = true,
+      },
     },
   },
 })