diff --git a/init.lua b/init.lua index afcbf05..ac1a947 100644 --- a/init.lua +++ b/init.lua @@ -1,1027 +1,14 @@ --- ============================================================ --- SECTION 1: OPTIONS --- Core Neovim settings, leaders, options, basic keymaps, basic autocmds --- ============================================================ -do - -- Enable faster startup by caching compiled Lua modules - vim.loader.enable() +-- [[ Setting options ]] +require 'options' - -- Set as the leader key - -- See `:help mapleader` - -- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) - vim.g.mapleader = ' ' - vim.g.maplocalleader = ' ' +-- [[ Basic keymaps ]] +require 'keymaps' - -- Set to true if you have a Nerd Font installed and selected in the terminal - vim.g.have_nerd_font = true +-- [[ Set up `vim.pack` ]] +require 'pack' - -- Set default terminal emulator to pwsh on Windows - if vim.fn.has('win32') == 1 then - vim.g.terminal_emulator = 'pwsh' - vim.o.shell = 'pwsh' - vim.o.shellcmdflag = '-Command' - vim.o.shellquote = '\"' - vim.o.shellxquote = '' - end - - -- [[ Setting options ]] - -- See `:help vim.o` - -- For more options, you can see `:help option-list` - - -- Set indentation behavior according to :help usr_30 section 5 - -- NMAC427/guess-indent.nvim plugin add automatic detection - vim.o.shiftwidth = 4 - vim.o.softtabstop = 4 - vim.o.expandtab = true - -- vim.o.smarttab = true - - -- Make line numbers default - vim.o.number = true - vim.o.relativenumber = true - - -- Enable mouse mode, can be useful for resizing splits for example! - vim.o.mouse = 'a' - - -- Don't show the mode, since it's already in the status line - vim.o.showmode = false - - -- Sync clipboard between OS and Neovim. - -- Schedule the setting after `UiEnter` because it can increase startup-time. - -- Remove this option if you want your OS clipboard to remain independent. - -- See `:help 'clipboard'` - -- vim.schedule(function() vim.o.clipboard = 'unnamedplus' end) - - -- Enable break indent - vim.o.breakindent = true - - -- Enable undo/redo changes even after closing and reopening a file - vim.o.undofile = true - - -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term - vim.o.ignorecase = true - vim.o.smartcase = true - - -- Keep signcolumn on by default - vim.o.signcolumn = 'yes' - - -- Decrease update time - vim.o.updatetime = 250 - - -- Decrease mapped sequence wait time - vim.o.timeoutlen = 300 - - -- Configure how new splits should be opened - vim.o.splitright = true - vim.o.splitbelow = true - - -- Sets how neovim will display certain whitespace characters in the editor. - -- See `:help 'list'` - -- and `:help 'listchars'` - -- - -- Notice listchars is set using `vim.opt` instead of `vim.o`. - -- It is very similar to `vim.o` but offers an interface for conveniently interacting with tables. - -- See `:help lua-options` - -- and `:help lua-guide-options` - vim.o.list = true - vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } - - -- Preview substitutions live, as you type! - vim.o.inccommand = 'split' - - -- Show which line your cursor is on - vim.o.cursorline = true - - -- Minimal number of screen lines to keep above and below the cursor. - vim.o.scrolloff = 8 - - -- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`), - -- instead raise a dialog asking if you wish to save the current file(s) - -- See `:help 'confirm'` - vim.o.confirm = true -end - --- ============================================================ --- SECTION 2: KEYMAPS --- basic keymaps --- ============================================================ -do - -- [[ Basic Keymaps ]] - -- See `:help vim.keymap.set()` - - -- Clear highlights on search when pressing in normal mode - -- See `:help hlsearch` - vim.keymap.set('n', '', 'nohlsearch') - - local function expand_diagnostic(_, bufnr) - vim.diagnostic.open_float { - bufnr = bufnr, - scope = 'cursor', - focus = false, - } - end - - -- Diagnostic Config & Keymaps - -- See `:help vim.diagnostic.Opts` - vim.diagnostic.config { - update_in_insert = false, - severity_sort = true, - float = { border = 'rounded', source = 'if_many' }, - underline = { severity = { min = vim.diagnostic.severity.WARN } }, - - -- Can switch between these as you prefer - virtual_text = true, -- Text shows up at the end of the line - virtual_lines = false, -- Text shows up underneath the line, with virtual lines - - -- Auto open the float, so you can easily read the errors when jumping with `[d` and `]d` - jump = { on_jump = expand_diagnostic }, - } - - vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) - vim.keymap.set('n', 'e', expand_diagnostic, { desc = '[E]xpand diagnostic message' }) - - -- 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' }) - - -- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes - -- 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" }) - - -- Additional keybinds - vim.keymap.set('n', 'w', 'write', { desc = '[W]rite to the current file' }) - vim.keymap.set('n', 'pv', vim.cmd.Ex, { desc = '[P]roject [V]iew' }) - vim.keymap.set('n', 'lsp', 'LspRestart', { desc = 'Restart LSP' }) - vim.keymap.set('n', '', 'zz', { desc = 'Center window on cursor on jump' }) - vim.keymap.set('n', '', 'zz', { desc = 'Center window on cursor on jump' }) - vim.keymap.set('x', 'p', [["_dP]], { desc = '[P]aste without register override' }) - vim.keymap.set({ 'n', 'v' }, 'y', [["+y]], { desc = '[Y]ank to system clipboard' }) - vim.keymap.set('n', 'Y', [["+Y]], { desc = '[Y]ank line to system clipboard' }) - - -- [[ Basic Autocommands ]] - -- See `:help lua-guide-autocommands` - - -- Highlight when yanking (copying) text - -- Try it with `yap` in normal mode - -- See `:help vim.hl.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.hl.on_yank() end, - }) -end - --- ============================================================ --- SECTION 3: PLUGIN MANAGER INTRO --- vim.pack intro, build hooks --- ============================================================ -do - -- [[ Intro to `vim.pack` ]] - -- `vim.pack` is a new plugin manager built into Neovim, - -- which provides a Lua interface for installing and managing plugins. - -- - -- See `:help vim.pack`, `:help vim.pack-examples` or the - -- excellent blog post from the creator of vim.pack and mini.nvim: - -- https://echasnovski.com/blog/2026-03-13-a-guide-to-vim-pack - -- - -- To inspect plugin state and pending updates, run - -- :lua vim.pack.update(nil, { offline = true }) - -- - -- To update plugins, run - -- :lua vim.pack.update() - -- - -- - -- Throughout the rest of the config there will be examples - -- of how to install and configure plugins using `vim.pack`. - -- - -- In this section we set up some autocommands to run build - -- steps for certain plugins after they are installed or updated. - - local function run_build(name, cmd, cwd) - local result = vim.system(cmd, { cwd = cwd }):wait() - if result.code ~= 0 then - local stderr = result.stderr or '' - local stdout = result.stdout or '' - local output = stderr ~= '' and stderr or stdout - if output == '' then output = 'No output from build command.' end - vim.notify(('Build failed for %s:\n%s'):format(name, output), vim.log.levels.ERROR) - end - end - - -- This autocommand runs after a plugin is installed or updated and - -- runs the appropriate build command for that plugin if necessary. - -- - -- See `:help vim.pack-events` - vim.api.nvim_create_autocmd('PackChanged', { - callback = function(ev) - local name = ev.data.spec.name - local kind = ev.data.kind - if kind ~= 'install' and kind ~= 'update' then return end - - if name == 'telescope-fzf-native.nvim' and vim.fn.executable 'make' == 1 then - run_build(name, { 'make' }, ev.data.path) - return - end - - if name == 'LuaSnip' then - if vim.fn.has 'win32' ~= 1 and vim.fn.executable 'make' == 1 then - run_build(name, { 'make', 'install_jsregexp' }, ev.data.path) - end - return - end - - if name == 'nvim-treesitter' then - if not ev.data.active then vim.cmd.packadd 'nvim-treesitter' end - vim.cmd 'TSUpdate' - return - end - end, - }) -end - ----Because most plugins are hosted on GitHub, you can use the helper ----function to have less repetition in the following sections. ----@param repo string ----@return string -local function gh(repo) return 'https://github.com/' .. repo end - --- ============================================================ --- SECTION 4: UI / CORE UX PLUGINS --- guess-indent, gitsigns, which-key, colorscheme, todo-comments, mini modules --- ============================================================ -do - -- [[ Installing and Configuring Plugins ]] - -- - -- To install a plugin simply call `vim.pack.add` with its git url. - -- This will download the default branch of the plugin, which will usually be `main` or `master` - -- You can also have more advanced specs, which we will talk about later. - -- - -- For most plugins it's not enough to install them, you also need to call their `.setup()` to start them. - -- - -- For example, lets say we want to install `guess-indent.nvim` - a plugin for - -- automatically detecting and setting the indentation. - -- - -- We first install it from https://github.com/NMAC427/guess-indent.nvim - -- and then call its `setup()` function to start it with default settings. - vim.pack.add { gh 'NMAC427/guess-indent.nvim' } - require('guess-indent').setup {} - - -- Here is a more advanced configuration example that passes options to `gitsigns.nvim` - -- - -- See `:help gitsigns` to understand what each configuration key does. - -- Adds git related signs to the gutter, as well as utilities for managing changes - vim.pack.add { gh 'lewis6991/gitsigns.nvim' } - require('gitsigns').setup { - signs = { - add = { text = '+' }, ---@diagnostic disable-line: missing-fields - change = { text = '~' }, ---@diagnostic disable-line: missing-fields - delete = { text = '_' }, ---@diagnostic disable-line: missing-fields - topdelete = { text = '‾' }, ---@diagnostic disable-line: missing-fields - changedelete = { text = '~' }, ---@diagnostic disable-line: missing-fields - }, - } - - -- Useful plugin to show you pending keybinds. - vim.pack.add { gh 'folke/which-key.nvim' } - require('which-key').setup { - -- Delay between pressing a key and opening which-key (milliseconds) - delay = 100, - icons = { mappings = vim.g.have_nerd_font }, - -- Document existing key chains - spec = { - { 's', group = '[S]earch', mode = { 'n', 'v' } }, - { 't', group = '[T]oggle' }, - { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first - { 'gr', group = 'LSP Actions', mode = { 'n' } }, - }, - } - - -- [[ Colorscheme ]] - -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command under that to load whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - - -- NOTE: Favourites: - -- tokyonight-night - -- lunaperche - -- miniautumn - -- slate - -- sorbet - - -- vim.pack.add { gh 'folke/tokyonight.nvim' } - -- ---@diagnostic disable-next-line: missing-fields - -- require('tokyonight').setup { - -- styles = { - -- comments = { italic = false }, -- Disable italics in comments - -- }, - -- } - - vim.pack.add { gh 'rose-pine/neovim' } - ---@diagnostic disable-next-line: missing-fields - require('rose-pine').setup { - styles = { - italic = false, -- Disable italics (rose-pine doesn't support disabling per area) - transparency = true, - }, - highlight_groups = { - NormalFloat = { bg = 'surface' }, -- Background for floating windows - }, - } - - -- 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 'rose-pine' - - -- Highlight todo, notes, etc in comments - vim.pack.add { gh 'folke/todo-comments.nvim' } - require('todo-comments').setup { signs = false } - - -- [[ mini.nvim ]] - -- A collection of various small independent plugins/modules - vim.pack.add { gh 'nvim-mini/mini.nvim' } - - -- If a nerd font is available, load the icons module for pretty icons in various plugins. - if vim.g.have_nerd_font then - require('mini.icons').setup() - -- Used for backwards compatibility with plugins that require `nvim-web-devicons` (e.g. telescope.nvim) - MiniIcons.mock_nvim_web_devicons() - end - - -- Better Around/Inside textobjects - -- - -- Examples: - -- - va) - [V]isually select [A]round [)]paren - -- - yiiq - [Y]ank [I]nside [I]+1 [Q]uote - -- - ci' - [C]hange [I]nside [']quote - require('mini.ai').setup { - -- NOTE: Avoid conflicts with the built-in incremental selection mappings on Neovim>=0.12 (see `:help treesitter-incremental-selection`) - mappings = { - around_next = 'aa', - inside_next = 'ii', - }, - 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/nvim-mini/mini.nvim -end - --- ============================================================ --- SECTION 5: SEARCH & NAVIGATION --- Telescope setup, keymaps, LSP picker mappings --- ============================================================ -do - -- [[ Fuzzy Finder (files, lsp, etc) ]] - -- - -- 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! - -- - -- There are lots of other alternative pickers (like snacks.picker, or fzf-lua) - -- so feel free to experiment and see what you like! - -- - -- 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! - - ---@type (string|vim.pack.Spec)[] - local telescope_plugins = { - gh 'nvim-lua/plenary.nvim', - gh 'nvim-telescope/telescope.nvim', - gh 'nvim-telescope/telescope-ui-select.nvim', - } - if vim.fn.executable 'make' == 1 then - table.insert(telescope_plugins, gh 'nvim-telescope/telescope-fzf-native.nvim') - end - - -- NOTE: You can install multiple plugins at once - vim.pack.add(telescope_plugins) - - -- 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', 'v' }, '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', 'sc', builtin.commands, { desc = '[S]earch [C]ommands' }) - vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) - - -- Add Telescope-based LSP pickers when an LSP attaches to a buffer. - -- If you later switch picker plugins, this is where to update these mappings. - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('telescope-lsp-attach', { clear = true }), - callback = function(event) - local buf = event.buf - - -- Find references for the word under your cursor. - vim.keymap.set('n', 'grr', builtin.lsp_references, { buffer = buf, desc = '[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. - vim.keymap.set('n', 'gri', builtin.lsp_implementations, { buffer = buf, desc = '[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 . - vim.keymap.set('n', 'grd', builtin.lsp_definitions, { buffer = buf, desc = '[G]oto [D]efinition' }) - - -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - vim.keymap.set('n', 'gO', builtin.lsp_document_symbols, { buffer = buf, desc = 'Open Document Symbols' }) - - -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. - vim.keymap.set('n', 'gW', builtin.lsp_dynamic_workspace_symbols, { buffer = buf, desc = 'Open Workspace Symbols' }) - - -- 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*. - vim.keymap.set('n', 'grt', builtin.lsp_type_definitions, { buffer = buf, desc = '[G]oto [T]ype Definition' }) - end, - }) - - -- Override default behavior and theme when searching - 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', follow = true } end, { desc = '[S]earch [N]eovim files' }) -end - --- ============================================================ --- SECTION 6: LSP --- LSP keymaps, server configuration, Mason tools installations --- ============================================================ -do - -- [[ LSP Configuration ]] - -- 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` - - -- Useful status updates for LSP. - vim.pack.add { gh 'j-hui/fidget.nvim' } - require('fidget').setup {} - - -- This function gets run when an LSP attaches to a particular buffer. - -- That is to say, every time a new file is opened that is associated with - -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this - -- function will be executed to configure the current buffer - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), - callback = function(event) - -- NOTE: Remember that Lua is a real programming language, and as such it is possible - -- to define small helper and utility functions so you don't have to repeat yourself. - -- - -- In this case, we create a function that lets us more easily define mappings specific - -- for LSP related items. It sets the mode, buffer and description for us each time. - local map = function(keys, func, desc, mode) - mode = mode or 'n' - vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) - end - - -- Rename the variable under your cursor. - -- 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' }) - - -- 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') - - -- The following two autocommands are used to highlight references of the - -- word under your cursor when your cursor rests there for a little while. - -- See `:help CursorHold` for information about when this is executed - -- - -- When you move your cursor, the highlights will be cleared (the second autocommand). - local client = vim.lsp.get_client_by_id(event.data.client_id) - if client and client:supports_method('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('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, - }) - - -- Enable the following language servers - -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. - -- See `:help lsp-config` for information about keys and how to configure - ---@type table - local servers = { - -- clangd = {}, - -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, - -- - -- Some languages (like typescript) have entire language plugins that can be useful: - -- https://github.com/pmizio/typescript-tools.nvim - -- - -- But for many setups, the LSP (`ts_ls`) will work just fine - -- ts_ls = {}, - - stylua = {}, -- Used to format Lua code - - -- Special Lua Config, as recommended by neovim help docs - lua_ls = { - on_init = function(client) - client.server_capabilities.documentFormattingProvider = false -- Disable formatting (formatting is done by stylua) - - if client.workspace_folders then - local path = client.workspace_folders[1].name - if path ~= vim.fn.stdpath 'config' and (vim.uv.fs_stat(path .. '/.luarc.json') or vim.uv.fs_stat(path .. '/.luarc.jsonc')) then return end - end - - client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, { - runtime = { - version = 'LuaJIT', - path = { 'lua/?.lua', 'lua/?/init.lua' }, - }, - workspace = { - checkThirdParty = false, - -- NOTE: this is a lot slower and will cause issues when working on your own configuration. - -- See https://github.com/neovim/nvim-lspconfig/issues/3189 - library = vim.tbl_extend('force', vim.api.nvim_get_runtime_file('', true), { - '${3rd}/luv/library', - '${3rd}/busted/library', - }), - }, - }) - end, - ---@type lspconfig.settings.lua_ls - settings = { - Lua = { - format = { enable = false }, -- Disable formatting (formatting is done by stylua) - }, - }, - }, - } - - vim.pack.add { - gh 'neovim/nvim-lspconfig', - gh 'mason-org/mason.nvim', - gh 'mason-org/mason-lspconfig.nvim', - gh 'WhoIsSethDaniel/mason-tool-installer.nvim', - } - - -- Automatically install LSPs and related tools to stdpath for Neovim - require('mason').setup { - registries = { - 'github:mason-org/mason-registry', - 'github:Crashdummyy/mason-registry', - } - } - - -- 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. - local ensure_installed = vim.tbl_keys(servers or {}) - vim.list_extend(ensure_installed, { - -- You can add other tools here that you want Mason to install - ts_ls = {}, - }) - - require('mason-tool-installer').setup { ensure_installed = ensure_installed } - - for name, server in pairs(servers) do - vim.lsp.config(name, server) - vim.lsp.enable(name) - end -end - --- ============================================================ --- SECTION 7: FORMATTING --- conform.nvim setup and keymap --- ============================================================ -do - -- [[ Formatting ]] - vim.pack.add { gh 'stevearc/conform.nvim' } - require('conform').setup { - notify_on_error = true, - -- format_on_save = function(bufnr) - -- -- You can specify filetypes to autoformat on save here: - -- local enabled_filetypes = { - -- -- lua = true, - -- -- python = true, - -- } - -- if enabled_filetypes[vim.bo[bufnr].filetype] then - -- return { timeout_ms = 500 } - -- else - -- return nil - -- end - -- end, - default_format_opts = { - lsp_format = 'fallback', -- Use external formatters if configured below, otherwise use LSP formatting. Set to `false` to disable LSP formatting entirely. - }, - -- You can also specify external formatters in here. - formatters_by_ft = { - -- rust = { 'rustfmt' }, - -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, - -- - -- You can use 'stop_after_first' to run the first available formatter from the list - css = { 'prettierd', 'prettier', stop_after_first = true }, - scss = { 'prettierd', 'prettier', stop_after_first = true }, - html = { 'prettierd', 'prettier', stop_after_first = true }, - javascript = { 'prettierd', 'prettier', stop_after_first = true }, - typescript = { 'prettierd', 'prettier', stop_after_first = true }, - }, - } - - vim.keymap.set( - { 'n', 'v' }, - 'f', - function() - require('conform').format({ async = true }, function(err) - if not err then - local mode = vim.api.nvim_get_mode().mode - if vim.startswith(string.lower(mode), 'v') then - vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('', true, false, true), 'n', true) - end - end - end) - end, - { desc = '[F]ormat code' }) -end - --- ============================================================ --- SECTION 8: AUTOCOMPLETE & SNIPPETS --- blink.cmp and luasnip setup --- ============================================================ -do - -- [[ Snippet Engine ]] - - -- NOTE: You can also specify plugin using a version range for its git tag. - -- See `:help vim.version.range()` for more info - vim.pack.add { { src = gh 'L3MON4D3/LuaSnip', version = vim.version.range '2.*' } } - require('luasnip').setup {} - - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - - vim.pack.add { gh 'rafamadriz/friendly-snippets' } - require('luasnip.loaders.from_vscode').lazy_load() - - -- [[ Autocomplete Engine ]] - -- V2 will reportedly have breaking changes - vim.pack.add { { src = gh 'saghen/blink.cmp', version = vim.version.range '1.*' } } - require('blink.cmp').setup { - 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 `:help 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', - }, - - 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' }, - }, - - 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 `:help blink-cmp-config-fuzzy` for more information - fuzzy = { implementation = 'prefer_rust_with_warning' }, - - -- Shows a signature help window while you type arguments for a function - signature = { enabled = true }, - } -end - --- ============================================================ --- SECTION 9: TREESITTER --- Parser installation, syntax highlighting, folds, indentation --- ============================================================ -do - -- [[ Configure Treesitter ]] - -- Used to highlight, edit, and navigate code - -- - -- See `:help nvim-treesitter-intro` - - -- NOTE: You can also specify a branch or a specific commit - vim.pack.add { { src = gh 'nvim-treesitter/nvim-treesitter', version = 'main' } } - - -- Ensure basic parsers are installed - local parsers = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' } - require('nvim-treesitter').install(parsers) - - ---@param buf integer - ---@param language string - local function treesitter_try_attach(buf, language) - -- Check if a parser exists and load it - if not vim.treesitter.language.add(language) then return end - -- Enable syntax highlighting and other treesitter features - vim.treesitter.start(buf, language) - - -- Enable treesitter based folds - -- For more info on folds see `:help folds` - -- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' - -- vim.wo.foldmethod = 'expr' - - -- Check if treesitter indentation is available for this language, and if so enable it - -- in case there is no indent query, the indentexpr will fallback to the vim's built in one - local has_indent_query = vim.treesitter.query.get(language, 'indents') ~= nil - - -- Enable treesitter based indentation - if has_indent_query then vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" end - end - - local available_parsers = require('nvim-treesitter').get_available() - vim.api.nvim_create_autocmd('FileType', { - callback = function(args) - local buf, filetype = args.buf, args.match - - local language = vim.treesitter.language.get_lang(filetype) - if not language then return end - - local installed_parsers = require('nvim-treesitter').get_installed 'parsers' - - if vim.tbl_contains(installed_parsers, language) then - -- Enable the parser if it is already installed - treesitter_try_attach(buf, language) - elseif vim.tbl_contains(available_parsers, language) then - -- If a parser is available in `nvim-treesitter`, auto-install it and enable it after the installation is done - require('nvim-treesitter').install(language):await(function() treesitter_try_attach(buf, language) end) - else - -- Try to enable treesitter features in case the parser exists but is not available from `nvim-treesitter` - treesitter_try_attach(buf, language) - end - end, - }) -end - --- ============================================================ --- SECTION 10: OPTIONAL EXAMPLES / NEXT STEPS --- kickstart.plugins.* examples --- ============================================================ -do - -- The following 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 recommended keymaps - - -- NOTE: You can add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- require 'custom.plugins' -end - --- Harpoon setup -do - vim.pack.add { { src = gh 'ThePrimeagen/harpoon', version = 'harpoon2' }} - local harpoon = require('harpoon') - harpoon:setup {} - - -- basic telescope configuration - local conf = require('telescope.config').values - local function toggle_telescope(harpoon_files) - local file_paths = {} - for _, item in ipairs(harpoon_files.items) do - table.insert(file_paths, item.value) - end - - require('telescope.pickers').new({}, { - prompt_title = 'Harpoon', - finder = require('telescope.finders').new_table({ - results = file_paths, - }), - previewer = conf.file_previewer({}), - sorter = conf.generic_sorter({}), - }):find() - end - - vim.keymap.set('n', '', function() toggle_telescope(harpoon:list()) end, { desc = 'Open harpoon window' }) - vim.keymap.set('n', 'a', function() harpoon:list():add() end, { desc = '[A]dd file to harpoon' }) - - -- vim.keymap.set("n", "", function() harpoon:list():select(1) end, { desc = 'Go to harpoon file 1' }) - -- vim.keymap.set("n", "", function() harpoon:list():select(2) end, { desc = 'Go to harpoon file 2' }) - -- vim.keymap.set("n", "", function() harpoon:list():select(3) end, { desc = 'Go to harpoon file 3' }) - -- vim.keymap.set("n", "", function() harpoon:list():select(4) end, { desc = 'Go to harpoon file 4' }) - - -- Toggle previous & next buffers stored within Harpoon list - vim.keymap.set("n", "", function() harpoon:list():prev() end, { desc = 'Go to previous harpoon file (down)' }) - vim.keymap.set("n", "", function() harpoon:list():next() end, { desc = 'Go to next harpoon file (up)' }) -end - -vim.pack.add { gh 'github/copilot.vim' } - -vim.pack.add { gh 'seblyng/roslyn.nvim' } -require('roslyn').setup {} - -vim.pack.add { gh 'catgoose/nvim-colorizer.lua' } -require('colorizer').setup {} - --- Adapt to local EditorConfig -vim.api.nvim_create_autocmd('BufEnter', { - callback = function() - local editorconfig = vim.b.editorconfig - if editorconfig and editorconfig.max_line_length then - vim.opt_local.colorcolumn = editorconfig.max_line_length - else - vim.o.textwidth = 120 - vim.opt_local.colorcolumn = '120' - end - end, -}) +-- [[ Install and configure plugins ]] +require 'plugins' -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua deleted file mode 100644 index 01e9172..0000000 --- a/lua/custom/plugins/init.lua +++ /dev/null @@ -1,13 +0,0 @@ --- You can add your own plugins here or in other files in this directory! --- I promise not to create any merge conflicts in this directory :) --- --- See the kickstart.nvim README for more information - --- Iterate over all Lua files in the plugins directory and load them -local plugins_dir = vim.fs.joinpath(vim.fn.stdpath 'config', 'lua', 'custom', 'plugins') -for file_name, type in vim.fs.dir(plugins_dir, { follow = true }) do - if (type == 'file' or type == 'link') and file_name:match '%.lua$' and file_name ~= 'init.lua' then - local module = file_name:gsub('%.lua$', '') - require('custom.plugins.' .. module) - end -end diff --git a/lua/kickstart/health.lua b/lua/health.lua similarity index 100% rename from lua/kickstart/health.lua rename to lua/health.lua diff --git a/lua/helpers.lua b/lua/helpers.lua new file mode 100644 index 0000000..445a36f --- /dev/null +++ b/lua/helpers.lua @@ -0,0 +1,5 @@ +---Because most plugins are hosted on GitHub, you can use the helper +---function to have less repetition in the following sections. +---@param repo string +---@return string +return function (repo) return 'https://github.com/' .. repo end diff --git a/lua/keymaps.lua b/lua/keymaps.lua new file mode 100644 index 0000000..a174f22 --- /dev/null +++ b/lua/keymaps.lua @@ -0,0 +1,83 @@ +-- See `:help vim.keymap.set()` + +-- Clear highlights on search when pressing in normal mode +-- See `:help hlsearch` +vim.keymap.set('n', '', 'nohlsearch') + +local function expand_diagnostic(_, bufnr) + vim.diagnostic.open_float { + bufnr = bufnr, + scope = 'cursor', + focus = false, + } +end + +-- Diagnostic Config & Keymaps +-- See `:help vim.diagnostic.Opts` +vim.diagnostic.config { + update_in_insert = false, + severity_sort = true, + float = { border = 'rounded', source = 'if_many' }, + underline = { severity = { min = vim.diagnostic.severity.WARN } }, + + -- Can switch between these as you prefer + virtual_text = true, -- Text shows up at the end of the line + virtual_lines = false, -- Text shows up underneath the line, with virtual lines + + -- Auto open the float, so you can easily read the errors when jumping with `[d` and `]d` + jump = { on_jump = expand_diagnostic }, +} + +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) +vim.keymap.set('n', 'e', expand_diagnostic, { desc = '[E]xpand diagnostic message' }) + +-- 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' }) + +-- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes +-- 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" }) + +-- Additional keybinds +vim.keymap.set('n', 'w', 'write', { desc = '[W]rite to the current file' }) +vim.keymap.set('n', 'pv', vim.cmd.Ex, { desc = '[P]roject [V]iew' }) +vim.keymap.set('n', 'lsp', 'LspRestart', { desc = 'Restart LSP' }) +vim.keymap.set('n', '', 'zz', { desc = 'Center window on cursor on jump' }) +vim.keymap.set('n', '', 'zz', { desc = 'Center window on cursor on jump' }) +vim.keymap.set('x', 'p', [["_dP]], { desc = '[P]aste without register override' }) +vim.keymap.set({ 'n', 'v' }, 'y', [["+y]], { desc = '[Y]ank to system clipboard' }) +vim.keymap.set('n', 'Y', [["+Y]], { desc = '[Y]ank line to system clipboard' }) + +-- [[ Basic Autocommands ]] +-- See `:help lua-guide-autocommands` + +-- Highlight when yanking (copying) text +-- Try it with `yap` in normal mode +-- See `:help vim.hl.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.hl.on_yank() end, +}) diff --git a/lua/options.lua b/lua/options.lua new file mode 100644 index 0000000..a14ff08 --- /dev/null +++ b/lua/options.lua @@ -0,0 +1,107 @@ +-- Enable faster startup by caching compiled Lua modules +vim.loader.enable() + +-- Set as the leader key +-- See `:help mapleader` +-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) +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 = true + +-- See `:help vim.o` +-- For more options, you can see `:help option-list` + +-- Set default terminal emulator to pwsh on Windows +if vim.fn.has 'win32' == 1 then + vim.g.terminal_emulator = 'pwsh' + vim.o.shell = 'pwsh' + vim.o.shellcmdflag = '-Command' + vim.o.shellquote = '"' + vim.o.shellxquote = '' +end + +-- Set indentation behavior according to :help usr_30 section 5 +-- NMAC427/guess-indent.nvim plugin add automatic detection +vim.o.shiftwidth = 4 +vim.o.softtabstop = 4 +vim.o.expandtab = true +-- vim.o.smarttab = true + +-- Make line numbers default +vim.o.number = true +vim.o.relativenumber = true + +-- Enable mouse mode, can be useful for resizing splits for example! +vim.o.mouse = 'a' + +-- Don't show the mode, since it's already in the status line +vim.o.showmode = false + +-- Sync clipboard between OS and Neovim. +-- Schedule the setting after `UiEnter` because it can increase startup-time. +-- Remove this option if you want your OS clipboard to remain independent. +-- See `:help 'clipboard'` +-- vim.schedule(function() vim.o.clipboard = 'unnamedplus' end) + +-- Enable break indent +vim.o.breakindent = true + +-- Enable undo/redo changes even after closing and reopening a file +vim.o.undofile = true + +-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term +vim.o.ignorecase = true +vim.o.smartcase = true + +-- Keep signcolumn on by default +vim.o.signcolumn = 'yes' + +-- Decrease update time +vim.o.updatetime = 250 + +-- Decrease mapped sequence wait time +vim.o.timeoutlen = 300 + +-- Configure how new splits should be opened +vim.o.splitright = true +vim.o.splitbelow = true + +-- Sets how neovim will display certain whitespace characters in the editor. +-- See `:help 'list'` +-- and `:help 'listchars'` +-- +-- Notice listchars is set using `vim.opt` instead of `vim.o`. +-- It is very similar to `vim.o` but offers an interface for conveniently interacting with tables. +-- See `:help lua-options` +-- and `:help lua-guide-options` +vim.o.list = true +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } + +-- Preview substitutions live, as you type! +vim.o.inccommand = 'split' + +-- Show which line your cursor is on +vim.o.cursorline = true + +-- Minimal number of screen lines to keep above and below the cursor. +vim.o.scrolloff = 8 + +-- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`), +-- instead raise a dialog asking if you wish to save the current file(s) +-- See `:help 'confirm'` +vim.o.confirm = true + +-- Adapt to local EditorConfig +vim.api.nvim_create_autocmd('BufEnter', { + callback = function() + local editorconfig = vim.b.editorconfig + if editorconfig and editorconfig.max_line_length then + vim.opt_local.colorcolumn = editorconfig.max_line_length + else + vim.o.textwidth = 120 + vim.opt_local.colorcolumn = '120' + end + end, +}) diff --git a/lua/pack.lua b/lua/pack.lua new file mode 100644 index 0000000..6de6270 --- /dev/null +++ b/lua/pack.lua @@ -0,0 +1,59 @@ +-- [[ Intro to `vim.pack` ]] +-- `vim.pack` is a new plugin manager built into Neovim, +-- which provides a Lua interface for installing and managing plugins. +-- +-- See `:help vim.pack`, `:help vim.pack-examples` or the +-- excellent blog post from the creator of vim.pack and mini.nvim: +-- https://echasnovski.com/blog/2026-03-13-a-guide-to-vim-pack +-- +-- To inspect plugin state and pending updates, run +-- :lua vim.pack.update(nil, { offline = true }) +-- +-- To update plugins, run +-- :lua vim.pack.update() +-- +-- +-- Throughout the rest of the config there will be examples +-- of how to install and configure plugins using `vim.pack`. +-- +-- In this section we set up some autocommands to run build +-- steps for certain plugins after they are installed or updated. + +local function run_build(name, cmd, cwd) + local result = vim.system(cmd, { cwd = cwd }):wait() + if result.code ~= 0 then + local stderr = result.stderr or '' + local stdout = result.stdout or '' + local output = stderr ~= '' and stderr or stdout + if output == '' then output = 'No output from build command.' end + vim.notify(('Build failed for %s:\n%s'):format(name, output), vim.log.levels.ERROR) + end +end + +-- This autocommand runs after a plugin is installed or updated and +-- runs the appropriate build command for that plugin if necessary. +-- +-- See `:help vim.pack-events` +vim.api.nvim_create_autocmd('PackChanged', { + callback = function(ev) + local name = ev.data.spec.name + local kind = ev.data.kind + if kind ~= 'install' and kind ~= 'update' then return end + + if name == 'telescope-fzf-native.nvim' and vim.fn.executable 'make' == 1 then + run_build(name, { 'make' }, ev.data.path) + return + end + + if name == 'LuaSnip' then + if vim.fn.has 'win32' ~= 1 and vim.fn.executable 'make' == 1 then run_build(name, { 'make', 'install_jsregexp' }, ev.data.path) end + return + end + + if name == 'nvim-treesitter' then + if not ev.data.active then vim.cmd.packadd 'nvim-treesitter' end + vim.cmd 'TSUpdate' + return + end + end, +}) diff --git a/lua/plugins.lua b/lua/plugins.lua new file mode 100644 index 0000000..a0a72f3 --- /dev/null +++ b/lua/plugins.lua @@ -0,0 +1,36 @@ +-- [[ Installing and Configuring Plugins ]] +-- +-- To install a plugin simply call `vim.pack.add` with its git url. +-- This will download the default branch of the plugin, which will usually be `main` or `master` +-- You can also have more advanced specs, which we will talk about later. +-- +-- For most plugins it's not enough to install them, you also need to call their `.setup()` to start them. +-- +-- For example, lets say we want to install `guess-indent.nvim` - a plugin for +-- automatically detecting and setting the indentation. +-- +-- We first install it from https://github.com/NMAC427/guess-indent.nvim +-- and then call its `setup()` function to start it with default settings. + +-- Load order matters +require 'plugins.guess-indent' +require 'plugins.gitsigns' +require 'plugins.which-key' +require 'plugins.colorscheme' +require 'plugins.todo-comments' +require 'plugins.mini' +require 'plugins.telescope' +require 'plugins.lspconfig' +require 'plugins.conform' +require 'plugins.autocomplete' +require 'plugins.treesitter' +require 'plugins.harpoon' +require 'plugins.copilot' +require 'plugins.colorizer' +require 'plugins.debug' +require 'plugins.indent_line' +-- require 'plugins.lint' +require 'plugins.autopairs' +-- require 'plugins.neo-tree' + +-- vim: ts=2 sts=2 sw=2 et diff --git a/lua/plugins/autocomplete.lua b/lua/plugins/autocomplete.lua new file mode 100644 index 0000000..8b008fa --- /dev/null +++ b/lua/plugins/autocomplete.lua @@ -0,0 +1,78 @@ +-- [[ Snippet Engine ]] + +local gh = require 'helpers' + +-- NOTE: You can also specify plugin using a version range for its git tag. +-- See `:help vim.version.range()` for more info +vim.pack.add { { src = gh 'L3MON4D3/LuaSnip', version = vim.version.range '2.*' } } +require('luasnip').setup {} + +-- `friendly-snippets` contains a variety of premade snippets. +-- See the README about individual language/framework/plugin snippets: +-- https://github.com/rafamadriz/friendly-snippets + +vim.pack.add { gh 'rafamadriz/friendly-snippets' } +require('luasnip.loaders.from_vscode').lazy_load() + +-- [[ Autocomplete Engine ]] +-- V2 will reportedly have breaking changes +vim.pack.add { { src = gh 'saghen/blink.cmp', version = vim.version.range '1.*' } } +require('blink.cmp').setup { + 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 `:help 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', + }, + + 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' }, + }, + + 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 `:help blink-cmp-config-fuzzy` for more information + fuzzy = { implementation = 'prefer_rust_with_warning' }, + + -- Shows a signature help window while you type arguments for a function + signature = { enabled = true }, +} diff --git a/lua/kickstart/plugins/autopairs.lua b/lua/plugins/autopairs.lua similarity index 100% rename from lua/kickstart/plugins/autopairs.lua rename to lua/plugins/autopairs.lua diff --git a/lua/plugins/colorizer.lua b/lua/plugins/colorizer.lua new file mode 100644 index 0000000..c26232d --- /dev/null +++ b/lua/plugins/colorizer.lua @@ -0,0 +1,3 @@ +local gh = require 'helpers' +vim.pack.add { gh 'catgoose/nvim-colorizer.lua' } +require('colorizer').setup {} diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua new file mode 100644 index 0000000..5a43f5c --- /dev/null +++ b/lua/plugins/colorscheme.lua @@ -0,0 +1,17 @@ +-- [[ Colorscheme ]] +-- You can easily change to a different colorscheme. +-- Change the name of the colorscheme plugin below, and then +-- change the command under that to load whatever the name of that colorscheme is. +-- +-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. + +-- NOTE: Favourites: +-- tokyonight-night +-- lunaperche +-- miniautumn +-- slate +-- sorbet + +-- Modules in plugins.colorschemes should configure the colorscheme and return the name of the colorscheme to load +local colors = require 'plugins.colorschemes.rose-pine' +vim.cmd.colorscheme(colors) diff --git a/lua/plugins/colorschemes/rose-pine.lua b/lua/plugins/colorschemes/rose-pine.lua new file mode 100644 index 0000000..16fbd9f --- /dev/null +++ b/lua/plugins/colorschemes/rose-pine.lua @@ -0,0 +1,17 @@ +local gh = require 'helpers' + +local name = 'rose-pine' +vim.pack.add { gh(name .. '/neovim') } + +---@diagnostic disable-next-line: missing-fields +require(name).setup { + styles = { + italic = false, -- Disable italics (rose-pine doesn't support disabling per area) + transparency = true, + }, + highlight_groups = { + NormalFloat = { bg = 'surface' }, -- Background for floating windows + }, +} + +return name diff --git a/lua/plugins/colorschemes/tokyonight.lua b/lua/plugins/colorschemes/tokyonight.lua new file mode 100644 index 0000000..6dbcced --- /dev/null +++ b/lua/plugins/colorschemes/tokyonight.lua @@ -0,0 +1,12 @@ +local gh = require 'helpers' + +local name = 'tokyonight' +vim.pack.add { gh 'folke/tokyonight.nvim' } +---@diagnostic disable-next-line: missing-fields +require(name).setup { + styles = { + comments = { italic = false }, -- Disable italics in comments + }, +} + +return name .. '-night' diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua new file mode 100644 index 0000000..3999d30 --- /dev/null +++ b/lua/plugins/conform.lua @@ -0,0 +1,45 @@ +-- [[ Formatting ]] + +local gh = require 'helpers' + +vim.pack.add { gh 'stevearc/conform.nvim' } +require('conform').setup { + notify_on_error = true, + -- format_on_save = function(bufnr) + -- -- You can specify filetypes to autoformat on save here: + -- local enabled_filetypes = { + -- -- lua = true, + -- -- python = true, + -- } + -- if enabled_filetypes[vim.bo[bufnr].filetype] then + -- return { timeout_ms = 500 } + -- else + -- return nil + -- end + -- end, + default_format_opts = { + lsp_format = 'fallback', -- Use external formatters if configured below, otherwise use LSP formatting. Set to `false` to disable LSP formatting entirely. + }, + -- You can also specify external formatters in here. + formatters_by_ft = { + -- rust = { 'rustfmt' }, + -- Conform can also run multiple formatters sequentially + -- python = { "isort", "black" }, + -- + -- You can use 'stop_after_first' to run the first available formatter from the list + css = { 'prettierd', 'prettier', stop_after_first = true }, + scss = { 'prettierd', 'prettier', stop_after_first = true }, + html = { 'prettierd', 'prettier', stop_after_first = true }, + javascript = { 'prettierd', 'prettier', stop_after_first = true }, + typescript = { 'prettierd', 'prettier', stop_after_first = true }, + }, +} + +vim.keymap.set({ 'n', 'v' }, 'f', function() + require('conform').format({ async = true }, function(err) + if not err then + local mode = vim.api.nvim_get_mode().mode + if vim.startswith(string.lower(mode), 'v') then vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('', true, false, true), 'n', true) end + end + end) +end, { desc = '[F]ormat code' }) diff --git a/lua/plugins/copilot.lua b/lua/plugins/copilot.lua new file mode 100644 index 0000000..a5f00b6 --- /dev/null +++ b/lua/plugins/copilot.lua @@ -0,0 +1,2 @@ +local gh = require 'helpers' +vim.pack.add { gh 'github/copilot.vim' } diff --git a/lua/kickstart/plugins/debug.lua b/lua/plugins/debug.lua similarity index 92% rename from lua/kickstart/plugins/debug.lua rename to lua/plugins/debug.lua index db5448c..03c768a 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/plugins/debug.lua @@ -12,7 +12,7 @@ vim.pack.add { 'https://github.com/nvim-neotest/nvim-nio', 'https://github.com/mason-org/mason.nvim', 'https://github.com/jay-babu/mason-nvim-dap.nvim', - 'https://github.com/leoluz/nvim-dap-go', + -- 'https://github.com/leoluz/nvim-dap-go', } -- Basic debugging keymaps, feel free to change to your liking! @@ -41,7 +41,7 @@ require('mason-nvim-dap').setup { -- 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', + -- 'delve', }, } @@ -86,10 +86,10 @@ 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 { - delve = { - -- On Windows delve must be run attached or it crashes. - -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring - detached = vim.fn.has 'win32' == 0, - }, -} +-- require('dap-go').setup { +-- delve = { +-- -- On Windows delve must be run attached or it crashes. +-- -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring +-- detached = vim.fn.has 'win32' == 0, +-- }, +-- } diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua similarity index 83% rename from lua/kickstart/plugins/gitsigns.lua rename to lua/plugins/gitsigns.lua index b7e40a8..4a651fa 100644 --- a/lua/kickstart/plugins/gitsigns.lua +++ b/lua/plugins/gitsigns.lua @@ -1,10 +1,19 @@ --- 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. - -vim.pack.add { 'https://github.com/lewis6991/gitsigns.nvim' } +local gh = require 'helpers' +-- Here is a more advanced configuration example that passes options to `gitsigns.nvim` +-- +-- See `:help gitsigns` to understand what each configuration key does. +-- Adds git related signs to the gutter, as well as utilities for managing changes +vim.pack.add { gh 'lewis6991/gitsigns.nvim' } require('gitsigns').setup { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + }, + -- Adds git related signs to the gutter, as well as utilities for managing changes on_attach = function(bufnr) local gitsigns = require 'gitsigns' diff --git a/lua/plugins/guess-indent.lua b/lua/plugins/guess-indent.lua new file mode 100644 index 0000000..00091b6 --- /dev/null +++ b/lua/plugins/guess-indent.lua @@ -0,0 +1,3 @@ +local gh = require 'helpers' +vim.pack.add { gh 'NMAC427/guess-indent.nvim' } +require('guess-indent').setup {} diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua new file mode 100644 index 0000000..710ccc2 --- /dev/null +++ b/lua/plugins/harpoon.lua @@ -0,0 +1,37 @@ +local gh = require 'helpers' + +vim.pack.add { { src = gh 'ThePrimeagen/harpoon', version = 'harpoon2' } } +local harpoon = require 'harpoon' +harpoon:setup {} + +-- basic telescope configuration +local conf = require('telescope.config').values +local function toggle_telescope(harpoon_files) + local file_paths = {} + for _, item in ipairs(harpoon_files.items) do + table.insert(file_paths, item.value) + end + + require('telescope.pickers') + .new({}, { + prompt_title = 'Harpoon', + finder = require('telescope.finders').new_table { + results = file_paths, + }, + previewer = conf.file_previewer {}, + sorter = conf.generic_sorter {}, + }) + :find() +end + +vim.keymap.set('n', '', function() toggle_telescope(harpoon:list()) end, { desc = 'Open harpoon window' }) +vim.keymap.set('n', 'a', function() harpoon:list():add() end, { desc = '[A]dd file to harpoon' }) + +-- vim.keymap.set("n", "", function() harpoon:list():select(1) end, { desc = 'Go to harpoon file 1' }) +-- vim.keymap.set("n", "", function() harpoon:list():select(2) end, { desc = 'Go to harpoon file 2' }) +-- vim.keymap.set("n", "", function() harpoon:list():select(3) end, { desc = 'Go to harpoon file 3' }) +-- vim.keymap.set("n", "", function() harpoon:list():select(4) end, { desc = 'Go to harpoon file 4' }) + +-- Toggle previous & next buffers stored within Harpoon list +vim.keymap.set('n', '', function() harpoon:list():prev() end, { desc = 'Go to previous harpoon file (down)' }) +vim.keymap.set('n', '', function() harpoon:list():next() end, { desc = 'Go to next harpoon file (up)' }) diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/plugins/indent_line.lua similarity index 100% rename from lua/kickstart/plugins/indent_line.lua rename to lua/plugins/indent_line.lua diff --git a/lua/kickstart/plugins/lint.lua b/lua/plugins/lint.lua similarity index 100% rename from lua/kickstart/plugins/lint.lua rename to lua/plugins/lint.lua diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua new file mode 100644 index 0000000..daf2b3f --- /dev/null +++ b/lua/plugins/lspconfig.lua @@ -0,0 +1,189 @@ +-- [[ LSP Configuration ]] +-- 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` + +local gh = require 'helpers' + +-- Useful status updates for LSP. +vim.pack.add { gh 'j-hui/fidget.nvim' } +require('fidget').setup {} + +-- This function gets run when an LSP attaches to a particular buffer. +-- That is to say, every time a new file is opened that is associated with +-- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this +-- function will be executed to configure the current buffer +vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), + callback = function(event) + -- NOTE: Remember that Lua is a real programming language, and as such it is possible + -- to define small helper and utility functions so you don't have to repeat yourself. + -- + -- In this case, we create a function that lets us more easily define mappings specific + -- for LSP related items. It sets the mode, buffer and description for us each time. + local map = function(keys, func, desc, mode) + mode = mode or 'n' + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + end + + -- Rename the variable under your cursor. + -- 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' }) + + -- 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') + + -- The following two autocommands are used to highlight references of the + -- word under your cursor when your cursor rests there for a little while. + -- See `:help CursorHold` for information about when this is executed + -- + -- When you move your cursor, the highlights will be cleared (the second autocommand). + local client = vim.lsp.get_client_by_id(event.data.client_id) + if client and client:supports_method('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('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, +}) + +-- Enable the following language servers +-- Feel free to add/remove any LSPs that you want here. They will automatically be installed. +-- See `:help lsp-config` for information about keys and how to configure +---@type table +local servers = { + -- clangd = {}, + -- gopls = {}, + -- pyright = {}, + -- rust_analyzer = {}, + -- + -- Some languages (like typescript) have entire language plugins that can be useful: + -- https://github.com/pmizio/typescript-tools.nvim + -- + -- But for many setups, the LSP (`ts_ls`) will work just fine + -- ts_ls = {}, + + stylua = {}, -- Used to format Lua code + + -- Special Lua Config, as recommended by neovim help docs + lua_ls = { + on_init = function(client) + client.server_capabilities.documentFormattingProvider = false -- Disable formatting (formatting is done by stylua) + + if client.workspace_folders then + local path = client.workspace_folders[1].name + if path ~= vim.fn.stdpath 'config' and (vim.uv.fs_stat(path .. '/.luarc.json') or vim.uv.fs_stat(path .. '/.luarc.jsonc')) then return end + end + + client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, { + runtime = { + version = 'LuaJIT', + path = { 'lua/?.lua', 'lua/?/init.lua' }, + }, + workspace = { + checkThirdParty = false, + -- NOTE: this is a lot slower and will cause issues when working on your own configuration. + -- See https://github.com/neovim/nvim-lspconfig/issues/3189 + library = vim.tbl_extend('force', vim.api.nvim_get_runtime_file('', true), { + '${3rd}/luv/library', + '${3rd}/busted/library', + }), + }, + }) + end, + ---@type lspconfig.settings.lua_ls + settings = { + Lua = { + format = { enable = false }, -- Disable formatting (formatting is done by stylua) + }, + }, + }, +} + +vim.pack.add { + gh 'neovim/nvim-lspconfig', + gh 'mason-org/mason.nvim', + gh 'mason-org/mason-lspconfig.nvim', + gh 'WhoIsSethDaniel/mason-tool-installer.nvim', + gh 'seblyng/roslyn.nvim', +} + +-- Automatically install LSPs and related tools to stdpath for Neovim +require('mason').setup { + registries = { + 'github:mason-org/mason-registry', + 'github:Crashdummyy/mason-registry', + }, +} + +-- 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. +local ensure_installed = vim.tbl_keys(servers or {}) +vim.list_extend(ensure_installed, { + -- You can add other tools here that you want Mason to install + ts_ls = {}, +}) + +require('mason-tool-installer').setup { ensure_installed = ensure_installed } +require('roslyn').setup {} + +for name, server in pairs(servers) do + vim.lsp.config(name, server) + vim.lsp.enable(name) +end diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua new file mode 100644 index 0000000..552ba90 --- /dev/null +++ b/lua/plugins/mini.lua @@ -0,0 +1,50 @@ +local gh = require 'helpers' + +-- [[ mini.nvim ]] +-- A collection of various small independent plugins/modules +vim.pack.add { gh 'nvim-mini/mini.nvim' } + +-- If a nerd font is available, load the icons module for pretty icons in various plugins. +if vim.g.have_nerd_font then + require('mini.icons').setup() + -- Used for backwards compatibility with plugins that require `nvim-web-devicons` (e.g. telescope.nvim) + MiniIcons.mock_nvim_web_devicons() +end + +-- Better Around/Inside textobjects +-- +-- Examples: +-- - va) - [V]isually select [A]round [)]paren +-- - yiiq - [Y]ank [I]nside [I]+1 [Q]uote +-- - ci' - [C]hange [I]nside [']quote +require('mini.ai').setup { + -- NOTE: Avoid conflicts with the built-in incremental selection mappings on Neovim>=0.12 (see `:help treesitter-incremental-selection`) + mappings = { + around_next = 'aa', + inside_next = 'ii', + }, + 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/nvim-mini/mini.nvim diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua similarity index 100% rename from lua/kickstart/plugins/neo-tree.lua rename to lua/plugins/neo-tree.lua diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 0000000..699c635 --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,130 @@ +-- [[ Fuzzy Finder (files, lsp, etc) ]] +-- +-- 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! +-- +-- There are lots of other alternative pickers (like snacks.picker, or fzf-lua) +-- so feel free to experiment and see what you like! +-- +-- 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! + +local gh = require 'helpers' + +---@type (string|vim.pack.Spec)[] +local telescope_plugins = { + gh 'nvim-lua/plenary.nvim', + gh 'nvim-telescope/telescope.nvim', + gh 'nvim-telescope/telescope-ui-select.nvim', +} +if vim.fn.executable 'make' == 1 then table.insert(telescope_plugins, gh 'nvim-telescope/telescope-fzf-native.nvim') end + +-- NOTE: You can install multiple plugins at once +vim.pack.add(telescope_plugins) + +-- 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', 'v' }, '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', 'sc', builtin.commands, { desc = '[S]earch [C]ommands' }) +vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + +-- Add Telescope-based LSP pickers when an LSP attaches to a buffer. +-- If you later switch picker plugins, this is where to update these mappings. +vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('telescope-lsp-attach', { clear = true }), + callback = function(event) + local buf = event.buf + + -- Find references for the word under your cursor. + vim.keymap.set('n', 'grr', builtin.lsp_references, { buffer = buf, desc = '[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. + vim.keymap.set('n', 'gri', builtin.lsp_implementations, { buffer = buf, desc = '[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 . + vim.keymap.set('n', 'grd', builtin.lsp_definitions, { buffer = buf, desc = '[G]oto [D]efinition' }) + + -- Fuzzy find all the symbols in your current document. + -- Symbols are things like variables, functions, types, etc. + vim.keymap.set('n', 'gO', builtin.lsp_document_symbols, { buffer = buf, desc = 'Open Document Symbols' }) + + -- Fuzzy find all the symbols in your current workspace. + -- Similar to document symbols, except searches over your entire project. + vim.keymap.set('n', 'gW', builtin.lsp_dynamic_workspace_symbols, { buffer = buf, desc = 'Open Workspace Symbols' }) + + -- 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*. + vim.keymap.set('n', 'grt', builtin.lsp_type_definitions, { buffer = buf, desc = '[G]oto [T]ype Definition' }) + end, +}) + +-- Override default behavior and theme when searching +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', follow = true } end, { desc = '[S]earch [N]eovim files' }) diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua new file mode 100644 index 0000000..aaf7bd8 --- /dev/null +++ b/lua/plugins/todo-comments.lua @@ -0,0 +1,5 @@ +local gh = require 'helpers' + +-- Highlight todo, notes, etc in comments +vim.pack.add { gh 'folke/todo-comments.nvim' } +require('todo-comments').setup { signs = false } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 0000000..bdabdc0 --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,57 @@ +-- [[ Configure Treesitter ]] +-- Used to highlight, edit, and navigate code +-- +-- See `:help nvim-treesitter-intro` + +local gh = require 'helpers' + +-- NOTE: You can also specify a branch or a specific commit +vim.pack.add { { src = gh 'nvim-treesitter/nvim-treesitter', version = 'main' } } + +-- Ensure basic parsers are installed +local parsers = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' } +require('nvim-treesitter').install(parsers) + +---@param buf integer +---@param language string +local function treesitter_try_attach(buf, language) + -- Check if a parser exists and load it + if not vim.treesitter.language.add(language) then return end + -- Enable syntax highlighting and other treesitter features + vim.treesitter.start(buf, language) + + -- Enable treesitter based folds + -- For more info on folds see `:help folds` + -- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' + -- vim.wo.foldmethod = 'expr' + + -- Check if treesitter indentation is available for this language, and if so enable it + -- in case there is no indent query, the indentexpr will fallback to the vim's built in one + local has_indent_query = vim.treesitter.query.get(language, 'indents') ~= nil + + -- Enable treesitter based indentation + if has_indent_query then vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" end +end + +local available_parsers = require('nvim-treesitter').get_available() +vim.api.nvim_create_autocmd('FileType', { + callback = function(args) + local buf, filetype = args.buf, args.match + + local language = vim.treesitter.language.get_lang(filetype) + if not language then return end + + local installed_parsers = require('nvim-treesitter').get_installed 'parsers' + + if vim.tbl_contains(installed_parsers, language) then + -- Enable the parser if it is already installed + treesitter_try_attach(buf, language) + elseif vim.tbl_contains(available_parsers, language) then + -- If a parser is available in `nvim-treesitter`, auto-install it and enable it after the installation is done + require('nvim-treesitter').install(language):await(function() treesitter_try_attach(buf, language) end) + else + -- Try to enable treesitter features in case the parser exists but is not available from `nvim-treesitter` + treesitter_try_attach(buf, language) + end + end, +}) diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua new file mode 100644 index 0000000..95236a8 --- /dev/null +++ b/lua/plugins/which-key.lua @@ -0,0 +1,16 @@ +local gh = require 'helpers' + +-- Useful plugin to show you pending keybinds. +vim.pack.add { gh 'folke/which-key.nvim' } +require('which-key').setup { + -- Delay between pressing a key and opening which-key (milliseconds) + delay = 100, + icons = { mappings = vim.g.have_nerd_font }, + -- Document existing key chains + spec = { + { 's', group = '[S]earch', mode = { 'n', 'v' } }, + { 't', group = '[T]oggle' }, + { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first + { 'gr', group = 'LSP Actions', mode = { 'n' } }, + }, +} diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json index 66a6d0e..4bd1d36 100644 --- a/nvim-pack-lock.json +++ b/nvim-pack-lock.json @@ -47,6 +47,10 @@ "rev": "7adc933dabcc7c86ae6b07aff7ee68eac398491f", "src": "https://github.com/mason-org/mason-lspconfig.nvim" }, + "mason-nvim-dap.nvim": { + "rev": "9a10e096703966335bd5c46c8c875d5b0690dade", + "src": "https://github.com/jay-babu/mason-nvim-dap.nvim" + }, "mason-tool-installer.nvim": { "rev": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc", "src": "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim" @@ -71,10 +75,26 @@ "rev": "72a05f62c52241bc7441c820eb53946f92b2e6a4", "src": "https://github.com/catgoose/nvim-colorizer.lua" }, + "nvim-dap": { + "rev": "9e848e09a697ee95302a3ef2dd43fd6eb709e570", + "src": "https://github.com/mfussenegger/nvim-dap" + }, + "nvim-dap-go": { + "rev": "b4421153ead5d726603b02743ea40cf26a51ed5f", + "src": "https://github.com/leoluz/nvim-dap-go" + }, + "nvim-dap-ui": { + "rev": "cc9dd33aade7f20bae414d0cba163bc60d4d4b43", + "src": "https://github.com/rcarriga/nvim-dap-ui" + }, "nvim-lspconfig": { "rev": "7ab79bb1b57160a537f427ac8a6026102f12b701", "src": "https://github.com/neovim/nvim-lspconfig" }, + "nvim-nio": { + "rev": "edcc181a875301dd21840189aa2f2f9ad69fc172", + "src": "https://github.com/nvim-neotest/nvim-nio" + }, "nvim-treesitter": { "rev": "61df84986b4b4ec469ee745a182e433d49f8c27e", "src": "https://github.com/nvim-treesitter/nvim-treesitter", @@ -104,10 +124,6 @@ "rev": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668", "src": "https://github.com/folke/todo-comments.nvim" }, - "undotree": { - "rev": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d", - "src": "https://github.com/mbbill/undotree" - }, "which-key.nvim": { "rev": "3aab2147e74890957785941f0c1ad87d0a44c15a", "src": "https://github.com/folke/which-key.nvim"