From bdca899d86c0c7c446cb98a3fdc9adb829eb2196 Mon Sep 17 00:00:00 2001 From: jordanyono Date: Mon, 4 May 2026 22:24:53 -0400 Subject: [PATCH] split and test --- lua/custom/plugins/init.lua | 27 +- lua/kickstart/autocmds.lua | 13 + lua/kickstart/diagnostics.lua | 26 ++ lua/kickstart/init.lua | 10 + lua/kickstart/keymaps.lua | 23 ++ lua/kickstart/lazy.lua | 30 ++ lua/kickstart/options.lua | 41 +++ lua/kickstart/plugins/blink.lua | 95 +++++ lua/kickstart/plugins/conform.lua | 61 ++++ lua/kickstart/plugins/gitsigns.lua | 63 +++- lua/kickstart/plugins/guess_indent.lua | 4 + lua/kickstart/plugins/lsp.lua | 421 ++++++++++++++++++++++ lua/kickstart/plugins/mini.lua | 45 +++ lua/kickstart/plugins/mini_icons.lua | 14 + lua/kickstart/plugins/neo-tree.lua | 46 +-- lua/kickstart/plugins/neotest_golang.lua | 6 + lua/kickstart/plugins/render_markdown.lua | 12 + lua/kickstart/plugins/spec.lua | 43 +++ lua/kickstart/plugins/telescope.lua | 160 ++++++++ lua/kickstart/plugins/todo_comments.lua | 13 + lua/kickstart/plugins/tokyonight.lua | 24 ++ lua/kickstart/plugins/treesitter.lua | 57 +++ lua/kickstart/plugins/vim_helm.lua | 11 + lua/kickstart/plugins/which_key.lua | 23 ++ 24 files changed, 1201 insertions(+), 67 deletions(-) create mode 100644 lua/kickstart/autocmds.lua create mode 100644 lua/kickstart/diagnostics.lua create mode 100644 lua/kickstart/init.lua create mode 100644 lua/kickstart/keymaps.lua create mode 100644 lua/kickstart/lazy.lua create mode 100644 lua/kickstart/options.lua create mode 100644 lua/kickstart/plugins/blink.lua create mode 100644 lua/kickstart/plugins/conform.lua create mode 100644 lua/kickstart/plugins/guess_indent.lua create mode 100644 lua/kickstart/plugins/lsp.lua create mode 100644 lua/kickstart/plugins/mini.lua create mode 100644 lua/kickstart/plugins/mini_icons.lua create mode 100644 lua/kickstart/plugins/neotest_golang.lua create mode 100644 lua/kickstart/plugins/render_markdown.lua create mode 100644 lua/kickstart/plugins/spec.lua create mode 100644 lua/kickstart/plugins/telescope.lua create mode 100644 lua/kickstart/plugins/todo_comments.lua create mode 100644 lua/kickstart/plugins/tokyonight.lua create mode 100644 lua/kickstart/plugins/treesitter.lua create mode 100644 lua/kickstart/plugins/vim_helm.lua create mode 100644 lua/kickstart/plugins/which_key.lua diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index d1ec2e41..69190bb3 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -1,7 +1,4 @@ --- You can add your own plugins here or in other files in this directory! --- I promise not to create any merge conflicts in this directory :) --- --- See the kickstart.nvim README for more information +-- Add plugins here (neo-tree lives in `lua/kickstart/plugins/neo-tree.lua`). ---@module 'lazy' ---@type LazySpec @@ -15,31 +12,9 @@ return { }, ft = { 'http', 'rest' }, opts = { - -- your configuration comes here global_keymaps = false, global_keymaps_prefix = 'R', kulala_keymaps_prefix = '', }, }, - { - 'nvim-neo-tree/neo-tree.nvim', - version = '*', - dependencies = { - 'nvim-lua/plenary.nvim', - 'MunifTanjim/nui.nvim', - 'nvim-tree/nvim-web-devicons', - }, - lazy = false, - opts = { - filesystem = { - visible = false, - window = { - mappings = { - ['.'] = 'set_root', -- Set current directory as root - ['H'] = 'toggle_hidden', -- Toggle hidden files with 'H' - }, - }, - }, - }, - }, } diff --git a/lua/kickstart/autocmds.lua b/lua/kickstart/autocmds.lua new file mode 100644 index 00000000..78f366b4 --- /dev/null +++ b/lua/kickstart/autocmds.lua @@ -0,0 +1,13 @@ +vim.api.nvim_create_autocmd('TextYankPost', { + desc = 'Highlight when yanking (copying) text', + group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), + callback = function() vim.hl.on_yank() end, +}) + +vim.api.nvim_create_autocmd('FileType', { + group = vim.api.nvim_create_augroup('kickstart-markdown-safe-read', { clear = true }), + pattern = 'markdown', + callback = function() + vim.opt_local.modeline = false + end, +}) diff --git a/lua/kickstart/diagnostics.lua b/lua/kickstart/diagnostics.lua new file mode 100644 index 00000000..daceaf49 --- /dev/null +++ b/lua/kickstart/diagnostics.lua @@ -0,0 +1,26 @@ +vim.diagnostic.config { + severity_sort = true, + float = { border = 'rounded', source = 'if_many' }, + underline = true, + signs = vim.g.have_nerd_font and { + text = { + [vim.diagnostic.severity.ERROR] = '󰅚 ', + [vim.diagnostic.severity.WARN] = '󰀪 ', + [vim.diagnostic.severity.INFO] = '󰋽 ', + [vim.diagnostic.severity.HINT] = '󰌶 ', + }, + } or {}, + virtual_text = { + source = 'if_many', + spacing = 2, + format = function(diagnostic) + local diagnostic_message = { + [vim.diagnostic.severity.ERROR] = diagnostic.message, + [vim.diagnostic.severity.WARN] = diagnostic.message, + [vim.diagnostic.severity.INFO] = diagnostic.message, + [vim.diagnostic.severity.HINT] = diagnostic.message, + } + return diagnostic_message[diagnostic.severity] + end, + }, +} diff --git a/lua/kickstart/init.lua b/lua/kickstart/init.lua new file mode 100644 index 00000000..d8b4c790 --- /dev/null +++ b/lua/kickstart/init.lua @@ -0,0 +1,10 @@ +vim.g.mapleader = ' ' +vim.g.maplocalleader = ' ' + +vim.g.have_nerd_font = true + +require 'kickstart.options' +require 'kickstart.keymaps' +require 'kickstart.autocmds' +require 'kickstart.diagnostics' +require 'kickstart.lazy' diff --git a/lua/kickstart/keymaps.lua b/lua/kickstart/keymaps.lua new file mode 100644 index 00000000..ec39d10b --- /dev/null +++ b/lua/kickstart/keymaps.lua @@ -0,0 +1,23 @@ +vim.keymap.set('n', '', 'nohlsearch') + +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) + +vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) + +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' }) + +vim.keymap.set('n', 'th', ':split | terminal', { desc = 'Terminal horizontal split' }) +vim.keymap.set('n', 'tv', ':vsplit | terminal', { desc = 'Terminal vertical split' }) +vim.keymap.set('n', 'tt', ':tabnew | terminal', { desc = 'Terminal in new tab' }) +vim.keymap.set('n', 'tf', ':ToggleTerm', { desc = 'Toggle floating terminal' }) + +vim.keymap.set('x', 'p', '"_dP', { noremap = true, silent = true }) + +local git_links = require 'custom.git_links' +vim.keymap.set({ 'n', 'v' }, 'go', git_links.open_github, { desc = 'Open in GitHub' }) + +vim.keymap.set('n', 'x', 'Neotree toggle', { desc = 'NeoTree Toggle' }) +vim.keymap.set('n', 'z', 'Neotree reveal', { desc = 'NeoTree Reveal' }) diff --git a/lua/kickstart/lazy.lua b/lua/kickstart/lazy.lua new file mode 100644 index 00000000..90213da2 --- /dev/null +++ b/lua/kickstart/lazy.lua @@ -0,0 +1,30 @@ +local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = 'https://github.com/folke/lazy.nvim.git' + local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } + if vim.v.shell_error ~= 0 then error('Error cloning lazy.nvim:\n' .. out) end +end + +---@type vim.Option +local rtp = vim.opt.rtp +rtp:prepend(lazypath) + +require('lazy').setup(require 'kickstart.plugins.spec', { + ui = { + icons = vim.g.have_nerd_font and {} or { + cmd = '⌘', + config = '🛠', + event = '📅', + ft = '📂', + init = '⚙', + keys = '🗝', + plugin = '🔌', + runtime = '💻', + require = '🌙', + source = '📄', + start = '🚀', + task = '📌', + lazy = '💤 ', + }, + }, +}) diff --git a/lua/kickstart/options.lua b/lua/kickstart/options.lua new file mode 100644 index 00000000..748a7d91 --- /dev/null +++ b/lua/kickstart/options.lua @@ -0,0 +1,41 @@ +-- Options: see `:help vim.o` and `:help option-list` + +vim.o.number = true + +vim.o.mouse = 'a' + +vim.o.showmode = false + +vim.schedule(function() vim.o.clipboard = 'unnamedplus' end) + +vim.o.breakindent = true + +vim.o.undofile = true + +vim.o.ignorecase = true +vim.o.smartcase = true + +vim.o.signcolumn = 'yes' + +vim.o.updatetime = 250 + +vim.o.timeoutlen = 300 + +vim.o.splitright = true +vim.o.splitbelow = true + +vim.o.list = true +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } + +vim.o.inccommand = 'split' + +vim.o.cursorline = true + +vim.o.scrolloff = 10 + +vim.o.confirm = true + +vim.opt.number = true +vim.opt.relativenumber = true + +vim.opt.autoread = true diff --git a/lua/kickstart/plugins/blink.lua b/lua/kickstart/plugins/blink.lua new file mode 100644 index 00000000..46b7466e --- /dev/null +++ b/lua/kickstart/plugins/blink.lua @@ -0,0 +1,95 @@ +---@type LazySpec +return { +{ -- Autocompletion + 'saghen/blink.cmp', + event = 'VimEnter', + version = '1.*', + dependencies = { + -- Snippet Engine + { + 'L3MON4D3/LuaSnip', + version = '2.*', + build = (function() + -- Build Step is needed for regex support in snippets. + -- This step is not supported in many windows environments. + -- Remove the below condition to re-enable on windows. + if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then return end + return 'make install_jsregexp' + end)(), + dependencies = { + -- `friendly-snippets` contains a variety of premade snippets. + -- See the README about individual language/framework/plugin snippets: + -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, + }, + opts = {}, + }, + }, + ---@module 'blink.cmp' + ---@type blink.cmp.Config + opts = { + keymap = { + -- 'default' (recommended) for mappings similar to built-in completions + -- to accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + -- 'super-tab' for tab to accept + -- 'enter' for enter to accept + -- 'none' for no mappings + -- + -- For an understanding of why the 'default' preset is recommended, + -- you will need to read `:help ins-completion` + -- + -- No, but seriously. Please read `:help ins-completion`, it is really good! + -- + -- All presets have the following mappings: + -- /: move to right/left of your snippet expansion + -- : Open menu or open docs if already open + -- / or /: Select next/previous item + -- : Hide menu + -- : Toggle signature help + -- + -- See :h blink-cmp-config-keymap for defining your own keymap + preset = 'super-tab', + + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + }, + + appearance = { + -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- Adjusts spacing to ensure icons are aligned + nerd_font_variant = 'mono', + }, + + completion = { + -- By default, you may press `` to show the documentation. + -- Optionally, set `auto_show = true` to show the documentation after a delay. + documentation = { auto_show = false, auto_show_delay_ms = 500 }, + }, + + sources = { + default = { 'lsp', 'path', 'snippets' }, + }, + + snippets = { preset = 'luasnip' }, + + -- Blink.cmp includes an optional, recommended rust fuzzy matcher, + -- which automatically downloads a prebuilt binary when enabled. + -- + -- By default, we use the Lua implementation instead, but you may enable + -- the rust implementation via `'prefer_rust_with_warning'` + -- + -- See :h blink-cmp-config-fuzzy for more information + fuzzy = { implementation = 'lua' }, + + -- Shows a signature help window while you type arguments for a function + signature = { enabled = true }, + }, +}, +} diff --git a/lua/kickstart/plugins/conform.lua b/lua/kickstart/plugins/conform.lua new file mode 100644 index 00000000..84b0ef56 --- /dev/null +++ b/lua/kickstart/plugins/conform.lua @@ -0,0 +1,61 @@ +---@type LazySpec +return { +{ -- Autoformat + 'stevearc/conform.nvim', + event = { 'BufWritePre' }, + cmd = { 'ConformInfo' }, + keys = { + { + 'f', + function() require('conform').format { async = true } end, + mode = '', + desc = '[F]ormat buffer', + }, + }, + ---@module 'conform' + ---@type conform.setupOpts + 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, + typescript = true, + typescriptreact = true, + javascript = true, + javascriptreact = true, + python = true, + sql = true, + json = true, + } + if disable_filetypes[vim.bo[bufnr].filetype] then + return nil + else + return nil + end + end, + default_format_opts = { + lsp_format = 'fallback', -- Use external formatters if configured below, otherwise use LSP formatting. Set to `false` to disable LSP formatting entirely. + }, + -- You can also specify external formatters in here. + formatters_by_ft = { + lua = { 'stylua' }, + sql = { 'sql_formatter' }, + json = { 'prettier' }, + -- Conform can also run multiple formatters sequentially + -- python = { "isort", "black" }, + -- + -- You can use 'stop_after_first' to run the first available formatter from the list + -- javascript = { "prettierd", "prettier", stop_after_first = true }, + }, + formatters = { + ['sql_formatter'] = { + prepend_args = { '-l', 'postgresql', '-c', '{"useTabs": true}' }, + }, + }, + }, +}, +} diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/kickstart/plugins/gitsigns.lua index 500ea6c4..e83ce140 100644 --- a/lua/kickstart/plugins/gitsigns.lua +++ b/lua/kickstart/plugins/gitsigns.lua @@ -1,15 +1,18 @@ --- Adds git related signs to the gutter, as well as utilities for managing changes --- NOTE: gitsigns is already included in init.lua but contains only the base --- config. This will add also the recommended keymaps. - ----@module 'lazy' ---@type LazySpec return { +{ -- Adds git related signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', ---@module 'gitsigns' ---@type Gitsigns.Config ---@diagnostic disable-next-line: missing-fields opts = { + signs = { + add = { text = '+' }, ---@diagnostic disable-line: missing-fields + change = { text = '~' }, ---@diagnostic disable-line: missing-fields + delete = { text = '_' }, ---@diagnostic disable-line: missing-fields + topdelete = { text = '‾' }, ---@diagnostic disable-line: missing-fields + changedelete = { text = '~' }, ---@diagnostic disable-line: missing-fields + }, on_attach = function(bufnr) local gitsigns = require 'gitsigns' @@ -19,6 +22,17 @@ return { vim.keymap.set(mode, l, r, opts) end + -- Detect branch once per buffer attach + local primary_branch = 'main' + local handle = io.popen 'git branch --list main master' + if handle then + local result = handle:read '*a' + handle:close() + if not string.find(result, 'main') and string.find(result, 'master') then + primary_branch = 'master' + end + end + -- Navigation map('n', ']c', function() if vim.wo.diff then @@ -37,27 +51,36 @@ return { end, { desc = 'Jump to previous git [c]hange' }) -- Actions - -- visual mode - map('v', 'hs', function() gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [s]tage hunk' }) - map('v', 'hr', function() gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [r]eset hunk' }) - -- normal mode + map('v', 'hs', function() + gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } + end, { desc = 'git [s]tage hunk' }) + map('v', 'hr', function() + gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } + end, { desc = 'git [r]eset hunk' }) + map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) + map('n', 'hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' }) map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) - map('n', 'hi', gitsigns.preview_hunk_inline, { desc = 'git preview hunk [i]nline' }) - map('n', 'hb', function() gitsigns.blame_line { full = true } end, { desc = 'git [b]lame line' }) - map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) - map('n', 'hD', function() gitsigns.diffthis '@' end, { desc = 'git [D]iff against last commit' }) - map('n', 'hQ', function() gitsigns.setqflist 'all' end, { desc = 'git hunk [Q]uickfix list (all files in repo)' }) - map('n', 'hq', gitsigns.setqflist, { desc = 'git hunk [q]uickfix list (all changes in this file)' }) - -- Toggles - map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) - map('n', 'tw', gitsigns.toggle_word_diff, { desc = '[T]oggle git intra-line [w]ord diff' }) + map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) + map('n', 'hB', gitsigns.blame, { desc = 'git [B]lame toggle' }) - -- Text object - map({ 'o', 'x' }, 'ih', gitsigns.select_hunk) + -- Diff Mappings + map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) + map('n', 'hD', function() + gitsigns.diffthis '@' + end, { desc = 'git [D]iff against last commit' }) + + map('n', 'hm', function() + gitsigns.diffthis(primary_branch) + end, { desc = 'git diff against [m]ain/master' }) + + -- Toggles + map('n', 'ht', gitsigns.toggle_current_line_blame, { desc = '[t]oggle git show blame line' }) + map('n', 'hv', gitsigns.preview_hunk_inline, { desc = 'toggle git show deleted ([v]iew)' }) end, }, +}, } diff --git a/lua/kickstart/plugins/guess_indent.lua b/lua/kickstart/plugins/guess_indent.lua new file mode 100644 index 00000000..80ddf99b --- /dev/null +++ b/lua/kickstart/plugins/guess_indent.lua @@ -0,0 +1,4 @@ +---@type LazySpec +return { + { 'NMAC427/guess-indent.nvim', opts = {} }, +} diff --git a/lua/kickstart/plugins/lsp.lua b/lua/kickstart/plugins/lsp.lua new file mode 100644 index 00000000..ce5e251f --- /dev/null +++ b/lua/kickstart/plugins/lsp.lua @@ -0,0 +1,421 @@ +---@type LazySpec +return { +{ + -- Main LSP Configuration + 'neovim/nvim-lspconfig', + dependencies = { + -- Load before this plugin's config runs so get_lsp_capabilities() exists even when + -- LSP startup happens before VimEnter (e.g. `nvim file.py`). + { 'saghen/blink.cmp', version = '1.*' }, + -- Automatically install LSPs and related tools to stdpath for Neovim + -- Mason must be loaded before its dependents so we need to set it up here. + -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})` + { + 'mason-org/mason.nvim', + ---@module 'mason.settings' + ---@type MasonSettings + ---@diagnostic disable-next-line: missing-fields + opts = {}, + }, + -- Maps LSP server names between nvim-lspconfig and Mason package names. + 'mason-org/mason-lspconfig.nvim', + 'WhoIsSethDaniel/mason-tool-installer.nvim', + + -- Useful status updates for LSP. + { 'j-hui/fidget.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, mode) + mode = mode or 'n' + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + end + + -- Rename the variable under your cursor. + -- Most Language Servers support renaming across files, etc. + map('grn', vim.lsp.buf.rename, '[R]e[n]ame') + + -- Execute a code action, usually your cursor needs to be on top of an error + -- or a suggestion from your LSP for this to activate. + map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) + + -- WARN: This is not Goto Definition, this is Goto Declaration. + -- For example, in C this would take you to the header. + map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + + -- Defer requiring Telescope until keypress: on `nvim file.py`, LspAttach can run + -- before VimEnter, when lazy.nvim has not loaded telescope.nvim yet. + -- + -- Nvim 0.11+ sets *global* defaults grr/gri/grt/gO → vim.lsp.buf.* (quickfix / loclist). + -- Buffer-local maps override. Match kickstart.nvim: grr gri grd gO gW grt (see telescope + -- LspAttach in upstream). `grd` is not a core default — it was only in your fork/telescope. + map('grr', function() require('telescope.builtin').lsp_references() end, '[R]eferences') + map('gri', function() require('telescope.builtin').lsp_implementations() end, '[I]mplementation') + map('grd', function() require('telescope.builtin').lsp_definitions() end, '[G]oto [D]efinition') + map('gO', function() require('telescope.builtin').lsp_document_symbols() end, 'Open Document Symbols') + map('gW', function() require('telescope.builtin').lsp_dynamic_workspace_symbols() end, 'Open Workspace Symbols') + -- gopls may error on anonymous func types ("cannot find type name from type func(...)"): + -- put the cursor on a named identifier, or use grd on the symbol name — same LSP limit. + map('grt', function() require('telescope.builtin').lsp_type_definitions() end, '[G]oto [T]ype Definition') + + -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10) + local function client_supports_method(client, method, bufnr) + if vim.fn.has 'nvim-0.11' == 1 then + return client:supports_method(method, bufnr) + else + return client.supports_method(method, { bufnr = bufnr }) + end + end + + local client = vim.lsp.get_client_by_id(event.data.client_id) + + -- ========================================================================= + -- NEW: The gopls Semantic Tokens Workaround + -- ========================================================================= + if client and client.name == 'gopls' and not client.server_capabilities.semanticTokensProvider then + local semantic = client.config.capabilities.textDocument.semanticTokens + if semantic then + client.server_capabilities.semanticTokensProvider = { + full = true, + legend = { + tokenTypes = semantic.tokenTypes, + tokenModifiers = semantic.tokenModifiers, + }, + range = true, + } + end + end + -- ========================================================================= + + -- The following two autocommands are used to highlight references of the + -- word under your cursor when your cursor rests there for a little while. + -- See `:help CursorHold` for information about when this is executed + -- + -- When you move your cursor, the highlights will be cleared (the second autocommand). + if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then + local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) + vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.document_highlight, + }) + + vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.clear_references, + }) + + vim.api.nvim_create_autocmd('LspDetach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), + callback = function(event2) + vim.lsp.buf.clear_references() + vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } + end, + }) + end + + -- The following code creates a keymap to toggle inlay hints in your + -- code, if the language server you are using supports them + -- + -- This may be unwanted, since they displace some of your code + if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then + map('th', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle Inlay [H]ints') + end + end, + }) + + + -- LSP servers and clients are able to communicate to each other what features they support. + -- By default, Neovim doesn't support everything that is in the LSP specification. + -- When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities. + -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers. + local capabilities = require('blink.cmp').get_lsp_capabilities() + + -- Enable the following language servers + -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. + -- See `:help lsp-config` for information about keys and how to configure + ---@type table + local servers = { + clangd = {}, + + -- ========================================================================= + -- UPDATED: The unified "God Mode" gopls config + -- ========================================================================= + gopls = { + settings = { + gopls = { + buildFlags = { + '-tags', + 'functional,integration,small,medium,large', + }, + + -- Completion settings + completeUnimported = true, + usePlaceholders = true, + deepCompletion = true, + matcher = 'Fuzzy', + + -- Hover and signature help + hoverKind = 'FullDocumentation', + linkTarget = 'pkg.go.dev', + linksInHover = true, + + -- Does this actually help? + expandWorkspaceToModule = true, + + -- Static analysis and diagnostics + staticcheck = true, -- THIS automatically runs the officially supported staticcheck suite + + analyses = { + -- Only natively supported go vet / gopls checks go here + asmdecl = true, + assign = true, + atomic = true, + atomicalign = true, + bools = true, + buildtag = true, + cgocall = true, + composites = true, + copylock = true, + defers = true, + directive = true, + errorsas = true, + framepointer = true, + httpresponse = true, + ifaceassert = true, + loopclosure = true, + lostcancel = true, + nilfunc = true, + printf = true, + shift = true, + sigchanyzer = true, + slog = true, + stdmethods = true, + stringintconv = true, + structtag = true, + testinggoroutine = true, + tests = true, + timeformat = true, + unmarshal = true, + unreachable = true, + unsafeptr = true, + unusedresult = true, + deepequalerrors = true, + embed = true, + fillreturns = true, + infertypeargs = true, + nilness = true, + nonewvars = true, + noresultvalues = true, + shadow = true, + simplifycompositelit = true, + simplifyrange = true, + simplifyslice = true, + sortslice = true, + stubmethods = true, + undeclaredname = true, + unusedparams = true, + unusedvariable = true, + unusedwrite = true, + useany = true, + }, + + hints = { + assignVariableTypes = true, + compositeLiteralFields = true, + compositeLiteralTypes = true, + constantValues = true, + functionTypeParameters = true, + parameterNames = true, + rangeVariableTypes = true, + }, + + codelenses = { + gc_details = true, + generate = true, + regenerate_cgo = true, + test = true, + tidy = true, + upgrade_dependency = true, + vendor = true, + vulncheck = true, + }, + + gofumpt = true, + directoryFilters = { '-vendor' }, + }, + }, + + on_attach = function(client, bufnr) + if client.name == 'gopls' then + vim.api.nvim_create_autocmd('BufWritePre', { + buffer = bufnr, + callback = function() + vim.lsp.buf.code_action { + context = { diagnostics = {}, only = { 'source.organizeImports' } }, + apply = true, + } + end, + }) + end + end, + }, + -- ========================================================================= + + pyright = {}, + rust_analyzer = {}, + -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs + -- + -- Some languages (like typescript) have entire language plugins that can be useful: + -- https://github.com/pmizio/typescript-tools.nvim + -- + -- But for many setups, the LSP (`ts_ls`) will work just fine + ts_ls = { + settings = {}, + on_attach = function(client, bufnr) + client.server_capabilities.documentFormattingProvider = false + client.server_capabilities.documentRangeFormattingProvider = false + + -- Disable format on save for this buffer + vim.api.nvim_set_option_value('formatoptions', '', { buf = bufnr }) + vim.api.nvim_create_autocmd('BufWritePre', { + buffer = bufnr, + callback = function() + -- Do nothing, preventing format on save + end, + }) + end, + }, + + stylua = {}, -- Used to format Lua code + + -- Special Lua Config, as recommended by neovim help docs + lua_ls = { + on_init = function(client) + client.server_capabilities.documentFormattingProvider = false -- Disable formatting (formatting is done by stylua) + + if client.workspace_folders then + local path = client.workspace_folders[1].name + if path ~= vim.fn.stdpath 'config' and (vim.uv.fs_stat(path .. '/.luarc.json') or vim.uv.fs_stat(path .. '/.luarc.jsonc')) then return end + end + + client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, { + runtime = { + version = 'LuaJIT', + path = { 'lua/?.lua', 'lua/?/init.lua' }, + }, + workspace = { + checkThirdParty = false, + -- NOTE: this is a lot slower and will cause issues when working on your own configuration. + -- See https://github.com/neovim/nvim-lspconfig/issues/3189 + library = vim.tbl_extend('force', vim.api.nvim_get_runtime_file('', true), { + '${3rd}/luv/library', + '${3rd}/busted/library', + }), + }, + }) + end, + ---@type lspconfig.settings.lua_ls + settings = { + Lua = { + format = { enable = false }, -- Disable formatting (formatting is done by stylua) + }, + }, + }, + } + -- + -- -- + -- -- FORCE GOPLS SETUP + -- -- + -- local gopls_config = servers.gopls + -- gopls_config.capabilities = vim.tbl_deep_extend('force', {}, capabilities, gopls_config.capabilities or {}) + -- require('lspconfig').gopls.setup(gopls_config) + -- + + -- Ensure the servers and tools above are installed + -- + -- To check the current status of installed tools and/or manually install + -- other tools, you can run + -- :Mason + -- + -- You can press `g?` for help in this menu. + local ensure_installed = vim.tbl_keys(servers or {}) + vim.list_extend(ensure_installed, { + 'stylua', -- Used to format Lua code + 'sql-formatter', + 'prettier', + 'staticcheck', + 'goimports', + 'gofumpt', + 'gomodifytags', + 'impl', + 'golangci-lint', + 'delve', + }) + + require('mason-tool-installer').setup { ensure_installed = ensure_installed } + + require('mason-lspconfig').setup { + ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer) + automatic_installation = false, + -- We are removing the handlers block here to prevent Mason + -- from silently skipping unmanaged/globally-installed binaries. + } + + -- Ensure lspconfig is loaded so defaults are populated in Nvim 0.11 + require 'lspconfig' + + -- Explicitly set up all servers defined in the servers table. + for server_name, server in pairs(servers) do + server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + + if vim.fn.has 'nvim-0.11' == 1 then + -- Neovim 0.11+ native config API (prevents deprecation warning) + local def = vim.lsp.config[server_name] or {} + vim.lsp.config[server_name] = vim.tbl_deep_extend('force', def, server) + vim.lsp.enable(server_name) + else + -- Neovim 0.10 and earlier legacy API + require('lspconfig')[server_name].setup(server) + end + end + end, +}, +} diff --git a/lua/kickstart/plugins/mini.lua b/lua/kickstart/plugins/mini.lua new file mode 100644 index 00000000..9be7ada7 --- /dev/null +++ b/lua/kickstart/plugins/mini.lua @@ -0,0 +1,45 @@ +---@type LazySpec +return { +{ -- Collection of various small independent plugins/modules + 'nvim-mini/mini.nvim', + config = function() + -- Better Around/Inside textobjects + -- + -- Examples: + -- - va) - [V]isually select [A]round [)]paren + -- - yiiq - [Y]ank [I]nside [I]+1 [Q]uote + -- - ci' - [C]hange [I]nside [']quote + require('mini.ai').setup { + -- NOTE: Avoid conflicts with the built-in incremental selection mappings on Neovim>=0.12 (see `:help treesitter-incremental-selection`) + mappings = { + around_next = 'aa', + inside_next = 'ii', + }, + n_lines = 500, + } + + -- Add/delete/replace surroundings (brackets, quotes, etc.) + -- + -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren + -- - sd' - [S]urround [D]elete [']quotes + -- - sr)' - [S]urround [R]eplace [)] ['] + require('mini.surround').setup() + + -- Simple and easy statusline. + -- You could remove this setup call if you don't like it, + -- and try some other statusline plugin + local statusline = require 'mini.statusline' + -- set use_icons to true if you have a Nerd Font + statusline.setup { use_icons = vim.g.have_nerd_font } + + -- You can configure sections in the statusline by overriding their + -- default behavior. For example, here we set the section for + -- cursor location to LINE:COLUMN + ---@diagnostic disable-next-line: duplicate-set-field + statusline.section_location = function() return '%2l:%-2v' end + + -- ... and there is more! + -- Check out: https://github.com/nvim-mini/mini.nvim + end, +}, +} diff --git a/lua/kickstart/plugins/mini_icons.lua b/lua/kickstart/plugins/mini_icons.lua new file mode 100644 index 00000000..3e6c96a0 --- /dev/null +++ b/lua/kickstart/plugins/mini_icons.lua @@ -0,0 +1,14 @@ +---@type LazySpec +return { +{ + 'nvim-mini/mini.icons', + opts = { + file = { + ['.go-version'] = { glyph = '', hl = 'MiniIconsBlue' }, + }, + filetype = { + gotmpl = { glyph = '󰟓', hl = 'MiniIconsGrey' }, + }, + }, +}, +} diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index 2775623e..64f1ebb9 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -1,28 +1,32 @@ --- Neo-tree is a Neovim plugin to browse the file system --- https://github.com/nvim-neo-tree/neo-tree.nvim +-- Neo-tree: https://github.com/nvim-neo-tree/neo-tree.nvim ---@module 'lazy' ---@type LazySpec return { - 'nvim-neo-tree/neo-tree.nvim', - version = '*', - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended - 'MunifTanjim/nui.nvim', - }, - lazy = false, - keys = { - { '\\', ':Neotree reveal', desc = 'NeoTree reveal', silent = true }, - }, - ---@module 'neo-tree' - ---@type neotree.Config - opts = { - filesystem = { - window = { - use_libuv_file_watcher = true, - mappings = { - ['\\'] = 'close_window', + { + 'nvim-neo-tree/neo-tree.nvim', + version = '*', + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-tree/nvim-web-devicons', + 'MunifTanjim/nui.nvim', + }, + lazy = false, + keys = { + { '\\', ':Neotree reveal', desc = 'NeoTree reveal', silent = true }, + }, + ---@module 'neo-tree' + ---@type neotree.Config + opts = { + filesystem = { + visible = false, + window = { + use_libuv_file_watcher = true, + mappings = { + ['\\'] = 'close_window', + ['.'] = 'set_root', + ['H'] = 'toggle_hidden', + }, }, }, }, diff --git a/lua/kickstart/plugins/neotest_golang.lua b/lua/kickstart/plugins/neotest_golang.lua new file mode 100644 index 00000000..043d0d37 --- /dev/null +++ b/lua/kickstart/plugins/neotest_golang.lua @@ -0,0 +1,6 @@ +---@type LazySpec +return { +{ + 'fredrikaverpil/neotest-golang', +}, +} diff --git a/lua/kickstart/plugins/render_markdown.lua b/lua/kickstart/plugins/render_markdown.lua new file mode 100644 index 00000000..53fb986c --- /dev/null +++ b/lua/kickstart/plugins/render_markdown.lua @@ -0,0 +1,12 @@ +---@type LazySpec +return { +{ + 'MeanderingProgrammer/render-markdown.nvim', + dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-mini/mini.nvim' }, + ft = { 'markdown', 'markdown.mdx' }, + opts = { + latex = { enabled = false }, + completions = { lsp = { enabled = true }, blink = { enabled = true } }, + }, +}, +} diff --git a/lua/kickstart/plugins/spec.lua b/lua/kickstart/plugins/spec.lua new file mode 100644 index 00000000..71cfad65 --- /dev/null +++ b/lua/kickstart/plugins/spec.lua @@ -0,0 +1,43 @@ +---@param out table +---@param chunk LazySpec|LazySpec[] +local function append_specs(out, chunk) + if type(chunk[1]) == 'string' then + out[#out + 1] = chunk + return + end + for i = 1, #chunk do + out[#out + 1] = chunk[i] + end +end + +---@type LazySpec +local specs = {} +local mods = { + 'kickstart.plugins.guess_indent', + 'kickstart.plugins.gitsigns', + 'kickstart.plugins.which_key', + 'kickstart.plugins.render_markdown', + 'kickstart.plugins.telescope', + 'kickstart.plugins.lsp', + 'kickstart.plugins.conform', + 'kickstart.plugins.blink', + 'kickstart.plugins.tokyonight', + 'kickstart.plugins.todo_comments', + 'kickstart.plugins.mini', + 'kickstart.plugins.treesitter', + 'kickstart.plugins.vim_helm', + 'kickstart.plugins.neotest_golang', + 'kickstart.plugins.mini_icons', + 'kickstart.plugins.debug', + 'kickstart.plugins.indent_line', + 'kickstart.plugins.lint', + 'kickstart.plugins.autopairs', + 'kickstart.plugins.neo-tree', + 'custom.plugins', +} + +for _, mod in ipairs(mods) do + append_specs(specs, require(mod)) +end + +return specs diff --git a/lua/kickstart/plugins/telescope.lua b/lua/kickstart/plugins/telescope.lua new file mode 100644 index 00000000..6071d6d3 --- /dev/null +++ b/lua/kickstart/plugins/telescope.lua @@ -0,0 +1,160 @@ +---@type LazySpec +return { +{ -- Fuzzy Finder (files, lsp, etc) + 'nvim-telescope/telescope.nvim', + -- By default, Telescope is included and acts as your picker for everything. + + -- If you would like to switch to a different picker (like snacks, or fzf-lua) + -- you can disable the Telescope plugin by setting enabled to false and enable + -- your replacement picker by requiring it explicitly (e.g. 'custom.plugins.snacks') + + -- Note: If you customize your config for yourself, + -- it’s best to remove the Telescope plugin config entirely + -- instead of just disabling it here, to keep your config clean. + enabled = true, + event = 'VimEnter', + 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', 'v' }, 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) + vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) + vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) + vim.keymap.set('n', 'sD', function() + local current_dir = vim.fn.expand '%:p:h' -- Gets the absolute path to the current file's folder + require('telescope.builtin').diagnostics { + cwd = current_dir, + -- This ensures it searches within the directory, not just the file + root_dir = current_dir, + } + end, { desc = '[S]earch [D]iagnostics in current directory' }) + vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) + vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) + vim.keymap.set('n', 'sc', builtin.commands, { desc = '[S]earch [C]ommands' }) + vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + + -- vim.keymap.set('n', 'g', '', { desc = '[Git]' }) + -- vim.keymap.set('n', 'gl', builtin.git_bcommits, { desc = '[Git] Buffer Commits' }) + -- vim.keymap.set('n', 'gr', builtin.git_bcommits_range, { desc = '[Git] Buffer Commits Range' }) + -- vim.keymap.set('n', 'gb', builtin.git_branches, { desc = '[Git] Branches' }) + -- vim.keymap.set('n', 'gc', builtin.git_commits, { desc = '[Git] Commits' }) + -- vim.keymap.set('n', 'gf', builtin.git_files, { desc = '[Git] Files' }) + -- vim.keymap.set('n', 'gt', builtin.git_stash, { desc = '[Git] Stash' }) + -- vim.keymap.set('n', 'gs', builtin.git_status, { desc = '[Git] Status' }) + -- vim.keymap.set('n', 'gm', function() + -- builtin.git_commits { + -- git_command = { 'git', 'log', '--oneline', '--decorate', 'main..HEAD' }, + -- } + -- end, { desc = '[Git] Commits ahead of main' }) + + -- 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' }) + + vim.keymap.set('n', 'sag', function() + builtin.live_grep { + prompt_title = 'Live Grep (All Files)', + -- This function adds the flags to the underlying grep command + additional_args = function(args) + return { '--hidden', '--no-ignore', '--no-ignore-parent', '--glob=!**/.git/*' } + end, + } + end, { desc = '[S]earch [A]ll Files [G]rep)' }) + + vim.keymap.set('n', 'saf', function() + builtin.find_files { + prompt_title = 'Find All Files (Hidden + Ignored)', + hidden = true, -- Show hidden dotfiles + no_ignore = true, -- Ignore .gitignore rules + no_ignore_parent = true, -- Ignore .gitignore rules of all parents, too + file_ignore_patterns = { '.git/' }, -- <--- Explicitly remove the .git folder + } + end, { desc = '[S]earch [A]ll [F]iles' }) + end, +}, +} diff --git a/lua/kickstart/plugins/todo_comments.lua b/lua/kickstart/plugins/todo_comments.lua new file mode 100644 index 00000000..93c2395c --- /dev/null +++ b/lua/kickstart/plugins/todo_comments.lua @@ -0,0 +1,13 @@ +---@type LazySpec +return { +-- Highlight todo, notes, etc in comments +{ + 'folke/todo-comments.nvim', + event = 'VimEnter', + dependencies = { 'nvim-lua/plenary.nvim' }, + ---@module 'todo-comments' + ---@type TodoOptions + ---@diagnostic disable-next-line: missing-fields + opts = { signs = false }, +}, +} diff --git a/lua/kickstart/plugins/tokyonight.lua b/lua/kickstart/plugins/tokyonight.lua new file mode 100644 index 00000000..65b6e41e --- /dev/null +++ b/lua/kickstart/plugins/tokyonight.lua @@ -0,0 +1,24 @@ +---@type LazySpec +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. + config = function() + ---@diagnostic disable-next-line: missing-fields + require('tokyonight').setup { + styles = { + comments = { italic = false }, -- Disable italics in comments + }, + } + + -- 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' + end, +}, +} diff --git a/lua/kickstart/plugins/treesitter.lua b/lua/kickstart/plugins/treesitter.lua new file mode 100644 index 00000000..58a764d5 --- /dev/null +++ b/lua/kickstart/plugins/treesitter.lua @@ -0,0 +1,57 @@ +---@type LazySpec +return { +{ -- Highlight, edit, and navigate code + 'nvim-treesitter/nvim-treesitter', + lazy = false, + build = ':TSUpdate', + main = 'nvim-treesitter.configs', -- Sets main module to use for opts + -- [[ Configure Treesitter ]] See `:help nvim-treesitter` + opts = { + ensure_installed = { + 'bash', + 'c', + 'diff', + 'html', + 'lua', + 'luadoc', + 'markdown', + 'markdown_inline', + 'query', + 'vim', + 'vimdoc', + 'go', + 'gomod', + 'gowork', + 'gosum', + 'rust', + 'python', + 'json', + 'toml', + 'css', + 'helm', + 'dockerfile', + 'bash', + 'yaml', + 'sql', + 'hcl', + 'terraform', + }, + -- 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' } }, + }, + -- 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 +}, +} diff --git a/lua/kickstart/plugins/vim_helm.lua b/lua/kickstart/plugins/vim_helm.lua new file mode 100644 index 00000000..8c3baea9 --- /dev/null +++ b/lua/kickstart/plugins/vim_helm.lua @@ -0,0 +1,11 @@ +---@type LazySpec +return { +{ + 'towolf/vim-helm', + event = 'BufReadPre', + config = function() + -- This plugin automatically detects helm files (including .tpl) + -- and sets the filetype to "helm" instead of "yaml" + end, +}, +} diff --git a/lua/kickstart/plugins/which_key.lua b/lua/kickstart/plugins/which_key.lua new file mode 100644 index 00000000..cae42bb1 --- /dev/null +++ b/lua/kickstart/plugins/which_key.lua @@ -0,0 +1,23 @@ +---@type LazySpec +return { +{ -- Useful plugin to show you pending keybinds. + 'folke/which-key.nvim', + event = 'VimEnter', + ---@module 'which-key' + ---@type wk.Opts + ---@diagnostic disable-next-line: missing-fields + opts = { + -- delay between pressing a key and opening which-key (milliseconds) + delay = 0, + icons = { mappings = vim.g.have_nerd_font }, + + -- Document existing key chains + spec = { + { 's', group = '[S]earch', mode = { 'n', 'v' } }, + { 't', group = '[T]oggle' }, + { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first + { 'gr', group = 'LSP Actions', mode = { 'n' } }, + }, + }, +}, +}