From 834e294b9ec237b1f376d361f8b0dda9f7b971b1 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Sun, 21 Apr 2024 17:55:07 -0300 Subject: [PATCH 01/34] Updating kickstart config with some of my custom needs, updating commands descriptions, removing some unneeded/wanted configs --- init.lua | 811 +------------------------------------------ lua/autocommands.lua | 44 +++ lua/keymaps.lua | 87 +++++ lua/lazy.lua | 695 ++++++++++++++++++++++++++++++++++++ lua/options.lua | 71 ++++ 5 files changed, 905 insertions(+), 803 deletions(-) create mode 100644 lua/autocommands.lua create mode 100644 lua/keymaps.lua create mode 100644 lua/lazy.lua create mode 100644 lua/options.lua diff --git a/init.lua b/init.lua index 3c70d7364af..b032bdc5bfa 100644 --- a/init.lua +++ b/init.lua @@ -91,811 +91,16 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] --- See `:help vim.opt` --- NOTE: You can change these options as you wish! --- For more options, you can see `:help option-list` +require 'options' --- Make line numbers default -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 +-- [[ Keymaps ]] +require 'keymaps' --- Enable mouse mode, can be useful for resizing splits for example! -vim.opt.mouse = 'a' +-- [[ Autocommands ]] +require 'autocommands' --- Don't show the mode, since it's already in the status line -vim.opt.showmode = false - --- Sync clipboard between OS and Neovim. --- Remove this option if you want your OS clipboard to remain independent. --- See `:help 'clipboard'` -vim.opt.clipboard = 'unnamedplus' - --- Enable break indent -vim.opt.breakindent = true - --- Save undo history -vim.opt.undofile = true - --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term -vim.opt.ignorecase = true -vim.opt.smartcase = true - --- Keep signcolumn on by default -vim.opt.signcolumn = 'yes' - --- Decrease update time -vim.opt.updatetime = 250 - --- Decrease mapped sequence wait time --- Displays which-key popup sooner -vim.opt.timeoutlen = 300 - --- Configure how new splits should be opened -vim.opt.splitright = true -vim.opt.splitbelow = true - --- Sets how neovim will display certain whitespace characters in the editor. --- See `:help 'list'` --- and `:help 'listchars'` -vim.opt.list = true -vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } - --- Preview substitutions live, as you type! -vim.opt.inccommand = 'split' - --- Show which line your cursor is on -vim.opt.cursorline = true - --- Minimal number of screen lines to keep above and below the cursor. -vim.opt.scrolloff = 10 - --- [[ Basic Keymaps ]] --- See `:help vim.keymap.set()` - --- Set highlight on search, but clear on pressing in normal mode -vim.opt.hlsearch = true -vim.keymap.set('n', '', 'nohlsearch') - --- Diagnostic keymaps -vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' }) -vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' }) -vim.keymap.set('n', 'e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' }) -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) - --- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier --- for people to discover. Otherwise, you normally need to press , which --- is not what someone will guess without a bit more experience. --- --- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping --- or just use to exit terminal mode -vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) - --- TIP: Disable arrow keys in normal mode --- vim.keymap.set('n', '', 'echo "Use h to move!!"') --- vim.keymap.set('n', '', 'echo "Use l to move!!"') --- vim.keymap.set('n', '', 'echo "Use k to move!!"') --- vim.keymap.set('n', '', 'echo "Use j to move!!"') - --- Keybinds to make split navigation easier. --- Use CTRL+ to switch between windows --- --- See `:help wincmd` for a list of all window commands -vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) -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' }) - --- [[ Basic Autocommands ]] --- See `:help lua-guide-autocommands` - --- Highlight when yanking (copying) text --- Try it with `yap` in normal mode --- See `:help vim.highlight.on_yank()` -vim.api.nvim_create_autocmd('TextYankPost', { - desc = 'Highlight when yanking (copying) text', - group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), - callback = function() - vim.highlight.on_yank() - end, -}) - --- [[ Install `lazy.nvim` plugin manager ]] --- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info -local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' -if not vim.loop.fs_stat(lazypath) then - local lazyrepo = 'https://github.com/folke/lazy.nvim.git' - vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } -end ---@diagnostic disable-next-line: undefined-field -vim.opt.rtp:prepend(lazypath) - --- [[ Configure and install plugins ]] --- --- To check the current status of your plugins, run --- :Lazy --- --- You can press `?` in this menu for help. Use `:q` to close the window --- --- To update plugins you can run --- :Lazy update --- --- NOTE: Here is where you install your plugins. -require('lazy').setup({ - -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). - 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - - -- NOTE: Plugins can also be added by using a table, - -- with the first argument being the link and the following - -- keys can be used to configure plugin behavior/loading/etc. - -- - -- Use `opts = {}` to force a plugin to be loaded. - -- - -- This is equivalent to: - -- require('Comment').setup({}) - - -- "gc" to comment visual regions/lines - { 'numToStr/Comment.nvim', opts = {} }, - - -- Here is a more advanced example where we pass configuration - -- options to `gitsigns.nvim`. This is equivalent to the following Lua: - -- require('gitsigns').setup({ ... }) - -- - -- See `:help gitsigns` to understand what the configuration keys do - { -- Adds git related signs to the gutter, as well as utilities for managing changes - 'lewis6991/gitsigns.nvim', - opts = { - signs = { - add = { text = '+' }, - change = { text = '~' }, - delete = { text = '_' }, - topdelete = { text = '‾' }, - changedelete = { text = '~' }, - }, - }, - }, - - -- NOTE: Plugins can also be configured to run Lua code when they are loaded. - -- - -- This is often very useful to both group configuration, as well as handle - -- lazy loading plugins that don't need to be loaded immediately at startup. - -- - -- For example, in the following configuration, we use: - -- event = 'VimEnter' - -- - -- which loads which-key before all the UI elements are loaded. Events can be - -- normal autocommands events (`:help autocmd-events`). - -- - -- Then, because we use the `config` key, the configuration only runs - -- after the plugin has been loaded: - -- config = function() ... end - - { -- Useful plugin to show you pending keybinds. - 'folke/which-key.nvim', - event = 'VimEnter', -- Sets the loading event to 'VimEnter' - config = function() -- This is the function that runs, AFTER loading - require('which-key').setup() - - -- Document existing key chains - require('which-key').register { - ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, - ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, - ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, - ['s'] = { name = '[S]earch', _ = 'which_key_ignore' }, - ['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, - ['t'] = { name = '[T]oggle', _ = 'which_key_ignore' }, - ['h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' }, - } - -- visual mode - require('which-key').register({ - ['h'] = { 'Git [H]unk' }, - }, { mode = 'v' }) - end, - }, - - -- NOTE: Plugins can specify dependencies. - -- - -- The dependencies are proper plugin specifications as well - anything - -- you do for a plugin at the top level, you can do for a dependency. - -- - -- Use the `dependencies` key to specify the dependencies of a particular plugin - - { -- Fuzzy Finder (files, lsp, etc) - 'nvim-telescope/telescope.nvim', - event = 'VimEnter', - branch = '0.1.x', - dependencies = { - 'nvim-lua/plenary.nvim', - { -- If encountering errors, see telescope-fzf-native README for installation instructions - 'nvim-telescope/telescope-fzf-native.nvim', - - -- `build` is used to run some command when the plugin is installed/updated. - -- This is only run then, not every time Neovim starts up. - build = 'make', - - -- `cond` is a condition used to determine whether this plugin should be - -- installed and loaded. - cond = function() - return vim.fn.executable 'make' == 1 - end, - }, - { '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 }, - }, - config = function() - -- Telescope is a fuzzy finder that comes with a lot of different things that - -- it can fuzzy find! It's more than just a "file finder", it can search - -- many different aspects of Neovim, your workspace, LSP, and more! - -- - -- The easiest way to use Telescope, is to start by doing something like: - -- :Telescope help_tags - -- - -- After running this command, a window will open up and you're able to - -- type in the prompt window. You'll see a list of `help_tags` options and - -- a corresponding preview of the help. - -- - -- Two important keymaps to use while in Telescope are: - -- - Insert mode: - -- - Normal mode: ? - -- - -- This opens a window that shows you all of the keymaps for the current - -- Telescope picker. This is really useful to discover what Telescope can - -- do as well as how to actually do it! - - -- [[ Configure Telescope ]] - -- See `:help telescope` and `:help telescope.setup()` - require('telescope').setup { - -- You can put your default mappings / updates / etc. in here - -- All the info you're looking for is in `:help telescope.setup()` - -- - -- defaults = { - -- mappings = { - -- i = { [''] = 'to_fuzzy_refine' }, - -- }, - -- }, - -- pickers = {} - extensions = { - ['ui-select'] = { - require('telescope.themes').get_dropdown(), - }, - }, - } - - -- Enable Telescope extensions if they are installed - pcall(require('telescope').load_extension, 'fzf') - pcall(require('telescope').load_extension, 'ui-select') - - -- See `:help telescope.builtin` - local builtin = require 'telescope.builtin' - vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) - vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) - vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) - vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) - vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) - vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) - vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) - vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) - vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) - vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) - - -- Slightly advanced example of overriding default behavior and theme - vim.keymap.set('n', '/', function() - -- You can pass additional configuration to Telescope to change the theme, layout, etc. - builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { - winblend = 10, - previewer = false, - }) - end, { desc = '[/] Fuzzily search in current buffer' }) - - -- It's also possible to pass additional configuration options. - -- See `:help telescope.builtin.live_grep()` for information about particular keys - vim.keymap.set('n', 's/', function() - builtin.live_grep { - grep_open_files = true, - prompt_title = 'Live Grep in Open Files', - } - end, { desc = '[S]earch [/] in Open Files' }) - - -- Shortcut for searching your Neovim configuration files - vim.keymap.set('n', 'sn', function() - builtin.find_files { cwd = vim.fn.stdpath 'config' } - end, { desc = '[S]earch [N]eovim files' }) - end, - }, - - { -- LSP Configuration & Plugins - 'neovim/nvim-lspconfig', - dependencies = { - -- Automatically install LSPs and related tools to stdpath for Neovim - { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants - 'williamboman/mason-lspconfig.nvim', - 'WhoIsSethDaniel/mason-tool-installer.nvim', - - -- Useful status updates for LSP. - -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', opts = {} }, - - -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins - -- used for completion, annotations and signatures of Neovim apis - { 'folke/neodev.nvim', opts = {} }, - }, - config = function() - -- 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) - vim.keymap.set('n', 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') - - -- Opens a popup that displays documentation about the word under your cursor - -- See `:help K` for why this keymap. - map('K', vim.lsp.buf.hover, 'Hover Documentation') - - -- 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') - - -- 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.server_capabilities.documentHighlightProvider then - vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { - buffer = event.buf, - callback = vim.lsp.buf.document_highlight, - }) - - vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { - buffer = event.buf, - callback = vim.lsp.buf.clear_references, - }) - end - - -- The following autocommand is used to enable 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.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then - map('th', function() - vim.lsp.inlay_hint.enable(0, not vim.lsp.inlay_hint.is_enabled()) - end, '[T]oggle Inlay [H]ints') - end - 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 (`tsserver`) will work just fine - -- tsserver = {}, - -- - - 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' } }, - }, - }, - }, - } - - -- 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. - require('mason').setup() - - -- 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('mason-lspconfig').setup { - 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 tsserver) - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) - end, - }, - } - end, - }, - - { -- Autoformat - 'stevearc/conform.nvim', - lazy = false, - keys = { - { - 'f', - function() - require('conform').format { async = true, lsp_fallback = true } - end, - mode = '', - desc = '[F]ormat buffer', - }, - }, - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well standardized coding style. You can add additional - -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true } - return { - timeout_ms = 500, - lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], - } - end, - formatters_by_ft = { - lua = { 'stylua' }, - -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, - -- - -- You can use a sub-list to tell conform to run *until* a formatter - -- is found. - -- javascript = { { "prettierd", "prettier" } }, - }, - }, - }, - - { -- Autocompletion - 'hrsh7th/nvim-cmp', - event = 'InsertEnter', - dependencies = { - -- Snippet Engine & its associated nvim-cmp source - { - 'L3MON4D3/LuaSnip', - build = (function() - -- Build Step is needed for regex support in snippets. - -- This step is not supported in many windows environments. - -- Remove the below condition to re-enable on windows. - if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then - return - end - return 'make install_jsregexp' - end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, - }, - }, - 'saadparwaiz1/cmp_luasnip', - - -- Adds other completion capabilities. - -- nvim-cmp does not ship with all sources by default. They are split - -- into multiple repos for maintenance purposes. - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/cmp-path', - }, - config = function() - -- See `:help cmp` - local cmp = require 'cmp' - local luasnip = require 'luasnip' - luasnip.config.setup {} - - cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - completion = { completeopt = 'menu,menuone,noinsert' }, - - -- For an understanding of why these mappings were - -- chosen, you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! - mapping = cmp.mapping.preset.insert { - -- Select the [n]ext item - [''] = cmp.mapping.select_next_item(), - -- Select the [p]revious item - [''] = cmp.mapping.select_prev_item(), - - -- Scroll the documentation window [b]ack / [f]orward - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - - -- Accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - [''] = cmp.mapping.confirm { select = true }, - - -- If you prefer more traditional completion keymaps, - -- you can uncomment the following lines - --[''] = cmp.mapping.confirm { select = true }, - --[''] = cmp.mapping.select_next_item(), - --[''] = cmp.mapping.select_prev_item(), - - -- Manually trigger a completion from nvim-cmp. - -- Generally you don't need this, because nvim-cmp will display - -- completions whenever it has completion options available. - [''] = cmp.mapping.complete {}, - - -- Think of as moving to the right of your snippet expansion. - -- So if you have a snippet that's like: - -- function $name($args) - -- $body - -- end - -- - -- will move you to the right of each of the expansion locations. - -- is similar, except moving you backwards. - [''] = cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { 'i', 's' }), - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'path' }, - }, - } - end, - }, - - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - init = function() - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' - - -- You can configure highlights by doing something like: - vim.cmd.hi 'Comment gui=none' - end, - }, - - -- Highlight todo, notes, etc in comments - { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, - - { -- Collection of various small independent plugins/modules - 'echasnovski/mini.nvim', - config = function() - -- Better Around/Inside textobjects - -- - -- Examples: - -- - va) - [V]isually select [A]round [)]paren - -- - yinq - [Y]ank [I]nside [N]ext [']quote - -- - ci' - [C]hange [I]nside [']quote - require('mini.ai').setup { n_lines = 500 } - - -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- - -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren - -- - sd' - [S]urround [D]elete [']quotes - -- - sr)' - [S]urround [R]eplace [)] ['] - require('mini.surround').setup() - - -- Simple and easy statusline. - -- You could remove this setup call if you don't like it, - -- and try some other statusline plugin - local statusline = require 'mini.statusline' - -- set use_icons to true if you have a Nerd Font - statusline.setup { use_icons = vim.g.have_nerd_font } - - -- You can configure sections in the statusline by overriding their - -- default behavior. For example, here we set the section for - -- cursor location to LINE:COLUMN - ---@diagnostic disable-next-line: duplicate-set-field - statusline.section_location = function() - return '%2l:%-2v' - end - - -- ... and there is more! - -- Check out: https://github.com/echasnovski/mini.nvim - end, - }, - { -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate', - opts = { - ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, - -- Autoinstall languages that are not installed - auto_install = true, - highlight = { - enable = true, - -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. - -- If you are experiencing weird indenting issues, add the language to - -- the list of additional_vim_regex_highlighting and disabled languages for indent. - additional_vim_regex_highlighting = { 'ruby' }, - }, - indent = { enable = true, disable = { 'ruby' } }, - }, - config = function(_, opts) - -- [[ Configure Treesitter ]] See `:help nvim-treesitter` - - -- Prefer git instead of curl in order to improve connectivity in some environments - require('nvim-treesitter.install').prefer_git = true - ---@diagnostic disable-next-line: missing-fields - require('nvim-treesitter.configs').setup(opts) - - -- There are additional nvim-treesitter modules that you can use to interact - -- with nvim-treesitter. You should go explore a few and see what interests you: - -- - -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` - -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context - -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects - end, - }, - - -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the - -- init.lua. If you want these files, they are in the repository, so you can just download them and - -- place them in the correct locations. - - -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart - -- - -- Here are some example plugins that I've included in the Kickstart repository. - -- Uncomment any of the lines below to enable them (you will need to restart nvim). - -- - -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- 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. - -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` - -- { import = 'custom.plugins' }, -}, { - ui = { - -- If you are using a Nerd Font: set icons to an empty table which will use the - -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table - icons = vim.g.have_nerd_font and {} or { - cmd = '⌘', - config = '🛠', - event = '📅', - ft = '📂', - init = '⚙', - keys = '🗝', - plugin = '🔌', - runtime = '💻', - require = '🌙', - source = '📄', - start = '🚀', - task = '📌', - lazy = '💤 ', - }, - }, -}) - --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et +-- [[ Lazy package manager ]] +require 'lazy' diff --git a/lua/autocommands.lua b/lua/autocommands.lua new file mode 100644 index 00000000000..16295ad856e --- /dev/null +++ b/lua/autocommands.lua @@ -0,0 +1,44 @@ +-- [[ Autocommands ]] +-- See `:help lua-guide-autocommands` +-- Definitions +local autocmd = vim.api.nvim_create_autocmd +-- local augroup = vim.api.nvim_create_augroup + +-- Highlight when yanking (copying) text +-- Try it with `yap` in normal mode +-- See `:help vim.highlight.on_yank()` +autocmd('TextYankPost', { + desc = 'Highlight when yanking (copying) text', + group = vim.api.nvim_create_augroup('highlight-yank', { clear = true }), + callback = function() + vim.highlight.on_yank() + end, +}) + +-- Resize splits if window got resized +local function augroup(name) + return vim.api.nvim_create_augroup('lazyvim_' .. name, { clear = true }) +end + +autocmd({ 'VimResized' }, { + group = augroup 'resize_splits', + callback = function() + vim.cmd 'tabdo wincmd =' + end, +}) + +-- Remove auto comment next line +autocmd({ 'BufEnter' }, { + group = augroup 'remove_auto_comment', + callback = function() + vim.cmd 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o' + end, +}) + +-- Set cursorline only in focused window +autocmd({ 'WinEnter', 'WinLeave' }, { + group = augroup 'cursorline', + callback = function() + vim.wo.cursorline = vim.fn.win_getid() == vim.fn.win_getid() + end, +}) diff --git a/lua/keymaps.lua b/lua/keymaps.lua new file mode 100644 index 00000000000..1e4758bd264 --- /dev/null +++ b/lua/keymaps.lua @@ -0,0 +1,87 @@ +-- [[ Keymaps ]] +-- See `:help vim.keymap.set()` +-- vim.keymap.set( required, required, required, not required) +-- Set highlight on search, but clear on pressing in normal mode +vim.keymap.set('n', '', 'nohlsearch', { desc = 'Remove higlight after search is done' }) + +-- Diagnostic keymaps +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' }) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' }) +vim.keymap.set('n', 'e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' }) +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) + +-- netrw remaps +vim.keymap.set('n', 'pv', vim.cmd.Ex, { desc = 'Open netrw' }) -- open netrw + +-- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier +-- for people to discover. Otherwise, you normally need to press , which +-- is not what someone will guess without a bit more experience. +-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping +-- or just use to exit terminal mode +vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) + +-- Keybinds to make split navigation easier. +-- Use CTRL+ to switch between windows +-- See `:help wincmd` for a list of all window commands +vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) +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' }) + +-- TODO add more comments, do some improvements on those. +-- copy pasting +vim.keymap.set('n', 'Y', 'y$', { desc = 'Yank till the end of the line' }) -- yanks till the end of the line, like C for change or D for delete +vim.keymap.set('n', 'J', 'mzJ`z', { desc = 'Marks the point (mz), joins the lines (J) and gets back to the marked place (`z)' }) +vim.keymap.set({ 'n', 'v' }, 'y', '"+y', { desc = 'Prefix y with leader to send to system clipboard' }) +vim.keymap.set({ 'n', 'v' }, 'Y', '"+Y', { desc = 'Prefix y with leader to send to system clipboard' }) +vim.keymap.set('x', 'p', '"+p', { desc = 'Deletes to void registry to avoid changing registry content' }) +vim.keymap.set('x', 'P', '"_dP', { desc = 'Deletes to void registry to avoid changing registry content' }) + +-- Search remaps +vim.keymap.set('n', 'n', 'nzzzv', { desc = 'n = next search, zz = center cursor on screen, zv = open fold if exist' }) +vim.keymap.set('n', 'N', 'Nzzzv', { desc = 'N = previous search, zz = center cursor on screen, zv = open fold if exist' }) + +-- Add additional undo breakpoints on these simbols, makes undo more granular +vim.keymap.set('i', ',', ',u', { desc = 'Add undo breakpoint on a ,' }) +vim.keymap.set('i', '.', '.u', { desc = 'Add undo breakpoint on a .' }) +vim.keymap.set('i', '!', '!u', { desc = 'Add undo breakpoint on a !' }) +vim.keymap.set('i', '?', '?u', { desc = 'Add undo breakpoint on a ?' }) + +-- Moving text around +vim.keymap.set('v', 'J', ":m '>+1gv=gv", { desc = 'Move selection down in visual mode' }) +vim.keymap.set('v', 'K', ":m '<-2gv=gv", { desc = 'Move selection up in visual mode' }) +vim.keymap.set('i', '', ':m .-2==', { desc = 'Move line up in insert mode' }) +vim.keymap.set('i', '', ':m .+1==', { desc = 'Move line down in insert mode' }) +vim.keymap.set('n', 'j', ':m .+1==', { desc = 'Move line up in in normal mode' }) +vim.keymap.set('n', 'k', ':m .-2==', { desc = 'Move line down in in normal mode' }) + +-- Window management +vim.keymap.set('n', '', '', { desc = 'Close window with ctrl+c' }) + +-- Markdown preview +vim.keymap.set('n', 'mp', ':Glow', { desc = 'Remap glow to show markdown preview' }) +vim.keymap.set('n', 'mq', ':Glow!', { desc = 'Remap glow to close markdown preview' }) + +-- Save file +vim.keymap.set({ 'i', 'v', 'n', 's' }, '', 'w', { desc = 'Save file' }) + +-- Function and remap to toggle relative numbers. +vim.keymap.set('n', 'nr', function() + vim.opt.nu = false + vim.opt.relativenumber = false +end, { desc = 'Disable number and relative number' }) +vim.keymap.set('n', 'rn', function() + vim.opt.nu = true + vim.opt.relativenumber = true +end, { desc = 'Enable number and relative number' }) + +-- Clean up +vim.keymap.set('n', 'dw', ':%s/\\s\\+$//e', { desc = 'Clean trailing whitespace in the document' }) +vim.keymap.set('n', 'dn', ':%s/\\n\\+\\%$//e', { desc = 'Clean trailing newlines in the document' }) +vim.keymap.set('n', 'ds', ':%s/\\^\\[\\+\\%$//e', { desc = 'Clean trailing escape sequences in the document' }) + +-- Testing remaps and functions + +-- better indenting +-- vim.keymap.set('v', '<', '', '>gv') diff --git a/lua/lazy.lua b/lua/lazy.lua new file mode 100644 index 00000000000..13cb64fddcb --- /dev/null +++ b/lua/lazy.lua @@ -0,0 +1,695 @@ +-- [[ Install `lazy.nvim` plugin manager ]] +-- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info +local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' +if not vim.loop.fs_stat(lazypath) then + local lazyrepo = 'https://github.com/folke/lazy.nvim.git' + vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } +end ---@diagnostic disable-next-line: undefined-field +vim.opt.rtp:prepend(lazypath) + +-- [[ Configure and install plugins ]] +-- +-- To check the current status of your plugins, run +-- :Lazy +-- +-- You can press `?` in this menu for help. Use `:q` to close the window +-- +-- To update plugins you can run +-- :Lazy update +-- +-- NOTE: Here is where you install your plugins. +require('lazy').setup({ + -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). + 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically + + -- NOTE: Plugins can also be added by using a table, + -- with the first argument being the link and the following + -- keys can be used to configure plugin behavior/loading/etc. + -- + -- Use `opts = {}` to force a plugin to be loaded. + -- + -- This is equivalent to: + -- require('Comment').setup({}) + + -- "gc" to comment visual regions/lines + { 'numToStr/Comment.nvim', opts = {} }, + + -- Here is a more advanced example where we pass configuration + -- options to `gitsigns.nvim`. This is equivalent to the following Lua: + -- require('gitsigns').setup({ ... }) + -- + -- See `:help gitsigns` to understand what the configuration keys do + { -- Adds git related signs to the gutter, as well as utilities for managing changes + 'lewis6991/gitsigns.nvim', + opts = { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + }, + }, + }, + + -- NOTE: Plugins can also be configured to run Lua code when they are loaded. + -- + -- This is often very useful to both group configuration, as well as handle + -- lazy loading plugins that don't need to be loaded immediately at startup. + -- + -- For example, in the following configuration, we use: + -- event = 'VimEnter' + -- + -- which loads which-key before all the UI elements are loaded. Events can be + -- normal autocommands events (`:help autocmd-events`). + -- + -- Then, because we use the `config` key, the configuration only runs + -- after the plugin has been loaded: + -- config = function() ... end + + { -- Useful plugin to show you pending keybinds. + 'folke/which-key.nvim', + event = 'VimEnter', -- Sets the loading event to 'VimEnter' + config = function() -- This is the function that runs, AFTER loading + require('which-key').setup() + + -- Document existing key chains + require('which-key').register { + ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, + ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, + ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, + ['s'] = { name = '[S]earch', _ = 'which_key_ignore' }, + ['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, + ['t'] = { name = '[T]oggle', _ = 'which_key_ignore' }, + ['h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' }, + } + -- visual mode + require('which-key').register({ + ['h'] = { 'Git [H]unk' }, + }, { mode = 'v' }) + end, + }, + + -- NOTE: Plugins can specify dependencies. + -- + -- The dependencies are proper plugin specifications as well - anything + -- you do for a plugin at the top level, you can do for a dependency. + -- + -- Use the `dependencies` key to specify the dependencies of a particular plugin + + { -- Fuzzy Finder (files, lsp, etc) + 'nvim-telescope/telescope.nvim', + event = 'VimEnter', + branch = '0.1.x', + dependencies = { + 'nvim-lua/plenary.nvim', + { -- If encountering errors, see telescope-fzf-native README for installation instructions + 'nvim-telescope/telescope-fzf-native.nvim', + + -- `build` is used to run some command when the plugin is installed/updated. + -- This is only run then, not every time Neovim starts up. + build = 'make', + + -- `cond` is a condition used to determine whether this plugin should be + -- installed and loaded. + cond = function() + return vim.fn.executable 'make' == 1 + end, + }, + { '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 }, + }, + config = function() + -- Telescope is a fuzzy finder that comes with a lot of different things that + -- it can fuzzy find! It's more than just a "file finder", it can search + -- many different aspects of Neovim, your workspace, LSP, and more! + -- + -- The easiest way to use Telescope, is to start by doing something like: + -- :Telescope help_tags + -- + -- After running this command, a window will open up and you're able to + -- type in the prompt window. You'll see a list of `help_tags` options and + -- a corresponding preview of the help. + -- + -- Two important keymaps to use while in Telescope are: + -- - Insert mode: + -- - Normal mode: ? + -- + -- This opens a window that shows you all of the keymaps for the current + -- Telescope picker. This is really useful to discover what Telescope can + -- do as well as how to actually do it! + + -- [[ Configure Telescope ]] + -- See `:help telescope` and `:help telescope.setup()` + require('telescope').setup { + -- You can put your default mappings / updates / etc. in here + -- All the info you're looking for is in `:help telescope.setup()` + -- + -- defaults = { + -- mappings = { + -- i = { [''] = 'to_fuzzy_refine' }, + -- }, + -- }, + -- pickers = {} + extensions = { + ['ui-select'] = { + require('telescope.themes').get_dropdown(), + }, + }, + } + + -- Enable Telescope extensions if they are installed + pcall(require('telescope').load_extension, 'fzf') + pcall(require('telescope').load_extension, 'ui-select') + + -- See `:help telescope.builtin` + local builtin = require 'telescope.builtin' + vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) + vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) + vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) + vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) + vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) + vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) + vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) + vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) + vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) + vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + + -- Slightly advanced example of overriding default behavior and theme + vim.keymap.set('n', '/', function() + -- You can pass additional configuration to Telescope to change the theme, layout, etc. + builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { + winblend = 10, + previewer = false, + }) + end, { desc = '[/] Fuzzily search in current buffer' }) + + -- It's also possible to pass additional configuration options. + -- See `:help telescope.builtin.live_grep()` for information about particular keys + vim.keymap.set('n', 's/', function() + builtin.live_grep { + grep_open_files = true, + prompt_title = 'Live Grep in Open Files', + } + end, { desc = '[S]earch [/] in Open Files' }) + + -- Shortcut for searching your Neovim configuration files + vim.keymap.set('n', 'sn', function() + builtin.find_files { cwd = vim.fn.stdpath 'config' } + end, { desc = '[S]earch [N]eovim files' }) + end, + }, + + { -- LSP Configuration & Plugins + 'neovim/nvim-lspconfig', + dependencies = { + -- Automatically install LSPs and related tools to stdpath for Neovim + { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants + 'williamboman/mason-lspconfig.nvim', + 'WhoIsSethDaniel/mason-tool-installer.nvim', + + -- Useful status updates for LSP. + -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` + { 'j-hui/fidget.nvim', opts = {} }, + + -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins + -- used for completion, annotations and signatures of Neovim apis + { 'folke/neodev.nvim', opts = {} }, + }, + config = function() + -- 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 + autocmd('LspAttach', { + group = 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) + vim.keymap.set('n', 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') + + -- Opens a popup that displays documentation about the word under your cursor + -- See `:help K` for why this keymap. + map('K', vim.lsp.buf.hover, 'Hover Documentation') + + -- 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') + + -- 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.server_capabilities.documentHighlightProvider then + autocmd({ 'CursorHold', 'CursorHoldI' }, { + buffer = event.buf, + callback = vim.lsp.buf.document_highlight, + }) + + autocmd({ 'CursorMoved', 'CursorMovedI' }, { + buffer = event.buf, + callback = vim.lsp.buf.clear_references, + }) + end + + -- The following autocommand is used to enable 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.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then + map('th', function() + vim.lsp.inlay_hint.enable(0, not vim.lsp.inlay_hint.is_enabled()) + end, '[T]oggle Inlay [H]ints') + end + 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 (`tsserver`) will work just fine + -- tsserver = {}, + -- + + 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' } }, + }, + }, + }, + } + + -- 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. + require('mason').setup() + + -- 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('mason-lspconfig').setup { + 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 tsserver) + server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + require('lspconfig')[server_name].setup(server) + end, + }, + } + end, + }, + + { -- Autoformat + 'stevearc/conform.nvim', + lazy = false, + keys = { + { + 'f', + function() + require('conform').format { async = true, lsp_fallback = true } + end, + mode = '', + desc = '[F]ormat buffer', + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + -- Disable "format_on_save lsp_fallback" for languages that don't + -- have a well standardized coding style. You can add additional + -- languages here or re-enable it for the disabled ones. + local disable_filetypes = { c = true, cpp = true } + return { + timeout_ms = 500, + lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], + } + end, + formatters_by_ft = { + lua = { 'stylua' }, + -- Conform can also run multiple formatters sequentially + -- python = { "isort", "black" }, + -- + -- You can use a sub-list to tell conform to run *until* a formatter + -- is found. + -- javascript = { { "prettierd", "prettier" } }, + }, + }, + }, + + { -- Autocompletion + 'hrsh7th/nvim-cmp', + event = 'InsertEnter', + dependencies = { + -- Snippet Engine & its associated nvim-cmp source + { + 'L3MON4D3/LuaSnip', + build = (function() + -- Build Step is needed for regex support in snippets. + -- This step is not supported in many windows environments. + -- Remove the below condition to re-enable on windows. + if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then + return + end + return 'make install_jsregexp' + end)(), + dependencies = { + -- `friendly-snippets` contains a variety of premade snippets. + -- See the README about individual language/framework/plugin snippets: + -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, + }, + }, + 'saadparwaiz1/cmp_luasnip', + + -- Adds other completion capabilities. + -- nvim-cmp does not ship with all sources by default. They are split + -- into multiple repos for maintenance purposes. + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-path', + }, + config = function() + -- See `:help cmp` + local cmp = require 'cmp' + local luasnip = require 'luasnip' + luasnip.config.setup {} + + cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + completion = { completeopt = 'menu,menuone,noinsert' }, + + -- For an understanding of why these mappings were + -- chosen, you will need to read `:help ins-completion` + -- + -- No, but seriously. Please read `:help ins-completion`, it is really good! + mapping = cmp.mapping.preset.insert { + -- Select the [n]ext item + [''] = cmp.mapping.select_next_item(), + -- Select the [p]revious item + [''] = cmp.mapping.select_prev_item(), + + -- Scroll the documentation window [b]ack / [f]orward + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + + -- Accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + [''] = cmp.mapping.confirm { select = true }, + + -- If you prefer more traditional completion keymaps, + -- you can uncomment the following lines + --[''] = cmp.mapping.confirm { select = true }, + --[''] = cmp.mapping.select_next_item(), + --[''] = cmp.mapping.select_prev_item(), + + -- Manually trigger a completion from nvim-cmp. + -- Generally you don't need this, because nvim-cmp will display + -- completions whenever it has completion options available. + [''] = cmp.mapping.complete {}, + + -- Think of as moving to the right of your snippet expansion. + -- So if you have a snippet that's like: + -- function $name($args) + -- $body + -- end + -- + -- will move you to the right of each of the expansion locations. + -- is similar, except moving you backwards. + [''] = cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { 'i', 's' }), + + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'path' }, + }, + } + end, + }, + + { -- You can easily change to a different colorscheme. + -- Change the name of the colorscheme plugin below, and then + -- change the command in the config to whatever the name of that colorscheme is. + -- + -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + 'folke/tokyonight.nvim', + priority = 1000, -- Make sure to load this before all the other start plugins. + init = function() + -- Load the colorscheme here. + -- Like many other themes, this one has different styles, and you could load + -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + vim.cmd.colorscheme 'tokyonight-night' + + -- You can configure highlights by doing something like: + vim.cmd.hi 'Comment gui=none' + end, + }, + + -- Highlight todo, notes, etc in comments + { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, + + { -- Collection of various small independent plugins/modules + 'echasnovski/mini.nvim', + config = function() + -- Better Around/Inside textobjects + -- + -- Examples: + -- - va) - [V]isually select [A]round [)]paren + -- - yinq - [Y]ank [I]nside [N]ext [']quote + -- - ci' - [C]hange [I]nside [']quote + require('mini.ai').setup { n_lines = 500 } + + -- Add/delete/replace surroundings (brackets, quotes, etc.) + -- + -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren + -- - sd' - [S]urround [D]elete [']quotes + -- - sr)' - [S]urround [R]eplace [)] ['] + require('mini.surround').setup() + + -- Simple and easy statusline. + -- You could remove this setup call if you don't like it, + -- and try some other statusline plugin + local statusline = require 'mini.statusline' + -- set use_icons to true if you have a Nerd Font + statusline.setup { use_icons = vim.g.have_nerd_font } + + -- You can configure sections in the statusline by overriding their + -- default behavior. For example, here we set the section for + -- cursor location to LINE:COLUMN + ---@diagnostic disable-next-line: duplicate-set-field + statusline.section_location = function() + return '%2l:%-2v' + end + + -- ... and there is more! + -- Check out: https://github.com/echasnovski/mini.nvim + end, + }, + { -- Highlight, edit, and navigate code + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate', + opts = { + ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, + -- Autoinstall languages that are not installed + auto_install = true, + highlight = { + enable = true, + -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. + -- If you are experiencing weird indenting issues, add the language to + -- the list of additional_vim_regex_highlighting and disabled languages for indent. + additional_vim_regex_highlighting = { 'ruby' }, + }, + indent = { enable = true, disable = { 'ruby' } }, + }, + config = function(_, opts) + -- [[ Configure Treesitter ]] See `:help nvim-treesitter` + + -- Prefer git instead of curl in order to improve connectivity in some environments + require('nvim-treesitter.install').prefer_git = true + ---@diagnostic disable-next-line: missing-fields + require('nvim-treesitter.configs').setup(opts) + + -- There are additional nvim-treesitter modules that you can use to interact + -- with nvim-treesitter. You should go explore a few and see what interests you: + -- + -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` + -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context + -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects + end, + }, + + -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the + -- init.lua. If you want these files, they are in the repository, so you can just download them and + -- place them in the correct locations. + + -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart + -- + -- Here are some example plugins that I've included in the Kickstart repository. + -- Uncomment any of the lines below to enable them (you will need to restart nvim). + -- + -- require 'kickstart.plugins.debug', + -- require 'kickstart.plugins.indent_line', + -- require 'kickstart.plugins.lint', + -- require 'kickstart.plugins.autopairs', + -- require 'kickstart.plugins.neo-tree', + -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps + + -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` + -- 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. + -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` + -- { import = 'custom.plugins' }, +}, { + ui = { + -- If you are using a Nerd Font: set icons to an empty table which will use the + -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table + icons = vim.g.have_nerd_font and {} or { + cmd = '⌘', + config = '🛠', + event = '📅', + ft = '📂', + init = '⚙', + keys = '🗝', + plugin = '🔌', + runtime = '💻', + require = '🌙', + source = '📄', + start = '🚀', + task = '📌', + lazy = '💤 ', + }, + }, +}) + +-- The line beneath this is called `modeline`. See `:help modeline` +-- vim: ts=2 sts=2 sw=2 et diff --git a/lua/options.lua b/lua/options.lua new file mode 100644 index 00000000000..a9fae643754 --- /dev/null +++ b/lua/options.lua @@ -0,0 +1,71 @@ +-- [[ Options ]] +-- See `:help vim.opt` +-- NOTE: You can change these options as you wish! +-- For more options, you can see `:help option-list` + +-- Set numbers and relativenumber +vim.opt.number = true +vim.opt.relativenumber = true + +-- Enable mouse mode, can be useful for resizing splits for example! +vim.opt.mouse = 'a' + +-- Don't show the mode, since it's already in the status line +vim.opt.showmode = false + +-- Set indent +-- vim.opt.tabstop = 4 +-- vim.opt.softtabstop = 4 +-- vim.opt.shiftwidth = 4 +vim.opt.wrap = true +vim.opt.breakindent = true -- keeps text indented after wrap line +vim.opt.expandtab = true +vim.opt.smartindent = true + +-- Save undo history and specify path to it. +vim.opt.undofile = true +vim.opt.undodir = os.getenv 'HOME' .. '/.nvim/undodir' + +-- Don't create swap or backup, we have undo for it +vim.opt.swapfile = false +vim.opt.backup = false + +-- Set highlight and navigation +vim.opt.hlsearch = true -- Highlight partial search +vim.opt.incsearch = true -- Incremental search to highlight partial matches +-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term +vim.opt.ignorecase = true +vim.opt.smartcase = true +vim.opt.signcolumn = 'yes' -- Keep signcolumn on by default +vim.opt.inccommand = 'split' -- Preview substitutions live, as you type! + +-- Minimal number of screen lines to keep above and below the cursor. +vim.opt.scrolloff = 20 + +-- Decrease update time +vim.opt.updatetime = 250 + +-- Decrease mapped sequence wait time +-- Displays which-key popup sooner +vim.opt.timeoutlen = 300 + +-- Configure how new splits should be opened +vim.opt.splitright = true +vim.opt.splitbelow = true + +-- Sets how neovim will display certain whitespace characters in the editor. +-- See `:help 'list'` +-- and `:help 'listchars'` +vim.opt.list = true +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } + +-- Show which line your cursor is on +vim.opt.cursorline = true +-- +-- set netrw config +vim.g.netrw_banner = 0 -- Remove banner at the top +vim.g.netrw_liststyle = 3 -- Default directory view. Cycle with i +vim.g.netrw_altv = 1 -- Files are opened to the right of netrw +vim.g.netrw_chgwin = -1 -- Files are opened in the netrw window +vim.g.netrw_winsize = 25 -- Window size +vim.g.netrw_list_hide = '.*.swp$, *.pyc$, *.log$, *.o$, *.xmi$, *.swp$, *.bak$, *.pyc$, *.class$, *.jar$, *.war$, *__pycache__*' -- Hide files with this extensions From 9ef80b2ace26369578af85a0aaf16524f9766ef2 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Sun, 21 Apr 2024 18:10:11 -0300 Subject: [PATCH 02/34] Separating plugin manager instalation from configuration --- init.lua | 3 ++- lua/{lazy.lua => lazy-config.lua} | 13 +++---------- lua/lazy-install.lua | 8 ++++++++ 3 files changed, 13 insertions(+), 11 deletions(-) rename lua/{lazy.lua => lazy-config.lua} (98%) create mode 100644 lua/lazy-install.lua diff --git a/init.lua b/init.lua index b032bdc5bfa..80640821b29 100644 --- a/init.lua +++ b/init.lua @@ -103,4 +103,5 @@ require 'keymaps' require 'autocommands' -- [[ Lazy package manager ]] -require 'lazy' +require 'lazy-install' +require 'lazy-config' diff --git a/lua/lazy.lua b/lua/lazy-config.lua similarity index 98% rename from lua/lazy.lua rename to lua/lazy-config.lua index 13cb64fddcb..179e2f1f6bd 100644 --- a/lua/lazy.lua +++ b/lua/lazy-config.lua @@ -1,13 +1,6 @@ --- [[ Install `lazy.nvim` plugin manager ]] --- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info -local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' -if not vim.loop.fs_stat(lazypath) then - local lazyrepo = 'https://github.com/folke/lazy.nvim.git' - vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } -end ---@diagnostic disable-next-line: undefined-field -vim.opt.rtp:prepend(lazypath) - -- [[ Configure and install plugins ]] +-- Definitions +local autocmd = vim.api.nvim_create_autocmd -- -- To check the current status of your plugins, run -- :Lazy @@ -249,7 +242,7 @@ require('lazy').setup({ -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this -- function will be executed to configure the current buffer autocmd('LspAttach', { - group = augroup('kickstart-lsp-attach', { clear = true }), + group = vim.api.nvim_create_augroup('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. diff --git a/lua/lazy-install.lua b/lua/lazy-install.lua new file mode 100644 index 00000000000..0e208332d13 --- /dev/null +++ b/lua/lazy-install.lua @@ -0,0 +1,8 @@ +-- [[ Install `lazy.nvim` plugin manager ]] +-- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info +local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' +if not vim.loop.fs_stat(lazypath) then + local lazyrepo = 'https://github.com/folke/lazy.nvim.git' + vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } +end ---@diagnostic disable-next-line: undefined-field +vim.opt.rtp:prepend(lazypath) From ede599bae8fc58cbe5feac3b2a6307a19179608d Mon Sep 17 00:00:00 2001 From: juanito87 Date: Mon, 22 Apr 2024 21:28:19 -0300 Subject: [PATCH 03/34] Renaming files, moving to modular config. --- init.lua | 4 + lua/autocommands.lua | 10 +- lua/lazy-config.lua | 63 +++------- .../plugins => plugins_config}/autopairs.lua | 0 .../plugins => plugins_config}/debug.lua | 0 .../plugins => plugins_config}/gitsigns.lua | 11 +- lua/plugins_config/harpoon.lua | 18 +++ lua/{kickstart => plugins_config}/health.lua | 0 .../indent_line.lua | 0 .../plugins => plugins_config}/lint.lua | 0 .../plugins => plugins_config}/neo-tree.lua | 0 lua/plugins_config/telescope.lua | 111 ++++++++++++++++++ lua/plugins_config/vim-fugitive.lua | 42 +++++++ lua/plugins_config/which-key.lua | 22 ++++ lua/plugins_config/worktree.lua | 3 + 15 files changed, 231 insertions(+), 53 deletions(-) rename lua/{kickstart/plugins => plugins_config}/autopairs.lua (100%) rename lua/{kickstart/plugins => plugins_config}/debug.lua (100%) rename lua/{kickstart/plugins => plugins_config}/gitsigns.lua (92%) create mode 100644 lua/plugins_config/harpoon.lua rename lua/{kickstart => plugins_config}/health.lua (100%) rename lua/{kickstart/plugins => plugins_config}/indent_line.lua (100%) rename lua/{kickstart/plugins => plugins_config}/lint.lua (100%) rename lua/{kickstart/plugins => plugins_config}/neo-tree.lua (100%) create mode 100644 lua/plugins_config/telescope.lua create mode 100644 lua/plugins_config/vim-fugitive.lua create mode 100644 lua/plugins_config/which-key.lua create mode 100644 lua/plugins_config/worktree.lua diff --git a/init.lua b/init.lua index 80640821b29..1b04fff5338 100644 --- a/init.lua +++ b/init.lua @@ -93,6 +93,10 @@ vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal vim.g.have_nerd_font = true +-- [[ Global variables ]] +Autocmd = vim.api.nvim_create_autocmd +Fugitive = vim.api.nvim_create_augroup('juanito_Fugitive', {}) + -- [[ Setting options ]] require 'options' diff --git a/lua/autocommands.lua b/lua/autocommands.lua index 16295ad856e..f1f111deb1e 100644 --- a/lua/autocommands.lua +++ b/lua/autocommands.lua @@ -1,13 +1,11 @@ -- [[ Autocommands ]] -- See `:help lua-guide-autocommands` -- Definitions -local autocmd = vim.api.nvim_create_autocmd --- local augroup = vim.api.nvim_create_augroup -- Highlight when yanking (copying) text -- Try it with `yap` in normal mode -- See `:help vim.highlight.on_yank()` -autocmd('TextYankPost', { +Autocmd('TextYankPost', { desc = 'Highlight when yanking (copying) text', group = vim.api.nvim_create_augroup('highlight-yank', { clear = true }), callback = function() @@ -20,7 +18,7 @@ local function augroup(name) return vim.api.nvim_create_augroup('lazyvim_' .. name, { clear = true }) end -autocmd({ 'VimResized' }, { +Autocmd({ 'VimResized' }, { group = augroup 'resize_splits', callback = function() vim.cmd 'tabdo wincmd =' @@ -28,7 +26,7 @@ autocmd({ 'VimResized' }, { }) -- Remove auto comment next line -autocmd({ 'BufEnter' }, { +Autocmd({ 'BufEnter' }, { group = augroup 'remove_auto_comment', callback = function() vim.cmd 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o' @@ -36,7 +34,7 @@ autocmd({ 'BufEnter' }, { }) -- Set cursorline only in focused window -autocmd({ 'WinEnter', 'WinLeave' }, { +Autocmd({ 'WinEnter', 'WinLeave' }, { group = augroup 'cursorline', callback = function() vim.wo.cursorline = vim.fn.win_getid() == vim.fn.win_getid() diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index 179e2f1f6bd..d506c4b442c 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -1,7 +1,4 @@ -- [[ Configure and install plugins ]] --- Definitions -local autocmd = vim.api.nvim_create_autocmd --- -- To check the current status of your plugins, run -- :Lazy -- @@ -13,7 +10,16 @@ local autocmd = vim.api.nvim_create_autocmd -- NOTE: Here is where you install your plugins. require('lazy').setup({ -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). + -- Plugins with default values 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically + -- Plugins with custom values + require 'plugins_config/vim-fugitive', -- Manage git in nvim + require 'plugins_config/which-key', -- Show created key bindings + -- require 'plugins_config/gitsigns', -- Manage git signs + + 'APZelos/blamer.nvim', -- Show git blame + 'ThePrimeagen/git-worktree.nvim', -- Manage worktrees from nvim + 'theprimeagen/harpoon', -- Improve workflow for multiple files -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following @@ -32,18 +38,6 @@ require('lazy').setup({ -- require('gitsigns').setup({ ... }) -- -- See `:help gitsigns` to understand what the configuration keys do - { -- Adds git related signs to the gutter, as well as utilities for managing changes - 'lewis6991/gitsigns.nvim', - opts = { - signs = { - add = { text = '+' }, - change = { text = '~' }, - delete = { text = '_' }, - topdelete = { text = '‾' }, - changedelete = { text = '~' }, - }, - }, - }, -- NOTE: Plugins can also be configured to run Lua code when they are loaded. -- @@ -60,29 +54,6 @@ require('lazy').setup({ -- after the plugin has been loaded: -- config = function() ... end - { -- Useful plugin to show you pending keybinds. - 'folke/which-key.nvim', - event = 'VimEnter', -- Sets the loading event to 'VimEnter' - config = function() -- This is the function that runs, AFTER loading - require('which-key').setup() - - -- Document existing key chains - require('which-key').register { - ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, - ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, - ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, - ['s'] = { name = '[S]earch', _ = 'which_key_ignore' }, - ['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, - ['t'] = { name = '[T]oggle', _ = 'which_key_ignore' }, - ['h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' }, - } - -- visual mode - require('which-key').register({ - ['h'] = { 'Git [H]unk' }, - }, { mode = 'v' }) - end, - }, - -- NOTE: Plugins can specify dependencies. -- -- The dependencies are proper plugin specifications as well - anything @@ -241,8 +212,8 @@ require('lazy').setup({ -- 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 - autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('lsp-attach', { clear = true }), + Autocmd('LspAttach', { + group = Augroup('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. @@ -301,12 +272,12 @@ require('lazy').setup({ -- 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.server_capabilities.documentHighlightProvider then - autocmd({ 'CursorHold', 'CursorHoldI' }, { + Autocmd({ 'CursorHold', 'CursorHoldI' }, { buffer = event.buf, callback = vim.lsp.buf.document_highlight, }) - autocmd({ 'CursorMoved', 'CursorMovedI' }, { + Autocmd({ 'CursorMoved', 'CursorMovedI' }, { buffer = event.buf, callback = vim.lsp.buf.clear_references, }) @@ -429,8 +400,12 @@ require('lazy').setup({ formatters_by_ft = { lua = { 'stylua' }, -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, - -- + python = { 'isort', 'black' }, + yaml = { 'yamlfix' }, + go = { 'gofmt' }, + rust = { 'rustfmt' }, + toml = { 'taplo' }, + jinja2 = { 'djlint' }, -- You can use a sub-list to tell conform to run *until* a formatter -- is found. -- javascript = { { "prettierd", "prettier" } }, diff --git a/lua/kickstart/plugins/autopairs.lua b/lua/plugins_config/autopairs.lua similarity index 100% rename from lua/kickstart/plugins/autopairs.lua rename to lua/plugins_config/autopairs.lua diff --git a/lua/kickstart/plugins/debug.lua b/lua/plugins_config/debug.lua similarity index 100% rename from lua/kickstart/plugins/debug.lua rename to lua/plugins_config/debug.lua diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/plugins_config/gitsigns.lua similarity index 92% rename from lua/kickstart/plugins/gitsigns.lua rename to lua/plugins_config/gitsigns.lua index 4bcc70f4c79..557c220078a 100644 --- a/lua/kickstart/plugins/gitsigns.lua +++ b/lua/plugins_config/gitsigns.lua @@ -3,9 +3,15 @@ -- config. This will add also the recommended keymaps. return { - { 'lewis6991/gitsigns.nvim', opts = { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + }, on_attach = function(bufnr) local gitsigns = require 'gitsigns' @@ -57,5 +63,4 @@ return { map('n', 'tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) end, }, - }, -} + } diff --git a/lua/plugins_config/harpoon.lua b/lua/plugins_config/harpoon.lua new file mode 100644 index 00000000000..acec5d06483 --- /dev/null +++ b/lua/plugins_config/harpoon.lua @@ -0,0 +1,18 @@ +local mark = require 'harpoon.mark' +local ui = require 'harpoon.ui' + +vim.keymap.set('n', 'a', mark.add_file) +vim.keymap.set('n', '', ui.toggle_quick_menu) + +vim.keymap.set('n', '', function() + ui.nav_file(1) +end) +vim.keymap.set('n', '', function() + ui.nav_file(2) +end) +vim.keymap.set('n', '', function() + ui.nav_file(3) +end) +vim.keymap.set('n', '', function() + ui.nav_file(4) +end) diff --git a/lua/kickstart/health.lua b/lua/plugins_config/health.lua similarity index 100% rename from lua/kickstart/health.lua rename to lua/plugins_config/health.lua diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/plugins_config/indent_line.lua similarity index 100% rename from lua/kickstart/plugins/indent_line.lua rename to lua/plugins_config/indent_line.lua diff --git a/lua/kickstart/plugins/lint.lua b/lua/plugins_config/lint.lua similarity index 100% rename from lua/kickstart/plugins/lint.lua rename to lua/plugins_config/lint.lua diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/plugins_config/neo-tree.lua similarity index 100% rename from lua/kickstart/plugins/neo-tree.lua rename to lua/plugins_config/neo-tree.lua diff --git a/lua/plugins_config/telescope.lua b/lua/plugins_config/telescope.lua new file mode 100644 index 00000000000..18aa92d2f25 --- /dev/null +++ b/lua/plugins_config/telescope.lua @@ -0,0 +1,111 @@ +return { -- Fuzzy Finder (files, lsp, etc) + 'nvim-telescope/telescope.nvim', + event = 'VimEnter', + branch = '0.1.x', + dependencies = { + 'nvim-lua/plenary.nvim', + { -- If encountering errors, see telescope-fzf-native README for installation instructions + 'nvim-telescope/telescope-fzf-native.nvim', + + -- `build` is used to run some command when the plugin is installed/updated. + -- This is only run then, not every time Neovim starts up. + build = 'make', + + -- `cond` is a condition used to determine whether this plugin should be + -- installed and loaded. + cond = function() + return vim.fn.executable 'make' == 1 + end, + }, + { '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 }, + { 'ThePrimeagen/git-worktree' }, + }, + config = function() + -- Telescope is a fuzzy finder that comes with a lot of different things that + -- it can fuzzy find! It's more than just a "file finder", it can search + -- many different aspects of Neovim, your workspace, LSP, and more! + -- + -- The easiest way to use Telescope, is to start by doing something like: + -- :Telescope help_tags + -- + -- After running this command, a window will open up and you're able to + -- type in the prompt window. You'll see a list of `help_tags` options and + -- a corresponding preview of the help. + -- + -- Two important keymaps to use while in Telescope are: + -- - Insert mode: + -- - Normal mode: ? + -- + -- This opens a window that shows you all of the keymaps for the current + -- Telescope picker. This is really useful to discover what Telescope can + -- do as well as how to actually do it! + + -- [[ Configure Telescope ]] + -- See `:help telescope` and `:help telescope.setup()` + require('telescope').setup { + -- You can put your default mappings / updates / etc. in here + -- All the info you're looking for is in `:help telescope.setup()` + -- + -- defaults = { + -- mappings = { + -- i = { [''] = 'to_fuzzy_refine' }, + -- }, + -- }, + -- pickers = {} + extensions = { + ['ui-select'] = { + require('telescope.themes').get_dropdown(), + }, + }, + } + + -- Enable Telescope extensions if they are installed + pcall(require('telescope').load_extension, 'fzf') + pcall(require('telescope').load_extension, 'ui-select') + + -- See `:help telescope.builtin` + local builtin = require 'telescope.builtin' + vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) + vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) + vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) + vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) + vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) + vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) + vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) + vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) + vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) + vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + vim.keymap.set('n', 'wm', function() + require('telescope').extensions.git_worktree.git_worktrees() -- manage worktrees on telescope + end) + vim.keymap.set('n', 'wc', function() + require('telescope').extensions.git_worktree.create_git_worktree() -- create worktree + end) + + -- Slightly advanced example of overriding default behavior and theme + vim.keymap.set('n', '/', function() + -- You can pass additional configuration to Telescope to change the theme, layout, etc. + builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { + winblend = 10, + previewer = false, + }) + end, { desc = '[/] Fuzzily search in current buffer' }) + + -- It's also possible to pass additional configuration options. + -- See `:help telescope.builtin.live_grep()` for information about particular keys + vim.keymap.set('n', 's/', function() + builtin.live_grep { + grep_open_files = true, + prompt_title = 'Live Grep in Open Files', + } + end, { desc = '[S]earch [/] in Open Files' }) + + -- Shortcut for searching your Neovim configuration files + vim.keymap.set('n', 'sn', function() + builtin.find_files { cwd = vim.fn.stdpath 'config' } + end, { desc = '[S]earch [N]eovim files' }) + end, +} diff --git a/lua/plugins_config/vim-fugitive.lua b/lua/plugins_config/vim-fugitive.lua new file mode 100644 index 00000000000..23368a174df --- /dev/null +++ b/lua/plugins_config/vim-fugitive.lua @@ -0,0 +1,42 @@ +return { + 'tpope/vim-fugitive', + + -- set git status remap + vim.keymap.set('n', 'gs', vim.cmd.Git, { desc = 'Start git buffer and check status' }), + vim.keymap.set('n', 'dv', ':Gvdiffsplit!', { desc = 'Diff split against HEAD vertical' }), + vim.keymap.set('n', 'dh', ':Gdiffsplit!', { desc = 'Diff split against HEAD horizontal' }), + vim.keymap.set('n', 'dt', ':windo diffthis', { desc = 'Diff files in all windows' }), + vim.keymap.set('n', 'dm', ':Gdiff!', { desc = 'On conflicted file opens a 3-way diff' }), + vim.keymap.set('n', '2', ':diffget //2 | diffupdate', { desc = 'On the middle file get the diff from Head' }), + vim.keymap.set('n', '3', ':diffget //3 | diffupdate', { desc = 'On the middle file get the diff from the other branch' }), + vim.keymap.set('n', 'do', ':diffo!', { desc = 'Turn off diff mode' }), + + -- + Autocmd('BufWinEnter', { + group = Fugitive, + pattern = '*', + callback = function() + if vim.bo.ft ~= 'fugitive' then + return + end + + local bufnr = vim.api.nvim_get_current_buf() + local opts = { buffer = bufnr, remap = false } + vim.keymap.set('n', 'gc', function() + vim.cmd.Git 'commit' + end) + vim.keymap.set('n', 'p', function() + vim.cmd.Git 'push' + end, opts) + + -- rebase always + vim.keymap.set('n', 'P', function() + vim.cmd.Git { 'pull', '--rebase' } + end, opts) + + -- NOTE: It allows me to easily set the branch i am pushing and any tracking + -- needed if i did not set the branch up correctly + vim.keymap.set('n', 't', ':Git push -u origin ', opts) + end, + }), +} diff --git a/lua/plugins_config/which-key.lua b/lua/plugins_config/which-key.lua new file mode 100644 index 00000000000..a5585ca41e7 --- /dev/null +++ b/lua/plugins_config/which-key.lua @@ -0,0 +1,22 @@ + return { -- Useful plugin to show you pending keybinds. + 'folke/which-key.nvim', + event = 'VimEnter', -- Sets the loading event to 'VimEnter' + config = function() -- This is the function that runs, AFTER loading + require('which-key').setup() + + -- Document existing key chains + require('which-key').register { + ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, + ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, + ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, + ['s'] = { name = '[S]earch', _ = 'which_key_ignore' }, + ['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, + ['t'] = { name = '[T]oggle', _ = 'which_key_ignore' }, + ['h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' }, + } + -- visual mode + require('which-key').register({ + ['h'] = { 'Git [H]unk' }, + }, { mode = 'v' }) + end, + } diff --git a/lua/plugins_config/worktree.lua b/lua/plugins_config/worktree.lua new file mode 100644 index 00000000000..3b73e668af1 --- /dev/null +++ b/lua/plugins_config/worktree.lua @@ -0,0 +1,3 @@ +require('git-worktree').setup { + change_directory_command = 'tcd', -- command to change directory (e.g. lcd for NvimTree) +} From 199d8fab5dc3025e42ae9bbb53ba2534de62795b Mon Sep 17 00:00:00 2001 From: juanito87 Date: Mon, 22 Apr 2024 23:22:40 -0300 Subject: [PATCH 04/34] Updating plugins config --- lua/plugins_config/autocomplete.lua | 110 +++++++++++++++ lua/plugins_config/colortheme.lua | 34 +++++ lua/plugins_config/conform.lua | 40 ++++++ lua/plugins_config/gitsigns.lua | 114 ++++++++-------- lua/plugins_config/harpoon.lua | 41 +++--- lua/plugins_config/lsp.lua | 205 ++++++++++++++++++++++++++++ lua/plugins_config/mini.lua | 37 +++++ lua/plugins_config/telescope.lua | 1 - lua/plugins_config/tree-sitter.lua | 35 +++++ lua/plugins_config/worktree.lua | 8 +- 10 files changed, 547 insertions(+), 78 deletions(-) create mode 100644 lua/plugins_config/autocomplete.lua create mode 100644 lua/plugins_config/colortheme.lua create mode 100644 lua/plugins_config/conform.lua create mode 100644 lua/plugins_config/lsp.lua create mode 100644 lua/plugins_config/mini.lua create mode 100644 lua/plugins_config/tree-sitter.lua diff --git a/lua/plugins_config/autocomplete.lua b/lua/plugins_config/autocomplete.lua new file mode 100644 index 00000000000..71e6c6ddb41 --- /dev/null +++ b/lua/plugins_config/autocomplete.lua @@ -0,0 +1,110 @@ +return { -- Autocompletion + 'hrsh7th/nvim-cmp', + event = 'InsertEnter', + dependencies = { + -- Snippet Engine & its associated nvim-cmp source + { + 'L3MON4D3/LuaSnip', + build = (function() + -- Build Step is needed for regex support in snippets. + -- This step is not supported in many windows environments. + -- Remove the below condition to re-enable on windows. + if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then + return + end + return 'make install_jsregexp' + end)(), + dependencies = { + -- `friendly-snippets` contains a variety of premade snippets. + -- See the README about individual language/framework/plugin snippets: + -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, + }, + }, + 'saadparwaiz1/cmp_luasnip', + + -- Adds other completion capabilities. + -- nvim-cmp does not ship with all sources by default. They are split + -- into multiple repos for maintenance purposes. + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-path', + }, + config = function() + -- See `:help cmp` + local cmp = require 'cmp' + local luasnip = require 'luasnip' + luasnip.config.setup {} + + cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + completion = { completeopt = 'menu,menuone,noinsert' }, + + -- For an understanding of why these mappings were + -- chosen, you will need to read `:help ins-completion` + -- + -- No, but seriously. Please read `:help ins-completion`, it is really good! + mapping = cmp.mapping.preset.insert { + -- Select the [n]ext item + [''] = cmp.mapping.select_next_item(), + -- Select the [p]revious item + [''] = cmp.mapping.select_prev_item(), + + -- Scroll the documentation window [b]ack / [f]orward + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + + -- Accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + [''] = cmp.mapping.confirm { select = true }, + + -- If you prefer more traditional completion keymaps, + -- you can uncomment the following lines + --[''] = cmp.mapping.confirm { select = true }, + --[''] = cmp.mapping.select_next_item(), + --[''] = cmp.mapping.select_prev_item(), + + -- Manually trigger a completion from nvim-cmp. + -- Generally you don't need this, because nvim-cmp will display + -- completions whenever it has completion options available. + [''] = cmp.mapping.complete {}, + + -- Think of as moving to the right of your snippet expansion. + -- So if you have a snippet that's like: + -- function $name($args) + -- $body + -- end + -- + -- will move you to the right of each of the expansion locations. + -- is similar, except moving you backwards. + [''] = cmp.mapping(function() + if luasnip.expand_or_locally_jumpable() then + luasnip.expand_or_jump() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function() + if luasnip.locally_jumpable(-1) then + luasnip.jump(-1) + end + end, { 'i', 's' }), + + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + }, + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'path' }, + }, + } + end, +} diff --git a/lua/plugins_config/colortheme.lua b/lua/plugins_config/colortheme.lua new file mode 100644 index 00000000000..17051bcc428 --- /dev/null +++ b/lua/plugins_config/colortheme.lua @@ -0,0 +1,34 @@ +return { -- You can easily change to a different colorscheme. + -- Change the name of the colorscheme plugin below, and then + -- change the command in the config to whatever the name of that colorscheme is. + -- + -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + 'folke/tokyonight.nvim', + priority = 1000, -- Make sure to load this before all the other start plugins. + init = function() + -- Load the colorscheme here. + -- Like many other themes, this one has different styles, and you could load + -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + vim.cmd.colorscheme 'tokyonight-night' + + -- You can configure highlights by doing something like: + vim.cmd.hi 'Comment gui=none' + end, +} +-- return { -- You can easily change to a different colorscheme. +-- -- Change the name of the colorscheme plugin below, and then +-- -- change the command in the config to whatever the name of that colorscheme is. +-- -- +-- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. +-- 'ellisonleao/gruvbox.nvim', +-- priority = 1000, -- Make sure to load this before all the other start plugins. +-- init = function() +-- -- Load the colorscheme here. +-- -- Like many other themes, this one has different styles, and you could load +-- -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. +-- vim.cmd.colorscheme 'gruvbox' +-- +-- -- You can configure highlights by doing something like: +-- vim.cmd.hi 'Comment gui=none' +-- end, +-- } diff --git a/lua/plugins_config/conform.lua b/lua/plugins_config/conform.lua new file mode 100644 index 00000000000..56f0cd231b8 --- /dev/null +++ b/lua/plugins_config/conform.lua @@ -0,0 +1,40 @@ +return { -- Autoformat + 'stevearc/conform.nvim', + lazy = false, + keys = { + { + 'f', + function() + require('conform').format { async = true, lsp_fallback = true } + end, + mode = '', + desc = '[F]ormat buffer', + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + -- Disable "format_on_save lsp_fallback" for languages that don't + -- have a well standardized coding style. You can add additional + -- languages here or re-enable it for the disabled ones. + local disable_filetypes = { c = true, cpp = true } + return { + timeout_ms = 500, + lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], + } + end, + formatters_by_ft = { + lua = { 'stylua' }, + -- Conform can also run multiple formatters sequentially + python = { 'isort', 'black' }, + yaml = { 'yamlfix' }, + go = { 'gofmt' }, + rust = { 'rustfmt' }, + toml = { 'taplo' }, + jinja2 = { 'djlint' }, + -- You can use a sub-list to tell conform to run *until* a formatter + -- is found. + -- javascript = { { "prettierd", "prettier" } }, + }, + }, +} diff --git a/lua/plugins_config/gitsigns.lua b/lua/plugins_config/gitsigns.lua index 557c220078a..c4f52293d51 100644 --- a/lua/plugins_config/gitsigns.lua +++ b/lua/plugins_config/gitsigns.lua @@ -3,64 +3,64 @@ -- config. This will add also the recommended keymaps. return { - 'lewis6991/gitsigns.nvim', - opts = { - signs = { - add = { text = '+' }, - change = { text = '~' }, - delete = { text = '_' }, - topdelete = { text = '‾' }, - changedelete = { text = '~' }, - }, - on_attach = function(bufnr) - local gitsigns = require 'gitsigns' + 'lewis6991/gitsigns.nvim', + opts = { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + }, + on_attach = function(bufnr) + local gitsigns = require 'gitsigns' - local function map(mode, l, r, opts) - opts = opts or {} - opts.buffer = bufnr - vim.keymap.set(mode, l, r, opts) - end + local function map(mode, l, r, opts) + opts = opts or {} + opts.buffer = bufnr + vim.keymap.set(mode, l, r, opts) + end - -- Navigation - map('n', ']c', function() - if vim.wo.diff then - vim.cmd.normal { ']c', bang = true } - else - gitsigns.nav_hunk 'next' - end - end, { desc = 'Jump to next git [c]hange' }) + -- Navigation + map('n', ']c', function() + if vim.wo.diff then + vim.cmd.normal { ']c', bang = true } + else + gitsigns.nav_hunk 'next' + end + end, { desc = 'Jump to next git [c]hange' }) - map('n', '[c', function() - if vim.wo.diff then - vim.cmd.normal { '[c', bang = true } - else - gitsigns.nav_hunk 'prev' - end - end, { desc = 'Jump to previous git [c]hange' }) + map('n', '[c', function() + if vim.wo.diff then + vim.cmd.normal { '[c', bang = true } + else + gitsigns.nav_hunk 'prev' + end + end, { desc = 'Jump to previous git [c]hange' }) - -- Actions - -- visual mode - map('v', 'hs', function() - gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } - end, { desc = 'stage git hunk' }) - map('v', 'hr', function() - gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } - end, { desc = 'reset git hunk' }) - -- normal mode - map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) - map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) - map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) - map('n', 'hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' }) - map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) - map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) - map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) - map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) - map('n', 'hD', function() - gitsigns.diffthis '@' - end, { desc = 'git [D]iff against last commit' }) - -- Toggles - map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) - map('n', 'tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) - end, - }, - } + -- Actions + -- visual mode + map('v', 'hs', function() + gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } + end, { desc = 'stage git hunk' }) + map('v', 'hr', function() + gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } + end, { desc = 'reset git hunk' }) + -- normal mode + map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) + map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) + map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) + map('n', 'hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' }) + map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) + map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) + map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) + map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) + map('n', 'hD', function() + gitsigns.diffthis '@' + end, { desc = 'git [D]iff against last commit' }) + -- Toggles + map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) + map('n', 'tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) + end, + }, +} diff --git a/lua/plugins_config/harpoon.lua b/lua/plugins_config/harpoon.lua index acec5d06483..5058b17b04b 100644 --- a/lua/plugins_config/harpoon.lua +++ b/lua/plugins_config/harpoon.lua @@ -1,18 +1,23 @@ -local mark = require 'harpoon.mark' -local ui = require 'harpoon.ui' - -vim.keymap.set('n', 'a', mark.add_file) -vim.keymap.set('n', '', ui.toggle_quick_menu) - -vim.keymap.set('n', '', function() - ui.nav_file(1) -end) -vim.keymap.set('n', '', function() - ui.nav_file(2) -end) -vim.keymap.set('n', '', function() - ui.nav_file(3) -end) -vim.keymap.set('n', '', function() - ui.nav_file(4) -end) +return { + 'ThePrimeagen/harpoon', + opts = { + -- local mark = require 'harpoon.mark', + -- local ui = require 'harpoon.ui', + -- + -- vim.keymap.set('n', 'a', mark.add_file), + -- vim.keymap.set('n', '', ui.toggle_quick_menu), + -- + -- vim.keymap.set('n', '', function() + -- ui.nav_file(1) + -- end), + -- vim.keymap.set('n', '', function() + -- ui.nav_file(2) + -- end), + -- vim.keymap.set('n', '', function() + -- ui.nav_file(3) + -- end), + -- vim.keymap.set('n', '', function() + -- ui.nav_file(4) + -- end), + }, +} diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua new file mode 100644 index 00000000000..a22afb80148 --- /dev/null +++ b/lua/plugins_config/lsp.lua @@ -0,0 +1,205 @@ +return { + 'neovim/nvim-lspconfig', + dependencies = { + -- Automatically install LSPs and related tools to stdpath for Neovim + { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants + 'williamboman/mason-lspconfig.nvim', + 'WhoIsSethDaniel/mason-tool-installer.nvim', + + -- Useful status updates for LSP. + -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` + { 'j-hui/fidget.nvim', opts = {} }, + + -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins + -- used for completion, annotations and signatures of Neovim apis + { 'folke/neodev.nvim', opts = {} }, + }, + config = function() + -- 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 + Autocmd('LspAttach', { + group = Augroup('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) + vim.keymap.set('n', 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') + + -- Opens a popup that displays documentation about the word under your cursor + -- See `:help K` for why this keymap. + map('K', vim.lsp.buf.hover, 'Hover Documentation') + + -- 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') + + -- 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.server_capabilities.documentHighlightProvider then + Autocmd({ 'CursorHold', 'CursorHoldI' }, { + buffer = event.buf, + callback = vim.lsp.buf.document_highlight, + }) + + Autocmd({ 'CursorMoved', 'CursorMovedI' }, { + buffer = event.buf, + callback = vim.lsp.buf.clear_references, + }) + end + + -- The following autocommand is used to enable 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.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then + map('th', function() + vim.lsp.inlay_hint.enable(0, not vim.lsp.inlay_hint.is_enabled()) + end, '[T]oggle Inlay [H]ints') + end + 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 (`tsserver`) will work just fine + -- tsserver = {}, + -- + + 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' } }, + }, + }, + }, + } + + -- 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. + require('mason').setup() + + -- 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('mason-lspconfig').setup { + 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 tsserver) + server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + require('lspconfig')[server_name].setup(server) + end, + }, + } + end, +} diff --git a/lua/plugins_config/mini.lua b/lua/plugins_config/mini.lua new file mode 100644 index 00000000000..5e7f743d661 --- /dev/null +++ b/lua/plugins_config/mini.lua @@ -0,0 +1,37 @@ +return { -- Collection of various small independent plugins/modules + 'echasnovski/mini.nvim', + config = function() + -- Better Around/Inside textobjects + -- + -- Examples: + -- - va) - [V]isually select [A]round [)]paren + -- - yinq - [Y]ank [I]nside [N]ext [']quote + -- - ci' - [C]hange [I]nside [']quote + require('mini.ai').setup { n_lines = 500 } + + -- Add/delete/replace surroundings (brackets, quotes, etc.) + -- + -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren + -- - sd' - [S]urround [D]elete [']quotes + -- - sr)' - [S]urround [R]eplace [)] ['] + require('mini.surround').setup() + + -- Simple and easy statusline. + -- You could remove this setup call if you don't like it, + -- and try some other statusline plugin + local statusline = require 'mini.statusline' + -- set use_icons to true if you have a Nerd Font + statusline.setup { use_icons = vim.g.have_nerd_font } + + -- You can configure sections in the statusline by overriding their + -- default behavior. For example, here we set the section for + -- cursor location to LINE:COLUMN + ---@diagnostic disable-next-line: duplicate-set-field + statusline.section_location = function() + return '%2l:%-2v' + end + + -- ... and there is more! + -- Check out: https://github.com/echasnovski/mini.nvim + end, +} diff --git a/lua/plugins_config/telescope.lua b/lua/plugins_config/telescope.lua index 18aa92d2f25..3899f30cc5b 100644 --- a/lua/plugins_config/telescope.lua +++ b/lua/plugins_config/telescope.lua @@ -21,7 +21,6 @@ return { -- Fuzzy Finder (files, lsp, etc) -- Useful for getting pretty icons, but requires a Nerd Font. { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, - { 'ThePrimeagen/git-worktree' }, }, config = function() -- Telescope is a fuzzy finder that comes with a lot of different things that diff --git a/lua/plugins_config/tree-sitter.lua b/lua/plugins_config/tree-sitter.lua new file mode 100644 index 00000000000..3d84a1526b4 --- /dev/null +++ b/lua/plugins_config/tree-sitter.lua @@ -0,0 +1,35 @@ +return { -- Highlight, edit, and navigate code + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate', + opts = { + ensure_installed = { 'lua', 'rust', 'toml', 'bash', 'dockerfile', 'go', 'http', 'json', 'make', 'markdown', 'python', 'regex', 'yaml' }, + -- Install parsers synchronously (only applied to `ensure_installed`) + sync_install = false, + + -- Autoinstall languages that are not installed + auto_install = true, + highlight = { + enable = true, + -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. + -- If you are experiencing weird indenting issues, add the language to + -- the list of additional_vim_regex_highlighting and disabled languages for indent. + additional_vim_regex_highlighting = false, + }, + indent = { enable = true, disable = { 'ruby' } }, + }, + config = function(_, opts) + -- [[ Configure Treesitter ]] See `:help nvim-treesitter` + + -- Prefer git instead of curl in order to improve connectivity in some environments + require('nvim-treesitter.install').prefer_git = true + ---@diagnostic disable-next-line: missing-fields + require('nvim-treesitter.configs').setup(opts) + + -- There are additional nvim-treesitter modules that you can use to interact + -- with nvim-treesitter. You should go explore a few and see what interests you: + -- + -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` + -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context + -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects + end, +} diff --git a/lua/plugins_config/worktree.lua b/lua/plugins_config/worktree.lua index 3b73e668af1..ce28c13a755 100644 --- a/lua/plugins_config/worktree.lua +++ b/lua/plugins_config/worktree.lua @@ -1,3 +1,7 @@ -require('git-worktree').setup { - change_directory_command = 'tcd', -- command to change directory (e.g. lcd for NvimTree) +return { + 'ThePrimeagen/git-worktree.nvim', -- Manage worktrees from nvim + opts = { + change_directory_command = 'tcd', -- command to change directory (e.g. lcd for NvimTree) + autopush = true, + }, } From 7edfc147ab80b5c18b7f769675ac73361ededc3d Mon Sep 17 00:00:00 2001 From: juanito87 Date: Mon, 22 Apr 2024 23:23:04 -0300 Subject: [PATCH 05/34] Moving plugins to multi file config --- lua/lazy-config.lua | 584 ++------------------------------------------ 1 file changed, 22 insertions(+), 562 deletions(-) diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index d506c4b442c..448d7cd5220 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -12,15 +12,29 @@ require('lazy').setup({ -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). -- Plugins with default values 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - -- Plugins with custom values - require 'plugins_config/vim-fugitive', -- Manage git in nvim - require 'plugins_config/which-key', -- Show created key bindings - -- require 'plugins_config/gitsigns', -- Manage git signs - 'APZelos/blamer.nvim', -- Show git blame - 'ThePrimeagen/git-worktree.nvim', -- Manage worktrees from nvim - 'theprimeagen/harpoon', -- Improve workflow for multiple files + 'numToStr/Comment.nvim', -- "gc" to comment visual regions/lines + + -- One liners + -- Highlight todo, notes, etc in comments + { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, + -- Plugins with custom values + require 'plugins_config/which-key', -- Show created key bindings + require 'plugins_config/gitsigns', -- Manage git signs + require 'plugins_config/vim-fugitive', -- Manage git in nvim + require 'plugins_config/telescope', -- Manage searches nicely + require 'plugins_config/worktree', -- Manage worktrees from nvim + require 'plugins_config/lsp', -- Multilanguage lsp config + require 'plugins_config/conform', -- Autoformat files using lsp on save + require 'plugins_config/autocomplete', -- Autocompletion + require 'plugins_config/colortheme', -- Color theme for the editor + require 'plugins_config/mini', -- Collections of useful mini plugins, like around/surround + require 'plugins_config/tree-sitter', -- manage lint, indentation and some othe language related tasks + + -- Broken configs + -- require 'plugins_config/harpoon', -- Improve workflow for multiple files + -- keeping comments for annotation -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following -- keys can be used to configure plugin behavior/loading/etc. @@ -31,7 +45,7 @@ require('lazy').setup({ -- require('Comment').setup({}) -- "gc" to comment visual regions/lines - { 'numToStr/Comment.nvim', opts = {} }, + -- { 'numToStr/Comment.nvim', opts = {} }, -- optional notation -- Here is a more advanced example where we pass configuration -- options to `gitsigns.nvim`. This is equivalent to the following Lua: @@ -61,560 +75,6 @@ require('lazy').setup({ -- -- Use the `dependencies` key to specify the dependencies of a particular plugin - { -- Fuzzy Finder (files, lsp, etc) - 'nvim-telescope/telescope.nvim', - event = 'VimEnter', - branch = '0.1.x', - dependencies = { - 'nvim-lua/plenary.nvim', - { -- If encountering errors, see telescope-fzf-native README for installation instructions - 'nvim-telescope/telescope-fzf-native.nvim', - - -- `build` is used to run some command when the plugin is installed/updated. - -- This is only run then, not every time Neovim starts up. - build = 'make', - - -- `cond` is a condition used to determine whether this plugin should be - -- installed and loaded. - cond = function() - return vim.fn.executable 'make' == 1 - end, - }, - { '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 }, - }, - config = function() - -- Telescope is a fuzzy finder that comes with a lot of different things that - -- it can fuzzy find! It's more than just a "file finder", it can search - -- many different aspects of Neovim, your workspace, LSP, and more! - -- - -- The easiest way to use Telescope, is to start by doing something like: - -- :Telescope help_tags - -- - -- After running this command, a window will open up and you're able to - -- type in the prompt window. You'll see a list of `help_tags` options and - -- a corresponding preview of the help. - -- - -- Two important keymaps to use while in Telescope are: - -- - Insert mode: - -- - Normal mode: ? - -- - -- This opens a window that shows you all of the keymaps for the current - -- Telescope picker. This is really useful to discover what Telescope can - -- do as well as how to actually do it! - - -- [[ Configure Telescope ]] - -- See `:help telescope` and `:help telescope.setup()` - require('telescope').setup { - -- You can put your default mappings / updates / etc. in here - -- All the info you're looking for is in `:help telescope.setup()` - -- - -- defaults = { - -- mappings = { - -- i = { [''] = 'to_fuzzy_refine' }, - -- }, - -- }, - -- pickers = {} - extensions = { - ['ui-select'] = { - require('telescope.themes').get_dropdown(), - }, - }, - } - - -- Enable Telescope extensions if they are installed - pcall(require('telescope').load_extension, 'fzf') - pcall(require('telescope').load_extension, 'ui-select') - - -- See `:help telescope.builtin` - local builtin = require 'telescope.builtin' - vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) - vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) - vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) - vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) - vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) - vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) - vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) - vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) - vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) - vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) - - -- Slightly advanced example of overriding default behavior and theme - vim.keymap.set('n', '/', function() - -- You can pass additional configuration to Telescope to change the theme, layout, etc. - builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { - winblend = 10, - previewer = false, - }) - end, { desc = '[/] Fuzzily search in current buffer' }) - - -- It's also possible to pass additional configuration options. - -- See `:help telescope.builtin.live_grep()` for information about particular keys - vim.keymap.set('n', 's/', function() - builtin.live_grep { - grep_open_files = true, - prompt_title = 'Live Grep in Open Files', - } - end, { desc = '[S]earch [/] in Open Files' }) - - -- Shortcut for searching your Neovim configuration files - vim.keymap.set('n', 'sn', function() - builtin.find_files { cwd = vim.fn.stdpath 'config' } - end, { desc = '[S]earch [N]eovim files' }) - end, - }, - - { -- LSP Configuration & Plugins - 'neovim/nvim-lspconfig', - dependencies = { - -- Automatically install LSPs and related tools to stdpath for Neovim - { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants - 'williamboman/mason-lspconfig.nvim', - 'WhoIsSethDaniel/mason-tool-installer.nvim', - - -- Useful status updates for LSP. - -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', opts = {} }, - - -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins - -- used for completion, annotations and signatures of Neovim apis - { 'folke/neodev.nvim', opts = {} }, - }, - config = function() - -- 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 - Autocmd('LspAttach', { - group = Augroup('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) - vim.keymap.set('n', 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') - - -- Opens a popup that displays documentation about the word under your cursor - -- See `:help K` for why this keymap. - map('K', vim.lsp.buf.hover, 'Hover Documentation') - - -- 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') - - -- 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.server_capabilities.documentHighlightProvider then - Autocmd({ 'CursorHold', 'CursorHoldI' }, { - buffer = event.buf, - callback = vim.lsp.buf.document_highlight, - }) - - Autocmd({ 'CursorMoved', 'CursorMovedI' }, { - buffer = event.buf, - callback = vim.lsp.buf.clear_references, - }) - end - - -- The following autocommand is used to enable 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.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then - map('th', function() - vim.lsp.inlay_hint.enable(0, not vim.lsp.inlay_hint.is_enabled()) - end, '[T]oggle Inlay [H]ints') - end - 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 (`tsserver`) will work just fine - -- tsserver = {}, - -- - - 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' } }, - }, - }, - }, - } - - -- 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. - require('mason').setup() - - -- 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('mason-lspconfig').setup { - 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 tsserver) - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) - end, - }, - } - end, - }, - - { -- Autoformat - 'stevearc/conform.nvim', - lazy = false, - keys = { - { - 'f', - function() - require('conform').format { async = true, lsp_fallback = true } - end, - mode = '', - desc = '[F]ormat buffer', - }, - }, - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well standardized coding style. You can add additional - -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true } - return { - timeout_ms = 500, - lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype], - } - end, - formatters_by_ft = { - lua = { 'stylua' }, - -- Conform can also run multiple formatters sequentially - python = { 'isort', 'black' }, - yaml = { 'yamlfix' }, - go = { 'gofmt' }, - rust = { 'rustfmt' }, - toml = { 'taplo' }, - jinja2 = { 'djlint' }, - -- You can use a sub-list to tell conform to run *until* a formatter - -- is found. - -- javascript = { { "prettierd", "prettier" } }, - }, - }, - }, - - { -- Autocompletion - 'hrsh7th/nvim-cmp', - event = 'InsertEnter', - dependencies = { - -- Snippet Engine & its associated nvim-cmp source - { - 'L3MON4D3/LuaSnip', - build = (function() - -- Build Step is needed for regex support in snippets. - -- This step is not supported in many windows environments. - -- Remove the below condition to re-enable on windows. - if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then - return - end - return 'make install_jsregexp' - end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, - }, - }, - 'saadparwaiz1/cmp_luasnip', - - -- Adds other completion capabilities. - -- nvim-cmp does not ship with all sources by default. They are split - -- into multiple repos for maintenance purposes. - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/cmp-path', - }, - config = function() - -- See `:help cmp` - local cmp = require 'cmp' - local luasnip = require 'luasnip' - luasnip.config.setup {} - - cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - completion = { completeopt = 'menu,menuone,noinsert' }, - - -- For an understanding of why these mappings were - -- chosen, you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! - mapping = cmp.mapping.preset.insert { - -- Select the [n]ext item - [''] = cmp.mapping.select_next_item(), - -- Select the [p]revious item - [''] = cmp.mapping.select_prev_item(), - - -- Scroll the documentation window [b]ack / [f]orward - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - - -- Accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - [''] = cmp.mapping.confirm { select = true }, - - -- If you prefer more traditional completion keymaps, - -- you can uncomment the following lines - --[''] = cmp.mapping.confirm { select = true }, - --[''] = cmp.mapping.select_next_item(), - --[''] = cmp.mapping.select_prev_item(), - - -- Manually trigger a completion from nvim-cmp. - -- Generally you don't need this, because nvim-cmp will display - -- completions whenever it has completion options available. - [''] = cmp.mapping.complete {}, - - -- Think of as moving to the right of your snippet expansion. - -- So if you have a snippet that's like: - -- function $name($args) - -- $body - -- end - -- - -- will move you to the right of each of the expansion locations. - -- is similar, except moving you backwards. - [''] = cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { 'i', 's' }), - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps - }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'path' }, - }, - } - end, - }, - - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - init = function() - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' - - -- You can configure highlights by doing something like: - vim.cmd.hi 'Comment gui=none' - end, - }, - - -- Highlight todo, notes, etc in comments - { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, - - { -- Collection of various small independent plugins/modules - 'echasnovski/mini.nvim', - config = function() - -- Better Around/Inside textobjects - -- - -- Examples: - -- - va) - [V]isually select [A]round [)]paren - -- - yinq - [Y]ank [I]nside [N]ext [']quote - -- - ci' - [C]hange [I]nside [']quote - require('mini.ai').setup { n_lines = 500 } - - -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- - -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren - -- - sd' - [S]urround [D]elete [']quotes - -- - sr)' - [S]urround [R]eplace [)] ['] - require('mini.surround').setup() - - -- Simple and easy statusline. - -- You could remove this setup call if you don't like it, - -- and try some other statusline plugin - local statusline = require 'mini.statusline' - -- set use_icons to true if you have a Nerd Font - statusline.setup { use_icons = vim.g.have_nerd_font } - - -- You can configure sections in the statusline by overriding their - -- default behavior. For example, here we set the section for - -- cursor location to LINE:COLUMN - ---@diagnostic disable-next-line: duplicate-set-field - statusline.section_location = function() - return '%2l:%-2v' - end - - -- ... and there is more! - -- Check out: https://github.com/echasnovski/mini.nvim - end, - }, - { -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate', - opts = { - ensure_installed = { 'bash', 'c', 'html', 'lua', 'luadoc', 'markdown', 'vim', 'vimdoc' }, - -- Autoinstall languages that are not installed - auto_install = true, - highlight = { - enable = true, - -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. - -- If you are experiencing weird indenting issues, add the language to - -- the list of additional_vim_regex_highlighting and disabled languages for indent. - additional_vim_regex_highlighting = { 'ruby' }, - }, - indent = { enable = true, disable = { 'ruby' } }, - }, - config = function(_, opts) - -- [[ Configure Treesitter ]] See `:help nvim-treesitter` - - -- Prefer git instead of curl in order to improve connectivity in some environments - require('nvim-treesitter.install').prefer_git = true - ---@diagnostic disable-next-line: missing-fields - require('nvim-treesitter.configs').setup(opts) - - -- There are additional nvim-treesitter modules that you can use to interact - -- with nvim-treesitter. You should go explore a few and see what interests you: - -- - -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` - -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context - -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects - end, - }, - -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the -- init.lua. If you want these files, they are in the repository, so you can just download them and -- place them in the correct locations. From 9943508270cba7ac064993d691a29605b1368b3f Mon Sep 17 00:00:00 2001 From: juanito87 Date: Mon, 22 Apr 2024 23:23:19 -0300 Subject: [PATCH 06/34] UPD. --- init.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 1b04fff5338..fb437b8a436 100644 --- a/init.lua +++ b/init.lua @@ -65,7 +65,7 @@ Kickstart Guide: MOST IMPORTANTLY, we provide a keymap "sh" to [s]earch the [h]elp documentation, which is very useful when you're not exactly sure of what you're looking for. - +g I have left several `:help X` comments throughout the init.lua These are hints about where to find more information about the relevant settings, plugins or Neovim features used in Kickstart. @@ -95,7 +95,8 @@ vim.g.have_nerd_font = true -- [[ Global variables ]] Autocmd = vim.api.nvim_create_autocmd -Fugitive = vim.api.nvim_create_augroup('juanito_Fugitive', {}) +Augroup = vim.api.nvim_create_augroup +Fugitive = vim.api.nvim_create_augroup('Fugitive', {}) -- [[ Setting options ]] require 'options' From 9480380fbad4c72e3649514989f1b7841320c825 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Mon, 22 Apr 2024 23:46:35 -0300 Subject: [PATCH 07/34] Fixing harpoon --- lua/lazy-config.lua | 4 ++-- lua/plugins_config/harpoon.lua | 41 +++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index 448d7cd5220..4320501ee6a 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -32,8 +32,8 @@ require('lazy').setup({ require 'plugins_config/mini', -- Collections of useful mini plugins, like around/surround require 'plugins_config/tree-sitter', -- manage lint, indentation and some othe language related tasks - -- Broken configs - -- require 'plugins_config/harpoon', -- Improve workflow for multiple files + -- Broken configs/Testing config + require 'plugins_config/harpoon', -- Improve workflow for multiple files -- keeping comments for annotation -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following diff --git a/lua/plugins_config/harpoon.lua b/lua/plugins_config/harpoon.lua index 5058b17b04b..b44f5389d25 100644 --- a/lua/plugins_config/harpoon.lua +++ b/lua/plugins_config/harpoon.lua @@ -1,23 +1,28 @@ return { 'ThePrimeagen/harpoon', - opts = { - -- local mark = require 'harpoon.mark', - -- local ui = require 'harpoon.ui', + dependencies = { + 'nvim-lua/plenary.nvim', + }, + config = function() + require('harpoon').setup {} + -- local harpoon = require('harpoon') + local mark = require 'harpoon.mark' + local ui = require 'harpoon.ui' -- - -- vim.keymap.set('n', 'a', mark.add_file), - -- vim.keymap.set('n', '', ui.toggle_quick_menu), + vim.keymap.set('n', 'a', mark.add_file, { desc = 'Mark a file to be used in harpoon' }) + vim.keymap.set('n', '', ui.toggle_quick_menu, { desc = 'Toogle harpoon quick menu' }) -- - -- vim.keymap.set('n', '', function() - -- ui.nav_file(1) - -- end), - -- vim.keymap.set('n', '', function() - -- ui.nav_file(2) - -- end), - -- vim.keymap.set('n', '', function() - -- ui.nav_file(3) - -- end), - -- vim.keymap.set('n', '', function() - -- ui.nav_file(4) - -- end), - }, + vim.keymap.set('n', '', function() + ui.nav_file(1) + end, { desc = 'Navigate to first marked file' }) + vim.keymap.set('n', '', function() + ui.nav_file(2) + end, { desc = 'Navigate to first marked file' }) + vim.keymap.set('n', '', function() + ui.nav_file(3) + end, { desc = 'Navigate to first marked file' }) + vim.keymap.set('n', '', function() + ui.nav_file(4) + end, { desc = 'Navigate to first marked file' }) + end, } From c3174bf31d1b085f34c63814a7c0b82a6d4d9e51 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Tue, 23 Apr 2024 20:38:45 -0300 Subject: [PATCH 08/34] Moved default configs not instaled to a diasble folder. --- lua/plugins_config/disabled/autopairs.lua | 16 ++++ lua/plugins_config/disabled/debug.lua | 90 +++++++++++++++++++++ lua/plugins_config/disabled/indent_line.lua | 9 +++ lua/plugins_config/disabled/lint.lua | 55 +++++++++++++ lua/plugins_config/disabled/neo-tree.lua | 25 ++++++ 5 files changed, 195 insertions(+) create mode 100644 lua/plugins_config/disabled/autopairs.lua create mode 100644 lua/plugins_config/disabled/debug.lua create mode 100644 lua/plugins_config/disabled/indent_line.lua create mode 100644 lua/plugins_config/disabled/lint.lua create mode 100644 lua/plugins_config/disabled/neo-tree.lua diff --git a/lua/plugins_config/disabled/autopairs.lua b/lua/plugins_config/disabled/autopairs.lua new file mode 100644 index 00000000000..87a7e5ffa2e --- /dev/null +++ b/lua/plugins_config/disabled/autopairs.lua @@ -0,0 +1,16 @@ +-- autopairs +-- https://github.com/windwp/nvim-autopairs + +return { + 'windwp/nvim-autopairs', + event = 'InsertEnter', + -- Optional dependency + dependencies = { 'hrsh7th/nvim-cmp' }, + config = function() + require('nvim-autopairs').setup {} + -- If you want to automatically add `(` after selecting a function or method + local cmp_autopairs = require 'nvim-autopairs.completion.cmp' + local cmp = require 'cmp' + cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) + end, +} diff --git a/lua/plugins_config/disabled/debug.lua b/lua/plugins_config/disabled/debug.lua new file mode 100644 index 00000000000..7be4abdbd96 --- /dev/null +++ b/lua/plugins_config/disabled/debug.lua @@ -0,0 +1,90 @@ +-- debug.lua +-- +-- Shows how to use the DAP plugin to debug your code. +-- +-- Primarily focused on configuring the debugger for Go, but can +-- be extended to other languages as well. That's why it's called +-- kickstart.nvim and not kitchen-sink.nvim ;) + +return { + -- NOTE: Yes, you can install new plugins here! + 'mfussenegger/nvim-dap', + -- NOTE: And you can specify dependencies as well + dependencies = { + -- Creates a beautiful debugger UI + 'rcarriga/nvim-dap-ui', + + -- Required dependency for nvim-dap-ui + 'nvim-neotest/nvim-nio', + + -- Installs the debug adapters for you + 'williamboman/mason.nvim', + 'jay-babu/mason-nvim-dap.nvim', + + -- Add your own debuggers here + 'leoluz/nvim-dap-go', + }, + config = function() + local dap = require 'dap' + local dapui = require 'dapui' + + require('mason-nvim-dap').setup { + -- Makes a best effort to setup the various debuggers with + -- reasonable debug configurations + automatic_setup = true, + + -- You can provide additional configuration to the handlers, + -- see mason-nvim-dap README for more information + handlers = {}, + + -- You'll need to check that you have the required things installed + -- online, please don't ask me how to install them :) + ensure_installed = { + -- Update this to ensure that you have the debuggers for the langs you want + 'delve', + }, + } + + -- Basic debugging keymaps, feel free to change to your liking! + vim.keymap.set('n', '', dap.continue, { desc = 'Debug: Start/Continue' }) + vim.keymap.set('n', '', dap.step_into, { desc = 'Debug: Step Into' }) + vim.keymap.set('n', '', dap.step_over, { desc = 'Debug: Step Over' }) + vim.keymap.set('n', '', dap.step_out, { desc = 'Debug: Step Out' }) + vim.keymap.set('n', 'b', dap.toggle_breakpoint, { desc = 'Debug: Toggle Breakpoint' }) + vim.keymap.set('n', 'B', function() + dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') + end, { desc = 'Debug: Set Breakpoint' }) + + -- Dap UI setup + -- For more information, see |:help nvim-dap-ui| + dapui.setup { + -- Set icons to characters that are more likely to work in every terminal. + -- Feel free to remove or use ones that you like more! :) + -- Don't feel like these are good choices. + icons = { expanded = '▾', collapsed = '▸', current_frame = '*' }, + controls = { + icons = { + pause = '⏸', + play = '▶', + step_into = '⏎', + step_over = '⏭', + step_out = '⏮', + step_back = 'b', + run_last = '▶▶', + terminate = '⏹', + disconnect = '⏏', + }, + }, + } + + -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. + vim.keymap.set('n', '', dapui.toggle, { desc = 'Debug: See last session result.' }) + + dap.listeners.after.event_initialized['dapui_config'] = dapui.open + dap.listeners.before.event_terminated['dapui_config'] = dapui.close + dap.listeners.before.event_exited['dapui_config'] = dapui.close + + -- Install golang specific config + require('dap-go').setup() + end, +} diff --git a/lua/plugins_config/disabled/indent_line.lua b/lua/plugins_config/disabled/indent_line.lua new file mode 100644 index 00000000000..ed7f269399f --- /dev/null +++ b/lua/plugins_config/disabled/indent_line.lua @@ -0,0 +1,9 @@ +return { + { -- Add indentation guides even on blank lines + 'lukas-reineke/indent-blankline.nvim', + -- Enable `lukas-reineke/indent-blankline.nvim` + -- See `:help ibl` + main = 'ibl', + opts = {}, + }, +} diff --git a/lua/plugins_config/disabled/lint.lua b/lua/plugins_config/disabled/lint.lua new file mode 100644 index 00000000000..7f0dc42fbbf --- /dev/null +++ b/lua/plugins_config/disabled/lint.lua @@ -0,0 +1,55 @@ +return { + + { -- Linting + 'mfussenegger/nvim-lint', + event = { 'BufReadPre', 'BufNewFile' }, + config = function() + local lint = require 'lint' + lint.linters_by_ft = { + markdown = { 'markdownlint' }, + } + + -- To allow other plugins to add linters to require('lint').linters_by_ft, + -- instead set linters_by_ft like this: + -- lint.linters_by_ft = lint.linters_by_ft or {} + -- lint.linters_by_ft['markdown'] = { 'markdownlint' } + -- + -- However, note that this will enable a set of default linters, + -- which will cause errors unless these tools are available: + -- { + -- clojure = { "clj-kondo" }, + -- dockerfile = { "hadolint" }, + -- inko = { "inko" }, + -- janet = { "janet" }, + -- json = { "jsonlint" }, + -- markdown = { "vale" }, + -- rst = { "vale" }, + -- ruby = { "ruby" }, + -- terraform = { "tflint" }, + -- text = { "vale" } + -- } + -- + -- You can disable the default linters by setting their filetypes to nil: + -- lint.linters_by_ft['clojure'] = nil + -- lint.linters_by_ft['dockerfile'] = nil + -- lint.linters_by_ft['inko'] = nil + -- lint.linters_by_ft['janet'] = nil + -- lint.linters_by_ft['json'] = nil + -- lint.linters_by_ft['markdown'] = nil + -- lint.linters_by_ft['rst'] = nil + -- lint.linters_by_ft['ruby'] = nil + -- lint.linters_by_ft['terraform'] = nil + -- lint.linters_by_ft['text'] = nil + + -- Create autocommand which carries out the actual linting + -- on the specified events. + local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true }) + vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { + group = lint_augroup, + callback = function() + require('lint').try_lint() + end, + }) + end, + }, +} diff --git a/lua/plugins_config/disabled/neo-tree.lua b/lua/plugins_config/disabled/neo-tree.lua new file mode 100644 index 00000000000..c793b885bc6 --- /dev/null +++ b/lua/plugins_config/disabled/neo-tree.lua @@ -0,0 +1,25 @@ +-- Neo-tree is a Neovim plugin to browse the file system +-- https://github.com/nvim-neo-tree/neo-tree.nvim + +return { + 'nvim-neo-tree/neo-tree.nvim', + version = '*', + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended + 'MunifTanjim/nui.nvim', + }, + cmd = 'Neotree', + keys = { + { '\\', ':Neotree reveal', { desc = 'NeoTree reveal' } }, + }, + opts = { + filesystem = { + window = { + mappings = { + ['\\'] = 'close_window', + }, + }, + }, + }, +} From 5d6f9025fb5199c6e01ffe4ea6e7455fc535b072 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Tue, 23 Apr 2024 20:39:50 -0300 Subject: [PATCH 09/34] Updating config file --- lua/lazy-config.lua | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index 4320501ee6a..61376dc885d 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -31,9 +31,10 @@ require('lazy').setup({ require 'plugins_config/colortheme', -- Color theme for the editor require 'plugins_config/mini', -- Collections of useful mini plugins, like around/surround require 'plugins_config/tree-sitter', -- manage lint, indentation and some othe language related tasks + require 'plugins_config/harpoon', -- Improve workflow for multiple files -- Broken configs/Testing config - require 'plugins_config/harpoon', -- Improve workflow for multiple files + -- keeping comments for annotation -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following @@ -79,18 +80,6 @@ require('lazy').setup({ -- init.lua. If you want these files, they are in the repository, so you can just download them and -- place them in the correct locations. - -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart - -- - -- Here are some example plugins that I've included in the Kickstart repository. - -- Uncomment any of the lines below to enable them (you will need to restart nvim). - -- - -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- This is the easiest way to modularize your config. -- From 9d70e6d4d7e3c53298be97994e2fa55e06686743 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Tue, 23 Apr 2024 20:40:09 -0300 Subject: [PATCH 10/34] removing comments --- lua/plugins_config/gitsigns.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lua/plugins_config/gitsigns.lua b/lua/plugins_config/gitsigns.lua index c4f52293d51..c3c446b9a57 100644 --- a/lua/plugins_config/gitsigns.lua +++ b/lua/plugins_config/gitsigns.lua @@ -1,7 +1,3 @@ --- Adds git related signs to the gutter, as well as utilities for managing changes --- NOTE: gitsigns is already included in init.lua but contains only the base --- config. This will add also the recommended keymaps. - return { 'lewis6991/gitsigns.nvim', opts = { From 0b1d7f80f211407ddf8e21b76b8b37c247d79dc8 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Tue, 23 Apr 2024 20:41:11 -0300 Subject: [PATCH 11/34] Removing duplicated files --- lua/plugins_config/autopairs.lua | 16 ------ lua/plugins_config/debug.lua | 90 ------------------------------ lua/plugins_config/indent_line.lua | 9 --- lua/plugins_config/lint.lua | 55 ------------------ lua/plugins_config/neo-tree.lua | 25 --------- 5 files changed, 195 deletions(-) delete mode 100644 lua/plugins_config/autopairs.lua delete mode 100644 lua/plugins_config/debug.lua delete mode 100644 lua/plugins_config/indent_line.lua delete mode 100644 lua/plugins_config/lint.lua delete mode 100644 lua/plugins_config/neo-tree.lua diff --git a/lua/plugins_config/autopairs.lua b/lua/plugins_config/autopairs.lua deleted file mode 100644 index 87a7e5ffa2e..00000000000 --- a/lua/plugins_config/autopairs.lua +++ /dev/null @@ -1,16 +0,0 @@ --- autopairs --- https://github.com/windwp/nvim-autopairs - -return { - 'windwp/nvim-autopairs', - event = 'InsertEnter', - -- Optional dependency - dependencies = { 'hrsh7th/nvim-cmp' }, - config = function() - require('nvim-autopairs').setup {} - -- If you want to automatically add `(` after selecting a function or method - local cmp_autopairs = require 'nvim-autopairs.completion.cmp' - local cmp = require 'cmp' - cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) - end, -} diff --git a/lua/plugins_config/debug.lua b/lua/plugins_config/debug.lua deleted file mode 100644 index 7be4abdbd96..00000000000 --- a/lua/plugins_config/debug.lua +++ /dev/null @@ -1,90 +0,0 @@ --- debug.lua --- --- Shows how to use the DAP plugin to debug your code. --- --- Primarily focused on configuring the debugger for Go, but can --- be extended to other languages as well. That's why it's called --- kickstart.nvim and not kitchen-sink.nvim ;) - -return { - -- NOTE: Yes, you can install new plugins here! - 'mfussenegger/nvim-dap', - -- NOTE: And you can specify dependencies as well - dependencies = { - -- Creates a beautiful debugger UI - 'rcarriga/nvim-dap-ui', - - -- Required dependency for nvim-dap-ui - 'nvim-neotest/nvim-nio', - - -- Installs the debug adapters for you - 'williamboman/mason.nvim', - 'jay-babu/mason-nvim-dap.nvim', - - -- Add your own debuggers here - 'leoluz/nvim-dap-go', - }, - config = function() - local dap = require 'dap' - local dapui = require 'dapui' - - require('mason-nvim-dap').setup { - -- Makes a best effort to setup the various debuggers with - -- reasonable debug configurations - automatic_setup = true, - - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information - handlers = {}, - - -- You'll need to check that you have the required things installed - -- online, please don't ask me how to install them :) - ensure_installed = { - -- Update this to ensure that you have the debuggers for the langs you want - 'delve', - }, - } - - -- Basic debugging keymaps, feel free to change to your liking! - vim.keymap.set('n', '', dap.continue, { desc = 'Debug: Start/Continue' }) - vim.keymap.set('n', '', dap.step_into, { desc = 'Debug: Step Into' }) - vim.keymap.set('n', '', dap.step_over, { desc = 'Debug: Step Over' }) - vim.keymap.set('n', '', dap.step_out, { desc = 'Debug: Step Out' }) - vim.keymap.set('n', 'b', dap.toggle_breakpoint, { desc = 'Debug: Toggle Breakpoint' }) - vim.keymap.set('n', 'B', function() - dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') - end, { desc = 'Debug: Set Breakpoint' }) - - -- Dap UI setup - -- For more information, see |:help nvim-dap-ui| - dapui.setup { - -- Set icons to characters that are more likely to work in every terminal. - -- Feel free to remove or use ones that you like more! :) - -- Don't feel like these are good choices. - icons = { expanded = '▾', collapsed = '▸', current_frame = '*' }, - controls = { - icons = { - pause = '⏸', - play = '▶', - step_into = '⏎', - step_over = '⏭', - step_out = '⏮', - step_back = 'b', - run_last = '▶▶', - terminate = '⏹', - disconnect = '⏏', - }, - }, - } - - -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. - vim.keymap.set('n', '', dapui.toggle, { desc = 'Debug: See last session result.' }) - - dap.listeners.after.event_initialized['dapui_config'] = dapui.open - dap.listeners.before.event_terminated['dapui_config'] = dapui.close - dap.listeners.before.event_exited['dapui_config'] = dapui.close - - -- Install golang specific config - require('dap-go').setup() - end, -} diff --git a/lua/plugins_config/indent_line.lua b/lua/plugins_config/indent_line.lua deleted file mode 100644 index ed7f269399f..00000000000 --- a/lua/plugins_config/indent_line.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { -- Add indentation guides even on blank lines - 'lukas-reineke/indent-blankline.nvim', - -- Enable `lukas-reineke/indent-blankline.nvim` - -- See `:help ibl` - main = 'ibl', - opts = {}, - }, -} diff --git a/lua/plugins_config/lint.lua b/lua/plugins_config/lint.lua deleted file mode 100644 index 7f0dc42fbbf..00000000000 --- a/lua/plugins_config/lint.lua +++ /dev/null @@ -1,55 +0,0 @@ -return { - - { -- Linting - 'mfussenegger/nvim-lint', - event = { 'BufReadPre', 'BufNewFile' }, - config = function() - local lint = require 'lint' - lint.linters_by_ft = { - markdown = { 'markdownlint' }, - } - - -- To allow other plugins to add linters to require('lint').linters_by_ft, - -- instead set linters_by_ft like this: - -- lint.linters_by_ft = lint.linters_by_ft or {} - -- lint.linters_by_ft['markdown'] = { 'markdownlint' } - -- - -- However, note that this will enable a set of default linters, - -- which will cause errors unless these tools are available: - -- { - -- clojure = { "clj-kondo" }, - -- dockerfile = { "hadolint" }, - -- inko = { "inko" }, - -- janet = { "janet" }, - -- json = { "jsonlint" }, - -- markdown = { "vale" }, - -- rst = { "vale" }, - -- ruby = { "ruby" }, - -- terraform = { "tflint" }, - -- text = { "vale" } - -- } - -- - -- You can disable the default linters by setting their filetypes to nil: - -- lint.linters_by_ft['clojure'] = nil - -- lint.linters_by_ft['dockerfile'] = nil - -- lint.linters_by_ft['inko'] = nil - -- lint.linters_by_ft['janet'] = nil - -- lint.linters_by_ft['json'] = nil - -- lint.linters_by_ft['markdown'] = nil - -- lint.linters_by_ft['rst'] = nil - -- lint.linters_by_ft['ruby'] = nil - -- lint.linters_by_ft['terraform'] = nil - -- lint.linters_by_ft['text'] = nil - - -- Create autocommand which carries out the actual linting - -- on the specified events. - local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true }) - vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { - group = lint_augroup, - callback = function() - require('lint').try_lint() - end, - }) - end, - }, -} diff --git a/lua/plugins_config/neo-tree.lua b/lua/plugins_config/neo-tree.lua deleted file mode 100644 index c793b885bc6..00000000000 --- a/lua/plugins_config/neo-tree.lua +++ /dev/null @@ -1,25 +0,0 @@ --- Neo-tree is a Neovim plugin to browse the file system --- https://github.com/nvim-neo-tree/neo-tree.nvim - -return { - 'nvim-neo-tree/neo-tree.nvim', - version = '*', - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended - 'MunifTanjim/nui.nvim', - }, - cmd = 'Neotree', - keys = { - { '\\', ':Neotree reveal', { desc = 'NeoTree reveal' } }, - }, - opts = { - filesystem = { - window = { - mappings = { - ['\\'] = 'close_window', - }, - }, - }, - }, -} From ea21f3506c93d59f27949133cf1919eff6e3c1a9 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Tue, 23 Apr 2024 22:34:42 -0300 Subject: [PATCH 12/34] UPD --- lua/keymaps.lua | 8 ++++---- lua/lazy-config.lua | 3 +-- lua/plugins_config/autocomplete.lua | 9 ++++----- lua/plugins_config/harpoon.lua | 1 - lua/plugins_config/lsp.lua | 4 ++-- lua/plugins_config/worktree.lua | 3 ++- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 1e4758bd264..558a0e44689 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -1,4 +1,4 @@ --- [[ Keymaps ]] +-- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` -- vim.keymap.set( required, required, required, not required) -- Set highlight on search, but clear on pressing in normal mode @@ -58,9 +58,9 @@ vim.keymap.set('n', 'k', ':m .-2==', { desc = 'Move line down in in -- Window management vim.keymap.set('n', '', '', { desc = 'Close window with ctrl+c' }) --- Markdown preview -vim.keymap.set('n', 'mp', ':Glow', { desc = 'Remap glow to show markdown preview' }) -vim.keymap.set('n', 'mq', ':Glow!', { desc = 'Remap glow to close markdown preview' }) +-- Markdown preview haven't setup this plugin +-- vim.keymap.set('n', 'mp', ':Glow', { desc = 'Remap glow to show markdown preview' }) +-- vim.keymap.set('n', 'mq', ':Glow!', { desc = 'Remap glow to close markdown preview' }) -- Save file vim.keymap.set({ 'i', 'v', 'n', 's' }, '', 'w', { desc = 'Save file' }) diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index 61376dc885d..cff6c454c2e 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -12,7 +12,6 @@ require('lazy').setup({ -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). -- Plugins with default values 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - 'APZelos/blamer.nvim', -- Show git blame 'numToStr/Comment.nvim', -- "gc" to comment visual regions/lines -- One liners @@ -21,7 +20,7 @@ require('lazy').setup({ -- Plugins with custom values require 'plugins_config/which-key', -- Show created key bindings - require 'plugins_config/gitsigns', -- Manage git signs + require 'plugins_config/gitsigns', -- Manage git signs, blame require 'plugins_config/vim-fugitive', -- Manage git in nvim require 'plugins_config/telescope', -- Manage searches nicely require 'plugins_config/worktree', -- Manage worktrees from nvim diff --git a/lua/plugins_config/autocomplete.lua b/lua/plugins_config/autocomplete.lua index 71e6c6ddb41..806719f674a 100644 --- a/lua/plugins_config/autocomplete.lua +++ b/lua/plugins_config/autocomplete.lua @@ -57,16 +57,15 @@ return { -- Autocompletion [''] = cmp.mapping.select_next_item(), -- Select the [p]revious item [''] = cmp.mapping.select_prev_item(), - - -- Scroll the documentation window [b]ack / [f]orward - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - -- Accept ([y]es) the completion. -- This will auto-import if your LSP supports it. -- This will expand snippets if the LSP sent a snippet. [''] = cmp.mapping.confirm { select = true }, + -- Scroll the documentation window [b]ack / [f]orward + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + -- If you prefer more traditional completion keymaps, -- you can uncomment the following lines --[''] = cmp.mapping.confirm { select = true }, diff --git a/lua/plugins_config/harpoon.lua b/lua/plugins_config/harpoon.lua index b44f5389d25..fbbbc14fc55 100644 --- a/lua/plugins_config/harpoon.lua +++ b/lua/plugins_config/harpoon.lua @@ -5,7 +5,6 @@ return { }, config = function() require('harpoon').setup {} - -- local harpoon = require('harpoon') local mark = require 'harpoon.mark' local ui = require 'harpoon.ui' -- diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index a22afb80148..b3a21482a82 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -121,8 +121,8 @@ return { -- This may be unwanted, since they displace some of your code if client and client.server_capabilities.inlayHintProvider and vim.lsp.inlay_hint then map('th', function() - vim.lsp.inlay_hint.enable(0, not vim.lsp.inlay_hint.is_enabled()) - end, '[T]oggle Inlay [H]ints') + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) + end, '[T]oggle Inlay [H]intsk ') end end, }) diff --git a/lua/plugins_config/worktree.lua b/lua/plugins_config/worktree.lua index ce28c13a755..ddc1fab5b1a 100644 --- a/lua/plugins_config/worktree.lua +++ b/lua/plugins_config/worktree.lua @@ -1,7 +1,8 @@ return { + 'ThePrimeagen/git-worktree.nvim', -- Manage worktrees from nvim opts = { change_directory_command = 'tcd', -- command to change directory (e.g. lcd for NvimTree) autopush = true, - }, + }, } From 9ce4a5cf52ae20bb41fd9e2fe9458629e4386549 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Mon, 1 Jul 2024 17:43:50 -0300 Subject: [PATCH 13/34] Adding copilot --- lua/lazy-config.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index cff6c454c2e..c06655c5751 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -13,6 +13,7 @@ require('lazy').setup({ -- Plugins with default values 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically 'numToStr/Comment.nvim', -- "gc" to comment visual regions/lines + 'github/copilot.vim', -- Copilot -- One liners -- Highlight todo, notes, etc in comments @@ -31,6 +32,7 @@ require('lazy').setup({ require 'plugins_config/mini', -- Collections of useful mini plugins, like around/surround require 'plugins_config/tree-sitter', -- manage lint, indentation and some othe language related tasks require 'plugins_config/harpoon', -- Improve workflow for multiple files + -- require 'plugins_config/copilot', -- copilot config -- Broken configs/Testing config From b7014515ccd9a60151996df70324cf477fa7b05f Mon Sep 17 00:00:00 2001 From: juanito87 Date: Mon, 14 Apr 2025 13:12:18 -0300 Subject: [PATCH 14/34] Updating whic-key config --- lua/lazy-config.lua | 4 ++- lua/plugins_config/which-key.lua | 49 ++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index c06655c5751..79fdd36537a 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -1,4 +1,4 @@ --- [[ Configure and install plugins ]] +--[[ Configure and install plugins ]] -- To check the current status of your plugins, run -- :Lazy -- @@ -18,6 +18,7 @@ require('lazy').setup({ -- One liners -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, + { 'CRAG666/code_runner.nvim', config = true }, -- Exe3cute code within nvim. -- Plugins with custom values require 'plugins_config/which-key', -- Show created key bindings @@ -32,6 +33,7 @@ require('lazy').setup({ require 'plugins_config/mini', -- Collections of useful mini plugins, like around/surround require 'plugins_config/tree-sitter', -- manage lint, indentation and some othe language related tasks require 'plugins_config/harpoon', -- Improve workflow for multiple files + -- require 'plugins_config/code_runner', -- Code runner -- require 'plugins_config/copilot', -- copilot config -- Broken configs/Testing config diff --git a/lua/plugins_config/which-key.lua b/lua/plugins_config/which-key.lua index a5585ca41e7..cce7e5edaec 100644 --- a/lua/plugins_config/which-key.lua +++ b/lua/plugins_config/which-key.lua @@ -1,22 +1,29 @@ - return { -- Useful plugin to show you pending keybinds. - 'folke/which-key.nvim', - event = 'VimEnter', -- Sets the loading event to 'VimEnter' - config = function() -- This is the function that runs, AFTER loading - require('which-key').setup() +return { -- Useful plugin to show you pending keybinds. + 'folke/which-key.nvim', + event = 'VimEnter', -- Sets the loading event to 'VimEnter' + config = function() -- This is the function that runs, AFTER loading + require('which-key').setup() - -- Document existing key chains - require('which-key').register { - ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, - ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, - ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, - ['s'] = { name = '[S]earch', _ = 'which_key_ignore' }, - ['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, - ['t'] = { name = '[T]oggle', _ = 'which_key_ignore' }, - ['h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' }, - } - -- visual mode - require('which-key').register({ - ['h'] = { 'Git [H]unk' }, - }, { mode = 'v' }) - end, - } + -- Document existing key chains + require('which-key').add { + { 'c', group = '[C]ode' }, + { 'c_', hidden = true }, + { 'd', group = '[D]ocument' }, + { 'd_', hidden = true }, + { 'h', group = 'Git [H]unk' }, + { 'h_', hidden = true }, + { 'r', group = '[R]ename' }, + { 'r_', hidden = true }, + { 's', group = '[S]earch' }, + { 's_', hidden = true }, + { 't', group = '[T]oggle' }, + { 't_', hidden = true }, + { 'w', group = '[W]orkspace' }, + { 'w_', hidden = true }, + } + -- visual mode + require('which-key').add { + { 'h', desc = 'Git [H]unk', mode = 'v' }, + } + end, +} From 06f2898fc23b0a30f1657af69358b326a79f89bd Mon Sep 17 00:00:00 2001 From: juanito87 Date: Mon, 14 Apr 2025 16:32:31 -0300 Subject: [PATCH 15/34] Updating code_runner config --- lua/lazy-config.lua | 4 ++-- lua/plugins_config/code_runner.lua | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 lua/plugins_config/code_runner.lua diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index 79fdd36537a..932cdbcac8c 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -18,7 +18,7 @@ require('lazy').setup({ -- One liners -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, - { 'CRAG666/code_runner.nvim', config = true }, -- Exe3cute code within nvim. + -- { 'CRAG666/code_runner.nvim', config = true }, -- Execute code within nvim. -- Plugins with custom values require 'plugins_config/which-key', -- Show created key bindings @@ -33,7 +33,7 @@ require('lazy').setup({ require 'plugins_config/mini', -- Collections of useful mini plugins, like around/surround require 'plugins_config/tree-sitter', -- manage lint, indentation and some othe language related tasks require 'plugins_config/harpoon', -- Improve workflow for multiple files - -- require 'plugins_config/code_runner', -- Code runner + require 'plugins_config/code_runner', -- Code runner -- require 'plugins_config/copilot', -- copilot config -- Broken configs/Testing config diff --git a/lua/plugins_config/code_runner.lua b/lua/plugins_config/code_runner.lua new file mode 100644 index 00000000000..d134c11ee32 --- /dev/null +++ b/lua/plugins_config/code_runner.lua @@ -0,0 +1,17 @@ +return { + 'CRAG666/code_runner.nvim', + config = function() + require('code_runner').setup { + filetype = { + python = 'python3 -u', + typescript = 'deno run', + rust = { + 'cd $dir &&', + 'rustc $fileName &&', + '$dir/$fileNameWithoutExt', + }, + }, + } + end, + event = 'VeryLazy', -- or "BufEnter" if we want to load sooner. +} From b8606128845b027f2aabad9ab99ede77a119ea6f Mon Sep 17 00:00:00 2001 From: juanito87 Date: Tue, 15 Apr 2025 14:33:06 -0300 Subject: [PATCH 16/34] Fixing typo --- init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/init.lua b/init.lua index fb437b8a436..558f227d68c 100644 --- a/init.lua +++ b/init.lua @@ -1,5 +1,4 @@ --[[ - ===================================================================== ==================== READ THIS BEFORE CONTINUING ==================== ===================================================================== From e5a05cfcb2641d02e03e33d48bf2d74f27a303f9 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Sat, 26 Apr 2025 12:04:04 -0300 Subject: [PATCH 17/34] Updating config, enabling more plugins, sort deprecation warnings --- lua/keymaps.lua | 37 ++++++++++--------- lua/lazy-config.lua | 5 ++- lua/plugins_config/code_runner.lua | 3 +- lua/plugins_config/gitsigns.lua | 4 +- .../{disabled => }/indent_line.lua | 0 lua/plugins_config/{disabled => }/lint.lua | 0 lua/plugins_config/lsp.lua | 2 +- lua/plugins_config/which-key.lua | 4 +- lua/plugins_config/worktree.lua | 1 - 9 files changed, 31 insertions(+), 25 deletions(-) rename lua/plugins_config/{disabled => }/indent_line.lua (100%) rename lua/plugins_config/{disabled => }/lint.lua (100%) diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 558a0e44689..b281c815297 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -1,12 +1,13 @@ -- [[ Basic Keymaps ]] --- See `:help vim.keymap.set()` +-- NOTE: See `:help vim.keymap.set()` -- vim.keymap.set( required, required, required, not required) + -- Set highlight on search, but clear on pressing in normal mode vim.keymap.set('n', '', 'nohlsearch', { desc = 'Remove higlight after search is done' }) -- Diagnostic keymaps -vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' }) -vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' }) +vim.keymap.set('n', '[d', function() vim.diagnostic.goto({ direction = 'prev', float = false }) end, { desc = 'Go to previous [D]iagnostic message' }) +vim.keymap.set('n', ']d', function() vim.diagnostic.goto({ direction = 'next', float = false }) end, { desc = 'Go to next [D]iagnostic message' }) vim.keymap.set('n', 'e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' }) vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) @@ -21,21 +22,20 @@ vim.keymap.set('n', 'pv', vim.cmd.Ex, { desc = 'Open netrw' }) -- open n vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) -- Keybinds to make split navigation easier. --- Use CTRL+ to switch between windows +-- NOTE: Use CTRL+ to switch between windows -- See `:help wincmd` for a list of all window commands vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) 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' }) --- TODO add more comments, do some improvements on those. -- copy pasting -vim.keymap.set('n', 'Y', 'y$', { desc = 'Yank till the end of the line' }) -- yanks till the end of the line, like C for change or D for delete +vim.keymap.set('n', 'Y', 'y$', { desc = 'Yank till the end of the line' }) vim.keymap.set('n', 'J', 'mzJ`z', { desc = 'Marks the point (mz), joins the lines (J) and gets back to the marked place (`z)' }) vim.keymap.set({ 'n', 'v' }, 'y', '"+y', { desc = 'Prefix y with leader to send to system clipboard' }) -vim.keymap.set({ 'n', 'v' }, 'Y', '"+Y', { desc = 'Prefix y with leader to send to system clipboard' }) -vim.keymap.set('x', 'p', '"+p', { desc = 'Deletes to void registry to avoid changing registry content' }) -vim.keymap.set('x', 'P', '"_dP', { desc = 'Deletes to void registry to avoid changing registry content' }) +vim.keymap.set({ 'n', 'v' }, 'Y', '"+Y', { desc = 'Prefix Y with leader to send to system clipboard' }) +vim.keymap.set('x', 'p', '"+p', { desc = 'Paste from clipboard over the selection, without chaging the clipboard registry("+).' }) +vim.keymap.set('x', 'P', '"_dP', { desc = 'Deletes to void registry("_) to avoid changing registry("0) content, and then pastes from clipboard' }) -- Search remaps vim.keymap.set('n', 'n', 'nzzzv', { desc = 'n = next search, zz = center cursor on screen, zv = open fold if exist' }) @@ -66,20 +66,23 @@ vim.keymap.set('n', '', '', { desc = 'Close window with ctrl+c' } vim.keymap.set({ 'i', 'v', 'n', 's' }, '', 'w', { desc = 'Save file' }) -- Function and remap to toggle relative numbers. -vim.keymap.set('n', 'nr', function() - vim.opt.nu = false - vim.opt.relativenumber = false -end, { desc = 'Disable number and relative number' }) -vim.keymap.set('n', 'rn', function() - vim.opt.nu = true - vim.opt.relativenumber = true -end, { desc = 'Enable number and relative number' }) +vim.keymap.set('n', 'nr', function() vim.opt.nu = false vim.opt.relativenumber = false end, { desc = 'Disable number and relative number' }) +vim.keymap.set('n', 'rn', function() vim.opt.nu = true vim.opt.relativenumber = true end, { desc = 'Enable number and relative number' }) -- Clean up vim.keymap.set('n', 'dw', ':%s/\\s\\+$//e', { desc = 'Clean trailing whitespace in the document' }) vim.keymap.set('n', 'dn', ':%s/\\n\\+\\%$//e', { desc = 'Clean trailing newlines in the document' }) vim.keymap.set('n', 'ds', ':%s/\\^\\[\\+\\%$//e', { desc = 'Clean trailing escape sequences in the document' }) +-- Code runner keymaps +vim.keymap.set('n', 'rr', ':RunCode', { noremap = true, silent = false }) +vim.keymap.set('n', 'rf', ':RunFile', { noremap = true, silent = false }) +vim.keymap.set('n', 'rft', ':RunFile tab', { noremap = true, silent = false }) +vim.keymap.set('n', 'rp', ':RunProject', { noremap = true, silent = false }) +vim.keymap.set('n', 'rc', ':RunClose', { noremap = true, silent = false }) +vim.keymap.set('n', 'crf', ':CRFiletype', { noremap = true, silent = false }) +vim.keymap.set('n', 'crp', ':CRProjects', { noremap = true, silent = false }) + -- Testing remaps and functions -- better indenting diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index 932cdbcac8c..cf0b5761775 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -17,8 +17,7 @@ require('lazy').setup({ -- One liners -- Highlight todo, notes, etc in comments - { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, - -- { 'CRAG666/code_runner.nvim', config = true }, -- Execute code within nvim. + -- { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, -- Plugins with custom values require 'plugins_config/which-key', -- Show created key bindings @@ -34,6 +33,8 @@ require('lazy').setup({ require 'plugins_config/tree-sitter', -- manage lint, indentation and some othe language related tasks require 'plugins_config/harpoon', -- Improve workflow for multiple files require 'plugins_config/code_runner', -- Code runner + require 'plugins_config/indent_line', -- visualize indentation + require 'plugins_config/lint', -- Add inting to files to complement tree sitter -- require 'plugins_config/copilot', -- copilot config -- Broken configs/Testing config diff --git a/lua/plugins_config/code_runner.lua b/lua/plugins_config/code_runner.lua index d134c11ee32..103cc93850c 100644 --- a/lua/plugins_config/code_runner.lua +++ b/lua/plugins_config/code_runner.lua @@ -4,7 +4,8 @@ return { require('code_runner').setup { filetype = { python = 'python3 -u', - typescript = 'deno run', + javascript = 'node $file', + typescript = 'ts-node $file', rust = { 'cd $dir &&', 'rustc $fileName &&', diff --git a/lua/plugins_config/gitsigns.lua b/lua/plugins_config/gitsigns.lua index c3c446b9a57..bbd91a0f552 100644 --- a/lua/plugins_config/gitsigns.lua +++ b/lua/plugins_config/gitsigns.lua @@ -46,7 +46,7 @@ return { map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) - map('n', 'hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' }) + map('n', 'hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' }) map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) @@ -56,7 +56,7 @@ return { end, { desc = 'git [D]iff against last commit' }) -- Toggles map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) - map('n', 'tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) + map('n', 'tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' }) end, }, } diff --git a/lua/plugins_config/disabled/indent_line.lua b/lua/plugins_config/indent_line.lua similarity index 100% rename from lua/plugins_config/disabled/indent_line.lua rename to lua/plugins_config/indent_line.lua diff --git a/lua/plugins_config/disabled/lint.lua b/lua/plugins_config/lint.lua similarity index 100% rename from lua/plugins_config/disabled/lint.lua rename to lua/plugins_config/lint.lua diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index b3a21482a82..175f51400ea 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -83,7 +83,7 @@ return { -- Rename the variable under your cursor. -- Most Language Servers support renaming across files, etc. - map('rn', vim.lsp.buf.rename, '[R]e[n]ame') + 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. diff --git a/lua/plugins_config/which-key.lua b/lua/plugins_config/which-key.lua index cce7e5edaec..0dfbdebd946 100644 --- a/lua/plugins_config/which-key.lua +++ b/lua/plugins_config/which-key.lua @@ -12,8 +12,10 @@ return { -- Useful plugin to show you pending keybinds. { 'd_', hidden = true }, { 'h', group = 'Git [H]unk' }, { 'h_', hidden = true }, - { 'r', group = '[R]ename' }, + { 'r', group = '[R]un code' }, { 'r_', hidden = true }, + { 'R', group = '[R]e[n]ame' }, + { 'R_', hidden = true }, { 's', group = '[S]earch' }, { 's_', hidden = true }, { 't', group = '[T]oggle' }, diff --git a/lua/plugins_config/worktree.lua b/lua/plugins_config/worktree.lua index ddc1fab5b1a..b85660e27f4 100644 --- a/lua/plugins_config/worktree.lua +++ b/lua/plugins_config/worktree.lua @@ -1,5 +1,4 @@ return { - 'ThePrimeagen/git-worktree.nvim', -- Manage worktrees from nvim opts = { change_directory_command = 'tcd', -- command to change directory (e.g. lcd for NvimTree) From 46a6fcfb4dd99d28d0e4d23f6a5a3c976e2785b5 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Sat, 26 Apr 2025 13:56:50 -0300 Subject: [PATCH 18/34] final fixes --- lua/lazy-config.lua | 2 ++ lua/plugins_config/colortheme.lua | 2 +- lua/plugins_config/{disabled => }/indent_line.lua | 0 lua/plugins_config/{disabled => }/lint.lua | 0 lua/plugins_config/lsp.lua | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) rename lua/plugins_config/{disabled => }/indent_line.lua (100%) rename lua/plugins_config/{disabled => }/lint.lua (100%) diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index 6d5d7ec524c..4b74bec3a47 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -80,6 +80,8 @@ require('lazy').setup({ require 'plugins_config/tree-sitter', -- manage lint, indentation and some othe language related tasks require 'plugins_config/harpoon', -- Improve workflow for multiple files require 'plugins_config/code_runner', -- Code runner + require 'plugins_config/indent_line', -- Indentation visualizer + require 'plugins_config/lint', -- Linter config -- Broken configs/Testing config diff --git a/lua/plugins_config/colortheme.lua b/lua/plugins_config/colortheme.lua index 1b2f55c6112..cc191ade886 100644 --- a/lua/plugins_config/colortheme.lua +++ b/lua/plugins_config/colortheme.lua @@ -17,4 +17,4 @@ return { -- You can easily change to a different colorscheme. -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. vim.cmd.colorscheme 'tokyonight-night' end, - }, -- + } diff --git a/lua/plugins_config/disabled/indent_line.lua b/lua/plugins_config/indent_line.lua similarity index 100% rename from lua/plugins_config/disabled/indent_line.lua rename to lua/plugins_config/indent_line.lua diff --git a/lua/plugins_config/disabled/lint.lua b/lua/plugins_config/lint.lua similarity index 100% rename from lua/plugins_config/disabled/lint.lua rename to lua/plugins_config/lint.lua diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index 7a5567f981a..948a06f7eb8 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -258,7 +258,6 @@ return { }, } end, -} { -- Autocompletion 'saghen/blink.cmp', event = 'VimEnter', @@ -357,3 +356,4 @@ return { signature = { enabled = true }, }, }, +} From 25148b1098efa610b1955f7ee273b10a2ed5467d Mon Sep 17 00:00:00 2001 From: juanito87 Date: Sun, 11 May 2025 16:20:43 -0300 Subject: [PATCH 19/34] test --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8ace8b9b22b..2232c655d68 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ A starting point for Neovim that is: * Single-file * Completely Documented + **NOT** a Neovim distribution, but instead a starting point for your configuration. ## Installation From 8ad2208c3851d4168a91600fa7cf9cd1c95978af Mon Sep 17 00:00:00 2001 From: juanito87 Date: Mon, 12 May 2025 16:24:49 -0300 Subject: [PATCH 20/34] Fix typos. --- lua/plugins_config/colortheme.lua | 2 +- lua/plugins_config/lsp.lua | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lua/plugins_config/colortheme.lua b/lua/plugins_config/colortheme.lua index 1b2f55c6112..cc191ade886 100644 --- a/lua/plugins_config/colortheme.lua +++ b/lua/plugins_config/colortheme.lua @@ -17,4 +17,4 @@ return { -- You can easily change to a different colorscheme. -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. vim.cmd.colorscheme 'tokyonight-night' end, - }, -- + } diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index 8fb241908ba..22893a14b5d 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -266,7 +266,7 @@ return { }, } end, -} + { -- Autocompletion 'saghen/blink.cmp', event = 'VimEnter', @@ -365,3 +365,4 @@ return { signature = { enabled = true }, }, }, +} From 114617997196aa628421e1000b0e159f839d2f34 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Sat, 12 Jul 2025 17:46:44 -0300 Subject: [PATCH 21/34] Updating config --- init.lua | 8 +- lua/lazy-config.lua | 35 +- lua/plugins_config/lsp.lua | 703 +++++++++++++++++++------------------ 3 files changed, 377 insertions(+), 369 deletions(-) diff --git a/init.lua b/init.lua index 558f227d68c..1d0a9f9f559 100644 --- a/init.lua +++ b/init.lua @@ -97,6 +97,10 @@ Autocmd = vim.api.nvim_create_autocmd Augroup = vim.api.nvim_create_augroup Fugitive = vim.api.nvim_create_augroup('Fugitive', {}) +-- [[ Lazy package manager ]] +require 'lazy-install' +require 'lazy-config' + -- [[ Setting options ]] require 'options' @@ -105,7 +109,3 @@ require 'keymaps' -- [[ Autocommands ]] require 'autocommands' - --- [[ Lazy package manager ]] -require 'lazy-install' -require 'lazy-config' diff --git a/lua/lazy-config.lua b/lua/lazy-config.lua index 69f34900e03..caf7e9c1c1d 100644 --- a/lua/lazy-config.lua +++ b/lua/lazy-config.lua @@ -9,6 +9,24 @@ -- -- NOTE: Here is where you install your plugins. require('lazy').setup({ + + -- Plugins with custom values + require 'plugins_config/lsp', -- Multilanguage lsp config + require 'plugins_config/which-key', -- Show created key bindings + require 'plugins_config/gitsigns', -- Manage git signs, blame + require 'plugins_config/vim-fugitive', -- Manage git in nvim + require 'plugins_config/telescope', -- Manage searches nicely + require 'plugins_config/worktree', -- Manage worktrees from nvim + require 'plugins_config/conform', -- Autoformat files using lsp on save + require 'plugins_config/autocomplete', -- Autocompletion + require 'plugins_config/colortheme', -- Color theme for the editor + require 'plugins_config/mini', -- Collections of useful mini plugins, like around/surround + require 'plugins_config/tree-sitter', -- manage lint, indentation and some othe language related tasks + require 'plugins_config/harpoon', -- Improve workflow for multiple files + require 'plugins_config/code_runner', -- Code runner + require 'plugins_config/indent_line', -- Indentation visualizer + require 'plugins_config/lint', -- Linter config + -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). -- Plugins with default values 'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically @@ -65,23 +83,6 @@ require('lazy').setup({ -- Highlight todo, notes, etc in comments { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, - -- Plugins with custom values - require 'plugins_config/which-key', -- Show created key bindings - require 'plugins_config/gitsigns', -- Manage git signs, blame - require 'plugins_config/vim-fugitive', -- Manage git in nvim - require 'plugins_config/telescope', -- Manage searches nicely - require 'plugins_config/worktree', -- Manage worktrees from nvim - require 'plugins_config/lsp', -- Multilanguage lsp config - require 'plugins_config/conform', -- Autoformat files using lsp on save - require 'plugins_config/autocomplete', -- Autocompletion - require 'plugins_config/colortheme', -- Color theme for the editor - require 'plugins_config/mini', -- Collections of useful mini plugins, like around/surround - require 'plugins_config/tree-sitter', -- manage lint, indentation and some othe language related tasks - require 'plugins_config/harpoon', -- Improve workflow for multiple files - require 'plugins_config/code_runner', -- Code runner - require 'plugins_config/indent_line', -- Indentation visualizer - require 'plugins_config/lint', -- Linter config - -- Broken configs/Testing config -- NOTE: Plugins can also be added by using a table, diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index 271ea6ea82c..4a6cca06a53 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -1,373 +1,380 @@ return { - -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins - -- used for completion, annotations and signatures of Neovim apis - 'folke/lazydev.nvim', - ft = 'lua', - opts = { - library = { - -- Load luvit types when the `vim.uv` word is found - { path = '${3rd}/luv/library', words = { 'vim%.uv' } }, + -- Lazy dev config + { + -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins + -- used for completion, annotations and signatures of Neovim apis + 'folke/lazydev.nvim', + ft = 'lua', + opts = { + library = { + -- Load luvit types when the `vim.uv` word is found + { path = '${3rd}/luv/library', words = { 'vim%.uv' } }, + }, }, }, - 'neovim/nvim-lspconfig', - dependencies = { - -- Automatically install LSPs and related tools to stdpath for Neovim - -- NOTE: Must be loaded before dependants - { 'mason-org/mason.nvim', opts = {} }, + -- LSP config + { + 'neovim/nvim-lspconfig', + dependencies = { + -- Automatically install LSPs and related tools to stdpath for Neovim + -- NOTE: Must be loaded before dependants + { 'mason-org/mason.nvim', opts = {} }, 'mason-org/mason-lspconfig.nvim', - 'WhoIsSethDaniel/mason-tool-installer.nvim', + 'WhoIsSethDaniel/mason-tool-installer.nvim', - -- Useful status updates for LSP. - -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', opts = {} }, + -- Useful status updates for LSP. + -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` + { 'j-hui/fidget.nvim', opts = {} }, - -- Allows extra capabilities provided by blink.cmp - 'saghen/blink.cmp', - }, - config = function() - -- 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 - Autocmd('LspAttach', { - group = Augroup('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 - -- Most Language Servers support renaming across files, etc. - map('grn', 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('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) - - -- Find references for the word under your cursor. - map('grr', 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('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - - -- 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('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') - - -- WARN: This is not Goto Definition, this is Goto Declaration. - -- For example, in C this would take you to the header. - map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - - -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - map('gO', 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') - - -- 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('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition') - - -- Opens a popup that displays documentation about the word under your cursor - -- See `:help K` for why this keymap. - map('K', vim.lsp.buf.hover, 'Hover Documentation') - - -- 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') - - -- 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 - -- + -- Allows extra capabilities provided by blink.cmp + 'saghen/blink.cmp', + }, + config = function() + -- 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 + Autocmd('LspAttach', { + group = Augroup('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 + -- Most Language Servers support renaming across files, etc. + map('grn', 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('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) + + -- Find references for the word under your cursor. + map('grr', 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('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + + -- 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('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + + -- WARN: This is not Goto Definition, this is Goto Declaration. + -- For example, in C this would take you to the header. + map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + + -- Fuzzy find all the symbols in your current document. + -- Symbols are things like variables, functions, types, etc. + map('gO', 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') + + -- 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('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition') + + -- Opens a popup that displays documentation about the word under your cursor + -- See `:help K` for why this keymap. + map('K', vim.lsp.buf.hover, 'Hover Documentation') + + -- 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') + + -- 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 + -- + + -- 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 + -- 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 - -- 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 }) + -- 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 - -- 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 blink.cmp, luasnip, etc. Neovim now has *more* capabilities. - -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers. - local capabilities = require('blink.cmp').get_lsp_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 = {}, - ansiblels = {}, - bashls = {}, - gh_actions_ls = {}, - jinja_lsp = {}, - markdown_oxide = {}, - terraform_lsp = {}, - yamlls = {}, - gopls = {}, - pyright = {}, - rust_analyzer = {}, - ts_ls = {}, - -- ... 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 - - lua_ls = { - -- cmd = {...}, - -- filetypes = { ...}, - -- capabilities = {}, - settings = { - Lua = { - completion = { - callSnippet = 'Replace', + }) + + -- 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 blink.cmp, luasnip, etc. Neovim now has *more* capabilities. + -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers. + local capabilities = require('blink.cmp').get_lsp_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 = {}, + ansiblels = {}, + bashls = {}, + gh_actions_ls = {}, + jinja_lsp = {}, + markdown_oxide = {}, + terraform_lsp = {}, + yamlls = {}, + gopls = {}, + pyright = {}, + rust_analyzer = {}, + ts_ls = {}, + -- ... 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 + + 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' } }, }, - -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings - -- diagnostics = { disable = { 'missing-fields' } }, }, }, - }, - } - - -- 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. - require('mason').setup() - - -- 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('mason-lspconfig').setup { - 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 tsserver) - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) - end, - }, - } - end, + } -{ -- Autocompletion - 'saghen/blink.cmp', - event = 'VimEnter', - version = '1.*', - dependencies = { - -- Snippet Engine - { - 'L3MON4D3/LuaSnip', - version = '2.*', - build = (function() - -- Build Step is needed for regex support in snippets. - -- This step is not supported in many windows environments. - -- Remove the below condition to re-enable on windows. - if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then - return - end - return 'make install_jsregexp' - end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, + -- 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. + -- 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('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 tsserver) + server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + require('lspconfig')[server_name].setup(server) + end, }, - opts = {}, - }, - 'folke/lazydev.nvim', - }, - --- @module 'blink.cmp' - --- @type blink.cmp.Config - opts = { - keymap = { - -- 'default' (recommended) for mappings similar to built-in completions - -- to accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - -- 'super-tab' for tab to accept - -- 'enter' for enter to accept - -- 'none' for no mappings - -- - -- For an understanding of why the 'default' preset is recommended, - -- you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! - -- - -- All presets have the following mappings: - -- /: move to right/left of your snippet expansion - -- : Open menu or open docs if already open - -- / or /: Select next/previous item - -- : Hide menu - -- : Toggle signature help - -- - -- See :h blink-cmp-config-keymap for defining your own keymap - preset = 'default', + } + end, + }, - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + -- Autocompletion + { + 'saghen/blink.cmp', + event = 'VimEnter', + version = '1.*', + dependencies = { + -- Snippet Engine + { + 'L3MON4D3/LuaSnip', + version = '2.*', + build = (function() + -- Build Step is needed for regex support in snippets. + -- This step is not supported in many windows environments. + -- Remove the below condition to re-enable on windows. + if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then + return + end + return 'make install_jsregexp' + end)(), + dependencies = { + -- `friendly-snippets` contains a variety of premade snippets. + -- See the README about individual language/framework/plugin snippets: + -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, + }, + opts = {}, + }, + 'folke/lazydev.nvim', }, + --- @module 'blink.cmp' + --- @type blink.cmp.Config + opts = { + keymap = { + -- 'default' (recommended) for mappings similar to built-in completions + -- to accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + -- 'super-tab' for tab to accept + -- 'enter' for enter to accept + -- 'none' for no mappings + -- + -- For an understanding of why the 'default' preset is recommended, + -- you will need to read `:help ins-completion` + -- + -- No, but seriously. Please read `:help ins-completion`, it is really good! + -- + -- All presets have the following mappings: + -- /: move to right/left of your snippet expansion + -- : Open menu or open docs if already open + -- / or /: Select next/previous item + -- : Hide menu + -- : Toggle signature help + -- + -- See :h blink-cmp-config-keymap for defining your own keymap + preset = 'default', + + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + }, - appearance = { - -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- Adjusts spacing to ensure icons are aligned - nerd_font_variant = 'mono', - }, + appearance = { + -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- Adjusts spacing to ensure icons are aligned + nerd_font_variant = 'mono', + }, - completion = { - -- By default, you may press `` to show the documentation. - -- Optionally, set `auto_show = true` to show the documentation after a delay. - documentation = { auto_show = false, auto_show_delay_ms = 500 }, - }, + completion = { + -- By default, you may press `` to show the documentation. + -- Optionally, set `auto_show = true` to show the documentation after a delay. + documentation = { auto_show = false, auto_show_delay_ms = 500 }, + }, - sources = { - default = { 'lsp', 'path', 'snippets', 'lazydev' }, - providers = { - lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, + sources = { + default = { 'lsp', 'path', 'snippets', 'lazydev' }, + providers = { + lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, + }, }, - }, - snippets = { preset = 'luasnip' }, + snippets = { preset = 'luasnip' }, - -- Blink.cmp includes an optional, recommended rust fuzzy matcher, - -- which automatically downloads a prebuilt binary when enabled. - -- - -- By default, we use the Lua implementation instead, but you may enable - -- the rust implementation via `'prefer_rust_with_warning'` - -- - -- See :h blink-cmp-config-fuzzy for more information - fuzzy = { implementation = 'lua' }, + -- Blink.cmp includes an optional, recommended rust fuzzy matcher, + -- which automatically downloads a prebuilt binary when enabled. + -- + -- By default, we use the Lua implementation instead, but you may enable + -- the rust implementation via `'prefer_rust_with_warning'` + -- + -- See :h blink-cmp-config-fuzzy for more information + fuzzy = { implementation = 'lua' }, - -- Shows a signature help window while you type arguments for a function - signature = { enabled = true }, - }, - }, + -- Shows a signature help window while you type arguments for a function + signature = { enabled = true }, + }, + } } From 0677b655eed6999a435542a34a0675d875abc06e Mon Sep 17 00:00:00 2001 From: juanito87 Date: Sat, 12 Jul 2025 18:27:22 -0300 Subject: [PATCH 22/34] Fixes --- init.lua | 8 ++++---- lua/lazy-install.lua | 2 +- lua/options.lua | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index 1d0a9f9f559..558f227d68c 100644 --- a/init.lua +++ b/init.lua @@ -97,10 +97,6 @@ Autocmd = vim.api.nvim_create_autocmd Augroup = vim.api.nvim_create_augroup Fugitive = vim.api.nvim_create_augroup('Fugitive', {}) --- [[ Lazy package manager ]] -require 'lazy-install' -require 'lazy-config' - -- [[ Setting options ]] require 'options' @@ -109,3 +105,7 @@ require 'keymaps' -- [[ Autocommands ]] require 'autocommands' + +-- [[ Lazy package manager ]] +require 'lazy-install' +require 'lazy-config' diff --git a/lua/lazy-install.lua b/lua/lazy-install.lua index ddc977b3797..b7bf7a83b96 100644 --- a/lua/lazy-install.lua +++ b/lua/lazy-install.lua @@ -8,4 +8,4 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then error('Error cloning lazy.nvim:\n' .. out) end end ---@diagnostic disable-next-line: undefined-field -vim.o.rtp:prepend(lazypath) +vim.opt.rtp:prepend(lazypath) diff --git a/lua/options.lua b/lua/options.lua index 420f36e2fb5..a579f87d6a1 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,4 +1,4 @@ --- [[ oions ]] +-- [[ options ]] -- See `:help vim.o` -- NOTE: You can change these oions as you wish! -- For more oions, you can see `:help option-list` @@ -65,7 +65,7 @@ vim.o.splitbelow = true -- See `:help 'list'` -- and `:help 'listchars'` vim.o.list = true -vim.o.listchars = { tab = '» ', trail = '·', nbsp = '␣' } +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } -- Show which line your cursor is on vim.o.cursorline = true From f35803ef0b242b6f235d6d8790e3c64e86bf84c9 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Sat, 12 Jul 2025 18:40:36 -0300 Subject: [PATCH 23/34] More fixes. --- lua/plugins_config/lsp.lua | 177 +++++++++++++++++++------------------ 1 file changed, 89 insertions(+), 88 deletions(-) diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index 4a6cca06a53..79d43facceb 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -220,7 +220,7 @@ return { gh_actions_ls = {}, jinja_lsp = {}, markdown_oxide = {}, - terraform_lsp = {}, + terraform = {}, yamlls = {}, gopls = {}, pyright = {}, @@ -280,101 +280,102 @@ return { -- Autocompletion { - 'saghen/blink.cmp', - event = 'VimEnter', - version = '1.*', - dependencies = { - -- Snippet Engine - { - 'L3MON4D3/LuaSnip', - version = '2.*', - build = (function() - -- Build Step is needed for regex support in snippets. - -- This step is not supported in many windows environments. - -- Remove the below condition to re-enable on windows. - if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then - return - end - return 'make install_jsregexp' - end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, - }, - opts = {}, + 'saghen/blink.cmp', + build = 'cargo +nightly build --release', + event = 'VimEnter', + version = '1.*', + dependencies = { + -- Snippet Engine + { + 'L3MON4D3/LuaSnip', + version = '2.*', + build = (function() + -- Build Step is needed for regex support in snippets. + -- This step is not supported in many windows environments. + -- Remove the below condition to re-enable on windows. + if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then + return + end + return 'make install_jsregexp' + end)(), + dependencies = { + -- `friendly-snippets` contains a variety of premade snippets. + -- See the README about individual language/framework/plugin snippets: + -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, }, - 'folke/lazydev.nvim', + opts = {}, }, - --- @module 'blink.cmp' - --- @type blink.cmp.Config - opts = { - keymap = { - -- 'default' (recommended) for mappings similar to built-in completions - -- to accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - -- 'super-tab' for tab to accept - -- 'enter' for enter to accept - -- 'none' for no mappings - -- - -- For an understanding of why the 'default' preset is recommended, - -- you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! - -- - -- All presets have the following mappings: - -- /: move to right/left of your snippet expansion - -- : Open menu or open docs if already open - -- / or /: Select next/previous item - -- : Hide menu - -- : Toggle signature help - -- - -- See :h blink-cmp-config-keymap for defining your own keymap - preset = 'default', + 'folke/lazydev.nvim', + }, + --- @module 'blink.cmp' + --- @type blink.cmp.Config + opts = { + keymap = { + -- 'default' (recommended) for mappings similar to built-in completions + -- to accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + -- 'super-tab' for tab to accept + -- 'enter' for enter to accept + -- 'none' for no mappings + -- + -- For an understanding of why the 'default' preset is recommended, + -- you will need to read `:help ins-completion` + -- + -- No, but seriously. Please read `:help ins-completion`, it is really good! + -- + -- All presets have the following mappings: + -- /: move to right/left of your snippet expansion + -- : Open menu or open docs if already open + -- / or /: Select next/previous item + -- : Hide menu + -- : Toggle signature help + -- + -- See :h blink-cmp-config-keymap for defining your own keymap + preset = 'default', - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps - }, + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + }, - appearance = { - -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- Adjusts spacing to ensure icons are aligned - nerd_font_variant = 'mono', - }, + appearance = { + -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- Adjusts spacing to ensure icons are aligned + nerd_font_variant = 'mono', + }, - completion = { - -- By default, you may press `` to show the documentation. - -- Optionally, set `auto_show = true` to show the documentation after a delay. - documentation = { auto_show = false, auto_show_delay_ms = 500 }, - }, + completion = { + -- By default, you may press `` to show the documentation. + -- Optionally, set `auto_show = true` to show the documentation after a delay. + documentation = { auto_show = false, auto_show_delay_ms = 500 }, + }, - sources = { - default = { 'lsp', 'path', 'snippets', 'lazydev' }, - providers = { - lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, - }, + sources = { + default = { 'lsp', 'path', 'snippets', 'lazydev' }, + providers = { + lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, }, + }, - snippets = { preset = 'luasnip' }, + snippets = { preset = 'luasnip' }, - -- Blink.cmp includes an optional, recommended rust fuzzy matcher, - -- which automatically downloads a prebuilt binary when enabled. - -- - -- By default, we use the Lua implementation instead, but you may enable - -- the rust implementation via `'prefer_rust_with_warning'` - -- - -- See :h blink-cmp-config-fuzzy for more information - fuzzy = { implementation = 'lua' }, + -- Blink.cmp includes an optional, recommended rust fuzzy matcher, + -- which automatically downloads a prebuilt binary when enabled. + -- + -- By default, we use the Lua implementation instead, but you may enable + -- the rust implementation via `'prefer_rust_with_warning'` + -- + -- See :h blink-cmp-config-fuzzy for more information + fuzzy = { implementation = 'lua' }, - -- Shows a signature help window while you type arguments for a function - signature = { enabled = true }, - }, - } + -- Shows a signature help window while you type arguments for a function + signature = { enabled = true }, + }, + }, } From b61a68c02fe8fdbcfcd0977898cf08c0e1b73e99 Mon Sep 17 00:00:00 2001 From: juanito87 Date: Sat, 12 Jul 2025 19:11:22 -0300 Subject: [PATCH 24/34] UPD --- lua/plugins_config/conform.lua | 4 ++-- lua/plugins_config/lsp.lua | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lua/plugins_config/conform.lua b/lua/plugins_config/conform.lua index c0684968c15..683789c04db 100644 --- a/lua/plugins_config/conform.lua +++ b/lua/plugins_config/conform.lua @@ -40,10 +40,10 @@ return { -- Autoformat jinja2 = { 'djlint' }, javascript = { 'prettierd', 'prettier' }, bash = { 'beautysh', 'shellcheck' }, - terraform = { 'terraform_fmt'}, + terraform = { 'terraform_fmt' }, ansible = { 'ansible-lint' }, hcl = { 'hcl' }, - markdown = { 'markdownfmt', 'markdownlint' }, + markdown = { 'markdownlint' }, -- You can use a sub-list to tell conform to run *until* a formatter -- is found. }, diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index 79d43facceb..df3ba373cf4 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -258,6 +258,12 @@ return { local ensure_installed = vim.tbl_keys(servers or {}) vim.list_extend(ensure_installed, { 'stylua', -- Used to format Lua code + 'rustfmt', -- Rust formatter + 'prettier', -- JS/MD formatter + 'black', -- Python formatter + 'isort', + 'shellcheck', + 'markdownlint', }) require('mason-tool-installer').setup { ensure_installed = ensure_installed } @@ -372,7 +378,7 @@ return { -- the rust implementation via `'prefer_rust_with_warning'` -- -- See :h blink-cmp-config-fuzzy for more information - fuzzy = { implementation = 'lua' }, + fuzzy = { implementation = 'prefer_rust_with_warning' }, -- Shows a signature help window while you type arguments for a function signature = { enabled = true }, From 32e75b6db73835989aa11355b7557a00134f3201 Mon Sep 17 00:00:00 2001 From: Juanito <11276687+Juanito87@users.noreply.github.com> Date: Tue, 16 Sep 2025 23:49:43 -0300 Subject: [PATCH 25/34] Update lsp.lua Test for nixos --- lua/plugins_config/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index df3ba373cf4..7860fad7b22 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -257,7 +257,7 @@ return { -- 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 + -- 'stylua', -- Used to format Lua code 'rustfmt', -- Rust formatter 'prettier', -- JS/MD formatter 'black', -- Python formatter From b27e3459ecf65a50b8ee183cf6834010d672fef7 Mon Sep 17 00:00:00 2001 From: Juanito <11276687+Juanito87@users.noreply.github.com> Date: Thu, 18 Sep 2025 13:06:08 -0300 Subject: [PATCH 26/34] Update lsp.lua --- lua/plugins_config/lsp.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index 7860fad7b22..e97eacbf49c 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -218,9 +218,9 @@ return { ansiblels = {}, bashls = {}, gh_actions_ls = {}, - jinja_lsp = {}, + -- jinja_lsp = {}, markdown_oxide = {}, - terraform = {}, + -- terraform = {}, yamlls = {}, gopls = {}, pyright = {}, From ae8377baac2ff9f82bd1ee0ed3cc208043bf7a1e Mon Sep 17 00:00:00 2001 From: Juanito <11276687+Juanito87@users.noreply.github.com> Date: Thu, 18 Sep 2025 15:20:56 -0300 Subject: [PATCH 27/34] Update lsp.lua --- lua/plugins_config/lsp.lua | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index e97eacbf49c..bca7b770de2 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -218,9 +218,9 @@ return { ansiblels = {}, bashls = {}, gh_actions_ls = {}, - -- jinja_lsp = {}, + jinja_lsp = {}, markdown_oxide = {}, - -- terraform = {}, + terraformls = {}, yamlls = {}, gopls = {}, pyright = {}, @@ -257,7 +257,6 @@ return { -- 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 'rustfmt', -- Rust formatter 'prettier', -- JS/MD formatter 'black', -- Python formatter @@ -265,7 +264,17 @@ return { 'shellcheck', 'markdownlint', }) - require('mason-tool-installer').setup { ensure_installed = ensure_installed } + require('mason-tool-installer').setup { + ensure_installed = ensure_installed, + auto_update = false, + } + local null_ls = require("null-ls") + null_ls.setup({ + sources = { + null_ls.builtins.formatting.stylua, + null_ls.builtins.formatting.terraform_fmt, + }, + }) require('mason-lspconfig').setup { ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer) From 088e844145ea9a413d968d2f6072ad7df178060a Mon Sep 17 00:00:00 2001 From: Juanito <11276687+Juanito87@users.noreply.github.com> Date: Thu, 18 Sep 2025 16:10:33 -0300 Subject: [PATCH 28/34] Update lsp.lua Fix typo --- lua/plugins_config/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index bca7b770de2..f806c4d1d63 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -268,7 +268,7 @@ return { ensure_installed = ensure_installed, auto_update = false, } - local null_ls = require("null-ls") + local null_ls = require("null_ls") null_ls.setup({ sources = { null_ls.builtins.formatting.stylua, From 42d46663afbd60c9e7c2f0f2d4a5e8c9dde21ad5 Mon Sep 17 00:00:00 2001 From: Juanito <11276687+Juanito87@users.noreply.github.com> Date: Thu, 18 Sep 2025 16:26:16 -0300 Subject: [PATCH 29/34] Update lsp.lua Updating lsp config, separating lint and lsp --- lua/plugins_config/lsp.lua | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index f806c4d1d63..d4ba2eeebdd 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -225,7 +225,7 @@ return { gopls = {}, pyright = {}, rust_analyzer = {}, - ts_ls = {}, + tsserve = {}, -- ... 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 @@ -268,7 +268,7 @@ return { ensure_installed = ensure_installed, auto_update = false, } - local null_ls = require("null_ls") + local null_ls = require("null-ls") null_ls.setup({ sources = { null_ls.builtins.formatting.stylua, @@ -292,7 +292,25 @@ return { } end, }, + -- Linters + { + "nvimtools/none-ls.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local null_ls = require("null-ls") + null_ls.setup({ + sources = { + -- Only diagnostics/linters here (NOT formatting) + null_ls.builtins.diagnostics.shellcheck, + null_ls.builtins.diagnostics.markdownlint, + null_ls.builtins.diagnostics.yamllint, + null_ls.builtins.diagnostics.ansiblelint, + }, + }) + end, + }, + -- Autocompletion { 'saghen/blink.cmp', From 9ca65a5cf83363636f2110c68a4798ded8ba66ff Mon Sep 17 00:00:00 2001 From: Juanito <11276687+Juanito87@users.noreply.github.com> Date: Thu, 18 Sep 2025 16:31:06 -0300 Subject: [PATCH 30/34] Update lsp.lua Fix typo --- lua/plugins_config/lsp.lua | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index d4ba2eeebdd..c24b0f4915e 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -225,7 +225,7 @@ return { gopls = {}, pyright = {}, rust_analyzer = {}, - tsserve = {}, + tsserver = {}, -- ... 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 @@ -268,13 +268,6 @@ return { ensure_installed = ensure_installed, auto_update = false, } - local null_ls = require("null-ls") - null_ls.setup({ - sources = { - null_ls.builtins.formatting.stylua, - null_ls.builtins.formatting.terraform_fmt, - }, - }) require('mason-lspconfig').setup { ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer) From dbb1ee7908cb7c06173efd0bc55f2771d56b2970 Mon Sep 17 00:00:00 2001 From: Juanito <11276687+Juanito87@users.noreply.github.com> Date: Thu, 18 Sep 2025 16:40:06 -0300 Subject: [PATCH 31/34] Update lsp.lua --- lua/plugins_config/lsp.lua | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lua/plugins_config/lsp.lua b/lua/plugins_config/lsp.lua index c24b0f4915e..2c6e9d54c28 100644 --- a/lua/plugins_config/lsp.lua +++ b/lua/plugins_config/lsp.lua @@ -225,7 +225,7 @@ return { gopls = {}, pyright = {}, rust_analyzer = {}, - tsserver = {}, + ts_ls = {}, -- ... 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 @@ -295,10 +295,20 @@ return { null_ls.setup({ sources = { -- Only diagnostics/linters here (NOT formatting) + -- Shell null_ls.builtins.diagnostics.shellcheck, - null_ls.builtins.diagnostics.markdownlint, - null_ls.builtins.diagnostics.yamllint, + -- Ansible null_ls.builtins.diagnostics.ansiblelint, + -- YAML + null_ls.builtins.diagnostics.yamllint, + -- Terraform + null_ls.builtins.diagnostics.terraform_validate, + -- Python (ruff or pylint) + null_ls.builtins.diagnostics.ruff, + -- Go (staticcheck) + null_ls.builtins.diagnostics.staticcheck, + -- Markdown + null_ls.builtins.diagnostics.markdownlint, }, }) end, From adf5f798f4d9eb5efdac19e8a4d54f2c5ba9fe89 Mon Sep 17 00:00:00 2001 From: Juanito <11276687+Juanito87@users.noreply.github.com> Date: Mon, 9 Mar 2026 18:20:46 +0000 Subject: [PATCH 32/34] UPD --- init.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index eb914a4c4f8..abb0d600564 100644 --- a/init.lua +++ b/init.lua @@ -207,7 +207,17 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the upper win -- vim.keymap.set("n", "", "H", { desc = "Move window to the left" }) -- vim.keymap.set("n", "", "L", { desc = "Move window to the right" }) -- vim.keymap.set("n", "", "J", { desc = "Move window to the lower" }) --- vim.keymap.set("n", "", "K", { desc = "Move window to the upper" }) +-- vim.keymap.set("n", "", "K", { desc = "Move window to the upper" }) + +-- Opencode integration +local function run_opencode_query(query) + local repo = vim.fn.system('git rev-parse --show-toplevel 2>/dev/null'):gsub('\n', '') or vim.fn.getcwd() + vim.fn.jobstart({'opencode', 'run', 'In repo ' .. repo .. ': ' .. query}, {detach = true}) +end + +vim.keymap.set('n', 'oa', function() run_opencode_query('Analyze current file: ' .. vim.fn.expand('%')) end, { desc = '[O]pencode [A]nalyze file' }) +vim.keymap.set('v', 'oe', function() run_opencode_query('Explain: ' .. vim.fn.getreg('*')) end, { desc = '[O]pencode [E]xplain selection' }) +vim.keymap.set('n', 'or', function() run_opencode_query('Refactor suggestions for repo') end, { desc = '[O]pencode [R]epo refactor' }) -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` From f640f80e12fdb4166938be1432e17a2eb9f1e40b Mon Sep 17 00:00:00 2001 From: Juanito <11276687+Juanito87@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:15:23 +0000 Subject: [PATCH 33/34] Add AGENTS.md development guide for AI coding agents - Document build/lint/test commands for Neovim config - Define code style guidelines based on .stylua.toml and existing patterns - Outline project conventions and development workflow - Include Neovim-specific considerations for plugin development --- AGENTS.md | 244 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 244 insertions(+) create mode 100644 AGENTS.md diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 00000000000..43637fb6da5 --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,244 @@ +# AGENTS.md - Development Guide for AI Coding Agents + +This file provides essential information for AI coding agents working in this Neovim configuration repository. It covers build/lint/test commands, code style guidelines, and project conventions to ensure consistent development. + +## Build/Lint/Test Commands + +### Linting +- **Command**: `:lua require('lint').try_lint()` +- **Description**: Run linting on current buffer using nvim-lint plugin +- **File types**: Currently configured for markdown files with `markdownlint` +- **Manual command**: `markdownlint-cli file.md` (if available globally) + +### Formatting +- **Command**: `:lua require('conform').format({ async = true, lsp_format = 'fallback' })` +- **Keybinding**: `f` (normal/visual mode) +- **Description**: Format current buffer using conform.nvim +- **Formatters by filetype**: + - Lua: `stylua` + - Python: `isort`, `black` + - JavaScript: `prettierd`, `prettier` + - Go: `gofmt` + - Rust: `rustfmt` + - YAML: `yamlfix` + - TOML: `taplo` + - Terraform: `terraform_fmt` + - Markdown: `markdownlint` + +### Testing +- **Status**: No automated testing framework configured +- **Reason**: This is a Neovim configuration repository, not an application with unit tests +- **Manual testing**: `:checkhealth` for Neovim health checks, `:Lazy` for plugin status + +### Single Test Execution +- **N/A**: No test suite exists for this configuration repository + +### Health Checks +- **Command**: `:checkhealth` +- **Description**: Comprehensive Neovim health check including plugins and configuration + +## Code Style Guidelines + +### Formatting (.stylua.toml) +- **Column width**: 160 characters +- **Indent type**: Spaces +- **Indent width**: 2 spaces +- **Quote style**: Auto-prefer single quotes +- **Call parentheses**: None (omit when possible) +- **Simple statements**: Always collapse + +### Imports +```lua +-- Standard require pattern +local module = require('module.name') + +-- For plugins and external libraries +local telescope = require('telescope') +local conform = require('conform') + +-- Conditional requires with error handling +local ok, plugin = pcall(require, 'optional.plugin') +if not ok then + -- Handle missing plugin gracefully +end +``` + +### Naming Conventions +- **Variables**: `camelCase` (e.g., `local bufferNumber = 1`) +- **Functions**: `camelCase` (e.g., `function setupLsp() end`) +- **Constants**: `UPPER_SNAKE_CASE` (e.g., `local MAX_RETRIES = 3`) +- **Modules**: `snake_case` for file names (e.g., `lsp_config.lua`) +- **Descriptive names**: Prefer clarity over brevity (e.g., `diagnosticConfig` over `diagCfg`) + +### Error Handling +```lua +-- Safe plugin loading +local ok, result = pcall(require, 'plugin.name') +if not ok then + vim.notify('Plugin failed to load: ' .. result, vim.log.levels.WARN) + return +end + +-- Safe function calls +local success, err = pcall(function() + -- Potentially failing operation +end) +if not success then + vim.notify('Operation failed: ' .. err, vim.log.levels.ERROR) +end +``` + +### Comments +```lua +-- Single line comments for explanations +-- Use for Neovim-specific behavior or complex logic + +-- TODO: Future improvements +-- FIXME: Known issues +-- NOTE: Important information for maintainers + +-- EmmyLua type annotations (when used) +---@param buffer number: The buffer number +---@return boolean: Success status +function processBuffer(buffer) + -- Implementation +end +``` + +### Function Organization +```lua +-- Anonymous functions for keymaps +vim.keymap.set('n', 'key', function() + -- Implementation +end, { desc = 'Description of what this does' }) + +-- Named functions for complex logic +local function setupPlugin() + -- Setup code here +end + +-- Call setup functions +setupPlugin() +``` + +### Table/Configuration Style +```lua +-- Consistent indentation and alignment +local config = { + option1 = true, + option2 = 'value', + nested = { + setting = 42, + enabled = false, + }, + -- Align values when it improves readability + timeout_ms = 500, + max_retries = 3, +} + +-- Plugin configurations follow this pattern +return { + 'plugin/name', + opts = { + -- Options here + }, + config = function() + -- Setup code + end, +} +``` + +### Autocommands +```lua +-- Use descriptive augroup names +local augroup = vim.api.nvim_create_augroup('plugin-name-feature', { clear = true }) + +vim.api.nvim_create_autocmd('FileType', { + group = augroup, + pattern = 'lua', + callback = function() + -- Callback implementation + end, +}) +``` + +### Keymaps +```lua +-- Always include descriptions for discoverability +vim.keymap.set('n', 'sh', builtin.help_tags, { + desc = '[S]earch [H]elp' +}) + +-- Use leader key consistently () +-- Group related mappings under leader prefixes +-- Follow existing patterns: s=search, t=toggle, h=git hunk, etc. +``` + +## Project Conventions + +### File Organization +``` +lua/ +├── options.lua # Vim options and settings +├── keymaps.lua # Keybindings +├── autocommands.lua # Autocommands +├── lazy-config.lua # Lazy plugin manager setup +├── plugins_config/ # Plugin-specific configurations +│ ├── lsp.lua # LSP setup +│ ├── conform.lua # Formatting setup +│ ├── telescope.lua # Fuzzy finder setup +│ └── ... +└── custom/ # User customizations +``` + +### Plugin Management +- **Manager**: lazy.nvim +- **Check status**: `:Lazy` +- **Update**: `:Lazy update` +- **Clean**: `:Lazy clean` +- **Profile**: `:Lazy profile` + +### Commit Messages +- Follow conventional commit format when possible +- Be descriptive about Neovim-specific changes +- Reference plugin names and features clearly + +### Plugin Configuration Pattern +```lua +return { + 'author/plugin-name', + event = 'VimEnter', -- Lazy loading trigger + dependencies = { 'dep1', 'dep2' }, + opts = { -- Simple options + setting = value, + }, + config = function() -- Complex setup + local plugin = require('plugin') + plugin.setup({ + -- Configuration + }) + end, + keys = { -- Keybindings + { 'key', function() end, desc = 'Description' }, + }, +} +``` + +## Development Workflow + +1. **Setup**: Clone repository and start Neovim +2. **Plugin management**: Use `:Lazy` commands for plugin operations +3. **Testing changes**: `:checkhealth`, `:Lazy`, manual testing +4. **Formatting**: Use `f` or conform commands +5. **Linting**: Use lint commands for supported file types +6. **Git workflow**: Standard branching, commit, and PR process + +## Neovim-Specific Considerations + +- **API usage**: Prefer `vim.api.nvim_*` functions over deprecated `vim.*` +- **Version compatibility**: Target latest stable Neovim +- **Plugin compatibility**: Check lazy-lock.json for pinned versions +- **Performance**: Be mindful of startup time and memory usage +- **User experience**: Consider both mouse and keyboard workflows + +This guide ensures AI agents can contribute effectively to this Neovim configuration while maintaining consistency with existing patterns and conventions. \ No newline at end of file From cde327c7ac2d3f20bd2f17c097ec8083eaf43d5b Mon Sep 17 00:00:00 2001 From: Juanito <11276687+Juanito87@users.noreply.github.com> Date: Mon, 9 Mar 2026 22:39:27 +0000 Subject: [PATCH 34/34] docs: streamline AGENTS.md for AI coding agents - Reduce length from 244 to ~150 lines while preserving all essential info - Consolidate build/lint/test commands section - Streamline code style guidelines and combine related sections - Simplify plugin configuration examples - Add CI information and clarify testing status - Maintain comprehensive coverage for AI agent development --- AGENTS.md | 177 ++++++++++++------------------------------------------ 1 file changed, 40 insertions(+), 137 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 43637fb6da5..f27bf36bd01 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -1,6 +1,6 @@ # AGENTS.md - Development Guide for AI Coding Agents -This file provides essential information for AI coding agents working in this Neovim configuration repository. It covers build/lint/test commands, code style guidelines, and project conventions to ensure consistent development. +This file provides essential information for AI coding agents working in this Neovim configuration repository. It covers build/lint/test commands, code style guidelines, and project conventions. ## Build/Lint/Test Commands @@ -9,68 +9,39 @@ This file provides essential information for AI coding agents working in this Ne - **Description**: Run linting on current buffer using nvim-lint plugin - **File types**: Currently configured for markdown files with `markdownlint` - **Manual command**: `markdownlint-cli file.md` (if available globally) +- **CI**: GitHub Actions runs stylua formatting checks ### Formatting - **Command**: `:lua require('conform').format({ async = true, lsp_format = 'fallback' })` - **Keybinding**: `f` (normal/visual mode) -- **Description**: Format current buffer using conform.nvim -- **Formatters by filetype**: - - Lua: `stylua` - - Python: `isort`, `black` - - JavaScript: `prettierd`, `prettier` - - Go: `gofmt` - - Rust: `rustfmt` - - YAML: `yamlfix` - - TOML: `taplo` - - Terraform: `terraform_fmt` - - Markdown: `markdownlint` +- **Formatters by filetype**: Lua: `stylua`, Python: `isort`/`black`, JavaScript: `prettier`, Go: `gofmt`, Rust: `rustfmt`, YAML: `yamlfix`, TOML: `taplo`, Terraform: `terraform_fmt`, Markdown: `markdownlint` ### Testing - **Status**: No automated testing framework configured -- **Reason**: This is a Neovim configuration repository, not an application with unit tests - **Manual testing**: `:checkhealth` for Neovim health checks, `:Lazy` for plugin status - -### Single Test Execution -- **N/A**: No test suite exists for this configuration repository - -### Health Checks -- **Command**: `:checkhealth` -- **Description**: Comprehensive Neovim health check including plugins and configuration +- **Single test execution**: N/A - use `:checkhealth` for comprehensive checks ## Code Style Guidelines ### Formatting (.stylua.toml) -- **Column width**: 160 characters -- **Indent type**: Spaces -- **Indent width**: 2 spaces -- **Quote style**: Auto-prefer single quotes -- **Call parentheses**: None (omit when possible) -- **Simple statements**: Always collapse - -### Imports +- Column width: 160 characters, indent: 2 spaces, quote style: auto-prefer single quotes +- Call parentheses: omit when possible, simple statements: always collapse + +### Imports & Naming ```lua -- Standard require pattern local module = require('module.name') --- For plugins and external libraries -local telescope = require('telescope') -local conform = require('conform') - -- Conditional requires with error handling local ok, plugin = pcall(require, 'optional.plugin') -if not ok then - -- Handle missing plugin gracefully -end +if not ok then vim.notify('Plugin failed: ' .. result, vim.log.levels.WARN) end ``` - -### Naming Conventions -- **Variables**: `camelCase` (e.g., `local bufferNumber = 1`) -- **Functions**: `camelCase` (e.g., `function setupLsp() end`) +- **Variables/Functions**: `camelCase` (e.g., `local bufferNumber = 1`, `function setupLsp() end`) - **Constants**: `UPPER_SNAKE_CASE` (e.g., `local MAX_RETRIES = 3`) -- **Modules**: `snake_case` for file names (e.g., `lsp_config.lua`) -- **Descriptive names**: Prefer clarity over brevity (e.g., `diagnosticConfig` over `diagCfg`) +- **Modules**: `snake_case` for file names +- **Descriptive names**: Prefer clarity over brevity -### Error Handling +### Error Handling & Comments ```lua -- Safe plugin loading local ok, result = pcall(require, 'plugin.name') @@ -78,100 +49,44 @@ if not ok then vim.notify('Plugin failed to load: ' .. result, vim.log.levels.WARN) return end - --- Safe function calls -local success, err = pcall(function() - -- Potentially failing operation -end) -if not success then - vim.notify('Operation failed: ' .. err, vim.log.levels.ERROR) -end ``` - -### Comments ```lua --- Single line comments for explanations --- Use for Neovim-specific behavior or complex logic - --- TODO: Future improvements --- FIXME: Known issues --- NOTE: Important information for maintainers - --- EmmyLua type annotations (when used) +-- Single line comments, TODO/FIXME/NOTE +-- EmmyLua annotations: ---@param name type: description ---@param buffer number: The buffer number ---@return boolean: Success status -function processBuffer(buffer) - -- Implementation -end ``` -### Function Organization +### Function & Table Style ```lua -- Anonymous functions for keymaps -vim.keymap.set('n', 'key', function() - -- Implementation -end, { desc = 'Description of what this does' }) +vim.keymap.set('n', 'key', function() end, { desc = 'Description' }) -- Named functions for complex logic -local function setupPlugin() - -- Setup code here -end +local function setupPlugin() end --- Call setup functions -setupPlugin() -``` - -### Table/Configuration Style -```lua --- Consistent indentation and alignment +-- Consistent table formatting local config = { option1 = true, - option2 = 'value', - nested = { - setting = 42, - enabled = false, - }, - -- Align values when it improves readability - timeout_ms = 500, - max_retries = 3, -} - --- Plugin configurations follow this pattern -return { - 'plugin/name', - opts = { - -- Options here - }, - config = function() - -- Setup code - end, + nested = { setting = 42 }, + timeout_ms = 500, -- Align when readable } ``` -### Autocommands +### Autocommands & Keymaps ```lua -- Use descriptive augroup names local augroup = vim.api.nvim_create_augroup('plugin-name-feature', { clear = true }) - vim.api.nvim_create_autocmd('FileType', { group = augroup, pattern = 'lua', - callback = function() - -- Callback implementation - end, + callback = function() end, }) ``` - -### Keymaps ```lua --- Always include descriptions for discoverability -vim.keymap.set('n', 'sh', builtin.help_tags, { - desc = '[S]earch [H]elp' -}) - --- Use leader key consistently () --- Group related mappings under leader prefixes --- Follow existing patterns: s=search, t=toggle, h=git hunk, etc. +-- Always include descriptions +vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) +-- Use leader key (), group related mappings under prefixes ``` ## Project Conventions @@ -184,24 +99,16 @@ lua/ ├── autocommands.lua # Autocommands ├── lazy-config.lua # Lazy plugin manager setup ├── plugins_config/ # Plugin-specific configurations -│ ├── lsp.lua # LSP setup -│ ├── conform.lua # Formatting setup -│ ├── telescope.lua # Fuzzy finder setup -│ └── ... └── custom/ # User customizations ``` ### Plugin Management - **Manager**: lazy.nvim -- **Check status**: `:Lazy` -- **Update**: `:Lazy update` -- **Clean**: `:Lazy clean` -- **Profile**: `:Lazy profile` +- **Commands**: `:Lazy` (status), `:Lazy update`, `:Lazy clean`, `:Lazy profile` ### Commit Messages -- Follow conventional commit format when possible -- Be descriptive about Neovim-specific changes -- Reference plugin names and features clearly +- Follow conventional commit format +- Be descriptive about Neovim-specific changes and plugin references ### Plugin Configuration Pattern ```lua @@ -209,16 +116,12 @@ return { 'author/plugin-name', event = 'VimEnter', -- Lazy loading trigger dependencies = { 'dep1', 'dep2' }, - opts = { -- Simple options - setting = value, - }, - config = function() -- Complex setup + opts = { setting = value }, -- Simple options + config = function() -- Complex setup local plugin = require('plugin') - plugin.setup({ - -- Configuration - }) + plugin.setup({ config }) end, - keys = { -- Keybindings + keys = { -- Keybindings { 'key', function() end, desc = 'Description' }, }, } @@ -227,18 +130,18 @@ return { ## Development Workflow 1. **Setup**: Clone repository and start Neovim -2. **Plugin management**: Use `:Lazy` commands for plugin operations -3. **Testing changes**: `:checkhealth`, `:Lazy`, manual testing -4. **Formatting**: Use `f` or conform commands +2. **Plugin management**: Use `:Lazy` commands +3. **Testing**: `:checkhealth`, `:Lazy`, manual testing +4. **Formatting**: `f` or conform commands 5. **Linting**: Use lint commands for supported file types 6. **Git workflow**: Standard branching, commit, and PR process ## Neovim-Specific Considerations -- **API usage**: Prefer `vim.api.nvim_*` functions over deprecated `vim.*` +- **API usage**: Prefer `vim.api.nvim_*` over deprecated `vim.*` - **Version compatibility**: Target latest stable Neovim - **Plugin compatibility**: Check lazy-lock.json for pinned versions -- **Performance**: Be mindful of startup time and memory usage -- **User experience**: Consider both mouse and keyboard workflows +- **Performance**: Mindful of startup time and memory usage +- **User experience**: Consider mouse and keyboard workflows -This guide ensures AI agents can contribute effectively to this Neovim configuration while maintaining consistency with existing patterns and conventions. \ No newline at end of file +This guide ensures AI agents can contribute effectively while maintaining consistency with existing patterns and conventions. \ No newline at end of file