summaryrefslogtreecommitdiff
path: root/lua/lang
diff options
context:
space:
mode:
authorChristian Chiarulli <[email protected]>2021-07-19 22:50:07 -0400
committerGitHub <[email protected]>2021-07-19 22:50:07 -0400
commitd02265175f33fb1586e5e1f080e0730c8642a961 (patch)
tree74edc2e46da039ab2c04c96d0198a8a30a4ca217 /lua/lang
parentacb6a7a2cedcb758db912cc4c9c8afdae7c11840 (diff)
Decoupling config from nvim (#1038)
Diffstat (limited to 'lua/lang')
-rw-r--r--lua/lang/java.lua3
-rw-r--r--lua/lang/lua.lua3
2 files changed, 4 insertions, 2 deletions
diff --git a/lua/lang/java.lua b/lua/lang/java.lua
index 73358317..d84c0000 100644
--- a/lua/lang/java.lua
+++ b/lua/lang/java.lua
@@ -58,7 +58,8 @@ M.lsp = function()
else
print "Unsupported system"
end
- JAVA_LS_EXECUTABLE = CONFIG_PATH .. "/utils/bin/jdtls"
+
+ JAVA_LS_EXECUTABLE = os.getenv "HOME" .. "/.local/share/lunarvim/lvim/utils/bin/jdtls"
require("jdtls").start_or_attach {
on_attach = require("lsp").common_on_attach,
diff --git a/lua/lang/lua.lua b/lua/lang/lua.lua
index 415e0849..02b2decf 100644
--- a/lua/lang/lua.lua
+++ b/lua/lang/lua.lua
@@ -59,11 +59,12 @@ M.lsp = function()
},
diagnostics = {
-- Get the language server to recognize the `vim` global
- globals = { "vim" },
+ globals = { "vim", "O" },
},
workspace = {
-- Make the server aware of Neovim runtime files
library = {
+ [vim.fn.expand "~/.local/share/lunarvim/lvim/lua"] = true,
[vim.fn.expand "$VIMRUNTIME/lua"] = true,
[vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
},