The Lua Journey Begins...

16 files changed, 4 insertions, 161 deletions

diff --git a/lua/lsp/bash-ls.lua b/lua/lsp/bash-ls.lua
deleted file mode 100644
index ae3e7d70..00000000
--- a/lua/lsp/bash-ls.lua
+++ /dev/null
@@ -1,3 +0,0 @@
--- npm i -g bash-language-server
-require'lspconfig'.bashls.setup{}
-
diff --git a/lua/lsp/css-ls.lua b/lua/lsp/css-ls.lua
deleted file mode 100644
index 337fd585..00000000
--- a/lua/lsp/css-ls.lua
+++ /dev/null
@@ -1,3 +0,0 @@
--- npm install -g vscode-css-languageserver-bin
-require'lspconfig'.cssls.setup{}
-
diff --git a/lua/lsp/docker-ls.lua b/lua/lsp/docker-ls.lua
deleted file mode 100644
index 32b8b946..00000000
--- a/lua/lsp/docker-ls.lua
+++ /dev/null
@@ -1,3 +0,0 @@
--- npm install -g dockerfile-language-server-nodejs
-require'lspconfig'.dockerls.setup{}
-
diff --git a/lua/lsp/general-ls.lua b/lua/lsp/general-ls.lua
deleted file mode 100644
index fa28dbcf..00000000
--- a/lua/lsp/general-ls.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-require"lspconfig".efm.setup {
-    init_options = {documentFormatting = true},
-    filetypes = {"lua"},
-    settings = {
-        rootMarkers = {".git/"},
-        languages = {
-            lua = {
-                {
-                    formatCommand = "lua-format -i --no-keep-simple-function-one-line --no-break-after-operator --column-limit=150 --break-after-table-lb",
-                    formatStdin = true
-                }
-            }
-        }
-    }
-}
diff --git a/lua/lsp/graphql-ls.lua b/lua/lsp/graphql-ls.lua
deleted file mode 100644
index 6369446d..00000000
--- a/lua/lsp/graphql-ls.lua
+++ /dev/null
@@ -1,3 +0,0 @@
--- npm install -g graphql-language-service-cli
-require'lspconfig'.graphql.setup{}
-
diff --git a/lua/lsp/html-ls.lua b/lua/lsp/html-ls.lua
deleted file mode 100644
index b27650a6..00000000
--- a/lua/lsp/html-ls.lua
+++ /dev/null
@@ -1,11 +0,0 @@
--- npm install -g vscode-html-languageserver-bin
---Enable (broadcasting) snippet capability for completion
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities.textDocument.completion.completionItem.snippetSupport = true
-
-require'lspconfig'.html.setup {
-  capabilities = capabilities,
-}
-
-
-require'lspconfig'.html.setup{}
diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/lua/lsp/init.lua
diff --git a/lua/lsp/java-ls.lua b/lua/lsp/java-ls.lua
deleted file mode 100644
index 689b71eb..00000000
--- a/lua/lsp/java-ls.lua
+++ /dev/null
@@ -1,8 +0,0 @@
--- In Vimscript
--- augroup lsp
---   au!
---   au FileType java lua require('jdtls').start_or_attach({cmd = {'java-linux-ls'}})
--- augroup end
--- find_root looks for parent directories relative to the current buffer containing one of the given arguments.
--- require'lspconfig'.jdtls.setup {cmd = {'java-linux-ls'}}
-require('jdtls').start_or_attach({cmd = {'java-linux-ls'}, root_dir = require('jdtls.setup').find_root({'gradle.build', 'pom.xml'})})
diff --git a/lua/lsp/javascript-ls.lua b/lua/lsp/javascript-ls.lua
deleted file mode 100644
index 62ca0675..00000000
--- a/lua/lsp/javascript-ls.lua
+++ /dev/null
@@ -1,3 +0,0 @@
--- npm install -g typescript typescript-language-server
-require'lspconfig'.tsserver.setup{}
-
diff --git a/lua/lsp/json-ls.lua b/lua/lsp/json-ls.lua
deleted file mode 100644
index 474f1803..00000000
--- a/lua/lsp/json-ls.lua
+++ /dev/null
@@ -1,11 +0,0 @@
--- npm install -g vscode-json-languageserver
-require'lspconfig'.jsonls.setup {
-    commands = {
-      Format = {
-        function()
-          vim.lsp.buf.range_formatting({},{0,0},{vim.fn.line("$"),0})
-        end
-      }
-    }
-}
-
diff --git a/lua/lsp/lsp-config.lua b/lua/lsp/lsp-config.lua
deleted file mode 100644
index 74b82865..00000000
--- a/lua/lsp/lsp-config.lua
+++ /dev/null
@@ -1,61 +0,0 @@
--- local nvim_lsp = require('lspconfig')
--- local on_attach = function(client, bufnr)
---   local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
---   local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
-
---   buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-
---   -- Mappings.
---   local opts = { noremap=true, silent=true }
---   buf_set_keymap('n', 'gD', '<Cmd>lua vim.lsp.buf.declaration()<CR>', opts)
---   -- buf_set_keymap('n', 'gd', ':lua vim.lsp.buf.definition()')
---   buf_set_keymap('n', 'K', '<Cmd>lua vim.lsp.buf.hover()<CR>', opts)
---   buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
---   buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
---   buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
---   buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
---   buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
---   buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
---   buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
---   buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
---   -- buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
---   buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
---   buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
---   buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
---   buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
-
--- -- *vim.lsp.buf.code_action()
-
---   -- Set some keybinds conditional on server capabilities
---   if client.resolved_capabilities.document_formatting then
---     buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
---   elseif client.resolved_capabilities.document_range_formatting then
---     buf_set_keymap("n", "<space>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
---   end
---  -- Set autocommands conditional on server_capabilities
---   -- if client.resolved_capabilities.document_highlight then
---   --   vim.api.nvim_exec([[
---   --     hi LspReferenceRead cterm=bold ctermbg=red guibg=Pink
---   --     hi LspReferenceText cterm=bold ctermbg=red guibg=Pink
---   --     hi LspReferenceWrite cterm=bold ctermbg=red guibg=Pink
---   --     augroup lsp_document_highlight
---   --       autocmd! * <buffer>
---   --       autocmd CursorHold <buffer> lua vim.lsp.buf.document_highlight()
---   --       autocmd CursorMoved <buffer> lua vim.lsp.buf.clear_references()
---   --     augroup END
---   --   ]], false)
---   -- end
--- end
-
--- -- Use a loop to conveniently both setup defined servers
--- -- and map buffer local keybindings when the language server attaches
--- local servers = { "pyright", "rust_analyzer", "tsserver" }
--- for _, lsp in ipairs(servers) do
---   nvim_lsp[lsp].setup { on_attach = on_attach }
--- end
-
-
-vim.fn.sign_define("LspDiagnosticsSignError", {text = "", numhl = "LspDiagnosticsDefaultError"})
-vim.fn.sign_define("LspDiagnosticsSignWarning", {text = "", numhl = "LspDiagnosticsDefaultWarning"})
-vim.fn.sign_define("LspDiagnosticsSignInformation", {text = "", numhl = "LspDiagnosticsDefaultInformation"})
-vim.fn.sign_define("LspDiagnosticsSignHint", {text = "", numhl = "LspDiagnosticsDefaultHint"})
diff --git a/lua/lsp/lsp-kind.lua b/lua/lsp/lsp-kind.lua
deleted file mode 100644
index 7ac3fefa..00000000
--- a/lua/lsp/lsp-kind.lua
+++ /dev/null
@@ -1,27 +0,0 @@
--- commented options are defaults
-require('lspkind').init({
-    with_text = false,
-    symbol_map = {
-      Text = '  ',
-      Method = '  ',
-      Function = '  ',
-      Constructor = '  ',
-      Variable = '[]',
-      Class = '  ',
-      Interface = ' 蘒',
-      Module = '  ',
-      Property = '  ',
-      Unit = ' 塞 ',
-      Value = '  ',
-      Enum = ' 練',
-      Keyword = '  ',
-      Snippet = '  ',
-      Color = '',
-      File = '',
-      Folder = ' ﱮ ',
-      EnumMember = '  ',
-      Constant = '  ',
-      Struct = '  '
-    },
-})
-
diff --git a/lua/lsp/lua-ls.lua b/lua/lsp/lua-ls.lua
index c04219a9..c2bd79c0 100644
--- a/lua/lsp/lua-ls.lua
+++ b/lua/lsp/lua-ls.lua
@@ -5,11 +5,11 @@ local sumneko_root_path = ""
 local sumneko_binary = ""
 
 if vim.fn.has("mac") == 1 then
-    sumneko_root_path = "/Users/" .. USER .. "/.config/nvim/lua-language-server"
-    sumneko_binary = "/Users/" .. USER .. "/.config/nvim/lua-language-server/bin/macOS/lua-language-server"
+    sumneko_root_path = "/Users/" .. USER .. "/.config/nvim/ls/lua-language-server"
+    sumneko_binary = "/Users/" .. USER .. "/.config/nvim/ls/lua-language-server/bin/macOS/lua-language-server"
 elseif vim.fn.has("unix") == 1 then
-    sumneko_root_path = "/home/" .. USER .. "/.config/nvim/lua-language-server"
-    sumneko_binary = "/home/" .. USER .. "/.config/nvim/lua-language-server/bin/Linux/lua-language-server"
+    sumneko_root_path = "/home/" .. USER .. "/.config/nvim/ls/lua-language-server"
+    sumneko_binary = "/home/" .. USER .. "/.config/nvim/ls/lua-language-server/bin/Linux/lua-language-server"
 else
     print("Unsupported system for sumneko")
 end
diff --git a/lua/lsp/python-ls.lua b/lua/lsp/python-ls.lua
deleted file mode 100644
index 0be71acb..00000000
--- a/lua/lsp/python-ls.lua
+++ /dev/null
@@ -1,3 +0,0 @@
--- npm i -g pyright
-require'lspconfig'.pyright.setup{}
-
diff --git a/lua/lsp/vim-ls.lua b/lua/lsp/vim-ls.lua
deleted file mode 100644
index ac1e6e19..00000000
--- a/lua/lsp/vim-ls.lua
+++ /dev/null
@@ -1,3 +0,0 @@
--- npm install -g vim-language-server
-require'lspconfig'.vimls.setup{}
-
diff --git a/lua/lsp/yaml-ls.lua b/lua/lsp/yaml-ls.lua
deleted file mode 100644
index 6b2de91e..00000000
--- a/lua/lsp/yaml-ls.lua
+++ /dev/null
@@ -1,3 +0,0 @@
--- npm install -g yaml-language-server
-require'lspconfig'.yamlls.setup{}
-