trying to fix auto indenting on some files part 3

lua/custom/plugins/lsp.lua

@@ -1,25 +1,46 @@
+-- ~/dlond/nvim/lua/custom/plugins/lsp.lua
+-- LSP configuration, assuming LSP servers are installed via Nix/Home Manager
+
 return {
   -- ========================================
-    -- LSP Configuration Override 
+  -- LSP Configuration (LSP servers provided by Nix/Home Manager)
   -- ========================================
   {
-        -- Status updates for LSP
+    'neovim/nvim-lspconfig',
-        { 'j-hui/fidget.nvim', opts = {} },
+    event = { "BufReadPre", "BufNewFile" }, -- Load LSP config early
-
+    dependencies = {
-        -- LSP source for nvim-cmp (ensure this is also listed as dep for nvim-cmp)
+      -- Dependencies for nvim-lspconfig itself, if any.
-        'hrsh7th/cmp-nvim-lsp',
+      -- Mason and mason-lspconfig are removed as Nix handles LSP installation.
+      { 'j-hui/fidget.nvim', opts = {} }, -- Useful status updates for LSP
+      'hrsh7th/cmp-nvim-lsp',         -- LSP completion source for nvim-cmp
     },
     config = function(_, opts)
+      -- This config function runs AFTER the plugin and its dependencies are loaded.
+      -- It sets up the LSP servers.
+
       -- Get LSP capabilities, augmented by nvim-cmp
       local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
 
-        local servers_to_setup = { 'lua_ls', 'clangd', 'pyright' } -- <-- EXPLICIT LIST HERE
+      -- Define the list of LSP servers you want to configure.
+      -- These servers must be installed via Nix/Home Manager and be in your PATH.
+      local servers_to_setup = {
+        "lua_ls",
+        "clangd",
+        "pyright",
+        "nixd",
+        -- Add other servers like "bashls", "yamlls", "gopls", "rust_analyzer" etc.
+        -- Ensure the corresponding packages (e.g., pkgs.bash-language-server)
+        -- are in your Home Manager home.packages list.
+      }
 
       -- Iterate through the defined servers list and set them up with lspconfig
       for _, server_name in ipairs(servers_to_setup) do
+        -- print('Attempting to set up LSP server: ' .. server_name) -- Debug print
         require('lspconfig')[server_name].setup {
           capabilities = capabilities, -- Pass augmented capabilities
-                -- Add any server-specific overrides here if needed
+          -- Add any server-specific overrides here if needed, e.g.:
+          -- For lua_ls:
+          -- settings = { Lua = { diagnostics = { globals = {'vim'} } } },
         }
       end
 
@@ -52,32 +73,16 @@ return {
                return client.supports_method(method, { bufnr = bufnr })
              end
           end
-
           if client and client_supports_method(client, 'textDocument/documentHighlight', event.buf) then
-                    local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight-override',
+             local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight-override', { clear = false })
-                        { clear = false })
+             vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.document_highlight })
-                    vim.api.nvim_create_autocmd(
+             vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.clear_references })
-                        { 'CursorHold', 'CursorHoldI' },
+             vim.api.nvim_create_autocmd('LspDetach', { group = vim.api.nvim_create_augroup('kickstart-lsp-detach-override', { clear = true }), callback = function(event2) vim.lsp.buf.clear_references(); vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight-override', buffer = event2.buf } end })
-                        { buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.document_highlight }
-                    )
-                    vim.api.nvim_create_autocmd(
-                        { 'CursorMoved', 'CursorMovedI' },
-                        { buffer = event.buf, group = highlight_augroup, callback = vim.lsp.buf.clear_references }
-                    )
-                    vim.api.nvim_create_autocmd('LspDetach', {
-                        group = vim.api.nvim_create_augroup('kickstart-lsp-detach-override', { clear = true }),
-                        callback = function(event2)
-                            vim.lsp.buf.clear_references()
-                            vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight-override', buffer = event2.buf }
-                        end,
-                    })
           end
 
           -- Inlay hints toggle
           if client and client_supports_method(client, 'textDocument/inlayHint', event.buf) then
-                    map('<leader>th', function()
+            map('<leader>th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle Inlay [H]ints')
-                        vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
-                    end, '[T]oggle Inlay [H]ints')
           end
         end,
       })
@@ -89,29 +94,22 @@ return {
         underline = { severity = vim.diagnostic.severity.ERROR },
         signs = vim.g.have_nerd_font and {
           text = {
-                    [vim.diagnostic.severity.ERROR] = '󰅚 ',
+            [vim.diagnostic.severity.ERROR] = '󰅚 ', [vim.diagnostic.severity.WARN] = '󰀪 ', [vim.diagnostic.severity.INFO] = '󰋽 ', [vim.diagnostic.severity.HINT] = '󰌶 ',
-                    [vim.diagnostic.severity.WARN] = '󰀪 ',
-                    [vim.diagnostic.severity.INFO] = '󰋽 ',
-                    [vim.diagnostic.severity.HINT] = '󰌶 ',
           },
         } or {},
         virtual_text = {
-                source = 'if_many',
+          source = 'if_many', spacing = 2,
-                spacing = 2,
           format = function(diagnostic)
-                    local diagnostic_message = {
+            local diagnostic_message = { [vim.diagnostic.severity.ERROR] = diagnostic.message, [vim.diagnostic.severity.WARN] = diagnostic.message, [vim.diagnostic.severity.INFO] = diagnostic.message, [vim.diagnostic.severity.HINT] = diagnostic.message }
-                        [vim.diagnostic.severity.ERROR] = diagnostic.message,
-                        [vim.diagnostic.severity.WARN] = diagnostic.message,
-                        [vim.diagnostic.severity.INFO] = diagnostic.message,
-                        [vim.diagnostic.severity.HINT] = diagnostic.message,
-                    }
             return diagnostic_message[diagnostic.severity]
           end,
         },
       }
-    end, -- End of config function
 
-    -- lazydev setup
+    end, -- End of config function
+  },
+
+  -- lazydev setup (still useful for Neovim Lua development)
   {
     'folke/lazydev.nvim',
     ft = 'lua',
@@ -120,3 +118,4 @@ return {
     },
   },
 }
+