From e3626e9aeb2aa9f2264f7a75ba1d89de2028f41d Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Mon, 20 Feb 2023 22:02:14 +0100
Subject: vim-dev: replace deprecated sumneko/nlua with luals and neodev

---
 dotfiles/vim/lua/vim-dev.lua     |  9 +--------
 usecases/desktop/development.nix | 10 +++++++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/dotfiles/vim/lua/vim-dev.lua b/dotfiles/vim/lua/vim-dev.lua
index d3b93c5..e1c38db 100644
--- a/dotfiles/vim/lua/vim-dev.lua
+++ b/dotfiles/vim/lua/vim-dev.lua
@@ -68,14 +68,7 @@ require("clangd_extensions").setup {
 	}
 }
 
-require("nlua.lsp.nvim").setup(lspconfig, {
-	cmd = {
-		string.format("%s/bin/lua-language-server", vim.g.sumneko_lua_base_path),
-		"-E",
-		string.format("%s/share/lua-language-server/main.lua", vim.g.sumneko_lua_base_path),
-	},
-	on_attach = on_attach,
-})
+require("neodev").setup({})
 
 -- Refactoring
 require("refactoring").setup {}
diff --git a/usecases/desktop/development.nix b/usecases/desktop/development.nix
index 470629f..7fc92af 100644
--- a/usecases/desktop/development.nix
+++ b/usecases/desktop/development.nix
@@ -10,7 +10,7 @@ let
     haskell-language-server
     marksman
     rust-analyzer-unwrapped
-    sumneko-lua-language-server
+    lua-language-server
 
     vimPlugins;
 
@@ -74,7 +74,7 @@ in
     vim = {
       extraPlugins = with vimPlugins; [
         lsp_signature-nvim
-        nlua-nvim
+        neodev-nvim
         nvim-lspconfig
         rust-tools-nvim
         clangd_extensions-nvim
@@ -84,13 +84,17 @@ in
 
       variables = {
         rust_analyzer_path = "${rust-analyzer-unwrapped}/bin/rust-analyzer";
-        sumneko_lua_base_path = "${sumneko-lua-language-server}";
+        luals_base_path = "${lua-language-server}";
         clangd_path = "${clang-tools}/bin/clangd";
       };
 
       lsp = {
         elixirls.cmd = [ "${elixir_ls}/bin/elixir-ls" ];
         hls.cmd = [ "${haskell-language-server}/bin/haskell-language-server" "--lsp" ];
+        lua_ls = {
+          cmd = [ "${lua-language-server}/bin/lua-language-server" ];
+          settings.Lua.completion.callSnippet = "Replace";
+        };
         marksman.cmd = [ "${marksman}/bin/marksman" ];
         pylsp.cmd = [ "${python-lsp-server}/bin/pylsp" ];
       };
-- 
cgit v1.2.3