Updates based on Chris's lunarvim

1 files changed, 4 insertions, 35 deletions

diff --git a/.config/nvim/ftplugin/zsh.lua b/.config/nvim/ftplugin/zsh.lua
index 6ece5ae..4dfbb7b 100644
--- a/.config/nvim/ftplugin/zsh.lua
+++ b/.config/nvim/ftplugin/zsh.lua
@@ -1,35 +1,4 @@
-if not require("cfg.utils").check_lsp_client_active "bashls" then
-  -- npm i -g bash-language-server
-  require("lspconfig").bashls.setup {
-    cmd = { DATA_PATH .. "/lspinstall/bash/node_modules/.bin/bash-language-server", "start" },
-    on_attach = require("cfg.lsp").common_on_attach,
-    filetypes = { "sh", "zsh" },
-  }
-end
-
--- sh
-local sh_arguments = {}
-
-local shellcheck = {
-  LintCommand = "shellcheck -f gcc -x",
-  lintFormats = { "%f:%l:%c: %trror: %m", "%f:%l:%c: %tarning: %m", "%f:%l:%c: %tote: %m" },
-}
-
-if O.lang.sh.linter == "shellcheck" then
-  table.insert(sh_arguments, shellcheck)
-end
-
-if not require("cfg.utils").check_lsp_client_active "efm" then
-  require("lspconfig").efm.setup {
-    -- init_options = {initializationOptions},
-    cmd = { DATA_PATH .. "/lspinstall/efm/efm-langserver" },
-    init_options = { documentFormatting = true, codeAction = false },
-    filetypes = { "zsh" },
-    settings = {
-      rootMarkers = { ".git/" },
-      languages = {
-        sh = sh_arguments,
-      },
-    },
-  }
-end
+require("lang.zsh").format()
+require("lang.zsh").lint()
+require("lang.zsh").lsp()
+require("lang.zsh").dap()