diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 70897df..bf554d7 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -260,15 +260,8 @@ return {
     after = {"lua-dev.nvim", "mason.nvim", "mason-lspconfig.nvim"},
     lock = false,
     config = function()
-      local lspconfig = require("lspconfig")
-      lspconfig.util.default_config = vim.tbl_extend(
-        "force",
-        lspconfig.util.default_config,
-        {
-          autostart = false
-        }
-      )
-    end-- disable lspconfig, handled by navigator
+      require("plugins.configs.lspconfig").setup()
+    end
   },
   ["williamboman/mason-lspconfig.nvim"] = {
     lock = false,
@@ -384,7 +377,7 @@ return {
   -- Lua dev env
   -- check setup in configs/navigator.lua
   ["folke/lua-dev.nvim"] = {
-    loack = true,
+    lock = true,
     module = "lua-dev",
   },
 
diff --git a/lua/plugins/configs/lspconfig.lua b/lua/plugins/configs/lspconfig.lua
index 5c2d9a6..8088489 100644
--- a/lua/plugins/configs/lspconfig.lua
+++ b/lua/plugins/configs/lspconfig.lua
@@ -1,80 +1,92 @@
+-- lsp is handled by navigator.lua
 local present, lspconfig = pcall(require, "lspconfig")
 
 if not present then
   return
 end
 
-require("base46").load_highlight "lsp"
-require "nvchad_ui.lsp"
-
+-- require("base46").load_highlight "lsp"
+-- require "nvchad_ui.lsp"
+--
 local M = {}
-local utils = require "core.utils"
-
--- export on_attach & capabilities for custom lspconfigs
-
-M.on_attach = function(client, bufnr)
-  print("NVCHAD ON ATTACH")
-  if vim.g.vim_version > 7 then
-    -- nightly
-    client.server_capabilities.documentFormattingProvider = false
-    client.server_capabilities.documentRangeFormattingProvider = false
-  else
-    -- stable
-    client.resolved_capabilities.document_formatting = false
-    client.resolved_capabilities.document_range_formatting = false
-  end
-
-  utils.load_mappings("lspconfig", { buffer = bufnr })
 
-  if client.server_capabilities.signatureHelpProvider then
-    require("nvchad_ui.signature").setup(client)
-  end
+function M.setup() 
+  lspconfig.util.default_config = vim.tbl_extend(
+  "force",
+  lspconfig.util.default_config,
+  {
+    autostart = false
+  })
 end
 
-M.capabilities = vim.lsp.protocol.make_client_capabilities()
-
-M.capabilities.textDocument.completion.completionItem = {
-  documentationFormat = { "markdown", "plaintext" },
-  snippetSupport = true,
-  preselectSupport = true,
-  insertReplaceSupport = true,
-  labelDetailsSupport = true,
-  deprecatedSupport = true,
-  commitCharactersSupport = true,
-  tagSupport = { valueSet = { 1 } },
-  resolveSupport = {
-    properties = {
-      "documentation",
-      "detail",
-      "additionalTextEdits",
-    },
-  },
-}
-
-lspconfig.sumneko_lua.setup {
-  on_attach = M.on_attach,
-  capabilities = M.capabilities,
-
-  settings = {
-    Lua = {
-      diagnostics = {
-        globals = { "vim" },
-      },
-      workspace = {
-        library = {
-          [vim.fn.expand "$VIMRUNTIME/lua"] = true,
-          [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
-        },
-        maxPreload = 100000,
-        preloadFileSize = 10000,
-      },
-    },
-  },
-}
 
-lspconfig.gopls.setup {
-  on_attach = M.on_attach,
-  capabilities = M.capabilities,
-}
+-- local utils = require "core.utils"
+--
+-- -- export on_attach & capabilities for custom lspconfigs
+--
+-- M.on_attach = function(client, bufnr)
+--   print("NVCHAD ON ATTACH")
+--   if vim.g.vim_version > 7 then
+--     -- nightly
+--     client.server_capabilities.documentFormattingProvider = false
+--     client.server_capabilities.documentRangeFormattingProvider = false
+--   else
+--     -- stable
+--     client.resolved_capabilities.document_formatting = false
+--     client.resolved_capabilities.document_range_formatting = false
+--   end
+--
+--   utils.load_mappings("lspconfig", { buffer = bufnr })
+--
+--   if client.server_capabilities.signatureHelpProvider then
+--     require("nvchad_ui.signature").setup(client)
+--   end
+-- end
+--
+-- M.capabilities = vim.lsp.protocol.make_client_capabilities()
+--
+-- M.capabilities.textDocument.completion.completionItem = {
+--   documentationFormat = { "markdown", "plaintext" },
+--   snippetSupport = true,
+--   preselectSupport = true,
+--   insertReplaceSupport = true,
+--   labelDetailsSupport = true,
+--   deprecatedSupport = true,
+--   commitCharactersSupport = true,
+--   tagSupport = { valueSet = { 1 } },
+--   resolveSupport = {
+--     properties = {
+--       "documentation",
+--       "detail",
+--       "additionalTextEdits",
+--     },
+--   },
+-- }
+--
+-- lspconfig.sumneko_lua.setup {
+--   on_attach = M.on_attach,
+--   capabilities = M.capabilities,
+--
+--   settings = {
+--     Lua = {
+--       diagnostics = {
+--         globals = { "vim" },
+--       },
+--       workspace = {
+--         library = {
+--           [vim.fn.expand "$VIMRUNTIME/lua"] = true,
+--           [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true,
+--         },
+--         maxPreload = 100000,
+--         preloadFileSize = 10000,
+--       },
+--     },
+--   },
+-- }
+--
+-- lspconfig.gopls.setup {
+--   on_attach = M.on_attach,
+--   capabilities = M.capabilities,
+-- }
 
 return M