config overhaul

6 files changed, 28 insertions, 28 deletions

diff --git a/lua/lsp/clangd.lua b/lua/lsp/clangd.lua
index dbbda084..594c375b 100644
--- a/lua/lsp/clangd.lua
+++ b/lua/lsp/clangd.lua
@@ -3,9 +3,9 @@ require'lspconfig'.clangd.setup {
     on_attach = require'lsp'.common_on_attach,
     handlers = {
         ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
-            virtual_text = O.clang.diagnostics.virtual_text,
-            signs = O.clang.diagnostics.signs,
-            underline = O.clang.diagnostics.underline,
+            virtual_text = O.lang.clang.diagnostics.virtual_text,
+            signs = O.lang.clang.diagnostics.signs,
+            underline = O.lang.clang.diagnostics.underline,
             update_in_insert = true
 
         })
diff --git a/lua/lsp/dart-ls.lua b/lua/lsp/dart-ls.lua
index 99f41311..fe4898e8 100644
--- a/lua/lsp/dart-ls.lua
+++ b/lua/lsp/dart-ls.lua
@@ -1,5 +1,5 @@
 require'lspconfig'.dartls.setup{
-    cmd = { "dart", O.dart.sdk_path, "--lsp" },
+    cmd = { "dart", O.lang.dart.sdk_path, "--lsp" },
     on_attach = require'lsp'.common_on_attach,
     init_options = {
       closingLabels = false,
@@ -8,4 +8,4 @@ require'lspconfig'.dartls.setup{
       outline = false,
       suggestFromUnimportedLibraries = true
     }
-}
\ No newline at end of file
+}
diff --git a/lua/lsp/efm-general-ls.lua b/lua/lsp/efm-general-ls.lua
index 24bdde23..da01db12 100644
--- a/lua/lsp/efm-general-ls.lua
+++ b/lua/lsp/efm-general-ls.lua
@@ -15,13 +15,13 @@ local isort = {formatCommand = "isort --quiet -", formatStdin = true}
 local yapf = {formatCommand = "yapf --quiet", formatStdin = true}
 local black = {formatCommand = "black --quiet -", formatStdin = true}
 
-if O.python.linter == 'flake8' then table.insert(python_arguments, flake8) end
+if O.lang.python.linter == 'flake8' then table.insert(python_arguments, flake8) end
 
-if O.python.isort then table.insert(python_arguments, isort) end
+if O.lang.python.isort then table.insert(python_arguments, isort) end
 
-if O.python.formatter == 'yapf' then
+if O.lang.python.formatter == 'yapf' then
     table.insert(python_arguments, yapf)
-elseif O.python.formatter == 'black' then
+elseif O.lang.python.formatter == 'black' then
     table.insert(python_arguments, black)
 end
 
@@ -38,9 +38,9 @@ local lua_fmt = {
     formatStdin = true
 }
 
-if O.lua.formatter == 'lua-format' then
+if O.lang.lua.formatter == 'lua-format' then
   table.insert(lua_arguments, luaFormat)
-elseif O.lua.formatter == 'lua-fmt' then
+elseif O.lang.lua.formatter == 'lua-fmt' then
   table.insert(lua_arguments, lua_fmt)
 end
 
@@ -54,9 +54,9 @@ local shellcheck = {
     lintFormats = {'%f:%l:%c: %trror: %m', '%f:%l:%c: %tarning: %m', '%f:%l:%c: %tote: %m'}
 }
 
-if O.sh.formatter == 'shfmt' then table.insert(sh_arguments, shfmt) end
+if O.lang.sh.formatter == 'shfmt' then table.insert(sh_arguments, shfmt) end
 
-if O.sh.linter == 'shellcheck' then table.insert(sh_arguments, shellcheck) end
+if O.lang.sh.linter == 'shellcheck' then table.insert(sh_arguments, shellcheck) end
 
 -- tsserver/web javascript react, vue, json, html, css, yaml
 local prettier = {formatCommand = "prettier --stdin-filepath ${INPUT}", formatStdin = true}
@@ -74,9 +74,9 @@ local eslint = {
 
 local tsserver_args = {}
 
-if O.tsserver.formatter == 'prettier' then table.insert(tsserver_args, prettier) end
+if O.lang.tsserver.formatter == 'prettier' then table.insert(tsserver_args, prettier) end
 
-if O.tsserver.linter == 'eslint' then table.insert(tsserver_args, eslint) end
+if O.lang.tsserver.linter == 'eslint' then table.insert(tsserver_args, eslint) end
 
 -- local markdownlint = {
 --     -- TODO default to global lintrc
diff --git a/lua/lsp/js-ts-ls.lua b/lua/lsp/js-ts-ls.lua
index 4eca1e57..94e1b72d 100644
--- a/lua/lsp/js-ts-ls.lua
+++ b/lua/lsp/js-ts-ls.lua
@@ -18,9 +18,9 @@ require'lspconfig'.tsserver.setup {
     settings = {documentFormatting = false},
     handlers = {
         ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
-            virtual_text = O.tsserver.diagnostics.virtual_text,
-            signs = O.tsserver.diagnostics.signs,
-            underline = O.tsserver.diagnostics.underline,
+            virtual_text = O.lang.tsserver.diagnostics.virtual_text,
+            signs = O.lang.tsserver.diagnostics.signs,
+            underline = O.lang.tsserver.diagnostics.underline,
             update_in_insert = true
 
         })
diff --git a/lua/lsp/python-ls.lua b/lua/lsp/python-ls.lua
index f9af265e..7ffcbb25 100644
--- a/lua/lsp/python-ls.lua
+++ b/lua/lsp/python-ls.lua
@@ -4,18 +4,18 @@ require'lspconfig'.pyright.setup {
     on_attach = require'lsp'.common_on_attach,
     handlers = {
         ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
-            virtual_text = O.python.diagnostics.virtual_text,
-            signs = O.python.diagnostics.signs,
-            underline = O.python.diagnostics.underline,
+            virtual_text = O.lang.python.diagnostics.virtual_text,
+            signs = O.lang.python.diagnostics.signs,
+            underline = O.lang.python.diagnostics.underline,
             update_in_insert = true
         })
     },
 	 settings = {
       python = {
         analysis = {
-		  typeCheckingMode = O.python.analysis.type_checking,
-		  autoSearchPaths = O.python.analysis.auto_search_paths,
-          useLibraryCodeForTypes = O.python.analysis.use_library_code_types
+		  typeCheckingMode = O.lang.python.analysis.type_checking,
+		  autoSearchPaths = O.lang.python.analysis.auto_search_paths,
+          useLibraryCodeForTypes = O.lang.python.analysis.use_library_code_types
         }
       }
     }
diff --git a/lua/lsp/ruby-ls.lua b/lua/lsp/ruby-ls.lua
index fd314e8e..079616b1 100644
--- a/lua/lsp/ruby-ls.lua
+++ b/lua/lsp/ruby-ls.lua
@@ -4,12 +4,12 @@ require'lspconfig'.solargraph.setup {
     on_attach = require'lsp'.common_on_attach,
     handlers = {
         ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
-            virtual_text = O.ruby.diagnostics.virtual_text,
-            signs = O.ruby.diagnostics.signs,
-            underline = O.ruby.diagnostics.underline,
+            virtual_text = O.lang.ruby.diagnostics.virtual_text,
+            signs = O.lang.ruby.diagnostics.signs,
+            underline = O.lang.ruby.diagnostics.underline,
             update_in_insert = true
 
         })
     },
-    filetypes = O.ruby.filetypes,
+    filetypes = O.lang.ruby.filetypes,
 }