diff --git a/init.lua b/init.lua index 9af8960d..c0a27d1e 100644 --- a/init.lua +++ b/init.lua @@ -301,7 +301,7 @@ require('lazy').setup({ -- Then, because we use the `opts` key (recommended), the configuration runs -- after the plugin has been loaded as `require(MODULE).setup(opts)`. - { -- Useful plugin to show you pending keybinds. + { -- Useful plugin to show you pending keybinds. 'folke/which-key.nvim', event = 'VimEnter', -- Sets the loading event to 'VimEnter' opts = { @@ -382,7 +382,7 @@ require('lazy').setup({ { 'nvim-telescope/telescope-ui-select.nvim' }, -- Useful for getting pretty icons, but requires a Nerd Font. - { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, + { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, }, config = function() -- Telescope is a fuzzy finder that comes with a lot of different things that diff --git a/lua/custom/plugins/formatting.lua b/lua/custom/plugins/formatting.lua index 047980de..af803017 100644 --- a/lua/custom/plugins/formatting.lua +++ b/lua/custom/plugins/formatting.lua @@ -1,40 +1,40 @@ -- Formatter configuration return { - -- ======================================== - -- Formatter Configuration (conform.nvim) - -- ======================================== - { - 'stevearc/conform.nvim', - event = 'BufWritePre', -- Format on save - -- cmd = { 'ConformInfo' }, -- Optional: If you want the command available - -- keys = { ... } -- Optional: Define keys if needed - opts = { - formatters_by_ft = { - lua = { 'stylua' }, - c = { 'clang_format' }, - cpp = { 'clang_format' }, - -- Use ruff for Python formatting (includes isort and is faster than black - -- Ensure 'ruff' is installed via Home Manager (pkgs.ruff) - python = { 'ruff_format', 'ruff_fix' }, - -- python = { 'isort', 'black' }, - nix = { 'alejandra' }, -- Add nix formatter - -- Add other filetypes and formatters, e.g.: - -- javascript = { "prettier" }, - -- typescript = { "prettier" }, - -- css = { "prettier" }, - -- html = { "prettier" }, - -- json = { "prettier" }, - -- yaml = { "prettier" }, - -- markdown = { "prettier" }, - -- bash = { "shfmt" }, - }, - -- Configure format_on_save behavior - format_on_save = { - -- I recommend these options, but adjust to your liking - timeout_ms = 500, -- Stop formatting if it takes too long - lsp_fallback = true, -- Fallback to LSP formatting if conform fails - }, - }, + -- ======================================== + -- Formatter Configuration (conform.nvim) + -- ======================================== + { + 'stevearc/conform.nvim', + event = 'BufWritePre', -- Format on save + -- cmd = { 'ConformInfo' }, -- Optional: If you want the command available + -- keys = { ... } -- Optional: Define keys if needed + opts = { + formatters_by_ft = { + lua = { 'stylua' }, + c = { 'clang_format' }, + cpp = { 'clang_format' }, + -- Use ruff for Python formatting (includes isort and is faster than black + -- Ensure 'ruff' is installed via Home Manager (pkgs.ruff) + python = { 'ruff_format', 'ruff_fix' }, + -- python = { 'isort', 'black' }, + nix = { 'alejandra' }, -- Add nix formatter + -- Add other filetypes and formatters, e.g.: + -- javascript = { "prettier" }, + -- typescript = { "prettier" }, + -- css = { "prettier" }, + -- html = { "prettier" }, + -- json = { "prettier" }, + -- yaml = { "prettier" }, + -- markdown = { "prettier" }, + -- bash = { "shfmt" }, + }, + -- Configure format_on_save behavior + format_on_save = { + -- I recommend these options, but adjust to your liking + timeout_ms = 500, -- Stop formatting if it takes too long + lsp_fallback = true, -- Fallback to LSP formatting if conform fails + }, }, + }, } diff --git a/lua/custom/plugins/lsp.lua b/lua/custom/plugins/lsp.lua index 4c1e0e90..3e5c02f2 100644 --- a/lua/custom/plugins/lsp.lua +++ b/lua/custom/plugins/lsp.lua @@ -2,137 +2,142 @@ -- LSP configuration, assuming LSP servers are installed via Nix/Home Manager return { - -- ======================================== - -- LSP Configuration (LSP servers provided by Nix/Home Manager) - -- ======================================== - { - 'neovim/nvim-lspconfig', - event = { "BufReadPre", "BufNewFile" }, -- Load LSP config early - dependencies = { - -- Dependencies for nvim-lspconfig itself, if any. - -- 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. + -- ======================================== + -- LSP Configuration (LSP servers provided by Nix/Home Manager) + -- ======================================== + { + 'neovim/nvim-lspconfig', + event = { 'BufReadPre', 'BufNewFile' }, -- Load LSP config early + dependencies = { + -- Dependencies for nvim-lspconfig itself, if any. + -- 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()) + -- Get LSP capabilities, augmented by nvim-cmp + local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) - -- 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", - "ruff", - -- 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. - } + -- 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', + 'ruff', + -- 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, e.g.: - -- For lua_ls: - -- settings = { Lua = { diagnostics = { globals = {'vim'} } } }, - } + -- 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, e.g.: + -- For lua_ls: + -- settings = { Lua = { diagnostics = { globals = {'vim'} } } }, + } + end + + -- Setup keymaps and diagnostics based on kickstart's original init.lua LSP section + vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-attach-override', { clear = true }), + callback = function(event) + local map = function(keys, func, desc, mode) + mode = mode or 'n' + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + end + + -- Standard LSP keymaps + map('grn', vim.lsp.buf.rename, '[R]e[n]ame') + map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) + map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') + map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols') + map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols') + map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition') + + -- Highlight references + local client = vim.lsp.get_client_by_id(event.data.client_id) + local function client_supports_method(client, method, bufnr) + if vim.fn.has 'nvim-0.11' == 1 then + return client:supports_method(method, { bufnr = bufnr }) + else + return client.supports_method(method, { bufnr = bufnr }) end - - -- Setup keymaps and diagnostics based on kickstart's original init.lua LSP section - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-attach-override', { clear = true }), - callback = function(event) - local map = function(keys, func, desc, mode) - mode = mode or 'n' - vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) - end - - -- Standard LSP keymaps - map('grn', vim.lsp.buf.rename, '[R]e[n]ame') - map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) - map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') - map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols') - map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols') - map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition') - - -- Highlight references - local client = vim.lsp.get_client_by_id(event.data.client_id) - local function client_supports_method(client, method, bufnr) - if vim.fn.has 'nvim-0.11' == 1 then - return client:supports_method(method, { bufnr = bufnr }) - else - 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', - { 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({ '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('th', - function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, - '[T]oggle Inlay [H]ints') - end - 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', { 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( + { '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 - -- Diagnostic configuration - vim.diagnostic.config { - severity_sort = true, - float = { border = 'rounded', source = 'if_many' }, - underline = { severity = vim.diagnostic.severity.ERROR }, - signs = vim.g.have_nerd_font and { - text = { - [vim.diagnostic.severity.ERROR] = '󰅚 ', [vim.diagnostic.severity.WARN] = '󰀪 ', [vim.diagnostic.severity.INFO] = '󰋽 ', [vim.diagnostic.severity.HINT] = '󰌶 ', - }, - } or {}, - virtual_text = { - source = 'if_many', spacing = 2, - format = function(diagnostic) - 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 - } - return diagnostic_message[diagnostic.severity] - end, - }, + -- Inlay hints toggle + if client and client_supports_method(client, 'textDocument/inlayHint', event.buf) then + map('th', function() + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) + end, '[T]oggle Inlay [H]ints') + end + end, + }) + + -- Diagnostic configuration + vim.diagnostic.config { + severity_sort = true, + float = { border = 'rounded', source = 'if_many' }, + underline = { severity = vim.diagnostic.severity.ERROR }, + signs = vim.g.have_nerd_font and { + text = { + [vim.diagnostic.severity.ERROR] = '󰅚 ', + [vim.diagnostic.severity.WARN] = '󰀪 ', + [vim.diagnostic.severity.INFO] = '󰋽 ', + [vim.diagnostic.severity.HINT] = '󰌶 ', + }, + } or {}, + virtual_text = { + source = 'if_many', + spacing = 2, + format = function(diagnostic) + 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, } - end, -- End of config function - }, - - -- lazydev setup (still useful for Neovim Lua development) - { - 'folke/lazydev.nvim', - ft = 'lua', - opts = { - library = { { path = 'luvit-meta/library', words = { 'vim%.uv' } } }, + return diagnostic_message[diagnostic.severity] + end, }, + } + end, -- End of config function + }, + + -- lazydev setup (still useful for Neovim Lua development) + { + 'folke/lazydev.nvim', + ft = 'lua', + opts = { + library = { { path = 'luvit-meta/library', words = { 'vim%.uv' } } }, }, + }, }