From 142445bb06f5b0886d36dd50f161594e08a6a0c2 Mon Sep 17 00:00:00 2001 From: David Bland Date: Mon, 3 Mar 2025 17:37:42 -0500 Subject: [PATCH 1/4] Custom --- init.lua | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index 5cac3d14601..83b6c8a8716 100644 --- a/init.lua +++ b/init.lua @@ -102,7 +102,7 @@ vim.g.have_nerd_font = false vim.opt.number = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! --- vim.opt.relativenumber = true +vim.opt.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a' @@ -188,6 +188,7 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the left wind vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) +vim.keymap.set('n', 'e', ':Explor', { desc = 'Open [E]xplor' }) -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` @@ -236,7 +237,6 @@ require('lazy').setup({ -- -- Use `opts = {}` to automatically pass options to a plugin's `setup()` function, forcing the plugin to be loaded. -- - -- Alternatively, use `config = function() ... end` for full control over the configuration. -- If you prefer to call `setup` explicitly, use: -- { @@ -252,6 +252,33 @@ require('lazy').setup({ -- options to `gitsigns.nvim`. -- -- See `:help gitsigns` to understand what the configuration keys do + { + 'zbirenbaum/copilot.lua', + cmd = 'Copilot', + build = ':Copilot auth', + event = 'BufReadPost', + opts = { + suggestion = { + enabled = not vim.g.ai_cmp, + auto_trigger = true, + hide_during_completion = vim.g.ai_cmp, + keymap = { + accept = false, -- handled by nvim-cmp / blink.cmp + next = '', + prev = '', + }, + }, + panel = { enabled = false }, + filetypes = { + markdown = true, + help = true, + }, + }, + }, + { + 'nvim-tree/nvim-tree.lua', + }, + { -- Adds git related signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', opts = { @@ -479,6 +506,7 @@ require('lazy').setup({ 'hrsh7th/cmp-nvim-lsp', }, config = function() + require('lspconfig').lua_ls.setup {} -- Brief aside: **What is LSP?** -- -- LSP is an initialism you've probably heard, but might not understand what it is. @@ -835,7 +863,15 @@ require('lazy').setup({ -- This will auto-import if your LSP supports it. -- This will expand snippets if the LSP sent a snippet. [''] = cmp.mapping.confirm { select = true }, - + [''] = cmp.mapping(function(fallback) + local fallback_key = vim.api.nvim_replace_termcodes('', true, true, true) + local resolved_key = vim.fn['copilot#Accept'](fallback) + if fallback_key == resolved_key then + cmp.confirm { select = true } + else + vim.api.nvim_feedkeys(resolved_key, 'n', true) + end + end), -- If you prefer more traditional completion keymaps, -- you can uncomment the following lines --[''] = cmp.mapping.confirm { select = true }, @@ -846,7 +882,23 @@ require('lazy').setup({ -- Generally you don't need this, because nvim-cmp will display -- completions whenever it has completion options available. [''] = cmp.mapping.complete {}, - + [''] = cmp.mapping(function(fallback) + local copilot = require 'copilot.suggestion' + if copilot.is_visible() then + copilot.accept() + elseif cmp.visible() then + local entry = cmp.get_selected_entry() + if not entry then + cmp.select_next_item { behavior = cmp.SelectBehavior.Select } + else + cmp.confirm() + end + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + end, { 'i', 's' }), -- Think of as moving to the right of your snippet expansion. -- So if you have a snippet that's like: -- function $name($args) @@ -875,6 +927,7 @@ require('lazy').setup({ -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it group_index = 0, }, + { name = 'copilot' }, { name = 'nvim_lsp' }, { name = 'luasnip' }, { name = 'path' }, From d1f146490306f08409a6216f68ee5ce027129ed4 Mon Sep 17 00:00:00 2001 From: David Bland Date: Fri, 20 Jun 2025 11:41:57 -0400 Subject: [PATCH 2/4] update1 --- init.lua | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/init.lua b/init.lua index 83b6c8a8716..863c31b9e89 100644 --- a/init.lua +++ b/init.lua @@ -275,6 +275,10 @@ require('lazy').setup({ }, }, }, + { + 'karb94/neoscroll.nvim', + opts = {}, + }, { 'nvim-tree/nvim-tree.lua', }, @@ -733,6 +737,32 @@ require('lazy').setup({ 'stylua', -- Used to format Lua code }) require('mason-tool-installer').setup { ensure_installed = ensure_installed } + require('neoscroll').setup { + mappings = { -- Keys to be mapped to their corresponding default scrolling animation + '', + '', + '', + '', + '', + '', + 'zt', + 'zz', + 'zb', + }, + hide_cursor = true, -- Hide cursor while scrolling + stop_eof = true, -- Stop at when scrolling downwards + respect_scrolloff = false, -- Stop scrolling when the cursor reaches the scrolloff margin of the file + cursor_scrolls_alone = true, -- The cursor will keep on scrolling even if the window cannot scroll further + duration_multiplier = 1.0, -- Global duration multiplier + easing = 'linear', -- Default easing function + pre_hook = nil, -- Function to run before the scrolling animation starts + post_hook = nil, -- Function to run after the scrolling animation ends + performance_mode = false, -- Disable "Performance Mode" on all buffers. + ignored_events = { -- Events ignored while scrolling + 'WinScrolled', + 'CursorMoved', + }, + } require('mason-lspconfig').setup { ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer) From a4ba3c4f5d6a98fec47d4d482a1938513a6b9825 Mon Sep 17 00:00:00 2001 From: David Bland Date: Tue, 12 Aug 2025 10:49:41 -0400 Subject: [PATCH 3/4] updates --- init.lua | 345 +++---------------- lua/plugins/mason.lua | 6 + lua/plugins/templates/index_tsx_template.tsx | 11 + 3 files changed, 64 insertions(+), 298 deletions(-) create mode 100644 lua/plugins/mason.lua create mode 100644 lua/plugins/templates/index_tsx_template.tsx diff --git a/init.lua b/init.lua index 863c31b9e89..e5d6d131bf6 100644 --- a/init.lua +++ b/init.lua @@ -252,36 +252,30 @@ require('lazy').setup({ -- options to `gitsigns.nvim`. -- -- See `:help gitsigns` to understand what the configuration keys do - { - 'zbirenbaum/copilot.lua', - cmd = 'Copilot', - build = ':Copilot auth', - event = 'BufReadPost', - opts = { - suggestion = { - enabled = not vim.g.ai_cmp, - auto_trigger = true, - hide_during_completion = vim.g.ai_cmp, - keymap = { - accept = false, -- handled by nvim-cmp / blink.cmp - next = '', - prev = '', - }, - }, - panel = { enabled = false }, - filetypes = { - markdown = true, - help = true, - }, - }, - }, { 'karb94/neoscroll.nvim', opts = {}, }, + { + 'TiagoMDG/react-comp-gen.nvim', + name = 'react-component-generator', + config = function() + require('react-component-generator').setup { + templates_dir = '~/custom-templates-directory', -- Custom templates directory (Optional) + file_extension = 'tsx', -- Preferred file extension (Optional) + } + end, + }, { 'nvim-tree/nvim-tree.lua', }, + { + 'windwp/nvim-ts-autotag', + config = function() + require('nvim-ts-autotag').setup() + end, + opts = {}, + }, { -- Adds git related signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', @@ -493,290 +487,57 @@ require('lazy').setup({ }, }, { - -- Main LSP Configuration 'neovim/nvim-lspconfig', dependencies = { - -- Automatically install LSPs and related tools to stdpath for Neovim - -- Mason must be loaded before its dependents so we need to set it up here. - -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})` { 'williamboman/mason.nvim', opts = {} }, - 'williamboman/mason-lspconfig.nvim', + { 'williamboman/mason-lspconfig.nvim', branch = 'main' }, 'WhoIsSethDaniel/mason-tool-installer.nvim', - - -- Useful status updates for LSP. { 'j-hui/fidget.nvim', opts = {} }, - - -- Allows extra capabilities provided by nvim-cmp 'hrsh7th/cmp-nvim-lsp', }, config = function() - require('lspconfig').lua_ls.setup {} - -- Brief aside: **What is LSP?** - -- - -- LSP is an initialism you've probably heard, but might not understand what it is. - -- - -- LSP stands for Language Server Protocol. It's a protocol that helps editors - -- and language tooling communicate in a standardized fashion. - -- - -- In general, you have a "server" which is some tool built to understand a particular - -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers - -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone - -- processes that communicate with some "client" - in this case, Neovim! - -- - -- LSP provides Neovim with features like: - -- - Go to definition - -- - Find references - -- - Autocompletion - -- - Symbol Search - -- - and more! - -- - -- Thus, Language Servers are external tools that must be installed separately from - -- Neovim. This is where `mason` and related plugins come into play. - -- - -- If you're wondering about lsp vs treesitter, you can check out the wonderfully - -- and elegantly composed help section, `:help lsp-vs-treesitter` - - -- This function gets run when an LSP attaches to a particular buffer. - -- That is to say, every time a new file is opened that is associated with - -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this - -- function will be executed to configure the current buffer - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), - callback = function(event) - -- NOTE: Remember that Lua is a real programming language, and as such it is possible - -- to define small helper and utility functions so you don't have to repeat yourself. - -- - -- In this case, we create a function that lets us more easily define mappings specific - -- for LSP related items. It sets the mode, buffer and description for us each time. - local map = function(keys, func, desc, mode) - mode = mode or 'n' - vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) - end - - -- Jump to the definition of the word under your cursor. - -- This is where a variable was first declared, or where a function is defined, etc. - -- To jump back, press . - map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') - - -- Find references for the word under your cursor. - map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - - -- Jump to the implementation of the word under your cursor. - -- Useful when your language has ways of declaring types without an actual implementation. - map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - - -- Jump to the type of the word under your cursor. - -- Useful when you're not sure what type a variable is and you want to see - -- the definition of its *type*, not where it was *defined*. - map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') - - -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - - -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. - map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') - - -- Rename the variable under your cursor. - -- Most Language Servers support renaming across files, etc. - map('rn', vim.lsp.buf.rename, '[R]e[n]ame') - - -- Execute a code action, usually your cursor needs to be on top of an error - -- or a suggestion from your LSP for this to activate. - map('ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' }) - - -- WARN: This is not Goto Definition, this is Goto Declaration. - -- For example, in C this would take you to the header. - map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - - -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10) - ---@param client vim.lsp.Client - ---@param method vim.lsp.protocol.Method - ---@param bufnr? integer some lsp support methods only in specific files - ---@return boolean - local function client_supports_method(client, method, bufnr) - if vim.fn.has 'nvim-0.11' == 1 then - return client:supports_method(method, bufnr) - else - return client.supports_method(method, { bufnr = bufnr }) - end - end - - -- The following two autocommands are used to highlight references of the - -- word under your cursor when your cursor rests there for a little while. - -- See `:help CursorHold` for information about when this is executed - -- - -- When you move your cursor, the highlights will be cleared (the second autocommand). - local client = vim.lsp.get_client_by_id(event.data.client_id) - if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then - local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { 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', { clear = true }), - callback = function(event2) - vim.lsp.buf.clear_references() - vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } - end, - }) - end - - -- The following code creates a keymap to toggle inlay hints in your - -- code, if the language server you are using supports them - -- - -- This may be unwanted, since they displace some of your code - if client and client_supports_method(client, vim.lsp.protocol.Methods.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 Config - -- See :help vim.diagnostic.Opts - 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, - }, - } - - -- LSP servers and clients are able to communicate to each other what features they support. - -- By default, Neovim doesn't support everything that is in the LSP specification. - -- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. - -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers. + -- 1) your normal LSP/keymap/diagnostic/capabilities setup… + local lspconfig = require 'lspconfig' local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) - -- Enable the following language servers - -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. - -- - -- Add any additional override configuration in the following tables. Available keys are: - -- - cmd (table): Override the default command used to start the server - -- - filetypes (table): Override the default list of associated filetypes for the server - -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features. - -- - settings (table): Override the default settings passed when initializing the server. - -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ local servers = { - -- clangd = {}, - -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, - -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs - -- - -- Some languages (like typescript) have entire language plugins that can be useful: - -- https://github.com/pmizio/typescript-tools.nvim - -- - -- But for many setups, the LSP (`ts_ls`) will work just fine - -- ts_ls = {}, - -- - lua_ls = { - -- cmd = { ... }, - -- filetypes = { ... }, - -- capabilities = {}, settings = { Lua = { - completion = { - callSnippet = 'Replace', - }, - -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings - -- diagnostics = { disable = { 'missing-fields' } }, + completion = { callSnippet = 'Replace' }, }, }, }, + -- add more servers here… } - -- Ensure the servers and tools above are installed - -- - -- To check the current status of installed tools and/or manually install - -- other tools, you can run - -- :Mason - -- - -- You can press `g?` for help in this menu. - -- - -- `mason` had to be setup earlier: to configure its options see the - -- `dependencies` table for `nvim-lspconfig` above. - -- - -- You can add other tools here that you want Mason to install - -- for you, so that they are available from within Neovim. - local ensure_installed = vim.tbl_keys(servers or {}) - vim.list_extend(ensure_installed, { - 'stylua', -- Used to format Lua code - }) - require('mason-tool-installer').setup { ensure_installed = ensure_installed } - require('neoscroll').setup { - mappings = { -- Keys to be mapped to their corresponding default scrolling animation - '', - '', - '', - '', - '', - '', - 'zt', - 'zz', - 'zb', - }, - hide_cursor = true, -- Hide cursor while scrolling - stop_eof = true, -- Stop at when scrolling downwards - respect_scrolloff = false, -- Stop scrolling when the cursor reaches the scrolloff margin of the file - cursor_scrolls_alone = true, -- The cursor will keep on scrolling even if the window cannot scroll further - duration_multiplier = 1.0, -- Global duration multiplier - easing = 'linear', -- Default easing function - pre_hook = nil, -- Function to run before the scrolling animation starts - post_hook = nil, -- Function to run after the scrolling animation ends - performance_mode = false, -- Disable "Performance Mode" on all buffers. - ignored_events = { -- Events ignored while scrolling - 'WinScrolled', - 'CursorMoved', - }, - } + -- attach your handlers/autocmds here (exactly as you already have) + -- …[your LspAttach autocmd and vim.diagnostic.config calls]… + + -- 2) ensure mason is up + require('mason').setup() + -- 3) tell mason-tool-installer to keep your LSP servers installed + local ensure = vim.tbl_keys(servers) + require('mason-tool-installer').setup { ensure_installed = ensure } + + -- 4) hook mason-lspconfig into lspconfig require('mason-lspconfig').setup { - ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer) - automatic_installation = false, - handlers = { - function(server_name) - local server = servers[server_name] or {} - -- This handles overriding only values explicitly passed - -- by the server configuration above. Useful when disabling - -- certain features of an LSP (for example, turning off formatting for ts_ls) - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) - end, - }, + ensure_installed = ensure, + automatic_installation = true, + } + + -- 5) set up handlers: this will call lspconfig[server].setup(opts) + require('mason-lspconfig').setup_handlers { + function(server_name) -- default handler + local opts = vim.tbl_deep_extend('force', { capabilities = capabilities }, servers[server_name] or {}) + lspconfig[server_name].setup(opts) + end, + -- if you need per-server overrides you can add: + -- ["rust_analyzer"] = function() + -- require("rust-tools").setup({ server = servers.rust_analyzer }) + -- end, } end, }, @@ -893,15 +654,6 @@ require('lazy').setup({ -- This will auto-import if your LSP supports it. -- This will expand snippets if the LSP sent a snippet. [''] = cmp.mapping.confirm { select = true }, - [''] = cmp.mapping(function(fallback) - local fallback_key = vim.api.nvim_replace_termcodes('', true, true, true) - local resolved_key = vim.fn['copilot#Accept'](fallback) - if fallback_key == resolved_key then - cmp.confirm { select = true } - else - vim.api.nvim_feedkeys(resolved_key, 'n', true) - end - end), -- If you prefer more traditional completion keymaps, -- you can uncomment the following lines --[''] = cmp.mapping.confirm { select = true }, @@ -913,10 +665,7 @@ require('lazy').setup({ -- completions whenever it has completion options available. [''] = cmp.mapping.complete {}, [''] = cmp.mapping(function(fallback) - local copilot = require 'copilot.suggestion' - if copilot.is_visible() then - copilot.accept() - elseif cmp.visible() then + if cmp.visible() then local entry = cmp.get_selected_entry() if not entry then cmp.select_next_item { behavior = cmp.SelectBehavior.Select } diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua new file mode 100644 index 00000000000..22edbe8e564 --- /dev/null +++ b/lua/plugins/mason.lua @@ -0,0 +1,6 @@ +return { + { + 'williamboman/mason-lspconfig.nvim', + branch = 'main', -- force v2.x from the main branch + }, +} diff --git a/lua/plugins/templates/index_tsx_template.tsx b/lua/plugins/templates/index_tsx_template.tsx new file mode 100644 index 00000000000..ece51ebcdf5 --- /dev/null +++ b/lua/plugins/templates/index_tsx_template.tsx @@ -0,0 +1,11 @@ +import './styles.css'; + +const {{ComponentName}} = () => { + return ( +
+

{{ComponentName}} Component

+
+ ); +} + +export default {{ComponentName}}; From 09a37c17695d57811d14115b5a987c46ed85dd6b Mon Sep 17 00:00:00 2001 From: David Bland Date: Tue, 12 Aug 2025 10:58:29 -0400 Subject: [PATCH 4/4] revert --- init.lua | 345 ++++++++++++++++--- lua/plugins/mason.lua | 6 - lua/plugins/templates/index_tsx_template.tsx | 11 - 3 files changed, 298 insertions(+), 64 deletions(-) delete mode 100644 lua/plugins/mason.lua delete mode 100644 lua/plugins/templates/index_tsx_template.tsx diff --git a/init.lua b/init.lua index e5d6d131bf6..863c31b9e89 100644 --- a/init.lua +++ b/init.lua @@ -253,29 +253,35 @@ require('lazy').setup({ -- -- See `:help gitsigns` to understand what the configuration keys do { - 'karb94/neoscroll.nvim', - opts = {}, + 'zbirenbaum/copilot.lua', + cmd = 'Copilot', + build = ':Copilot auth', + event = 'BufReadPost', + opts = { + suggestion = { + enabled = not vim.g.ai_cmp, + auto_trigger = true, + hide_during_completion = vim.g.ai_cmp, + keymap = { + accept = false, -- handled by nvim-cmp / blink.cmp + next = '', + prev = '', + }, + }, + panel = { enabled = false }, + filetypes = { + markdown = true, + help = true, + }, + }, }, { - 'TiagoMDG/react-comp-gen.nvim', - name = 'react-component-generator', - config = function() - require('react-component-generator').setup { - templates_dir = '~/custom-templates-directory', -- Custom templates directory (Optional) - file_extension = 'tsx', -- Preferred file extension (Optional) - } - end, + 'karb94/neoscroll.nvim', + opts = {}, }, { 'nvim-tree/nvim-tree.lua', }, - { - 'windwp/nvim-ts-autotag', - config = function() - require('nvim-ts-autotag').setup() - end, - opts = {}, - }, { -- Adds git related signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', @@ -487,57 +493,290 @@ require('lazy').setup({ }, }, { + -- Main LSP Configuration 'neovim/nvim-lspconfig', dependencies = { + -- Automatically install LSPs and related tools to stdpath for Neovim + -- Mason must be loaded before its dependents so we need to set it up here. + -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})` { 'williamboman/mason.nvim', opts = {} }, - { 'williamboman/mason-lspconfig.nvim', branch = 'main' }, + 'williamboman/mason-lspconfig.nvim', 'WhoIsSethDaniel/mason-tool-installer.nvim', + + -- Useful status updates for LSP. { 'j-hui/fidget.nvim', opts = {} }, + + -- Allows extra capabilities provided by nvim-cmp 'hrsh7th/cmp-nvim-lsp', }, config = function() - -- 1) your normal LSP/keymap/diagnostic/capabilities setup… - local lspconfig = require 'lspconfig' + require('lspconfig').lua_ls.setup {} + -- Brief aside: **What is LSP?** + -- + -- LSP is an initialism you've probably heard, but might not understand what it is. + -- + -- LSP stands for Language Server Protocol. It's a protocol that helps editors + -- and language tooling communicate in a standardized fashion. + -- + -- In general, you have a "server" which is some tool built to understand a particular + -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers + -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone + -- processes that communicate with some "client" - in this case, Neovim! + -- + -- LSP provides Neovim with features like: + -- - Go to definition + -- - Find references + -- - Autocompletion + -- - Symbol Search + -- - and more! + -- + -- Thus, Language Servers are external tools that must be installed separately from + -- Neovim. This is where `mason` and related plugins come into play. + -- + -- If you're wondering about lsp vs treesitter, you can check out the wonderfully + -- and elegantly composed help section, `:help lsp-vs-treesitter` + + -- This function gets run when an LSP attaches to a particular buffer. + -- That is to say, every time a new file is opened that is associated with + -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this + -- function will be executed to configure the current buffer + vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), + callback = function(event) + -- NOTE: Remember that Lua is a real programming language, and as such it is possible + -- to define small helper and utility functions so you don't have to repeat yourself. + -- + -- In this case, we create a function that lets us more easily define mappings specific + -- for LSP related items. It sets the mode, buffer and description for us each time. + local map = function(keys, func, desc, mode) + mode = mode or 'n' + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + end + + -- Jump to the definition of the word under your cursor. + -- This is where a variable was first declared, or where a function is defined, etc. + -- To jump back, press . + map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + + -- Find references for the word under your cursor. + map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') + + -- Jump to the implementation of the word under your cursor. + -- Useful when your language has ways of declaring types without an actual implementation. + map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + + -- Jump to the type of the word under your cursor. + -- Useful when you're not sure what type a variable is and you want to see + -- the definition of its *type*, not where it was *defined*. + map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') + + -- Fuzzy find all the symbols in your current document. + -- Symbols are things like variables, functions, types, etc. + map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') + + -- Fuzzy find all the symbols in your current workspace. + -- Similar to document symbols, except searches over your entire project. + map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') + + -- Rename the variable under your cursor. + -- Most Language Servers support renaming across files, etc. + map('rn', vim.lsp.buf.rename, '[R]e[n]ame') + + -- Execute a code action, usually your cursor needs to be on top of an error + -- or a suggestion from your LSP for this to activate. + map('ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' }) + + -- WARN: This is not Goto Definition, this is Goto Declaration. + -- For example, in C this would take you to the header. + map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + + -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10) + ---@param client vim.lsp.Client + ---@param method vim.lsp.protocol.Method + ---@param bufnr? integer some lsp support methods only in specific files + ---@return boolean + local function client_supports_method(client, method, bufnr) + if vim.fn.has 'nvim-0.11' == 1 then + return client:supports_method(method, bufnr) + else + return client.supports_method(method, { bufnr = bufnr }) + end + end + + -- The following two autocommands are used to highlight references of the + -- word under your cursor when your cursor rests there for a little while. + -- See `:help CursorHold` for information about when this is executed + -- + -- When you move your cursor, the highlights will be cleared (the second autocommand). + local client = vim.lsp.get_client_by_id(event.data.client_id) + if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then + local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { 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', { clear = true }), + callback = function(event2) + vim.lsp.buf.clear_references() + vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } + end, + }) + end + + -- The following code creates a keymap to toggle inlay hints in your + -- code, if the language server you are using supports them + -- + -- This may be unwanted, since they displace some of your code + if client and client_supports_method(client, vim.lsp.protocol.Methods.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 Config + -- See :help vim.diagnostic.Opts + 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, + }, + } + + -- LSP servers and clients are able to communicate to each other what features they support. + -- By default, Neovim doesn't support everything that is in the LSP specification. + -- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. + -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers. local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) + -- Enable the following language servers + -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. + -- + -- Add any additional override configuration in the following tables. Available keys are: + -- - cmd (table): Override the default command used to start the server + -- - filetypes (table): Override the default list of associated filetypes for the server + -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features. + -- - settings (table): Override the default settings passed when initializing the server. + -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ local servers = { + -- clangd = {}, + -- gopls = {}, + -- pyright = {}, + -- rust_analyzer = {}, + -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs + -- + -- Some languages (like typescript) have entire language plugins that can be useful: + -- https://github.com/pmizio/typescript-tools.nvim + -- + -- But for many setups, the LSP (`ts_ls`) will work just fine + -- ts_ls = {}, + -- + lua_ls = { + -- cmd = { ... }, + -- filetypes = { ... }, + -- capabilities = {}, settings = { Lua = { - completion = { callSnippet = 'Replace' }, + completion = { + callSnippet = 'Replace', + }, + -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings + -- diagnostics = { disable = { 'missing-fields' } }, }, }, }, - -- add more servers here… } - -- attach your handlers/autocmds here (exactly as you already have) - -- …[your LspAttach autocmd and vim.diagnostic.config calls]… - - -- 2) ensure mason is up - require('mason').setup() - - -- 3) tell mason-tool-installer to keep your LSP servers installed - local ensure = vim.tbl_keys(servers) - require('mason-tool-installer').setup { ensure_installed = ensure } - - -- 4) hook mason-lspconfig into lspconfig - require('mason-lspconfig').setup { - ensure_installed = ensure, - automatic_installation = true, + -- Ensure the servers and tools above are installed + -- + -- To check the current status of installed tools and/or manually install + -- other tools, you can run + -- :Mason + -- + -- You can press `g?` for help in this menu. + -- + -- `mason` had to be setup earlier: to configure its options see the + -- `dependencies` table for `nvim-lspconfig` above. + -- + -- You can add other tools here that you want Mason to install + -- for you, so that they are available from within Neovim. + local ensure_installed = vim.tbl_keys(servers or {}) + vim.list_extend(ensure_installed, { + 'stylua', -- Used to format Lua code + }) + require('mason-tool-installer').setup { ensure_installed = ensure_installed } + require('neoscroll').setup { + mappings = { -- Keys to be mapped to their corresponding default scrolling animation + '', + '', + '', + '', + '', + '', + 'zt', + 'zz', + 'zb', + }, + hide_cursor = true, -- Hide cursor while scrolling + stop_eof = true, -- Stop at when scrolling downwards + respect_scrolloff = false, -- Stop scrolling when the cursor reaches the scrolloff margin of the file + cursor_scrolls_alone = true, -- The cursor will keep on scrolling even if the window cannot scroll further + duration_multiplier = 1.0, -- Global duration multiplier + easing = 'linear', -- Default easing function + pre_hook = nil, -- Function to run before the scrolling animation starts + post_hook = nil, -- Function to run after the scrolling animation ends + performance_mode = false, -- Disable "Performance Mode" on all buffers. + ignored_events = { -- Events ignored while scrolling + 'WinScrolled', + 'CursorMoved', + }, } - -- 5) set up handlers: this will call lspconfig[server].setup(opts) - require('mason-lspconfig').setup_handlers { - function(server_name) -- default handler - local opts = vim.tbl_deep_extend('force', { capabilities = capabilities }, servers[server_name] or {}) - lspconfig[server_name].setup(opts) - end, - -- if you need per-server overrides you can add: - -- ["rust_analyzer"] = function() - -- require("rust-tools").setup({ server = servers.rust_analyzer }) - -- end, + require('mason-lspconfig').setup { + ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer) + automatic_installation = false, + handlers = { + function(server_name) + local server = servers[server_name] or {} + -- This handles overriding only values explicitly passed + -- by the server configuration above. Useful when disabling + -- certain features of an LSP (for example, turning off formatting for ts_ls) + server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + require('lspconfig')[server_name].setup(server) + end, + }, } end, }, @@ -654,6 +893,15 @@ require('lazy').setup({ -- This will auto-import if your LSP supports it. -- This will expand snippets if the LSP sent a snippet. [''] = cmp.mapping.confirm { select = true }, + [''] = cmp.mapping(function(fallback) + local fallback_key = vim.api.nvim_replace_termcodes('', true, true, true) + local resolved_key = vim.fn['copilot#Accept'](fallback) + if fallback_key == resolved_key then + cmp.confirm { select = true } + else + vim.api.nvim_feedkeys(resolved_key, 'n', true) + end + end), -- If you prefer more traditional completion keymaps, -- you can uncomment the following lines --[''] = cmp.mapping.confirm { select = true }, @@ -665,7 +913,10 @@ require('lazy').setup({ -- completions whenever it has completion options available. [''] = cmp.mapping.complete {}, [''] = cmp.mapping(function(fallback) - if cmp.visible() then + local copilot = require 'copilot.suggestion' + if copilot.is_visible() then + copilot.accept() + elseif cmp.visible() then local entry = cmp.get_selected_entry() if not entry then cmp.select_next_item { behavior = cmp.SelectBehavior.Select } diff --git a/lua/plugins/mason.lua b/lua/plugins/mason.lua deleted file mode 100644 index 22edbe8e564..00000000000 --- a/lua/plugins/mason.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - { - 'williamboman/mason-lspconfig.nvim', - branch = 'main', -- force v2.x from the main branch - }, -} diff --git a/lua/plugins/templates/index_tsx_template.tsx b/lua/plugins/templates/index_tsx_template.tsx deleted file mode 100644 index ece51ebcdf5..00000000000 --- a/lua/plugins/templates/index_tsx_template.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import './styles.css'; - -const {{ComponentName}} = () => { - return ( -
-

{{ComponentName}} Component

-
- ); -} - -export default {{ComponentName}};