From ac66d2256b1bb5c4836fb5cb8f0644ca00736c4a Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Wed, 23 Aug 2023 18:46:02 -0400
Subject: [PATCH] Working lua-language-server configuration

---
 nix/base-system/flake.nix |  2 +-
 nix/base-system/init.lua  | 21 ++++++++++++++++++++-
 nix/darwin/flake.lock     |  6 +++---
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index c10a191..13d1db3 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -148,7 +148,7 @@ EOF";
             (tlaplus.override {
               adoptopenjdk-bin = jdk;
             })
-            luajitPackages.lua-lsp
+			lua-language-server
             jdk
             plantuml-c4
             texlive.combined.scheme-basic
diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index 64e86d3..9a50750 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -103,7 +103,26 @@ lspconfig.tsserver.setup{}
 lspconfig.rust_analyzer.setup{}
 
 -- lua language server setup.
-lspconfig.lua_ls.setup{}
+lspconfig.lua_ls.setup{
+    settings = {
+      Lua = {
+	    runtime = { version = 'LuaJIT', },
+		diagnostics = {
+      	  -- Get the language server to recognize the `vim` global
+      	  globals = {'vim'},
+      	},
+        workspace = {
+          -- Make the server aware of Neovim runtime files
+          library = vim.api.nvim_get_runtime_file("", true),
+          -- Disable the checkThirdParty prompts.
+          checkThirdParty = false,
+        },
+        telemetry = {
+          enable = false,
+        },
+	  },
+	},
+}
 
 -- lsp configuration
 vim.api.nvim_create_autocmd('LspAttach', {
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index d88a1ea..e0db752 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -34,12 +34,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-RQLwfX1ZM8lLATzqM41ZhBnB+LRK71D3Q5nyaG3c30A=",
-        "path": "/nix/store/3yf62sm1x6h8bb01hxwln2sgi1czwcqy-source/nix/base-system",
+        "narHash": "sha256-2QL7ewPUK7h3868qChArUaSba0xvUod8J1vpaPQo+Sw=",
+        "path": "/nix/store/k56fbhy1997yid1h1kfksx7rmhs4gsxv-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/3yf62sm1x6h8bb01hxwln2sgi1czwcqy-source/nix/base-system",
+        "path": "/nix/store/k56fbhy1997yid1h1kfksx7rmhs4gsxv-source/nix/base-system",
         "type": "path"
       }
     },