From 68450346a1200dd2b9342213dd1150f43b20be11 Mon Sep 17 00:00:00 2001
From: dlond <dlond@me.com>
Date: Thu, 29 May 2025 21:24:30 +1200
Subject: [PATCH] refactor lsp

---
 init.lua                             |  2 +-
 lua/custom/plugins/lsp/clangd.lua    | 11 +++++++----
 lua/custom/plugins/lsp/init.lua      |  4 ++++
 lua/custom/plugins/{ => lsp}/lsp.lua |  4 +---
 4 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 lua/custom/plugins/lsp/init.lua
 rename lua/custom/plugins/{ => lsp}/lsp.lua (90%)

diff --git a/init.lua b/init.lua
index 29f39c87..74a20fbe 100644
--- a/init.lua
+++ b/init.lua
@@ -949,7 +949,7 @@ require('lazy').setup({
   --    This is the easiest way to modularize your config.
   --
   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-  { import = 'custom.plugins' },
+  -- { import = 'custom.plugins' },
   --
   -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
   -- Or use telescope!
diff --git a/lua/custom/plugins/lsp/clangd.lua b/lua/custom/plugins/lsp/clangd.lua
index ff6be504..10e63ff2 100644
--- a/lua/custom/plugins/lsp/clangd.lua
+++ b/lua/custom/plugins/lsp/clangd.lua
@@ -1,8 +1,6 @@
 local M = {}
 
-local lspconfig = require 'lspconfig'
-local capabilities = require('blink.cmp').get_lsp_capabilities()
-local Path = require 'plenary.path'
+-- local Path = require 'plenary.path'
 local pickers = require 'telescope.pickers'
 local finders = require 'telescope.finders'
 local conf = require('telescope.config').values
@@ -50,6 +48,9 @@ function M.pick_target()
 end
 
 function M.setup()
+  local lspconfig = require 'lspconfig'
+  local capabilities = require('blink.cmp').get_lsp_capabilities()
+
   lspconfig.clangd.setup {
     cmd = make_clangd_cmd(),
     filetypes = { 'c', 'cpp', 'objc', 'objcpp', 'cuda' },
@@ -59,4 +60,6 @@ function M.setup()
   }
 end
 
-return M
+M.setup()
+
+return {}
diff --git a/lua/custom/plugins/lsp/init.lua b/lua/custom/plugins/lsp/init.lua
new file mode 100644
index 00000000..3606ccbf
--- /dev/null
+++ b/lua/custom/plugins/lsp/init.lua
@@ -0,0 +1,4 @@
+return {
+  require 'custom.plugins.lsp.lsp',
+  require 'custom.plugins.lsp.clangd',
+}
diff --git a/lua/custom/plugins/lsp.lua b/lua/custom/plugins/lsp/lsp.lua
similarity index 90%
rename from lua/custom/plugins/lsp.lua
rename to lua/custom/plugins/lsp/lsp.lua
index 4af7e87d..5a3c4e78 100644
--- a/lua/custom/plugins/lsp.lua
+++ b/lua/custom/plugins/lsp/lsp.lua
@@ -30,9 +30,7 @@ local servers = {
 
 for server_name, server in pairs(servers) do
   server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
-  require('lspconfig')[server_name].setup(server)
+  lspconfig[server_name].setup(server)
 end
 
-require('custom.plugins.lsp.clangd').setup()
-
 return {}