diff --git a/init.lua b/init.lua index 748e7f81454..f41255a0e23 100644 --- a/init.lua +++ b/init.lua @@ -3,601 +3,861 @@ ===================================================================== ==================== READ THIS BEFORE CONTINUING ==================== ===================================================================== +======== .-----. ======== +======== .----------------------. | === | ======== +======== |.-""""""""""""""""""-.| |-----| ======== +======== || || | === | ======== +======== || KICKSTART.NVIM || |-----| ======== +======== || || | === | ======== +======== || || |-----| ======== +======== ||:Tutor || |:::::| ======== +======== |'-..................-'| |____o| ======== +======== `"")----------------(""` ___________ ======== +======== /::::::::::| |::::::::::\ \ no mouse \ ======== +======== /:::========| |==hjkl==:::\ \ required \ ======== +======== '""""""""""""' '""""""""""""' '""""""""""' ======== +======== ======== +===================================================================== +===================================================================== -Kickstart.nvim is *not* a distribution. - -Kickstart.nvim is a template for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. +What is Kickstart? - Once you've done that, you should start exploring, configuring and tinkering to - explore Neovim! + Kickstart.nvim is *not* a distribution. - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example: - - https://learnxinyminutes.com/docs/lua/ + Kickstart.nvim is a starting point for your own configuration. + The goal is that you can read every line of code, top-to-bottom, understand + what your configuration is doing, and modify it to suit your needs. + Once you've done that, you can start exploring, configuring and tinkering to + make Neovim your own! That might mean leaving Kickstart just the way it is for a while + or immediately breaking it into modular pieces. It's up to you! - And then you can explore or search through `:help lua-guide` - - https://neovim.io/doc/user/lua-guide.html + If you don't know anything about Lua, I recommend taking some time to read through + a guide. One possible example which will only take 10-15 minutes: + - https://learnxinyminutes.com/docs/lua/ + After understanding a bit more about Lua, you can use `:help lua-guide` as a + reference for how Neovim integrates Lua. + - :help lua-guide + - (or HTML version): https://neovim.io/doc/user/lua-guide.html Kickstart Guide: -I have left several `:help X` comments throughout the init.lua -You should run that command and read that help section for more information. + TODO: The very first thing you should do is to run the command `:Tutor` in Neovim. -In addition, I have some `NOTE:` items throughout the file. -These are for you, the reader to help understand what is happening. Feel free to delete -them once you know what you're doing, but they should serve as a guide for when you -are first encountering a few different constructs in your nvim config. + If you don't know what this means, type the following: + - + - : + - Tutor + - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now :) ---]] - --- Set as the leader key --- See `:help mapleader` --- NOTE: Must happen before plugins are required (otherwise wrong leader will be used) -vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' - --- [[ Install `lazy.nvim` plugin manager ]] --- https://github.com/folke/lazy.nvim --- `:help lazy.nvim.txt` for more info -local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' -if not vim.loop.fs_stat(lazypath) then - vim.fn.system { - 'git', - 'clone', - '--filter=blob:none', - 'https://github.com/folke/lazy.nvim.git', - '--branch=stable', -- latest stable release - lazypath, - } -end -vim.opt.rtp:prepend(lazypath) + (If you already know the Neovim basics, you can skip this step.) --- [[ Configure plugins ]] --- NOTE: Here is where you install your plugins. --- You can configure plugins using the `config` key. --- --- You can also configure plugins after the setup call, --- as they will be available in your neovim runtime. -require('lazy').setup({ - -- NOTE: First, some plugins that don't require any configuration - - -- Git related plugins - 'tpope/vim-fugitive', - 'tpope/vim-rhubarb', - - -- Detect tabstop and shiftwidth automatically - 'tpope/vim-sleuth', - - -- NOTE: This is where your plugins related to LSP can be installed. - -- The configuration is done below. Search for lspconfig to find it below. - { - -- LSP Configuration & Plugins - 'neovim/nvim-lspconfig', - dependencies = { - -- Automatically install LSPs to stdpath for neovim - 'williamboman/mason.nvim', - 'williamboman/mason-lspconfig.nvim', - - -- Useful status updates for LSP - -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} }, - - -- Additional lua configuration, makes nvim stuff amazing! - 'folke/neodev.nvim', - }, - }, + Once you've completed that, you can continue working through **AND READING** the rest + of the kickstart init.lua. - { - -- Autocompletion - 'hrsh7th/nvim-cmp', - dependencies = { - -- Snippet Engine & its associated nvim-cmp source - 'L3MON4D3/LuaSnip', - 'saadparwaiz1/cmp_luasnip', + Next, run AND READ `:help`. + This will open up a help window with some basic information + about reading, navigating and searching the builtin help documentation. - -- Adds LSP completion capabilities - 'hrsh7th/cmp-nvim-lsp', + This should be the first place you go to look when you're stuck or confused + with something. It's one of my favorite Neovim features. - -- Adds a number of user-friendly snippets - 'rafamadriz/friendly-snippets', - }, - }, + 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. - -- Useful plugin to show you pending keybinds. - { 'folke/which-key.nvim', opts = {} }, - { - -- Adds git related signs to the gutter, as well as utilities for managing changes - 'lewis6991/gitsigns.nvim', - opts = { - -- See `:help gitsigns.txt` - signs = { - add = { text = '+' }, - change = { text = '~' }, - delete = { text = '_' }, - topdelete = { text = '‾' }, - changedelete = { text = '~' }, - }, - on_attach = function(bufnr) - vim.keymap.set('n', 'hp', require('gitsigns').preview_hunk, { buffer = bufnr, desc = 'Preview git hunk' }) - - -- don't override the built-in and fugitive keymaps - local gs = package.loaded.gitsigns - vim.keymap.set({ 'n', 'v' }, ']c', function() - if vim.wo.diff then - return ']c' - end - vim.schedule(function() - gs.next_hunk() - end) - return '' - end, { expr = true, buffer = bufnr, desc = 'Jump to next hunk' }) - vim.keymap.set({ 'n', 'v' }, '[c', function() - if vim.wo.diff then - return '[c' - end - vim.schedule(function() - gs.prev_hunk() - end) - return '' - end, { expr = true, buffer = bufnr, desc = 'Jump to previous hunk' }) - end, - }, - }, + 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. - { - -- Theme inspired by Atom - 'navarasu/onedark.nvim', - priority = 1000, - config = function() - vim.cmd.colorscheme 'onedark' - end, - }, + NOTE: Look for lines like this - { - -- Set lualine as statusline - 'nvim-lualine/lualine.nvim', - -- See `:help lualine.txt` - opts = { - options = { - icons_enabled = false, - theme = 'onedark', - component_separators = '|', - section_separators = '', - }, - }, - }, + Throughout the file. These are for you, the reader, to help you understand what is happening. + Feel free to delete them once you know what you're doing, but they should serve as a guide + for when you are first encountering a few different constructs in your Neovim config. - { - -- Add indentation guides even on blank lines - 'lukas-reineke/indent-blankline.nvim', - -- Enable `lukas-reineke/indent-blankline.nvim` - -- See `:help ibl` - main = 'ibl', - opts = {}, - }, +If you experience any errors while trying to install kickstart, run `:checkhealth` for more info. - -- "gc" to comment visual regions/lines - { 'numToStr/Comment.nvim', opts = {} }, - - -- Fuzzy Finder (files, lsp, etc) - { - 'nvim-telescope/telescope.nvim', - branch = '0.1.x', - dependencies = { - 'nvim-lua/plenary.nvim', - -- Fuzzy Finder Algorithm which requires local dependencies to be built. - -- Only load if `make` is available. Make sure you have the system - -- requirements installed. - { - 'nvim-telescope/telescope-fzf-native.nvim', - -- NOTE: If you are having trouble with this installation, - -- refer to the README for telescope-fzf-native for more instructions. - build = 'make', - cond = function() - return vim.fn.executable 'make' == 1 - end, - }, - }, - }, +I hope you enjoy your Neovim journey, +- TJ - { - -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', - dependencies = { - 'nvim-treesitter/nvim-treesitter-textobjects', - }, - build = ':TSUpdate', - }, +P.S. You can delete this when you're done too. It's your config now! :) +--]] - -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart - -- These are some example plugins that I've included in the kickstart repository. - -- Uncomment any of the lines below to enable them. - -- require 'kickstart.plugins.autoformat', - -- require 'kickstart.plugins.debug', +-- 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 = ' ' - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping - -- up-to-date with whatever is in the kickstart repo. - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- - -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins - -- { import = 'custom.plugins' }, -}, {}) +-- Set to true if you have a Nerd Font installed +vim.g.have_nerd_font = true -- [[ Setting options ]] --- See `:help vim.o` +-- See `:help vim.opt` -- NOTE: You can change these options as you wish! - --- Set highlight on search -vim.o.hlsearch = false +-- For more options, you can see `:help option-list` -- Make line numbers default -vim.wo.number = true +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 --- Enable mouse mode -vim.o.mouse = 'a' +-- 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 -- Sync clipboard between OS and Neovim. -- Remove this option if you want your OS clipboard to remain independent. -- See `:help 'clipboard'` -vim.o.clipboard = 'unnamedplus' +vim.opt.clipboard = 'unnamedplus' -- Enable break indent -vim.o.breakindent = true +vim.opt.breakindent = true -- Save undo history -vim.o.undofile = true +vim.opt.undofile = true --- Case-insensitive searching UNLESS \C or capital in search -vim.o.ignorecase = true -vim.o.smartcase = 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.wo.signcolumn = 'yes' +vim.opt.signcolumn = 'yes' -- Decrease update time -vim.o.updatetime = 250 -vim.o.timeoutlen = 300 +vim.opt.updatetime = 250 --- Set completeopt to have a better completion experience -vim.o.completeopt = 'menuone,noselect' +-- Decrease mapped sequence wait time +-- Displays which-key popup sooner +vim.opt.timeoutlen = 300 --- NOTE: You should make sure your terminal supports this -vim.o.termguicolors = true +-- Configure how new splits should be opened +vim.opt.splitright = true +vim.opt.splitbelow = true --- [[ Basic Keymaps ]] +-- 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 = '␣' } --- Keymaps for better default experience --- See `:help vim.keymap.set()` -vim.keymap.set({ 'n', 'v' }, '', '', { silent = true }) +-- 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()` --- Remap for dealing with word wrap -vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true }) -vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true }) +-- 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 diagnostic message' }) -vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' }) -vim.keymap.set('n', 'e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' }) -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' }) - --- [[ Highlight on yank ]] --- See `:help vim.highlight.on_yank()` -local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true }) +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, - group = highlight_group, - pattern = '*', }) --- [[ Configure Telescope ]] --- See `:help telescope` and `:help telescope.setup()` -require('telescope').setup { - defaults = { - mappings = { - i = { - [''] = false, - [''] = false, - }, - }, - }, -} - --- Enable telescope fzf native, if installed -pcall(require('telescope').load_extension, 'fzf') - --- Telescope live_grep in git root --- Function to find the git root directory based on the current buffer's path -local function find_git_root() - -- Use the current buffer's path as the starting point for the git search - local current_file = vim.api.nvim_buf_get_name(0) - local current_dir - local cwd = vim.fn.getcwd() - -- If the buffer is not associated with a file, return nil - if current_file == "" then - current_dir = cwd - else - -- Extract the directory from the current file's path - current_dir = vim.fn.fnamemodify(current_file, ":h") - end - - -- Find the Git root directory from the current file's path - local git_root = vim.fn.systemlist("git -C " .. vim.fn.escape(current_dir, " ") .. " rev-parse --show-toplevel")[1] - if vim.v.shell_error ~= 0 then - print("Not a git repository. Searching on current working directory") - return cwd - end - return git_root -end - --- Custom live_grep function to search in git root -local function live_grep_git_root() - local git_root = find_git_root() - if git_root then - require('telescope.builtin').live_grep({ - search_dirs = {git_root}, - }) - end -end - -vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {}) - --- See `:help telescope.builtin` -vim.keymap.set('n', '?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' }) -vim.keymap.set('n', '', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' }) -vim.keymap.set('n', '/', function() - -- You can pass additional configuration to telescope to change theme, layout, etc. - require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { - winblend = 10, - previewer = false, - }) -end, { desc = '[/] Fuzzily search in current buffer' }) - -vim.keymap.set('n', 'gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' }) -vim.keymap.set('n', 'sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' }) -vim.keymap.set('n', 'sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' }) -vim.keymap.set('n', 'sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' }) -vim.keymap.set('n', 'sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' }) -vim.keymap.set('n', 'sG', ':LiveGrepGitRoot', { desc = '[S]earch by [G]rep on Git Root' }) -vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' }) -vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' }) - --- [[ Configure Treesitter ]] --- See `:help nvim-treesitter` --- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}' -vim.defer_fn(function() - require('nvim-treesitter.configs').setup { - -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' }, - - -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) - auto_install = false, - - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = '', - node_incremental = '', - scope_incremental = '', - node_decremental = '', - }, - }, - textobjects = { - select = { - enable = true, - lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim - keymaps = { - -- You can use the capture groups defined in textobjects.scm - ['aa'] = '@parameter.outer', - ['ia'] = '@parameter.inner', - ['af'] = '@function.outer', - ['if'] = '@function.inner', - ['ac'] = '@class.outer', - ['ic'] = '@class.inner', - }, - }, - move = { - enable = true, - set_jumps = true, -- whether to set jumps in the jumplist - goto_next_start = { - [']m'] = '@function.outer', - [']]'] = '@class.outer', - }, - goto_next_end = { - [']M'] = '@function.outer', - [']['] = '@class.outer', - }, - goto_previous_start = { - ['[m'] = '@function.outer', - ['[['] = '@class.outer', - }, - goto_previous_end = { - ['[M'] = '@function.outer', - ['[]'] = '@class.outer', - }, - }, - swap = { - enable = true, - swap_next = { - ['a'] = '@parameter.inner', - }, - swap_previous = { - ['A'] = '@parameter.inner', - }, - }, - }, - } -end, 0) - --- [[ Configure LSP ]] --- This function gets run when an LSP connects to a particular buffer. -local on_attach = function(_, bufnr) - -- 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 - -- many times. - -- - -- 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 nmap = function(keys, func, desc) - if desc then - desc = 'LSP: ' .. desc - end - - vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc }) - end - - nmap('rn', vim.lsp.buf.rename, '[R]e[n]ame') - nmap('ca', vim.lsp.buf.code_action, '[C]ode [A]ction') - - nmap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') - nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - nmap('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') - nmap('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - nmap('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') - - -- See `:help K` for why this keymap - nmap('K', vim.lsp.buf.hover, 'Hover Documentation') - nmap('', vim.lsp.buf.signature_help, 'Signature Documentation') - - -- Lesser used LSP functionality - nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - nmap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') - nmap('wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder') - nmap('wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, '[W]orkspace [L]ist Folders') - - -- Create a command `:Format` local to the LSP buffer - vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_) - vim.lsp.buf.format() - end, { desc = 'Format current buffer with LSP' }) -end - --- document existing key chains -require('which-key').register { - ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, - ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, - ['g'] = { name = '[G]it', _ = 'which_key_ignore' }, - ['h'] = { name = 'More git', _ = 'which_key_ignore' }, - ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, - ['s'] = { name = '[S]earch', _ = 'which_key_ignore' }, - ['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, -} - --- mason-lspconfig requires that these setup functions are called in this order --- before setting up the servers. -require('mason').setup() -require('mason-lspconfig').setup() - --- Enable the following language servers --- Feel free to add/remove any LSPs that you want here. They will automatically be installed. +-- [[ 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 ]] -- --- Add any additional override configuration in the following tables. They will be passed to --- the `settings` field of the server config. You must look up that documentation yourself. +-- To check the current status of your plugins, run +-- :Lazy -- --- If you want to override the default filetypes that your language server will attach to you can --- define the property 'filetypes' to the map in question. -local servers = { - -- clangd = {}, - -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, - -- tsserver = {}, - -- html = { filetypes = { 'html', 'twig', 'hbs'} }, - - lua_ls = { - Lua = { - workspace = { checkThirdParty = false }, - telemetry = { enable = false }, - }, - }, -} - --- Setup neovim lua configuration -require('neodev').setup() - --- nvim-cmp supports additional completion capabilities, so broadcast that to servers -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) - --- Ensure the servers above are installed -local mason_lspconfig = require 'mason-lspconfig' - -mason_lspconfig.setup { - ensure_installed = vim.tbl_keys(servers), -} - -mason_lspconfig.setup_handlers { - function(server_name) - require('lspconfig')[server_name].setup { - capabilities = capabilities, - on_attach = on_attach, - settings = servers[server_name], - filetypes = (servers[server_name] or {}).filetypes, - } - end, -} - --- [[ Configure nvim-cmp ]] --- See `:help cmp` -local cmp = require 'cmp' -local luasnip = require 'luasnip' -require('luasnip.loaders.from_vscode').lazy_load() -luasnip.config.setup {} - -cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - mapping = cmp.mapping.preset.insert { - [''] = cmp.mapping.select_next_item(), - [''] = cmp.mapping.select_prev_item(), - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete {}, - [''] = cmp.mapping.confirm { - behavior = cmp.ConfirmBehavior.Replace, - select = true, +-- 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' }, + -- } + -- 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', + -- '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 + -- 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', + -- 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 }, + -- + -- -- 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', '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` + -- + -- ---@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', + + -- 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 = '💤 ', }, - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { 'i', 's' }), }, - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - }, -} +}) -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 00000000000..cf6d5732d43 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,52 @@ +{ + "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, + "LuaSnip": { "branch": "master", "commit": "659c4479529a05cc9b05ef762639a09d366cc690" }, + "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, + "better-ts-errors.nvim": { "branch": "main", "commit": "d57a7794b271e1a0010d0328e5d3f18e20f1face" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "1a7ff54dcfbe1af139b11829c6d58f5ffab87707" }, + "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" }, + "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, + "gitsigns.nvim": { "branch": "main", "commit": "4daf7022f1481edf1e8fb9947df13bb07c18e89a" }, + "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, + "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.nvim": { "branch": "main", "commit": "7b4d5d48b6b5a75009d63f8f3e4ef4819b7e8139" }, + "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "c7efdbd0b739646c58d22fa44f6fffa2973f303e" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, + "nvim-dap": { "branch": "master", "commit": "8517126e9323e346f6a99b3b594c5a940b914dcd" }, + "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" }, + "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, + "nvim-lint": { "branch": "master", "commit": "36da8dd0ddc4f88e0beae234c20e75397326f143" }, + "nvim-lspconfig": { "branch": "master", "commit": "d2d153a179ed59aa7134d7ebdf4d7dcb156efa22" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, + "nvim-treesitter": { "branch": "master", "commit": "e1e3108cd23d7f967842261bd66126b6734d8907" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" }, + "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, + "oil.nvim": { "branch": "master", "commit": "8735d185b37457bd899cd4e47a4517b899407949" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, + "toggleterm.nvim": { "branch": "main", "commit": "022ff5594acccc8d90d2e46dc43994f7722ebdf7" }, + "tokyonight.nvim": { "branch": "main", "commit": "ce91ba480070c95f40753e4663e32b4632ac6db3" }, + "trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" }, + "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, + "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, + "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, + "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, + "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" }, + "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" } +} diff --git a/lua/custom/other/autocomand.lua b/lua/custom/other/autocomand.lua new file mode 100644 index 00000000000..eee3a58263f --- /dev/null +++ b/lua/custom/other/autocomand.lua @@ -0,0 +1,55 @@ +vim.filetype.add { + pattern = { + ['Podfile'] = 'ruby', + ['Appfile'] = 'ruby', + ['Matchfile'] = 'ruby', + ['Pluginfile'] = 'ruby', + ['Fastfile'] = 'ruby', + ['.podspec'] = 'ruby', + }, +} +vim.filetype.add { + pattern = { + ['Podfile'] = 'ruby', + ['Appfile'] = 'ruby', + ['Matchfile'] = 'ruby', + ['Pluginfile'] = 'ruby', + ['Fastfile'] = 'ruby', + }, +} +vim.filetype.add { + pattern = { + ['Podfile'] = 'ruby', + ['Appfile'] = 'ruby', + ['Matchfile'] = 'ruby', + ['Pluginfile'] = 'ruby', + ['Fastfile'] = 'ruby', + }, +} + +vim.keymap.set('n', 'bd', function() + local bufs = vim.api.nvim_list_bufs() + local current_buf = vim.api.nvim_get_current_buf() + for _, i in ipairs(bufs) do + if i ~= current_buf then + vim.api.nvim_buf_delete(i, {}) + end + end +end, { desc = 'Delete all buffers but the one that is focused' }) + +-- oil fix copilot +vim.api.nvim_create_augroup('OilRelPathFix', {}) +vim.api.nvim_create_autocmd('BufEnter', { + group = 'OilRelPathFix', + pattern = 'oil:///*', + callback = function() + vim.cmd 'Copilot disable' + end, +}) +vim.api.nvim_create_autocmd('BufLeave', { + group = 'OilRelPathFix', + pattern = 'oil:///*', + callback = function() + vim.cmd 'Copilot enable' + end, +}) diff --git a/lua/custom/plugins/alpha.lua b/lua/custom/plugins/alpha.lua new file mode 100644 index 00000000000..4361ddaeb7d --- /dev/null +++ b/lua/custom/plugins/alpha.lua @@ -0,0 +1,40 @@ +return { + "goolord/alpha-nvim", + event = "VimEnter", + dependencies = { "nvim-tree/nvim-web-devicons" }, + config = function() + require 'alpha'.setup(require 'alpha.themes.startify'.config) + -- require 'alpha'.setup(require 'alpha.themes.dashboard'.config) + + -- local alpha = require("alpha") + -- local dashboard = require("alpha.themes.dashboard") + + -- -- Set header + -- dashboard.section.header.val = { + -- " ", + -- " ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ", + -- " ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ", + -- " ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ", + -- " ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ", + -- " ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ", + -- " ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ", + -- " ", + -- } + -- + -- -- Set menu + -- dashboard.section.buttons.val = { + -- dashboard.button("e", " > New File", "ene"), + -- dashboard.button("SPC ee", " > Toggle file explorer", "NvimTreeToggle"), + -- dashboard.button("SPC ff", "󰱼 > Find File", "Telescope find_files"), + -- dashboard.button("SPC fs", " > Find Word", "Telescope live_grep"), + -- dashboard.button("SPC wr", "󰁯 > Restore Session For Current Directory", "SessionRestore"), + -- dashboard.button("q", " > Quit NVIM", "qa"), + -- } + -- + -- -- Send config to alpha + -- alpha.setup(dashboard.opts) + -- + -- -- Disable folding on alpha buffer + -- vim.cmd([[autocmd FileType alpha setlocal nofoldenable]]) + end, +} diff --git a/lua/custom/plugins/auto-tag.lua b/lua/custom/plugins/auto-tag.lua new file mode 100644 index 00000000000..f5059d0abc2 --- /dev/null +++ b/lua/custom/plugins/auto-tag.lua @@ -0,0 +1,4 @@ +return { + 'windwp/nvim-ts-autotag', + lazy = false, +} diff --git a/lua/custom/plugins/comment.lua b/lua/custom/plugins/comment.lua new file mode 100644 index 00000000000..e268726b621 --- /dev/null +++ b/lua/custom/plugins/comment.lua @@ -0,0 +1,22 @@ +-- 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 +return { + 'numToStr/Comment.nvim', + dependencies = { + 'JoosepAlviste/nvim-ts-context-commentstring', + }, + config = function() + require('Comment').setup { + pre_hook = require('ts_context_commentstring.integrations.comment_nvim').create_pre_hook(), + } + end, + lazy = false, +} diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua new file mode 100644 index 00000000000..be5a961e5de --- /dev/null +++ b/lua/custom/plugins/copilot.lua @@ -0,0 +1,18 @@ +return { + 'zbirenbaum/copilot.lua', + event = 'InsertEnter', + cmd = 'Copilot', + opts = { + suggestion = { + auto_trigger = true, + keymap = { + accept = '', + accept_line = '', + accept_word = '', + next = '', + prev = '', + dismiss = '', + }, + }, + }, +} diff --git a/lua/custom/plugins/formatting.lua b/lua/custom/plugins/formatting.lua new file mode 100644 index 00000000000..9fadaa74fc0 --- /dev/null +++ b/lua/custom/plugins/formatting.lua @@ -0,0 +1,37 @@ +return { + 'stevearc/conform.nvim', + event = { 'BufReadPre', 'BufNewFile' }, + 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 = { + javascript = { 'prettier' }, + typescript = { 'prettier' }, + javascriptreact = { 'prettier' }, + typescriptreact = { 'prettier' }, + svelte = { 'prettier' }, + css = { 'prettier' }, + html = { 'prettier' }, + json = { 'prettier' }, + yaml = { 'prettier' }, + markdown = { 'prettier' }, + graphal = { 'prettier' }, + 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" } }, + }, + }, +} diff --git a/lua/custom/plugins/gitsigns.lua b/lua/custom/plugins/gitsigns.lua new file mode 100644 index 00000000000..e46a99ba98d --- /dev/null +++ b/lua/custom/plugins/gitsigns.lua @@ -0,0 +1,17 @@ +-- 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 +return { -- 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 = '~' }, + }, + }, +} diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua new file mode 100644 index 00000000000..d65e72f1ddf --- /dev/null +++ b/lua/custom/plugins/harpoon.lua @@ -0,0 +1,70 @@ +return { + 'ThePrimeagen/harpoon', + branch = 'harpoon2', + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + local harpoon = require 'harpoon' + + -- REQUIRED + harpoon:setup { + + settings = { + save_on_toggle = true, + }, + } + -- REQUIRED + + vim.keymap.set('n', 'a', function() + harpoon:list():append() + end, { desc = 'Add current file to harpoon list' }) + + vim.keymap.set('n', '', function() + harpoon.ui:toggle_quick_menu(harpoon:list()) + end) + + vim.keymap.set('n', '', function() + harpoon:list():select(1) + end) + vim.keymap.set('n', '', function() + harpoon:list():select(2) + end) + vim.keymap.set('n', '', function() + harpoon:list():select(3) + end) + vim.keymap.set('n', '', function() + harpoon:list():select(4) + end) + + -- Toggle previous & next buffers stored within Harpoon list + vim.keymap.set('n', '', function() + harpoon:list():prev() + end) + vim.keymap.set('n', '', function() + harpoon:list():next() + end) + + -- -- 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' }) + end, +} diff --git a/lua/custom/plugins/iluminate.lua b/lua/custom/plugins/iluminate.lua new file mode 100644 index 00000000000..e8dda813ca2 --- /dev/null +++ b/lua/custom/plugins/iluminate.lua @@ -0,0 +1,28 @@ +return { + 'RRethy/vim-illuminate', + event = 'BufReadPost', + config = function() + require('illuminate').configure { + delay = 200, + filetypes_denylist = { + 'NvimTree', + 'markdown', + 'fugitive', + 'oil', + }, + providers = { + 'treesitter', + 'lsp', + 'regex', + }, + modes_allowlist = { 'n' }, + min_count_to_highlight = 2, + } + -- vim.cmd [[hi IlluminatedWordText guibg=#a7c080 guifg=#424c33 gui=nocombine]] + -- vim.cmd [[hi IlluminatedWordWrite guibg=#a7c080 guifg=#424c33 gui=nocombine]] + -- vim.cmd [[hi IlluminatedWordRead guibg=#a7c080 guifg=#424c33 gui=nocombine]] + -- vim.cmd [[hi IlluminatedWordText guibg=#ff71ce]] + -- vim.cmd [[hi IlluminatedWordRead guibg=#ff71ce]] + -- vim.cmd [[hi IlluminatedWordWrite guibg=#ff71ce]] + end, +} diff --git a/lua/custom/plugins/linting.lua b/lua/custom/plugins/linting.lua new file mode 100644 index 00000000000..1b12be2b7a8 --- /dev/null +++ b/lua/custom/plugins/linting.lua @@ -0,0 +1,47 @@ +return { + 'mfussenegger/nvim-lint', + event = { + 'BufReadPre', + 'BufNewFile', + }, + config = function() + local lint = require 'lint' + + lint.linters_by_ft = { + javascript = { 'eslint_d' }, + typescript = { 'eslint_d' }, + javascriptreact = { 'eslint_d' }, + typescriptreact = { 'eslint_d' }, + svelte = { 'eslint_d' }, + swift = { 'swiftlint' }, + } + + local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true }) + + vim.api.nvim_create_autocmd({ + 'BufEnter', + 'BufWritePost', + 'InsertLeave', + }, { + group = lint_augroup, + callback = function() + lint.try_lint() + end, + }) + + vim.keymap.set('n', 'll', function() + lint.try_lint() + end, { desc = 'Trigger [l]inting for current fi[l]e' }) + + -- Shortcut for eslint --fix + vim.keymap.set('n', 'lf', function() + local bufnr = vim.api.nvim_get_current_buf() + local filename = vim.api.nvim_buf_get_name(bufnr) + local eslint_d_bin = '/Users/eduardogrigolo/.local/share/nvim/mason/bin/eslint_d' + + vim.fn.system(eslint_d_bin .. ' --fix ' .. filename) + vim.cmd 'edit!' -- to reload the file + vim.cmd 'write' -- to save the file + end, { desc = 'Trigger [l]inting auto [f]ix and save current file using eslint' }) + end, +} diff --git a/lua/custom/plugins/lspconfig.lua b/lua/custom/plugins/lspconfig.lua new file mode 100644 index 00000000000..4146b6eec62 --- /dev/null +++ b/lua/custom/plugins/lspconfig.lua @@ -0,0 +1,195 @@ +return { -- LSP Configuration & Plugins + 'neovim/nvim-lspconfig', + dependencies = { + -- Automatically install LSPs and related tools to stdpath for Neovim + 'williamboman/mason.nvim', + '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 + 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/custom/plugins/mini.lua b/lua/custom/plugins/mini.lua new file mode 100644 index 00000000000..5e7f743d661 --- /dev/null +++ b/lua/custom/plugins/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/custom/plugins/no-neck-pain.lua b/lua/custom/plugins/no-neck-pain.lua new file mode 100644 index 00000000000..7250dce9ff9 --- /dev/null +++ b/lua/custom/plugins/no-neck-pain.lua @@ -0,0 +1,33 @@ +return { + 'shortcuts/no-neck-pain.nvim', + event = 'VimEnter', + keys = { + { 'nn', 'NoNeckPain', desc = 'Toggle NoNeckPain' }, + }, + config = function() + require('no-neck-pain').setup { + width = 150, + buffers = { + right = { + enabled = false, + }, + colors = { + background = '#2a273f', + text = '#ffffff', + }, + scratchPad = { + -- set to `false` to + -- disable auto-saving + enabled = true, + -- set to `nil` to default + -- to current working directory + -- location = '~/Documents/VimScratchPad', + location = nil, + }, + bo = { + filetype = 'md', + }, + }, + } + end, +} diff --git a/lua/custom/plugins/nvim-cmp.lua b/lua/custom/plugins/nvim-cmp.lua new file mode 100644 index 00000000000..57bc3dce982 --- /dev/null +++ b/lua/custom/plugins/nvim-cmp.lua @@ -0,0 +1,104 @@ +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 }, + + -- 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/custom/plugins/nvim-treesitter-textobjects.lua b/lua/custom/plugins/nvim-treesitter-textobjects.lua new file mode 100644 index 00000000000..a564707544f --- /dev/null +++ b/lua/custom/plugins/nvim-treesitter-textobjects.lua @@ -0,0 +1 @@ +return {} diff --git a/lua/custom/plugins/nvim-treesitter.lua b/lua/custom/plugins/nvim-treesitter.lua new file mode 100644 index 00000000000..fa555f7464e --- /dev/null +++ b/lua/custom/plugins/nvim-treesitter.lua @@ -0,0 +1,30 @@ +return { -- Highlight, edit, and navigate code + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate', + opts = { + ensure_installed = { 'bash', 'c', 'html', 'lua', '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` + + ---@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/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua new file mode 100644 index 00000000000..434d0f9c3b1 --- /dev/null +++ b/lua/custom/plugins/oil.lua @@ -0,0 +1,36 @@ +return { + 'stevearc/oil.nvim', + -- Optional dependencies + dependencies = { 'nvim-tree/nvim-web-devicons' }, + -- keys = { + -- { + -- 'ft', + -- 'Oil', + -- desc = 'Open [f]ile [t]ree (Oil)', + -- }, + -- }, + config = function() + local oil = require 'oil' + + oil.setup { + default_file_explorer = false, + columns = { + 'icon', + -- 'permissions', + -- 'size', + -- 'mtime', + }, + view_options = { + -- Show files and directories that start with "." + show_hidden = true, + }, + } + + vim.keymap.set({ 'n', 'v' }, 'f-', function() + oil.toggle_float() + end, { desc = 'Open [f]loating [-] file tree (Oil)' }) + vim.keymap.set({ 'n', 'v' }, '-', function() + oil.open() + end, { desc = 'Open [-] file tree (Oil)' }) + end, +} diff --git a/lua/custom/plugins/pretty-ts-errors.lua b/lua/custom/plugins/pretty-ts-errors.lua new file mode 100644 index 00000000000..a84940d1f99 --- /dev/null +++ b/lua/custom/plugins/pretty-ts-errors.lua @@ -0,0 +1,11 @@ +-- stable version +return { + 'OlegGulevskyy/better-ts-errors.nvim', + dependencies = { 'MunifTanjim/nui.nvim' }, + config = { + keymaps = { + toggle = 'dd', -- default 'dd' + go_to_definition = 'dx', -- default 'dx' + }, + }, +} diff --git a/lua/custom/plugins/telescope.lua b/lua/custom/plugins/telescope.lua new file mode 100644 index 00000000000..b95f241fe6f --- /dev/null +++ b/lua/custom/plugins/telescope.lua @@ -0,0 +1,107 @@ +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 }, + }, + 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', 'sa', function() + builtin.find_files { find_command = { 'rg', '--files', '--hidden', '--follow', '--glob', '!node_modules/*', '!*.log' } } + end, { desc = '[S]earch [A]ll Files' }) + 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, +} diff --git a/lua/custom/plugins/todo-comments.lua b/lua/custom/plugins/todo-comments.lua new file mode 100644 index 00000000000..092e8552f34 --- /dev/null +++ b/lua/custom/plugins/todo-comments.lua @@ -0,0 +1,2 @@ +-- Highlight todo, notes, etc in comments +return { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } } diff --git a/lua/custom/plugins/toggle-term.lua b/lua/custom/plugins/toggle-term.lua new file mode 100644 index 00000000000..1461dad5f27 --- /dev/null +++ b/lua/custom/plugins/toggle-term.lua @@ -0,0 +1,69 @@ +return { + 'akinsho/toggleterm.nvim', + event = 'VimEnter', + + -- { "tt", "ToggleTerm direction=float", desc = "Toggle Term" }, + -- { "ta", "ToggleTermToggleAll", desc = "Toggle Term All" }, + -- }, + version = '*', + opts = { --[[ things you want to change go here]] + open_mapping = [[\\]], + terminal_mappings = true, + }, + config = function() + -- lazygit with toggle term + local Terminal = require('toggleterm.terminal').Terminal + + local regularTerm = Terminal:new { + hidden = true, + direction = 'horizontal', + size = 100, + -- vim.api.nvim_set_keymap('n', 'tt', 'lua regular_term()', { noremap = true, silent = true, desc = 'Open [t]erminal view' }), + on_open = function() + vim.cmd 'startinsert!' + vim.keymap.set('t', '', [[]], { buffer = 0 }) + end, + } + + local floatTerm = Terminal:new { + hidden = true, + direction = 'float', + size = 100, + -- vim.api.nvim_set_keymap('n', 'tt', 'lua regular_term()', { noremap = true, silent = true, desc = 'Open [t]erminal view' }), + on_open = function() + vim.cmd 'startinsert!' + vim.keymap.set('t', '', [[]], { buffer = 0 }) + end, + } + + local lazygit = Terminal:new { + cmd = 'lazygit', + dir = 'git_dir', + direction = 'float', + float_opts = { + border = 'double', + }, + -- function to run on opening the terminal + -- on_open = function(term) + -- vim.cmd("startinsert!") + -- vim.api.nvim_buf_set_keymap(term.bufnr, "n", "q", "close", { noremap = true, silent = true }) + -- end, + } + + function lazygit_toggle() + lazygit:toggle() + end + + function regular_term() + regularTerm:toggle() + end + + function float_term() + floatTerm:toggle() + end + + vim.keymap.set({ 'n', 'v' }, 'gl', 'lua lazygit_toggle()', { noremap = true, silent = true, desc = 'Open [g]it [l]azygit window' }) + vim.keymap.set({ 'n', 'v' }, 'tt', 'lua regular_term()', { noremap = true, silent = true, desc = 'Open [t]erminal bottom view' }) + vim.keymap.set({ 'n', 'v' }, 'tf', 'lua float_term()', { noremap = true, silent = true, desc = 'Open [t]erminal [f]loat view' }) + end, +} diff --git a/lua/custom/plugins/tokyonight.lua b/lua/custom/plugins/tokyonight.lua new file mode 100644 index 00000000000..e2dc256aecb --- /dev/null +++ b/lua/custom/plugins/tokyonight.lua @@ -0,0 +1,90 @@ +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 { +-- 'folke/tokyonight.nvim', +-- lazy = false, +-- priority = 1000, +-- opts = {}, +-- config = function() +-- require('tokyonight').setup { +-- -- your configuration comes here +-- -- or leave it empty to use the default settings +-- style = 'moon', -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day` +-- -- light_style = 'day', -- The theme is used when the background is set to light +-- transparent = true, -- Enable this to disable setting the background color +-- -- terminal_colors = true, -- Configure the colors used when opening a `:terminal` in [Neovim](https://github.com/neovim/neovim) +-- -- styles = { +-- -- -- Style to be applied to different syntax groups +-- -- -- Value is any valid attr-list value for `:help nvim_set_hl` +-- -- comments = { italic = true }, +-- -- keywords = { italic = true }, +-- -- functions = {}, +-- -- variables = {}, +-- -- -- Background styles. Can be "dark", "transparent" or "normal" +-- -- sidebars = 'dark', -- style for sidebars, see below +-- -- floats = 'dark', -- style for floating windows +-- -- }, +-- -- sidebars = { 'qf', 'help' }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]` +-- -- day_brightness = 0.3, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors +-- -- hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**. +-- -- dim_inactive = false, -- dims inactive windows +-- -- lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold +-- -- +-- -- --- You can override specific color groups to use other groups or a hex color +-- -- --- function will be called with a ColorScheme table +-- -- ---@param colors ColorScheme +-- -- on_colors = function(colors) end, +-- -- +-- -- --- You can override specific highlights to use other groups or a hex color +-- -- --- function will be called with a Highlights and ColorScheme table +-- -- ---@param highlights Highlights +-- -- ---@param colors ColorScheme +-- on_highlights = function(highlights, colors) +-- local prompt = '#2d3149' +-- highlights.TelescopeNormal = { +-- bg = colors.bg_dark, +-- fg = colors.fg_dark, +-- } +-- highlights.TelescopeBorder = { +-- bg = colors.bg_dark, +-- fg = colors.bg_dark, +-- } +-- highlights.TelescopePromptNormal = { +-- bg = prompt, +-- } +-- highlights.TelescopePromptBorder = { +-- bg = prompt, +-- fg = prompt, +-- } +-- highlights.TelescopePromptTitle = { +-- bg = prompt, +-- fg = prompt, +-- } +-- highlights.TelescopePreviewTitle = { +-- bg = colors.bg_dark, +-- fg = colors.bg_dark, +-- } +-- highlights.TelescopeResultsTitle = { +-- bg = colors.bg_dark, +-- fg = colors.bg_dark, +-- } +-- end, +-- } +-- end, +-- } diff --git a/lua/custom/plugins/trouble.lua b/lua/custom/plugins/trouble.lua new file mode 100644 index 00000000000..e08e24d9265 --- /dev/null +++ b/lua/custom/plugins/trouble.lua @@ -0,0 +1,38 @@ +return { + 'folke/trouble.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + opts = {}, -- for default options, refer to the configuration section for custom setup. + cmd = 'Trouble', + keys = { + { + 'xx', + 'Trouble diagnostics toggle', + desc = 'Diagnostics (Trouble)', + }, + { + 'xX', + 'Trouble diagnostics toggle filter.buf=0', + desc = 'Buffer Diagnostics (Trouble)', + }, + { + 'cs', + 'Trouble symbols toggle focus=false', + desc = 'Symbols (Trouble)', + }, + { + 'cl', + 'Trouble lsp toggle focus=false win.position=right', + desc = 'LSP Definitions / references / ... (Trouble)', + }, + { + 'xL', + 'Trouble loclist toggle', + desc = 'Location List (Trouble)', + }, + { + 'xQ', + 'Trouble qflist toggle', + desc = 'Quickfix List (Trouble)', + }, + }, +} diff --git a/lua/custom/plugins/ts-context-commentstring.lua b/lua/custom/plugins/ts-context-commentstring.lua new file mode 100644 index 00000000000..144d717e0a1 --- /dev/null +++ b/lua/custom/plugins/ts-context-commentstring.lua @@ -0,0 +1,15 @@ +-- 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({}) + +return { + 'JoosepAlviste/nvim-ts-context-commentstring', + opts = { + enable_autocmd = false, + }, +} diff --git a/lua/custom/plugins/undotree.lua b/lua/custom/plugins/undotree.lua new file mode 100644 index 00000000000..74d0bf887b0 --- /dev/null +++ b/lua/custom/plugins/undotree.lua @@ -0,0 +1,7 @@ +return { + 'mbbill/undotree', + config = function() + vim.g.undotree_SetFocusWhenToggle = 1 + vim.keymap.set({ 'n', 'v' }, 'du', vim.cmd.UndotreeToggle, { desc = 'Toggle [u]ndotree' }) + end, +} diff --git a/lua/custom/plugins/vim-fugitive.lua b/lua/custom/plugins/vim-fugitive.lua new file mode 100644 index 00000000000..b6b4c97bc32 --- /dev/null +++ b/lua/custom/plugins/vim-fugitive.lua @@ -0,0 +1,3 @@ +return { + 'tpope/vim-fugitive', +} diff --git a/lua/custom/plugins/vim-rhubarb.lua b/lua/custom/plugins/vim-rhubarb.lua new file mode 100644 index 00000000000..952228d3677 --- /dev/null +++ b/lua/custom/plugins/vim-rhubarb.lua @@ -0,0 +1,3 @@ +return { + 'tpope/vim-rhubarb', +} diff --git a/lua/custom/plugins/vim-sleuth.lua b/lua/custom/plugins/vim-sleuth.lua new file mode 100644 index 00000000000..7f814c521bb --- /dev/null +++ b/lua/custom/plugins/vim-sleuth.lua @@ -0,0 +1,3 @@ +return { + 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically +} diff --git a/lua/custom/plugins/vim-visual-multi.lua b/lua/custom/plugins/vim-visual-multi.lua new file mode 100644 index 00000000000..47112e7d739 --- /dev/null +++ b/lua/custom/plugins/vim-visual-multi.lua @@ -0,0 +1,4 @@ +return { + 'mg979/vim-visual-multi', + branch = 'master', +} diff --git a/lua/custom/plugins/which-key.lua b/lua/custom/plugins/which-key.lua new file mode 100644 index 00000000000..0601bec083f --- /dev/null +++ b/lua/custom/plugins/which-key.lua @@ -0,0 +1,21 @@ +return { -- Useful plugin to show you pending keybinds. + 'folke/which-key.nvim', + event = 'VeryLazy', + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + }, + keys = { + { 'c', group = '[C]ode' }, + { 'c_', hidden = true }, + { 'd', group = '[D]ocument' }, + { 'd_', hidden = true }, + { 'r', group = '[R]ename' }, + { 'r_', hidden = true }, + { 's', group = '[S]earch' }, + { 's_', hidden = true }, + { 'w', group = '[W]orkspace' }, + { 'w_', hidden = true }, + }, +} diff --git a/lua/kickstart/health.lua b/lua/kickstart/health.lua new file mode 100644 index 00000000000..04df77b33e8 --- /dev/null +++ b/lua/kickstart/health.lua @@ -0,0 +1,52 @@ +--[[ +-- +-- This file is not required for your own configuration, +-- but helps people determine if their system is setup correctly. +-- +--]] + +local check_version = function() + local verstr = string.format('%s.%s.%s', vim.version().major, vim.version().minor, vim.version().patch) + if not vim.version.cmp then + vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) + return + end + + if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then + vim.health.ok(string.format("Neovim version is: '%s'", verstr)) + else + vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) + end +end + +local check_external_reqs = function() + -- Basic utils: `git`, `make`, `unzip` + for _, exe in ipairs { 'git', 'make', 'unzip', 'rg' } do + local is_executable = vim.fn.executable(exe) == 1 + if is_executable then + vim.health.ok(string.format("Found executable: '%s'", exe)) + else + vim.health.warn(string.format("Could not find executable: '%s'", exe)) + end + end + + return true +end + +return { + check = function() + vim.health.start 'kickstart.nvim' + + vim.health.info [[NOTE: Not every warning is a 'must-fix' in `:checkhealth` + + Fix only warnings for plugins and languages you intend to use. + Mason will give warnings for languages that are not installed. + You do not need to install, unless you want to use those languages!]] + + local uv = vim.uv or vim.loop + vim.health.info('System Information: ' .. vim.inspect(uv.os_uname())) + + check_version() + check_external_reqs() + end, +} diff --git a/lua/kickstart/plugins/autoformat.lua b/lua/kickstart/plugins/autoformat.lua index bc56b15b027..1bbd622ed32 100644 --- a/lua/kickstart/plugins/autoformat.lua +++ b/lua/kickstart/plugins/autoformat.lua @@ -46,9 +46,9 @@ return { -- Tsserver usually works poorly. Sorry you work with bad languages -- You can remove this line if you know what you're doing :) - if client.name == 'tsserver' then - return - end + -- if client.name == 'tsserver' then + -- return + -- end -- Create an autocmd that will run *before* we save the buffer. -- Run the formatting command for the LSP that has just attached. diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua index 7fc783fabd4..7be4abdbd96 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/kickstart/plugins/debug.lua @@ -14,6 +14,9 @@ return { -- 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', diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/kickstart/plugins/indent_line.lua new file mode 100644 index 00000000000..ed7f269399f --- /dev/null +++ b/lua/kickstart/plugins/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/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua new file mode 100644 index 00000000000..7f0dc42fbbf --- /dev/null +++ b/lua/kickstart/plugins/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, + }, +}