From 0797eeb51abf990f96015765b5c0951a0cce56b0 Mon Sep 17 00:00:00 2001 From: DBLA Date: Sun, 14 Dec 2025 10:29:57 -0800 Subject: [PATCH] test refactor --- init.lua | 2265 +----------------------------------- lua/config/autocmds.lua | 16 + lua/config/keymaps.lua | 27 + lua/config/options.lua | 66 ++ lua/plugins/completion.lua | 193 +++ lua/plugins/debug.lua | 3 + lua/plugins/deltaview.lua | 11 + lua/plugins/editor.lua | 92 ++ lua/plugins/git.lua | 19 + lua/plugins/lsp.lua | 192 +++ lua/plugins/misc.lua | 108 ++ lua/plugins/navigation.lua | 57 + lua/plugins/snacks.lua | 135 +++ lua/plugins/telescope.lua | 61 + lua/plugins/treesitter.lua | 29 + lua/plugins/ui.lua | 78 ++ 16 files changed, 1098 insertions(+), 2254 deletions(-) create mode 100644 lua/config/autocmds.lua create mode 100644 lua/config/keymaps.lua create mode 100644 lua/config/options.lua create mode 100644 lua/plugins/completion.lua create mode 100644 lua/plugins/debug.lua create mode 100644 lua/plugins/deltaview.lua create mode 100644 lua/plugins/editor.lua create mode 100644 lua/plugins/git.lua create mode 100644 lua/plugins/lsp.lua create mode 100644 lua/plugins/misc.lua create mode 100644 lua/plugins/navigation.lua create mode 100644 lua/plugins/snacks.lua create mode 100644 lua/plugins/telescope.lua create mode 100644 lua/plugins/treesitter.lua create mode 100644 lua/plugins/ui.lua diff --git a/init.lua b/init.lua index 101f678d..d7a77ab9 100644 --- a/init.lua +++ b/init.lua @@ -1,242 +1,12 @@ ---[[ +-- Neovim Configuration +-- Modular structure based on Kickstart.nvim +-- Load core configuration +require 'config.options' +require 'config.keymaps' +require 'config.autocmds' -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== -======== .-----. ======== -======== .----------------------. | === | ======== -======== |.-""""""""""""""""""-.| |-----| ======== -======== || || | === | ======== -======== || KICKSTART.NVIM || |-----| ======== -======== || || | === | ======== -======== || || |-----| ======== -======== ||:Tutor || |:::::| ======== -======== |'-..................-'| |____o| ======== -======== `"")----------------(""` ___________ ======== -======== /::::::::::| |::::::::::\ \ no mouse \ ======== -======== /:::========| |==hjkl==:::\ \ required \ ======== -======== '""""""""""""' '""""""""""""' '""""""""""' ======== -======== ======== -===================================================================== -===================================================================== - -What is Kickstart? - - Kickstart.nvim is *not* a distribution. - - 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! - - 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: - - TODO: The very first thing you should do is to run the command `:Tutor` in Neovim. - - If you don't know what this means, type the following: - - - - : - - Tutor - - - - (If you already know the Neovim basics, you can skip this step.) - - Once you've completed that, you can continue working through **AND READING** the rest - of the kickstart init.lua. - - 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. - - 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. - - 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. - - 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. - - NOTE: Look for lines like this - - 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. - -If you experience any errors while trying to install kickstart, run `:checkhealth` for more info. - -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 loaded (otherwise wrong leader will be used) -vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' - --- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = true - --- [[ Setting options ]] --- See `:help vim.o` --- NOTE: You can change these options as you wish! --- For more options, you can see `:help option-list` - --- Make line numbers default -vim.o.number = true --- You can also add relative line numbers, to help with jumping. --- Experiment for yourself to see if you like it! -vim.o.relativenumber = true - --- Enable mouse mode, can be useful for resizing splits for example! -vim.o.mouse = 'a' - --- Don't show the mode, since it's already in the status line -vim.o.showmode = false - --- Sync clipboard between OS and Neovim. --- Schedule the setting after `UiEnter` because it can increase startup-time. --- Remove this option if you want your OS clipboard to remain independent. --- See `:help 'clipboard'` -vim.schedule(function() - vim.o.clipboard = 'unnamedplus' -end) - --- Enable break indent -vim.o.breakindent = true - --- Save undo history -vim.o.undofile = true - --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term -vim.o.ignorecase = true -vim.o.smartcase = true - --- Keep signcolumn on by default -vim.o.signcolumn = 'yes' - --- Decrease update time -vim.o.updatetime = 250 - --- Decrease mapped sequence wait time -vim.o.timeoutlen = 300 - --- Configure how new splits should be opened -vim.o.splitright = true -vim.o.splitbelow = true - --- Sets how neovim will display certain whitespace characters in the editor. --- See `:help 'list'` --- and `:help 'listchars'` --- --- Notice listchars is set using `vim.opt` instead of `vim.o`. --- It is very similar to `vim.o` but offers an interface for conveniently interacting with tables. --- See `:help lua-options` --- and `:help lua-options-guide` -vim.o.list = true -vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } - --- Preview substitutions live, as you type! -vim.o.inccommand = 'split' - --- Show which line your cursor is on -vim.o.cursorline = true - --- Minimal number of screen lines to keep above and below the cursor. -vim.o.scrolloff = 10 - --- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`), --- instead raise a dialog asking if you wish to save the current file(s) --- See `:help 'confirm'` -vim.o.confirm = true - --- [[ Basic Keymaps ]] --- See `:help vim.keymap.set()` - --- Clear highlights on search when pressing in normal mode --- See `:help hlsearch` -vim.keymap.set('n', '', 'nohlsearch') - --- Diagnostic keymaps -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) - --- Go to first character in line -vim.keymap.set('', 'h', '^') - --- Go to last character in line -vim.keymap.set('', 'l', 'g_') - --- Save -vim.keymap.set('n', 'w', ':wa ') - --- 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' }) - -vim.opt.autoread = true - --- refresh files if changed outside -vim.fn.timer_start(2000, function() - vim.cmd 'silent! checktime' -end, { ['repeat'] = -1 }) - --- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes --- vim.keymap.set("n", "", "H", { desc = "Move window to the left" }) --- vim.keymap.set("n", "", "L", { desc = "Move window to the right" }) --- vim.keymap.set("n", "", "J", { desc = "Move window to the lower" }) --- vim.keymap.set("n", "", "K", { desc = "Move window to the upper" }) - --- [[ Basic Autocommands ]] --- See `:help lua-guide-autocommands` - --- Highlight when yanking (copying) text --- Try it with `yap` in normal mode --- See `:help vim.hl.on_yank()` -vim.api.nvim_create_autocmd('TextYankPost', { - desc = 'Highlight when yanking (copying) text', - group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), - callback = function() - vim.hl.on_yank() - end, -}) - --- [[ Install `lazy.nvim` plugin manager ]] --- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info +-- Bootstrap lazy.nvim plugin manager 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' @@ -245,2024 +15,14 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then error('Error cloning lazy.nvim:\n' .. out) end end +vim.opt.rtp:prepend(lazypath) ----@type vim.Option -local rtp = vim.opt.rtp -rtp:prepend(lazypath) - --- [[ Configure and install plugins ]] --- --- To check the current status of your plugins, run --- :Lazy --- --- You can press `?` in this menu for help. Use `:q` to close the window --- --- To update plugins you can run --- :Lazy update --- --- NOTE: Here is where you install your plugins. +-- Setup lazy.nvim with plugin modules require('lazy').setup({ - -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). - 'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically - - 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - 'tpope/vim-fugitive', -- Git commands in nvim - -- 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 automatically pass options to a plugin's `setup()` function, forcing the plugin to be loaded. - -- - - -- Alternatively, use `config = function() ... end` for full control over the configuration. - -- If you prefer to call `setup` explicitly, use: - -- { - -- 'lewis6991/gitsigns.nvim', - -- config = function() - -- require('gitsigns').setup({ - -- -- Your gitsigns configuration here - -- }) - -- end, - -- } - -- - -- Here is a more advanced example where we pass configuration - -- options to `gitsigns.nvim`. - -- - -- 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 `opts` key (recommended), the configuration runs - -- after the plugin has been loaded as `require(MODULE).setup(opts)`. - - { -- Useful plugin to show you pending keybinds. - 'folke/which-key.nvim', - event = 'VimEnter', -- Sets the loading event to 'VimEnter' - opts = { - -- delay between pressing a key and opening which-key (milliseconds) - -- this setting is independent of vim.o.timeoutlen - delay = 0, - icons = { - -- set icon mappings to true if you have a Nerd Font - mappings = vim.g.have_nerd_font, - -- If you are using a Nerd Font: set icons.keys to an empty table which will use the - -- default which-key.nvim defined Nerd Font icons, otherwise define a string table - keys = vim.g.have_nerd_font and {} or { - Up = ' ', - Down = ' ', - Left = ' ', - Right = ' ', - C = ' ', - M = ' ', - D = ' ', - S = ' ', - CR = ' ', - Esc = ' ', - ScrollWheelDown = ' ', - ScrollWheelUp = ' ', - NL = ' ', - BS = ' ', - Space = ' ', - Tab = ' ', - F1 = '', - F2 = '', - F3 = '', - F4 = '', - F5 = '', - F6 = '', - F7 = '', - F8 = '', - F9 = '', - F10 = '', - F11 = '', - F12 = '', - }, - }, - - -- Document existing key chains - spec = { - { 's', group = '[S]earch' }, - { 't', group = '[T]oggle' }, - { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, - }, - }, - 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', - 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 Plugins - { - -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins - -- used for completion, annotations and signatures of Neovim apis - 'folke/lazydev.nvim', - ft = 'lua', - opts = { - library = { - -- Load luvit types when the `vim.uv` word is found - { path = '${3rd}/luv/library', words = { 'vim%.uv' } }, - }, - }, - }, - { - -- Main LSP Configuration - 'neovim/nvim-lspconfig', - dependencies = { - -- Automatically install LSPs and related tools to stdpath for Neovim - -- Mason must be loaded before its dependents so we need to set it up here. - -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})` - { 'mason-org/mason.nvim', opts = {} }, - 'mason-org/mason-lspconfig.nvim', - 'WhoIsSethDaniel/mason-tool-installer.nvim', - - -- Useful status updates for LSP. - { 'j-hui/fidget.nvim', opts = {} }, - - -- Allows extra capabilities provided by blink.cmp - 'saghen/blink.cmp', - }, - config = function() - -- Brief aside: **What is LSP?** - -- - -- LSP is an initialism you've probably heard, but might not understand what it is. - -- - -- LSP stands for Language Server Protocol. It's a protocol that helps editors - -- and language tooling communicate in a standardized fashion. - -- - -- In general, you have a "server" which is some tool built to understand a particular - -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers - -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone - -- processes that communicate with some "client" - in this case, Neovim! - -- - -- LSP provides Neovim with features like: - -- - Go to definition - -- - Find references - -- - Autocompletion - -- - Symbol Search - -- - and more! - -- - -- Thus, Language Servers are external tools that must be installed separately from - -- Neovim. This is where `mason` and related plugins come into play. - -- - -- If you're wondering about lsp vs treesitter, you can check out the wonderfully - -- and elegantly composed help section, `:help lsp-vs-treesitter` - local lspconfig = require 'lspconfig' - - -- 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' }) - - -- Find references for the word under your cursor. - map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - - -- Jump to the implementation of the word under your cursor. - -- Useful when your language has ways of declaring types without an actual implementation. - map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - - -- Jump to the definition of the word under your cursor. - -- This is where a variable was first declared, or where a function is defined, etc. - -- To jump back, press . - map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') - - -- WARN: This is not Goto Definition, this is Goto Declaration. - -- For example, in C this would take you to the header. - map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - - -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols') - - -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. - map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols') - - -- Jump to the type of the word under your cursor. - -- Useful when you're not sure what type a variable is and you want to see - -- the definition of its *type*, not where it was *defined*. - map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition') - - -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10) - ---@param client vim.lsp.Client - ---@param method vim.lsp.protocol.Method - ---@param bufnr? integer some lsp support methods only in specific files - ---@return boolean - local function client_supports_method(client, method, bufnr) - if vim.fn.has 'nvim-0.11' == 1 then - return client:supports_method(method, bufnr) - else - return client.supports_method(method, { bufnr = bufnr }) - end - end - - -- The following two autocommands are used to highlight references of the - -- word under your cursor when your cursor rests there for a little while. - -- See `:help CursorHold` for information about when this is executed - -- - -- When you move your cursor, the highlights will be cleared (the second autocommand). - local client = vim.lsp.get_client_by_id(event.data.client_id) - if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then - local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) - vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { - buffer = event.buf, - group = highlight_augroup, - callback = vim.lsp.buf.document_highlight, - }) - - vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { - buffer = event.buf, - group = highlight_augroup, - callback = vim.lsp.buf.clear_references, - }) - - vim.api.nvim_create_autocmd('LspDetach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), - callback = function(event2) - vim.lsp.buf.clear_references() - vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } - end, - }) - end - - -- The following code creates a keymap to toggle inlay hints in your - -- code, if the language server you are using supports them - -- - -- This may be unwanted, since they displace some of your code - if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then - map('th', function() - vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) - end, '[T]oggle Inlay [H]ints') - end - end, - }) - - -- Diagnostic Config - -- See :help vim.diagnostic.Opts - vim.diagnostic.config { - severity_sort = true, - float = { border = 'rounded', source = 'if_many' }, - underline = { severity = vim.diagnostic.severity.ERROR }, - signs = vim.g.have_nerd_font and { - text = { - [vim.diagnostic.severity.ERROR] = '󰅚 ', - [vim.diagnostic.severity.WARN] = '󰀪 ', - [vim.diagnostic.severity.INFO] = '󰋽 ', - [vim.diagnostic.severity.HINT] = '󰌶 ', - }, - } or {}, - virtual_text = { - source = 'if_many', - spacing = 2, - format = function(diagnostic) - local diagnostic_message = { - [vim.diagnostic.severity.ERROR] = diagnostic.message, - [vim.diagnostic.severity.WARN] = diagnostic.message, - [vim.diagnostic.severity.INFO] = diagnostic.message, - [vim.diagnostic.severity.HINT] = diagnostic.message, - } - return diagnostic_message[diagnostic.severity] - end, - }, - } - - -- LSP servers and clients are able to communicate to each other what features they support. - -- By default, Neovim doesn't support everything that is in the LSP specification. - -- When you add blink.cmp, luasnip, etc. Neovim now has *more* capabilities. - -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers. - local capabilities = require('blink.cmp').get_lsp_capabilities() - - -- Enable the following language servers - -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. - -- - -- Add any additional override configuration in the following tables. Available keys are: - -- - cmd (table): Override the default command used to start the server - -- - filetypes (table): Override the default list of associated filetypes for the server - -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features. - -- - settings (table): Override the default settings passed when initializing the server. - -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ - local on_attach = function(_, bufnr) - local map = function(keys, func, desc, mode) - mode = mode or 'n' - vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) - end - opts.buffer = bufnr - - -- opts.desc = 'Show line diagnostics' - -- vim.keymap.set('n', 'd', vim.diagnostic.open_float, opts) - -- - -- opts.desc = 'Show documentation for what is under cursor' - -- vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) - -- - -- opts.desc = 'Show LSP definition' - -- vim.keymap.set('n', 'gd', 'Telescope lsp_definitions trim_text=true', opts) - - -- 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' }) - - -- Find references for the word under your cursor. - map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - - -- Jump to the implementation of the word under your cursor. - -- Useful when your language has ways of declaring types without an actual implementation. - map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - - -- Jump to the definition of the word under your cursor. - -- This is where a variable was first declared, or where a function is defined, etc. - -- To jump back, press . - map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') - - -- WARN: This is not Goto Definition, this is Goto Declaration. - -- For example, in C this would take you to the header. - map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - - -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols') - - -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. - map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols') - - -- Jump to the type of the word under your cursor. - -- Useful when you're not sure what type a variable is and you want to see - -- the definition of its *type*, not where it was *defined*. - map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition') - end - - local lspconfig = vim.lsp.config - lspconfig('sourcekit', { - capabilities = capabilities, - on_attach = on_attach, - root_dir = function(_, callback) - callback(require('lspconfig.util').root_pattern 'Package.swift'(vim.fn.getcwd()) or require('lspconfig.util').find_git_ancestor(vim.fn.getcwd())) - end, - cmd = { vim.trim(vim.fn.system 'xcrun -f sourcekit-lsp') }, - }) - - vim.lsp.enable 'sourcekit' - local servers = { - clangd = {}, - gopls = {}, - rust_analyzer = {}, - jedi_language_server = {}, - -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs - -- - -- Some languages (like typescript) have entire language plugins that can be useful: - -- https://github.com/pmizio/typescript-tools.nvim - -- - -- But for many setups, the LSP (`ts_ls`) will work just fine - ts_ls = {}, - lua_ls = { - -- cmd = { ... }, - -- filetypes = { ... }, - -- capabilities = {}, - settings = { - Lua = { - completion = { - callSnippet = 'Replace', - }, - -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings - -- diagnostics = { disable = { 'missing-fields' } }, - }, - }, - }, - } - - -- Ensure the servers and tools above are installed - -- - -- To check the current status of installed tools and/or manually install - -- other tools, you can run - -- :Mason - -- - -- You can press `g?` for help in this menu. - -- - -- `mason` had to be setup earlier: to configure its options see the - -- `dependencies` table for `nvim-lspconfig` above. - -- - -- You can add other tools here that you want Mason to install - -- for you, so that they are available from within Neovim. - local ensure_installed = vim.tbl_keys(servers or {}) - vim.list_extend(ensure_installed, { - 'stylua', -- Used to format Lua code - }) - require('mason-tool-installer').setup { ensure_installed = ensure_installed } - - require('mason-lspconfig').setup { - ensure_installed = {}, -- explicitly set to an empty table (Kickstart populates installs via mason-tool-installer) - automatic_installation = false, - handlers = { - function(server_name) - local server = servers[server_name] or {} - -- This handles overriding only values explicitly passed - -- by the server configuration above. Useful when disabling - -- certain features of an LSP (for example, turning off formatting for ts_ls) - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) - end, - }, - } - end, - }, - - { -- Autoformat - 'stevearc/conform.nvim', - event = { 'BufWritePre' }, - cmd = { 'ConformInfo' }, - keys = { - { - 'f', - function() - require('conform').format { async = true, lsp_format = 'fallback' } - end, - mode = '', - desc = '[F]ormat buffer', - }, - }, - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well standardized coding style. You can add additional - -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true } - if disable_filetypes[vim.bo[bufnr].filetype] then - return nil - else - return { - timeout_ms = 500, - lsp_format = 'fallback', - } - end - end, - formatters_by_ft = { - lua = { 'stylua' }, - -- Conform can also run multiple formatters sequentially - -- python = { 'ruff_format' }, - html = { 'djlint' }, - -- - -- You can use 'stop_after_first' to run the first available formatter from the list - -- javascript = { "prettierd", "prettier", stop_after_first = true }, - }, - }, - }, - - { -- Autocompletion - 'saghen/blink.cmp', - event = 'VimEnter', - version = '1.*', - dependencies = { - -- Snippet Engine - { - 'L3MON4D3/LuaSnip', - version = '2.*', - build = (function() - -- Build Step is needed for regex support in snippets. - -- This step is not supported in many windows environments. - -- Remove the below condition to re-enable on windows. - if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then - return - end - return 'make install_jsregexp' - end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, - }, - opts = {}, - }, - 'folke/lazydev.nvim', - }, - --- @module 'blink.cmp' - --- @type blink.cmp.Config - opts = { - keymap = { - -- 'default' (recommended) for mappings similar to built-in completions - -- to accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - -- 'super-tab' for tab to accept - -- 'enter' for enter to accept - -- 'none' for no mappings - -- - -- For an understanding of why the 'default' preset is recommended, - -- you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! - -- - -- All presets have the following mappings: - -- /: move to right/left of your snippet expansion - -- : Open menu or open docs if already open - -- / or /: Select next/previous item - -- : Hide menu - -- : Toggle signature help - -- - -- See :h blink-cmp-config-keymap for defining your own keymap - - preset = 'enter', - - -- 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 = { - trigger = { - show_on_insert_on_trigger_character = true, - }, - ghost_text = { - enabled = true, - }, - menu = { - border = 'single', - draw = { - treesitter = { 'lsp' }, - padding = { 0, 1 }, -- padding only on right side - components = { - kind_icon = { - text = function(ctx) - local kind_icon, _, _ = require('mini.icons').get('lsp', ctx.kind) - return kind_icon - end, - -- (optional) use highlights from mini.icons - highlight = function(ctx) - local _, hl, _ = require('mini.icons').get('lsp', ctx.kind) - return hl - end, - }, - kind = { - -- (optional) use highlights from mini.icons - highlight = function(ctx) - local _, hl, _ = require('mini.icons').get('lsp', ctx.kind) - return hl - end, - }, - }, - }, - }, - documentation = { auto_show = true, auto_show_delay_ms = 100, window = { border = 'single' } }, - }, - signature = { window = { border = 'single' } }, - sources = { - default = { 'lsp', 'path', 'snippets', 'lazydev' }, - providers = { - lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, - }, - }, - - 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 = { - sorts = { - 'exact', - -- defaults - 'score', - 'sort_text', - }, - implementation = 'rust', - }, - - -- Shows a signature help window while you type arguments for a function - signature = { enabled = true }, - }, - }, - - { -- 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', - 'rebelot/kanagawa.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - config = function() - ---@diagnostic disable-next-line: missing-fields - - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - vim.cmd 'colorscheme kanagawa' - -- 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 [Q]uote - -- - 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 - require('mini.files').setup() - end, - keys = { - { 'ff', 'lua MiniFiles.open()', desc = 'Toggle file navigator' }, - }, - }, - { -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', - 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' }, - -- 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 - }, - { - 'christoomey/vim-tmux-navigator', - }, - { - 'cbochs/grapple.nvim', - dependencies = { - { 'nvim-tree/nvim-web-devicons', lazy = true }, - }, - opts = { - scope = 'git_branch', -- also try out "git_branch" - icons = false, - }, - event = { 'BufReadPost', 'BufNewFile' }, - cmd = 'Grapple', - keys = { - { 'm', 'Grapple toggle', desc = 'Grapple toggle tag' }, - { 'k', 'Grapple toggle_tags', desc = 'Grapple toggle tags' }, - { 'K', 'Grapple toggle_scopes', desc = 'Grapple toggle scopes' }, - { 'j', 'Grapple cycle forward', desc = 'Grapple cycle forward' }, - { 'J', 'Grapple cycle backward', desc = 'Grapple cycle backward' }, - { '1', 'Grapple select index=1', desc = 'Grapple select 1' }, - { '2', 'Grapple select index=2', desc = 'Grapple select 2' }, - { '3', 'Grapple select index=3', desc = 'Grapple select 3' }, - { '4', 'Grapple select index=4', desc = 'Grapple select 4' }, - { '5', 'Grapple select index=5', desc = 'Grapple select 5' }, - }, - }, - { - 'folke/trouble.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() - vim.keymap.set('n', 'xx', function() - require('trouble').toggle() - end) - vim.keymap.set('n', 'xw', function() - require('trouble').toggle 'workspace_diagnostics' - end) - vim.keymap.set('n', 'xd', function() - require('trouble').toggle 'document_diagnostics' - end) - vim.keymap.set('n', 'xq', function() - require('trouble').toggle 'quickfix' - end) - vim.keymap.set('n', 'xl', function() - require('trouble').toggle 'loclist' - end) - vim.keymap.set('n', 'gR', function() - require('trouble').toggle 'lsp_references' - end) - end, - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - }, - }, - { - 'stevearc/oil.nvim', - opts = {}, - -- Optional dependencies - config = function() -- this is the function that runs, after loading - require('oil').setup { - view_options = { - show_hidden = true, - }, - } - - vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }) - end, - dependencies = { { 'echasnovski/mini.icons', opts = {} } }, - lazy = false, - }, - { - 'kristijanhusak/vim-dadbod-ui', - dependencies = { - { 'tpope/vim-dadbod', lazy = true }, - { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true }, - }, - cmd = { - 'DBUI', - 'DBUIToggle', - 'DBUIAddConnection', - 'DBUIFindBuffer', - }, - init = function() - -- Your DBUI configuration - vim.g.db_ui_use_nerd_fonts = 1 - end, - }, - { - 'folke/snacks.nvim', - priority = 1000, - lazy = false, - ---@type snacks.Config - opts = { - image = { - enabled = true, - }, - bigfile = { enabled = true }, - dashboard = { enabled = true }, - indent = { enabled = true }, - input = { enabled = true }, - notifier = { - enabled = true, - timeout = 3000, - }, - quickfile = { enabled = true }, - scroll = { enabled = true }, - statuscolumn = { enabled = true }, - words = { enabled = true }, - terminal = { win = { style = 'float' } }, - styles = { - notification = { - -- wo = { wrap = true } -- Wrap notifications - }, - }, - }, - keys = { - -- Top Pickers & Explorer - { - '', - function() - Snacks.picker.smart() - end, - desc = 'Smart Find Files', - }, - { - ',', - function() - Snacks.picker.buffers() - end, - desc = 'Buffers', - }, - { - '/', - function() - Snacks.picker.grep() - end, - desc = 'Grep', - }, - { - ':', - function() - Snacks.picker.command_history() - end, - desc = 'Command History', - }, - { - 'n', - function() - Snacks.picker.notifications() - end, - desc = 'Notification History', - }, - { - 'e', - function() - Snacks.explorer() - end, - desc = 'File Explorer', - }, - -- find - { - 'fb', - function() - Snacks.picker.buffers() - end, - desc = 'Buffers', - }, - { - 'fc', - function() - Snacks.picker.files { cwd = vim.fn.stdpath 'config' } - end, - desc = 'Find Config File', - }, - { - 'ff', - function() - Snacks.picker.files() - end, - desc = 'Find Files', - }, - { - 'fg', - function() - Snacks.picker.git_files() - end, - desc = 'Find Git Files', - }, - { - 'fp', - function() - Snacks.picker.projects() - end, - - desc = 'Projects', - }, - { - 'fr', - function() - Snacks.picker.recent() - end, - desc = 'Recent', - }, - -- git - { - 'gb', - function() - Snacks.picker.git_branches() - end, - desc = 'Git Branches', - }, - { - 'gl', - function() - Snacks.picker.git_log() - end, - desc = 'Git Log', - }, - { - 'gL', - function() - Snacks.picker.git_log_line() - end, - desc = 'Git Log Line', - }, - { - 'gs', - function() - Snacks.picker.git_status() - end, - desc = 'Git Status', - }, - { - 'gS', - function() - Snacks.picker.git_stash() - end, - desc = 'Git Stash', - }, - { - 'gd', - function() - Snacks.picker.git_diff() - end, - desc = 'Git Diff (Hunks)', - }, - { - 'gf', - function() - Snacks.picker.git_log_file() - end, - desc = 'Git Log File', - }, - -- gh - { - 'gi', - function() - Snacks.picker.gh_issue() - end, - desc = 'GitHub Issues (open)', - }, - { - 'gI', - function() - Snacks.picker.gh_issue { state = 'all' } - end, - desc = 'GitHub Issues (all)', - }, - { - 'gp', - function() - Snacks.picker.gh_pr() - end, - desc = 'GitHub Pull Requests (open)', - }, - { - 'gP', - function() - Snacks.picker.gh_pr { state = 'all' } - end, - desc = 'GitHub Pull Requests (all)', - }, - -- Grep - { - 'sb', - function() - Snacks.picker.lines() - end, - desc = 'Buffer Lines', - }, - { - 'sB', - function() - Snacks.picker.grep_buffers() - end, - desc = 'Grep Open Buffers', - }, - { - 'sg', - function() - Snacks.picker.grep() - end, - desc = 'Grep', - }, - { - 'sw', - function() - Snacks.picker.grep_word() - end, - desc = 'Visual selection or word', - mode = { 'n', 'x' }, - }, - -- search - { - 's"', - function() - Snacks.picker.registers() - end, - desc = 'Registers', - }, - { - 's/', - function() - Snacks.picker.search_history() - end, - desc = 'Search History', - }, - { - 'sa', - function() - Snacks.picker.autocmds() - end, - desc = 'Autocmds', - }, - { - 'sb', - function() - Snacks.picker.lines() - end, - desc = 'Buffer Lines', - }, - { - 'sc', - function() - Snacks.picker.command_history() - end, - desc = 'Command History', - }, - { - 'sC', - function() - Snacks.picker.commands() - end, - desc = 'Commands', - }, - { - 'sd', - function() - Snacks.picker.diagnostics() - end, - desc = 'Diagnostics', - }, - { - 'sD', - function() - Snacks.picker.diagnostics_buffer() - end, - desc = 'Buffer Diagnostics', - }, - { - 'sh', - function() - Snacks.picker.help() - end, - desc = 'Help Pages', - }, - { - 'sH', - function() - Snacks.picker.highlights() - end, - desc = 'Highlights', - }, - { - 'si', - function() - Snacks.picker.icons() - end, - desc = 'Icons', - }, - { - 'sj', - function() - Snacks.picker.jumps() - end, - desc = 'Jumps', - }, - { - 'sk', - function() - Snacks.picker.keymaps() - end, - desc = 'Keymaps', - }, - { - 'sl', - function() - Snacks.picker.loclist() - end, - desc = 'Location List', - }, - { - 'sm', - function() - Snacks.picker.marks() - end, - desc = 'Marks', - }, - { - 'sM', - function() - Snacks.picker.man() - end, - desc = 'Man Pages', - }, - { - 'sp', - function() - Snacks.picker.lazy() - end, - desc = 'Search for Plugin Spec', - }, - { - 'sq', - function() - Snacks.picker.qflist() - end, - desc = 'Quickfix List', - }, - { - 'sR', - function() - Snacks.picker.resume() - end, - desc = 'Resume', - }, - { - 'su', - function() - Snacks.picker.undo() - end, - desc = 'Undo History', - }, - { - 'uC', - function() - Snacks.picker.colorschemes() - end, - desc = 'Colorschemes', - }, - -- LSP - { - 'gd', - function() - Snacks.picker.lsp_definitions() - end, - desc = 'Goto Definition', - }, - { - 'gD', - function() - Snacks.picker.lsp_declarations() - end, - desc = 'Goto Declaration', - }, - { - 'gr', - function() - Snacks.picker.lsp_references() - end, - nowait = true, - desc = 'References', - }, - { - 'gI', - function() - Snacks.picker.lsp_implementations() - end, - desc = 'Goto Implementation', - }, - { - 'gy', - function() - Snacks.picker.lsp_type_definitions() - end, - desc = 'Goto T[y]pe Definition', - }, - { - 'gai', - function() - Snacks.picker.lsp_incoming_calls() - end, - desc = 'C[a]lls Incoming', - }, - { - 'gao', - function() - Snacks.picker.lsp_outgoing_calls() - end, - desc = 'C[a]lls Outgoing', - }, - { - 'ss', - function() - Snacks.picker.lsp_symbols() - end, - desc = 'LSP Symbols', - }, - { - 'sS', - function() - Snacks.picker.lsp_workspace_symbols() - end, - desc = 'LSP Workspace Symbols', - }, - -- Other - { - 'z', - function() - Snacks.zen() - end, - desc = 'Toggle Zen Mode', - }, - { - 'Z', - function() - Snacks.zen.zoom() - end, - desc = 'Toggle Zoom', - }, - { - '.', - function() - Snacks.scratch() - end, - desc = 'Toggle Scratch Buffer', - }, - { - 'S', - function() - Snacks.scratch.select() - end, - desc = 'Select Scratch Buffer', - }, - { - 'n', - function() - Snacks.notifier.show_history() - end, - desc = 'Notification History', - }, - { - 'bd', - function() - Snacks.bufdelete() - end, - desc = 'Delete Buffer', - }, - { - 'cR', - function() - Snacks.rename.rename_file() - end, - desc = 'Rename File', - }, - { - 'gB', - function() - Snacks.gitbrowse() - end, - desc = 'Git Browse', - mode = { 'n', 'v' }, - }, - { - 'gg', - function() - Snacks.lazygit() - end, - desc = 'Lazygit', - }, - { - 'un', - function() - Snacks.notifier.hide() - end, - desc = 'Dismiss All Notifications', - }, - { - '', - function() - Snacks.terminal() - end, - desc = 'Toggle Terminal', - }, - { - '', - function() - Snacks.terminal() - end, - desc = 'which_key_ignore', - }, - { - ']]', - function() - Snacks.words.jump(vim.v.count1) - end, - desc = 'Next Reference', - mode = { 'n', 't' }, - }, - { - '[[', - function() - Snacks.words.jump(-vim.v.count1) - end, - desc = 'Prev Reference', - mode = { 'n', 't' }, - }, - { - 'N', - desc = 'Neovim News', - function() - Snacks.win { - file = vim.api.nvim_get_runtime_file('doc/news.txt', false)[1], - width = 0.6, - height = 0.6, - wo = { - spell = false, - wrap = false, - signcolumn = 'yes', - statuscolumn = ' ', - conceallevel = 3, - }, - } - end, - }, - -- { - -- 'z', - -- function() - -- Snacks.zen() - -- end, - -- desc = 'Toggle Zen Mode', - -- }, - -- { - -- 'Z', - -- function() - -- Snacks.zen.zoom() - -- end, - -- desc = 'Toggle Zoom', - -- }, - -- { - -- '.', - -- function() - -- Snacks.scratch() - -- end, - -- desc = 'Toggle Scratch Buffer', - -- }, - -- { - -- 'S', - -- function() - -- Snacks.scratch.select() - -- end, - -- desc = 'Select Scratch Buffer', - -- }, - -- { - -- 'n', - -- function() - -- Snacks.notifier.show_history() - -- end, - -- desc = 'Notification History', - -- }, - -- { - -- 'bd', - -- function() - -- Snacks.bufdelete() - -- end, - -- desc = 'Delete Buffer', - -- }, - -- { - -- 'cR', - -- function() - -- Snacks.rename.rename_file() - -- end, - -- desc = 'Rename File', - -- }, - -- { - -- 'gB', - -- function() - -- Snacks.gitbrowse() - -- end, - -- desc = 'Git Browse', - -- mode = { 'n', 'v' }, - -- }, - -- { - -- 'gb', - -- function() - -- Snacks.git.blame_line() - -- end, - -- desc = 'Git Blame Line', - -- }, - -- { - -- 'gf', - -- function() - -- Snacks.lazygit.log_file() - -- end, - -- desc = 'Lazygit Current File History', - -- }, - -- { - -- 'gg', - -- function() - -- Snacks.lazygit() - -- end, - -- desc = 'Lazygit', - -- }, - -- { - -- 'gl', - -- function() - -- Snacks.lazygit.log() - -- end, - -- desc = 'Lazygit Log (cwd)', - -- }, - -- { - -- 'un', - -- function() - -- Snacks.notifier.hide() - -- end, - -- desc = 'Dismiss All Notifications', - -- }, - -- { - -- '', - -- function() - -- Snacks.terminal() - -- end, - -- desc = 'Toggle Terminal', - -- }, - -- { - -- '', - -- function() - -- Snacks.terminal() - -- end, - -- desc = 'which_key_ignore', - -- }, - -- { - -- ']]', - -- function() - -- Snacks.words.jump(vim.v.count1) - -- end, - -- desc = 'Next Reference', - -- mode = { 'n', 't' }, - -- }, - -- { - -- '[[', - -- function() - -- Snacks.words.jump(-vim.v.count1) - -- end, - -- desc = 'Prev Reference', - -- mode = { 'n', 't' }, - -- }, - -- { - -- 'N', - -- desc = 'Neovim News', - -- function() - -- Snacks.win { - -- file = vim.api.nvim_get_runtime_file('doc/news.txt', false)[1], - -- width = 0.6, - -- height = 0.6, - -- wo = { - -- spell = false, - -- wrap = false, - -- signcolumn = 'yes', - -- statuscolumn = ' ', - -- conceallevel = 4, - -- }, - -- } - -- end, - -- }, - }, - init = function() - vim.api.nvim_create_autocmd('User', { - pattern = 'VeryLazy', - callback = function() - -- Setup some globals for debugging (lazy-loaded) - _G.dd = function(...) - Snacks.debug.inspect(...) - end - _G.bt = function() - Snacks.debug.backtrace() - end - vim.print = _G.dd -- Override print to use snacks for `:=` command - - -- Create some toggle mappings - Snacks.toggle.option('spell', { name = 'Spelling' }):map 'us' - Snacks.toggle.option('wrap', { name = 'Wrap' }):map 'uw' - Snacks.toggle.option('relativenumber', { name = 'Relative Number' }):map 'uL' - Snacks.toggle.diagnostics():map 'ud' - Snacks.toggle.line_number():map 'ul' - Snacks.toggle.option('conceallevel', { off = 0, on = vim.o.conceallevel > 0 and vim.o.conceallevel or 2 }):map 'uc' - Snacks.toggle.treesitter():map 'uT' - Snacks.toggle.option('background', { off = 'light', on = 'dark', name = 'Dark Background' }):map 'ub' - Snacks.toggle.inlay_hints():map 'uh' - Snacks.toggle.indent():map 'ug' - Snacks.toggle.dim():map 'uD' - end, - }) - end, - }, - { - 'lervag/wiki.vim', - -- tag = "v0.10", -- uncomment to pin to a specific release - init = function() - -- wiki.vim configuration goes here, e.g. - vim.g.wiki_root = '~/Documents/Developer/' - end, - }, - -- Lazy - { - 'piersolenski/import.nvim', - dependencies = { - -- One of the following pickers is required: - 'nvim-telescope/telescope.nvim', - -- 'folke/snacks.nvim', - -- 'ibhagwan/fzf-lua', - }, - opts = { - picker = 'telescope', - }, - keys = { - { - 'i', - function() - require('import').pick() - end, - desc = 'Import', - }, - }, - }, - { - 'dimtion/guttermarks.nvim', - event = 'VeryLazy', - }, - { - 'retran/meow.yarn.nvim', - dependencies = { 'MunifTanjim/nui.nvim' }, - config = function() - require('meow.yarn').setup { - -- Your custom configuration goes here - } - - vim.keymap.set('n', 'yS', 'MeowYarn type super', { desc = 'Yarn: Super Types' }) - vim.keymap.set('n', 'ys', 'MeowYarn type sub', { desc = 'Yarn: Sub Types' }) - vim.keymap.set('n', 'yC', 'MeowYarn call callers', { desc = 'Yarn: Callers' }) - vim.keymap.set('n', 'yc', 'MeowYarn call callees', { desc = 'Yarn: Callees' }) - end, - }, - { - 'folke/flash.nvim', - event = 'VeryLazy', - ---@type Flash.Config - opts = {}, - keys = { - { - 's', - mode = { 'n', 'x', 'o' }, - function() - require('flash').jump() - end, - desc = 'Flash', - }, - { - 'S', - mode = { 'n', 'x', 'o' }, - function() - require('flash').treesitter() - end, - desc = 'Flash Treesitter', - }, - { - 'r', - mode = 'o', - function() - require('flash').remote() - end, - desc = 'Remote Flash', - }, - { - 'R', - mode = { 'o', 'x' }, - function() - require('flash').treesitter_search() - end, - desc = 'Treesitter Search', - }, - { - '', - mode = { 'c' }, - function() - require('flash').toggle() - end, - desc = 'Toggle Flash Search', - }, - }, - }, - { - 'wojciech-kulik/xcodebuild.nvim', - dependencies = { - 'MunifTanjim/nui.nvim', - 'nvim-treesitter/nvim-treesitter', -- (optional) for Quick tests support (required Swift parser) - }, - config = function() - require('xcodebuild').setup { - -- put some options here or leave it empty to use default settings - } - vim.keymap.set('n', 'X', 'XcodebuildPicker', { desc = 'Show Xcodebuild Actions' }) - vim.keymap.set('n', 'xf', 'XcodebuildProjectManager', { desc = 'Show Project Manager Actions' }) - - vim.keymap.set('n', 'xb', 'XcodebuildBuild', { desc = 'Build Project' }) - vim.keymap.set('n', 'xB', 'XcodebuildBuildForTesting', { desc = 'Build For Testing' }) - vim.keymap.set('n', 'xr', 'XcodebuildBuildRun', { desc = 'Build & Run Project' }) - - vim.keymap.set('n', 'xt', 'XcodebuildTest', { desc = 'Run Tests' }) - vim.keymap.set('v', 'xt', 'XcodebuildTestSelected', { desc = 'Run Selected Tests' }) - vim.keymap.set('n', 'xT', 'XcodebuildTestClass', { desc = 'Run Current Test Class' }) - vim.keymap.set('n', 'x.', 'XcodebuildTestRepeat', { desc = 'Repeat Last Test Run' }) - - vim.keymap.set('n', 'xl', 'XcodebuildToggleLogs', { desc = 'Toggle Xcodebuild Logs' }) - vim.keymap.set('n', 'xc', 'XcodebuildToggleCodeCoverage', { desc = 'Toggle Code Coverage' }) - vim.keymap.set('n', 'xC', 'XcodebuildShowCodeCoverageReport', { desc = 'Show Code Coverage Report' }) - vim.keymap.set('n', 'xe', 'XcodebuildTestExplorerToggle', { desc = 'Toggle Test Explorer' }) - vim.keymap.set('n', 'xs', 'XcodebuildFailingSnapshots', { desc = 'Show Failing Snapshots' }) - - vim.keymap.set('n', 'xp', 'XcodebuildPreviewGenerateAndShow', { desc = 'Generate Preview' }) - vim.keymap.set('n', 'x', 'XcodebuildPreviewToggle', { desc = 'Toggle Preview' }) - - vim.keymap.set('n', 'xd', 'XcodebuildSelectDevice', { desc = 'Select Device' }) - vim.keymap.set('n', 'xq', 'Telescope quickfix', { desc = 'Show QuickFix List' }) - - vim.keymap.set('n', 'xx', 'XcodebuildQuickfixLine', { desc = 'Quickfix Line' }) - vim.keymap.set('n', 'xa', 'XcodebuildCodeActions', { desc = 'Show Code Actions' }) - end, - }, - { - 'NickvanDyke/opencode.nvim', - dependencies = { - -- Recommended for better prompt input, and required to use opencode.nvim's embedded terminal — otherwise optional - { 'folke/snacks.nvim', opts = { input = { enabled = true } } }, - }, - ---@type opencode.Opts - opts = { - -- Your configuration, if any — see lua/opencode/config.lua - }, - config = function() - vim.keymap.set({ 'n', 'x' }, 'oa', function() - require('opencode').ask('@this: ', { submit = true }) - end, { desc = 'Ask opencode' }) - vim.keymap.set({ 'n', 'x' }, 'os', function() - require('opencode').select() - end, { desc = 'Execute opencode action…' }) - vim.keymap.set({ 'n', 'x' }, 'ga', function() - require('opencode').prompt '@this' - end, { desc = 'Add to opencode' }) - vim.keymap.set({ 'n', 't' }, 'ot', function() - require('opencode').toggle() - end, { desc = 'Toggle opencode' }) - vim.keymap.set('n', '', function() - require('opencode').command 'session.half.page.up' - end, { desc = 'opencode half page up' }) - vim.keymap.set('n', '', function() - require('opencode').command 'session.half.page.down' - end, { desc = 'opencode half page down' }) - end, - -- keys = { - -- -- Recommended keymaps - -- { - -- 'oA', - -- function() - -- require('opencode').ask() - -- end, - -- desc = 'Ask opencode', - -- }, - -- -- { - -- -- 'oa', - -- -- function() - -- -- require('opencode').ask('@this: ', { submit = true }) - -- -- end, - -- -- desc = 'Ask opencode about this', - -- -- mode = 'n', - -- -- }, - -- -- { - -- -- 'oa', - -- -- function() - -- -- require('opencode').ask '@selection: ' - -- -- end, - -- -- desc = 'Ask opencode about selection', - -- -- mode = 'v', - -- -- }, - -- { - -- 'ot', - -- function() - -- require('opencode').toggle() - -- end, - -- desc = 'Toggle embedded opencode', - -- }, - -- { - -- 'on', - -- function() - -- require('opencode').command 'session_new' - -- end, - -- desc = 'New session', - -- }, - -- { - -- 'oy', - -- function() - -- require('opencode').command 'messages_copy' - -- end, - -- desc = 'Copy last message', - -- }, - -- { - -- '', - -- function() - -- require('opencode').command 'messages_half_page_up' - -- end, - -- desc = 'Scroll messages up', - -- }, - -- { - -- '', - -- function() - -- require('opencode').command 'messages_half_page_down' - -- end, - -- desc = 'Scroll messages down', - -- }, - -- { - -- 'op', - -- function() - -- require('opencode').select_prompt() - -- end, - -- desc = 'Select prompt', - -- mode = { 'n', 'v' }, - -- }, - -- -- Example: keymap for custom prompt - -- { - -- 'oe', - -- function() - -- require('opencode').prompt 'Explain @cursor and its context' - -- end, - -- desc = 'Explain code near cursor', - -- }, - -- }, - -- { - -- 'dmtrKovalenko/fff.nvim', - -- build = 'cargo build --release', - -- -- or if you are using nixos - -- -- build = "nix run .#release", - -- opts = { -- (optional) - -- debug = { - -- enabled = true, -- we expect your collaboration at least during the beta - -- show_scores = true, -- to help us optimize the scoring system, feel free to share your scores! - -- }, - -- }, - -- -- No need to lazy-load with lazy.nvim. - -- -- This plugin initializes itself lazily. - -- lazy = false, - -- keys = { - -- { - -- 'ff', -- try it if you didn't it is a banger keybinding for a picker - -- function() - -- require('fff').find_files() - -- end, - -- desc = 'FFFind files', - -- }, - -- }, - -- }, - -- { - -- 'oribarilan/lensline.nvim', - -- tag = 'release/1.1', -- or: branch = 'release/1.x' for latest non-breaking updates - -- event = 'LspAttach', - -- config = function() - -- require('lensline').setup { - -- providers = { -- Array format: order determines display sequence - -- { - -- name = 'references', - -- enabled = true, -- enable references provider - -- quiet_lsp = true, -- suppress noisy LSP log messages (e.g., Pyright reference spam) - -- }, - -- { - -- name = 'last_author', - -- enabled = true, -- enabled by default with caching optimization - -- cache_max_files = 50, -- maximum number of files to cache blame data for (default: 50) - -- }, - -- -- built-in providers that are diabled by default: - -- { - -- name = 'diagnostics', - -- enabled = false, -- disabled by default - enable explicitly to use - -- min_level = 'WARN', -- only show WARN and ERROR by default (HINT, INFO, WARN, ERROR) - -- }, - -- { - -- name = 'complexity', - -- enabled = true, -- disabled by default - enable explicitly to use - -- min_level = 'L', -- only show L (Large) and XL (Extra Large) complexity by default - -- }, - -- }, - -- style = { - -- separator = ' • ', -- separator between all lens attributes - -- highlight = 'Comment', -- highlight group for lens text - -- prefix = '┃ ', -- prefix before lens content - -- placement = 'above', -- "above" | "inline" - where to render lenses (consider prefix = "" for inline) - -- use_nerdfont = true, -- enable nerd font icons in built-in providers - -- }, - -- render = 'all', -- "all" | "focused" (only active window's focused function) - -- limits = { - -- exclude = { - -- -- see config.lua for extensive list of default patterns - -- }, - -- exclude_gitignored = true, -- respect .gitignore by not processing ignored files - -- max_lines = 1000, -- process only first N lines of large files - -- max_lenses = 70, -- skip rendering if too many lenses generated - -- }, - -- debounce_ms = 500, -- unified debounce delay for all providers - -- focused_debounce_ms = 150, -- debounce delay for focus tracking in focused mode - -- debug_mode = false, -- enable debug output for development, see CONTRIBUTE.md - -- } - -- end, - -- }, - }, - - -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the - -- init.lua. If you want these files, they are in the repository, so you can just download them and - -- place them in the correct locations. - - -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart - -- - -- Here are some example plugins that I've included in the Kickstart repository. - -- Uncomment any of the lines below to enable them (you will need to restart nvim). - -- - require 'kickstart.plugins.debug', - require 'kickstart.plugins.indent_line', - require 'kickstart.plugins.lint', - require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- This is the easiest way to modularize your config. - -- - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, - -- - -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` - -- Or use telescope! - -- In normal mode type `sh` then write `lazy.nvim-plugin` - -- you can continue same window with `sr` which resumes last telescope search + -- Import all plugin modules from lua/plugins/ + { import = '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 = '🛠', @@ -2280,6 +40,3 @@ require('lazy').setup({ }, }, }) - --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua new file mode 100644 index 00000000..2dcc70d4 --- /dev/null +++ b/lua/config/autocmds.lua @@ -0,0 +1,16 @@ +-- Autocommands configuration +-- See `:help lua-guide-autocommands` + +-- Highlight when yanking (copying) text +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, +}) + +-- Refresh files if changed outside of Neovim +vim.fn.timer_start(2000, function() + vim.cmd 'silent! checktime' +end, { ['repeat'] = -1 }) diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua new file mode 100644 index 00000000..a7510021 --- /dev/null +++ b/lua/config/keymaps.lua @@ -0,0 +1,27 @@ +-- Keymaps configuration +-- See `:help vim.keymap.set()` + +-- Clear highlights on search when pressing in normal mode +vim.keymap.set('n', '', 'nohlsearch') + +-- Diagnostic keymaps +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) + +-- Go to first character in line +vim.keymap.set('', 'h', '^') + +-- Go to last character in line +vim.keymap.set('', 'l', 'g_') + +-- Save all files +vim.keymap.set('n', 'w', ':wa ') + +-- Exit terminal mode with easier shortcut +vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) + +-- Keybinds to make split navigation easier +-- Use CTRL+ to switch between windows +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' }) diff --git a/lua/config/options.lua b/lua/config/options.lua new file mode 100644 index 00000000..88d305ae --- /dev/null +++ b/lua/config/options.lua @@ -0,0 +1,66 @@ +-- Options configuration +-- See `:help vim.o` and `:help option-list` + +-- Set leader key (must happen before plugins are loaded) +vim.g.mapleader = ' ' +vim.g.maplocalleader = ' ' + +-- Set to true if you have a Nerd Font installed +vim.g.have_nerd_font = true + +-- Line numbers +vim.o.number = true +vim.o.relativenumber = true + +-- Enable mouse mode +vim.o.mouse = 'a' + +-- Don't show mode (already in status line) +vim.o.showmode = false + +-- Sync clipboard between OS and Neovim +vim.schedule(function() + vim.o.clipboard = 'unnamedplus' +end) + +-- Enable break indent +vim.o.breakindent = true + +-- Save undo history +vim.o.undofile = true + +-- Case-insensitive searching UNLESS \C or capital letters in search term +vim.o.ignorecase = true +vim.o.smartcase = true + +-- Keep signcolumn on by default +vim.o.signcolumn = 'yes' + +-- Decrease update time +vim.o.updatetime = 250 + +-- Decrease mapped sequence wait time +vim.o.timeoutlen = 300 + +-- Configure how new splits should be opened +vim.o.splitright = true +vim.o.splitbelow = true + +-- Sets how neovim will display certain whitespace characters +vim.o.list = true +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } + +-- Preview substitutions live, as you type +vim.o.inccommand = 'split' + +-- Show which line your cursor is on +vim.o.cursorline = true + +-- Minimal number of screen lines to keep above and below the cursor +vim.o.scrolloff = 10 + +-- Raise dialog for unsaved changes instead of failing +vim.o.confirm = true + +-- Auto-read files changed outside of Neovim +vim.opt.autoread = true diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua new file mode 100644 index 00000000..6f036274 --- /dev/null +++ b/lua/plugins/completion.lua @@ -0,0 +1,193 @@ +-- Autocompletion configuration +-- +return { + 'saghen/blink.cmp', + dependencies = { + 'rafamadriz/friendly-snippets', + 'echasnovski/mini.icons', + 'onsails/lspkind-nvim', + }, + event = 'VeryLazy', + version = '*', + opts = { + enabled = function() + return not vim.tbl_contains({ 'oil' }, vim.bo.filetype) + end, + keymap = { + preset = 'enter', + [''] = { + function(cmp) + cmp.show_documentation() + end, + }, + [''] = {}, + }, + signature = { enabled = false }, + appearance = { + -- use_nvim_cmp_as_default = true, + nerd_font_variant = 'mono', + }, + sources = { + default = { 'lsp', 'path', 'snippets', 'buffer' }, + }, + + cmdline = { + keymap = { + [''] = { 'show', 'select_next' }, + [''] = { 'select_prev' }, + [''] = { 'select_and_accept', 'fallback' }, + [''] = { 'select_and_accept', 'fallback' }, + [''] = { 'select_and_accept', 'fallback' }, + [''] = { 'select_next', 'fallback' }, + [''] = { 'select_prev', 'fallback' }, + [''] = { + 'cancel', + function() + vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes('', true, false, true), 'n', true) + end, + }, + }, + + sources = function() + local type = vim.fn.getcmdtype() + -- Search forward and backward + if type == '/' or type == '?' then + return {} + end + -- Commands + if type == ':' or type == '@' then + return { 'cmdline', 'path' } + end + return {} + end, + completion = { ghost_text = { enabled = false } }, + }, + + completion = { + trigger = { + show_on_trigger_character = true, + }, + documentation = { + auto_show = true, + auto_show_delay_ms = 200, + window = { + border = 'rounded', + winhighlight = 'Normal:Normal,FloatBorder:FloatBorder,CursorLine:BlinkCmpDocCursorLine,Search:None', + }, + }, + list = { + selection = { + auto_insert = false, + }, + }, + menu = { + border = 'rounded', + draw = { + gap = 2, + components = { + kind_icon = { + ellipsis = false, + highlight = function(ctx) + local _, hl, _ = require('mini.icons').get('lsp', ctx.kind) + return hl + end, + text = function(ctx) + local icon = require('lspkind').symbolic(ctx.kind, { mode = 'symbol' }) + return icon .. ctx.icon_gap + end, + }, + }, + }, + winhighlight = 'Normal:Normal,FloatBorder:FloatBorder,CursorLine:BlinkCmpMenuSelection,Search:None', + }, + }, + }, + opts_extend = { 'sources.default' }, +} +-- return { +-- { +-- 'saghen/blink.cmp', +-- event = 'VimEnter', +-- version = '1.*', +-- dependencies = { +-- { +-- 'L3MON4D3/LuaSnip', +-- version = '2.*', +-- build = (function() +-- if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then +-- return +-- end +-- return 'make install_jsregexp' +-- end)(), +-- opts = {}, +-- }, +-- 'folke/lazydev.nvim', +-- }, +-- ---@module 'blink.cmp' +-- ---@type blink.cmp.Config +-- opts = { +-- keymap = { +-- preset = 'enter', +-- }, +-- +-- appearance = { +-- nerd_font_variant = 'mono', +-- }, +-- +-- completion = { +-- trigger = { +-- show_on_insert_on_trigger_character = true, +-- }, +-- ghost_text = { +-- enabled = true, +-- }, +-- menu = { +-- border = 'single', +-- draw = { +-- treesitter = { 'lsp' }, +-- padding = { 0, 1 }, +-- components = { +-- kind_icon = { +-- text = function(ctx) +-- local kind_icon, _, _ = require('mini.icons').get('lsp', ctx.kind) +-- return kind_icon +-- end, +-- highlight = function(ctx) +-- local _, hl, _ = require('mini.icons').get('lsp', ctx.kind) +-- return hl +-- end, +-- }, +-- kind = { +-- highlight = function(ctx) +-- local _, hl, _ = require('mini.icons').get('lsp', ctx.kind) +-- return hl +-- end, +-- }, +-- }, +-- }, +-- }, +-- documentation = { auto_show = true, auto_show_delay_ms = 100, window = { border = 'single' } }, +-- }, +-- +-- signature = { enabled = true, window = { border = 'single' } }, +-- +-- sources = { +-- default = { 'lsp', 'path', 'snippets', 'lazydev' }, +-- providers = { +-- lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, +-- }, +-- }, +-- +-- snippets = { preset = 'luasnip' }, +-- +-- fuzzy = { +-- sorts = { +-- 'exact', +-- 'score', +-- 'sort_text', +-- }, +-- implementation = 'rust', +-- }, +-- }, +-- }, +-- } diff --git a/lua/plugins/debug.lua b/lua/plugins/debug.lua new file mode 100644 index 00000000..d592be0d --- /dev/null +++ b/lua/plugins/debug.lua @@ -0,0 +1,3 @@ +-- Debug Adapter Protocol (DAP) configuration +-- Re-exports the existing kickstart debug config +return require 'kickstart.plugins.debug' diff --git a/lua/plugins/deltaview.lua b/lua/plugins/deltaview.lua new file mode 100644 index 00000000..8a334280 --- /dev/null +++ b/lua/plugins/deltaview.lua @@ -0,0 +1,11 @@ +return { + { + 'kokusenz/deltaview.nvim', + opts = { + keyconfig = { + dv_toggle_keybind = 'dd', + }, + use_nerdfonts = false, + }, + }, +} diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua new file mode 100644 index 00000000..e2761910 --- /dev/null +++ b/lua/plugins/editor.lua @@ -0,0 +1,92 @@ +-- Editor enhancement plugins +return { + -- Detect tabstop and shiftwidth automatically (removed guess-indent.nvim duplicate) + 'tpope/vim-sleuth', + + -- Highlight TODOs in comments + { + 'folke/todo-comments.nvim', + event = 'VimEnter', + dependencies = { 'nvim-lua/plenary.nvim' }, + opts = { signs = false }, + }, + + -- Collection of mini plugins + { + 'echasnovski/mini.nvim', + config = function() + -- Better Around/Inside textobjects + require('mini.ai').setup { n_lines = 500 } + + -- Add/delete/replace surroundings + require('mini.surround').setup() + + -- Simple statusline + local statusline = require 'mini.statusline' + statusline.setup { use_icons = vim.g.have_nerd_font } + + ---@diagnostic disable-next-line: duplicate-set-field + statusline.section_location = function() + return '%2l:%-2v' + end + + -- File navigator + require('mini.files').setup() + end, + keys = { + { 'ff', 'lua MiniFiles.open()', desc = 'Toggle file navigator' }, + }, + }, + + -- Autopairs + { + 'windwp/nvim-autopairs', + event = 'InsertEnter', + dependencies = { 'hrsh7th/nvim-cmp' }, + config = function() + require('nvim-autopairs').setup {} + end, + }, + + -- Diagnostics list + { + 'folke/trouble.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + opts = {}, + keys = { + { 'xx', 'Trouble diagnostics toggle', desc = 'Diagnostics (Trouble)' }, + { 'xw', 'Trouble diagnostics toggle filter.buf=0', desc = 'Buffer Diagnostics (Trouble)' }, + { 'xq', 'Trouble qflist toggle', desc = 'Quickfix List (Trouble)' }, + { 'xl', 'Trouble loclist toggle', desc = 'Location List (Trouble)' }, + { 'gR', 'Trouble lsp_references toggle', desc = 'LSP References (Trouble)' }, + }, + }, + + -- Linting + { + 'mfussenegger/nvim-lint', + event = { 'BufReadPre', 'BufNewFile' }, + config = function() + local lint = require 'lint' + lint.linters_by_ft = { + -- Add linters per filetype as needed + } + + vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { + group = vim.api.nvim_create_augroup('lint', { clear = true }), + callback = function() + if vim.opt_local.modifiable:get() then + lint.try_lint() + end + end, + }) + end, + }, + + -- Indentation guides + { + 'lukas-reineke/indent-blankline.nvim', + main = 'ibl', + opts = {}, + }, +} diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua new file mode 100644 index 00000000..478f6737 --- /dev/null +++ b/lua/plugins/git.lua @@ -0,0 +1,19 @@ +-- Git integration plugins +return { + -- Git commands in nvim + 'tpope/vim-fugitive', + + -- Git signs in the gutter + { + 'lewis6991/gitsigns.nvim', + opts = { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + }, + }, + }, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua new file mode 100644 index 00000000..361f4ab0 --- /dev/null +++ b/lua/plugins/lsp.lua @@ -0,0 +1,192 @@ +-- LSP Configuration +return { + { + -- Lua LSP for Neovim config + 'folke/lazydev.nvim', + ft = 'lua', + opts = { + library = { + { path = '${3rd}/luv/library', words = { 'vim%.uv' } }, + }, + }, + }, + { + -- Main LSP Configuration + 'neovim/nvim-lspconfig', + dependencies = { + { 'mason-org/mason.nvim', opts = {} }, + 'mason-org/mason-lspconfig.nvim', + 'WhoIsSethDaniel/mason-tool-installer.nvim', + { 'j-hui/fidget.nvim', opts = {} }, + 'saghen/blink.cmp', + }, + config = function() + -- LSP attach autocmd for keymaps and features + vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), + callback = function(event) + local map = function(keys, func, desc, mode) + mode = mode or 'n' + vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + end + + -- LSP keymaps + map('grn', vim.lsp.buf.rename, '[R]e[n]ame') + map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) + map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') + map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols') + map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols') + map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition') + + -- Helper function for method support check + 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 + + -- Document highlighting + local client = vim.lsp.get_client_by_id(event.data.client_id) + if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then + local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) + vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.document_highlight, + }) + + vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { + buffer = event.buf, + group = highlight_augroup, + callback = vim.lsp.buf.clear_references, + }) + + vim.api.nvim_create_autocmd('LspDetach', { + group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), + callback = function(event2) + vim.lsp.buf.clear_references() + vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } + end, + }) + end + + -- Inlay hints toggle + if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then + map('th', function() + vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) + end, '[T]oggle Inlay [H]ints') + end + end, + }) + + -- Diagnostic config + vim.diagnostic.config { + severity_sort = true, + float = { border = 'rounded', source = 'if_many' }, + underline = { severity = vim.diagnostic.severity.ERROR }, + signs = vim.g.have_nerd_font and { + text = { + [vim.diagnostic.severity.ERROR] = '󰅚 ', + [vim.diagnostic.severity.WARN] = '󰀪 ', + [vim.diagnostic.severity.INFO] = '󰋽 ', + [vim.diagnostic.severity.HINT] = '󰌶 ', + }, + } or {}, + virtual_text = { + source = 'if_many', + spacing = 2, + format = function(diagnostic) + return diagnostic.message + end, + }, + } + + -- Get capabilities from blink.cmp + local capabilities = require('blink.cmp').get_lsp_capabilities() + + -- Sourcekit setup for Swift + local lspconfig = vim.lsp.config + lspconfig('sourcekit', { + capabilities = capabilities, + root_dir = function(_, callback) + callback(require('lspconfig.util').root_pattern 'Package.swift'(vim.fn.getcwd()) or require('lspconfig.util').find_git_ancestor(vim.fn.getcwd())) + end, + cmd = { vim.trim(vim.fn.system 'xcrun -f sourcekit-lsp') }, + }) + vim.lsp.enable 'sourcekit' + + -- Server configurations + local servers = { + clangd = {}, + gopls = {}, + rust_analyzer = {}, + jedi_language_server = {}, + ts_ls = {}, + lua_ls = { + settings = { + Lua = { + completion = { + callSnippet = 'Replace', + }, + }, + }, + }, + } + + -- Setup mason tools + local ensure_installed = vim.tbl_keys(servers or {}) + vim.list_extend(ensure_installed, { 'stylua' }) + require('mason-tool-installer').setup { ensure_installed = ensure_installed } + + require('mason-lspconfig').setup { + ensure_installed = {}, + automatic_installation = false, + handlers = { + function(server_name) + local server = servers[server_name] or {} + server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) + require('lspconfig')[server_name].setup(server) + end, + }, + } + end, + }, + { -- Autoformat + 'stevearc/conform.nvim', + event = { 'BufWritePre' }, + cmd = { 'ConformInfo' }, + keys = { + { + 'f', + function() + require('conform').format { async = true, lsp_format = 'fallback' } + end, + mode = '', + desc = '[F]ormat buffer', + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + local disable_filetypes = { c = true, cpp = true } + if disable_filetypes[vim.bo[bufnr].filetype] then + return nil + else + return { + timeout_ms = 500, + lsp_format = 'fallback', + } + end + end, + formatters_by_ft = { + lua = { 'stylua' }, + html = { 'djlint' }, + }, + }, + }, +} diff --git a/lua/plugins/misc.lua b/lua/plugins/misc.lua new file mode 100644 index 00000000..2cfa9efc --- /dev/null +++ b/lua/plugins/misc.lua @@ -0,0 +1,108 @@ +-- Miscellaneous plugins +return { + -- Database client + { + 'kristijanhusak/vim-dadbod-ui', + dependencies = { + { 'tpope/vim-dadbod', lazy = true }, + { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql' }, lazy = true }, + }, + cmd = { 'DBUI', 'DBUIToggle', 'DBUIAddConnection', 'DBUIFindBuffer' }, + init = function() + vim.g.db_ui_use_nerd_fonts = 1 + end, + }, + + -- Wiki/notes + { + 'lervag/wiki.vim', + init = function() + vim.g.wiki_root = '~/Documents/Developer/' + end, + }, + + -- Import picker + { + 'piersolenski/import.nvim', + dependencies = { 'nvim-telescope/telescope.nvim' }, + opts = { picker = 'telescope' }, + keys = { + { 'i', function() require('import').pick() end, desc = 'Import' }, + }, + }, + + -- Type hierarchy viewer + { + 'retran/meow.yarn.nvim', + dependencies = { 'MunifTanjim/nui.nvim' }, + config = function() + require('meow.yarn').setup {} + vim.keymap.set('n', 'yS', 'MeowYarn type super', { desc = 'Yarn: Super Types' }) + vim.keymap.set('n', 'ys', 'MeowYarn type sub', { desc = 'Yarn: Sub Types' }) + vim.keymap.set('n', 'yC', 'MeowYarn call callers', { desc = 'Yarn: Callers' }) + vim.keymap.set('n', 'yc', 'MeowYarn call callees', { desc = 'Yarn: Callees' }) + end, + }, + + -- Xcode development + { + 'wojciech-kulik/xcodebuild.nvim', + dependencies = { + 'MunifTanjim/nui.nvim', + 'nvim-treesitter/nvim-treesitter', + }, + config = function() + require('xcodebuild').setup {} + + vim.keymap.set('n', 'X', 'XcodebuildPicker', { desc = 'Show Xcodebuild Actions' }) + vim.keymap.set('n', 'xf', 'XcodebuildProjectManager', { desc = 'Show Project Manager Actions' }) + vim.keymap.set('n', 'xb', 'XcodebuildBuild', { desc = 'Build Project' }) + vim.keymap.set('n', 'xB', 'XcodebuildBuildForTesting', { desc = 'Build For Testing' }) + vim.keymap.set('n', 'xr', 'XcodebuildBuildRun', { desc = 'Build & Run Project' }) + vim.keymap.set('n', 'xt', 'XcodebuildTest', { desc = 'Run Tests' }) + vim.keymap.set('v', 'xt', 'XcodebuildTestSelected', { desc = 'Run Selected Tests' }) + vim.keymap.set('n', 'xT', 'XcodebuildTestClass', { desc = 'Run Current Test Class' }) + vim.keymap.set('n', 'x.', 'XcodebuildTestRepeat', { desc = 'Repeat Last Test Run' }) + vim.keymap.set('n', 'xl', 'XcodebuildToggleLogs', { desc = 'Toggle Xcodebuild Logs' }) + vim.keymap.set('n', 'xc', 'XcodebuildToggleCodeCoverage', { desc = 'Toggle Code Coverage' }) + vim.keymap.set('n', 'xC', 'XcodebuildShowCodeCoverageReport', { desc = 'Show Code Coverage Report' }) + vim.keymap.set('n', 'xe', 'XcodebuildTestExplorerToggle', { desc = 'Toggle Test Explorer' }) + vim.keymap.set('n', 'xs', 'XcodebuildFailingSnapshots', { desc = 'Show Failing Snapshots' }) + vim.keymap.set('n', 'xp', 'XcodebuildPreviewGenerateAndShow', { desc = 'Generate Preview' }) + vim.keymap.set('n', 'x', 'XcodebuildPreviewToggle', { desc = 'Toggle Preview' }) + vim.keymap.set('n', 'xd', 'XcodebuildSelectDevice', { desc = 'Select Device' }) + vim.keymap.set('n', 'xq', 'Telescope quickfix', { desc = 'Show QuickFix List' }) + vim.keymap.set('n', 'xa', 'XcodebuildCodeActions', { desc = 'Show Code Actions' }) + end, + }, + + -- OpenCode AI assistant + { + 'NickvanDyke/opencode.nvim', + dependencies = { + { 'folke/snacks.nvim', opts = { input = { enabled = true } } }, + }, + ---@type opencode.Opts + opts = {}, + config = function() + vim.keymap.set({ 'n', 'x' }, 'oa', function() + require('opencode').ask('@this: ', { submit = true }) + end, { desc = 'Ask opencode' }) + vim.keymap.set({ 'n', 'x' }, 'os', function() + require('opencode').select() + end, { desc = 'Execute opencode action…' }) + vim.keymap.set({ 'n', 'x' }, 'ga', function() + require('opencode').prompt '@this' + end, { desc = 'Add to opencode' }) + vim.keymap.set({ 'n', 't' }, 'ot', function() + require('opencode').toggle() + end, { desc = 'Toggle opencode' }) + vim.keymap.set('n', '', function() + require('opencode').command 'session.half.page.up' + end, { desc = 'opencode half page up' }) + vim.keymap.set('n', '', function() + require('opencode').command 'session.half.page.down' + end, { desc = 'opencode half page down' }) + end, + }, +} diff --git a/lua/plugins/navigation.lua b/lua/plugins/navigation.lua new file mode 100644 index 00000000..5c042225 --- /dev/null +++ b/lua/plugins/navigation.lua @@ -0,0 +1,57 @@ +-- Navigation and file management plugins +return { + -- Tmux integration + { 'christoomey/vim-tmux-navigator' }, + + -- File explorer (edit directories like buffers) + { + 'stevearc/oil.nvim', + dependencies = { { 'echasnovski/mini.icons', opts = {} } }, + lazy = false, + config = function() + require('oil').setup { + view_options = { show_hidden = true }, + } + vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }) + end, + }, + + -- File tagging/bookmarks + { + 'cbochs/grapple.nvim', + dependencies = { { 'nvim-tree/nvim-web-devicons', lazy = true } }, + opts = { + scope = 'git_branch', + icons = false, + }, + event = { 'BufReadPost', 'BufNewFile' }, + cmd = 'Grapple', + keys = { + { 'm', 'Grapple toggle', desc = 'Grapple toggle tag' }, + { 'k', 'Grapple toggle_tags', desc = 'Grapple toggle tags' }, + { 'K', 'Grapple toggle_scopes', desc = 'Grapple toggle scopes' }, + { 'j', 'Grapple cycle forward', desc = 'Grapple cycle forward' }, + { 'J', 'Grapple cycle backward', desc = 'Grapple cycle backward' }, + { '1', 'Grapple select index=1', desc = 'Grapple select 1' }, + { '2', 'Grapple select index=2', desc = 'Grapple select 2' }, + { '3', 'Grapple select index=3', desc = 'Grapple select 3' }, + { '4', 'Grapple select index=4', desc = 'Grapple select 4' }, + { '5', 'Grapple select index=5', desc = 'Grapple select 5' }, + }, + }, + + -- Jump motions + { + 'folke/flash.nvim', + event = 'VeryLazy', + ---@type Flash.Config + opts = {}, + keys = { + { 's', mode = { 'n', 'x', 'o' }, function() require('flash').jump() end, desc = 'Flash' }, + { 'S', mode = { 'n', 'x', 'o' }, function() require('flash').treesitter() end, desc = 'Flash Treesitter' }, + { 'r', mode = 'o', function() require('flash').remote() end, desc = 'Remote Flash' }, + { 'R', mode = { 'o', 'x' }, function() require('flash').treesitter_search() end, desc = 'Treesitter Search' }, + { '', mode = { 'c' }, function() require('flash').toggle() end, desc = 'Toggle Flash Search' }, + }, + }, +} diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua new file mode 100644 index 00000000..42aa7129 --- /dev/null +++ b/lua/plugins/snacks.lua @@ -0,0 +1,135 @@ +-- Snacks.nvim - Multi-purpose utilities +return { + { + 'folke/snacks.nvim', + priority = 1000, + lazy = false, + ---@type snacks.Config + opts = { + image = { enabled = true }, + bigfile = { enabled = true }, + dashboard = { enabled = true }, + indent = { enabled = true }, + input = { enabled = true }, + notifier = { enabled = true, timeout = 3000 }, + quickfile = { enabled = true }, + scroll = { enabled = true }, + statuscolumn = { enabled = true }, + words = { enabled = true }, + terminal = { win = { style = 'float' } }, + }, + keys = { + -- Pickers & Explorer + { '', function() Snacks.picker.smart() end, desc = 'Smart Find Files' }, + { ',', function() Snacks.picker.buffers() end, desc = 'Buffers' }, + { ':', function() Snacks.picker.command_history() end, desc = 'Command History' }, + { 'n', function() Snacks.picker.notifications() end, desc = 'Notification History' }, + { 'e', function() Snacks.explorer() end, desc = 'File Explorer' }, + + -- Find + { 'fb', function() Snacks.picker.buffers() end, desc = 'Buffers' }, + { 'fc', function() Snacks.picker.files { cwd = vim.fn.stdpath 'config' } end, desc = 'Find Config File' }, + { 'fg', function() Snacks.picker.git_files() end, desc = 'Find Git Files' }, + { 'fp', function() Snacks.picker.projects() end, desc = 'Projects' }, + { 'fr', function() Snacks.picker.recent() end, desc = 'Recent' }, + + -- Git + { 'gb', function() Snacks.picker.git_branches() end, desc = 'Git Branches' }, + { 'gl', function() Snacks.picker.git_log() end, desc = 'Git Log' }, + { 'gL', function() Snacks.picker.git_log_line() end, desc = 'Git Log Line' }, + { 'gs', function() Snacks.picker.git_status() end, desc = 'Git Status' }, + { 'gS', function() Snacks.picker.git_stash() end, desc = 'Git Stash' }, + { 'gd', function() Snacks.picker.git_diff() end, desc = 'Git Diff (Hunks)' }, + { 'gf', function() Snacks.picker.git_log_file() end, desc = 'Git Log File' }, + + -- GitHub + { 'gi', function() Snacks.picker.gh_issue() end, desc = 'GitHub Issues (open)' }, + { 'gI', function() Snacks.picker.gh_issue { state = 'all' } end, desc = 'GitHub Issues (all)' }, + { 'gp', function() Snacks.picker.gh_pr() end, desc = 'GitHub Pull Requests (open)' }, + { 'gP', function() Snacks.picker.gh_pr { state = 'all' } end, desc = 'GitHub Pull Requests (all)' }, + + -- Search + { 'sb', function() Snacks.picker.lines() end, desc = 'Buffer Lines' }, + { 'sB', function() Snacks.picker.grep_buffers() end, desc = 'Grep Open Buffers' }, + { 'sw', function() Snacks.picker.grep_word() end, desc = 'Visual selection or word', mode = { 'n', 'x' } }, + { 's"', function() Snacks.picker.registers() end, desc = 'Registers' }, + { 's/', function() Snacks.picker.search_history() end, desc = 'Search History' }, + { 'sa', function() Snacks.picker.autocmds() end, desc = 'Autocmds' }, + { 'sc', function() Snacks.picker.command_history() end, desc = 'Command History' }, + { 'sC', function() Snacks.picker.commands() end, desc = 'Commands' }, + { 'sD', function() Snacks.picker.diagnostics_buffer() end, desc = 'Buffer Diagnostics' }, + { 'sH', function() Snacks.picker.highlights() end, desc = 'Highlights' }, + { 'si', function() Snacks.picker.icons() end, desc = 'Icons' }, + { 'sj', function() Snacks.picker.jumps() end, desc = 'Jumps' }, + { 'sl', function() Snacks.picker.loclist() end, desc = 'Location List' }, + { 'sm', function() Snacks.picker.marks() end, desc = 'Marks' }, + { 'sM', function() Snacks.picker.man() end, desc = 'Man Pages' }, + { 'sp', function() Snacks.picker.lazy() end, desc = 'Search for Plugin Spec' }, + { 'sq', function() Snacks.picker.qflist() end, desc = 'Quickfix List' }, + { 'sR', function() Snacks.picker.resume() end, desc = 'Resume' }, + { 'su', function() Snacks.picker.undo() end, desc = 'Undo History' }, + { 'uC', function() Snacks.picker.colorschemes() end, desc = 'Colorschemes' }, + + -- LSP (via Snacks picker) + { 'gd', function() Snacks.picker.lsp_definitions() end, desc = 'Goto Definition' }, + { 'gD', function() Snacks.picker.lsp_declarations() end, desc = 'Goto Declaration' }, + { 'gr', function() Snacks.picker.lsp_references() end, nowait = true, desc = 'References' }, + { 'gI', function() Snacks.picker.lsp_implementations() end, desc = 'Goto Implementation' }, + { 'gy', function() Snacks.picker.lsp_type_definitions() end, desc = 'Goto T[y]pe Definition' }, + { 'gai', function() Snacks.picker.lsp_incoming_calls() end, desc = 'C[a]lls Incoming' }, + { 'gao', function() Snacks.picker.lsp_outgoing_calls() end, desc = 'C[a]lls Outgoing' }, + { 'sS', function() Snacks.picker.lsp_workspace_symbols() end, desc = 'LSP Workspace Symbols' }, + + -- Other utilities + { 'z', function() Snacks.zen() end, desc = 'Toggle Zen Mode' }, + { 'Z', function() Snacks.zen.zoom() end, desc = 'Toggle Zoom' }, + { '.', function() Snacks.scratch() end, desc = 'Toggle Scratch Buffer' }, + { 'S', function() Snacks.scratch.select() end, desc = 'Select Scratch Buffer' }, + { 'bd', function() Snacks.bufdelete() end, desc = 'Delete Buffer' }, + { 'cR', function() Snacks.rename.rename_file() end, desc = 'Rename File' }, + { 'gB', function() Snacks.gitbrowse() end, desc = 'Git Browse', mode = { 'n', 'v' } }, + { 'gg', function() Snacks.lazygit() end, desc = 'Lazygit' }, + { 'un', function() Snacks.notifier.hide() end, desc = 'Dismiss All Notifications' }, + { '', function() Snacks.terminal() end, desc = 'Toggle Terminal' }, + { '', function() Snacks.terminal() end, desc = 'which_key_ignore' }, + { ']]', function() Snacks.words.jump(vim.v.count1) end, desc = 'Next Reference', mode = { 'n', 't' } }, + { '[[', function() Snacks.words.jump(-vim.v.count1) end, desc = 'Prev Reference', mode = { 'n', 't' } }, + { + 'N', + desc = 'Neovim News', + function() + Snacks.win { + file = vim.api.nvim_get_runtime_file('doc/news.txt', false)[1], + width = 0.6, + height = 0.6, + wo = { spell = false, wrap = false, signcolumn = 'yes', statuscolumn = ' ', conceallevel = 3 }, + } + end, + }, + }, + init = function() + vim.api.nvim_create_autocmd('User', { + pattern = 'VeryLazy', + callback = function() + -- Setup globals for debugging + _G.dd = function(...) Snacks.debug.inspect(...) end + _G.bt = function() Snacks.debug.backtrace() end + vim.print = _G.dd + + -- Toggle mappings + Snacks.toggle.option('spell', { name = 'Spelling' }):map 'us' + Snacks.toggle.option('wrap', { name = 'Wrap' }):map 'uw' + Snacks.toggle.option('relativenumber', { name = 'Relative Number' }):map 'uL' + Snacks.toggle.diagnostics():map 'ud' + Snacks.toggle.line_number():map 'ul' + Snacks.toggle.option('conceallevel', { off = 0, on = vim.o.conceallevel > 0 and vim.o.conceallevel or 2 }):map 'uc' + Snacks.toggle.treesitter():map 'uT' + Snacks.toggle.option('background', { off = 'light', on = 'dark', name = 'Dark Background' }):map 'ub' + Snacks.toggle.inlay_hints():map 'uh' + Snacks.toggle.indent():map 'ug' + Snacks.toggle.dim():map 'uD' + end, + }) + end, + }, +} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 00000000..6acd637f --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,61 @@ +-- Telescope fuzzy finder configuration +return { + { + 'nvim-telescope/telescope.nvim', + event = 'VimEnter', + dependencies = { + 'nvim-lua/plenary.nvim', + { + 'nvim-telescope/telescope-fzf-native.nvim', + build = 'make', + cond = function() + return vim.fn.executable 'make' == 1 + end, + }, + { 'nvim-telescope/telescope-ui-select.nvim' }, + { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, + }, + config = function() + require('telescope').setup { + extensions = { + ['ui-select'] = { + require('telescope.themes').get_dropdown(), + }, + }, + } + + pcall(require('telescope').load_extension, 'fzf') + pcall(require('telescope').load_extension, 'ui-select') + + local builtin = require 'telescope.builtin' + vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) + vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) + vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) + vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) + vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) + vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) + vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) + vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) + vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) + vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + + vim.keymap.set('n', '/', function() + 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', 's/', function() + builtin.live_grep { + grep_open_files = true, + prompt_title = 'Live Grep in Open Files', + } + end, { desc = '[S]earch [/] in Open Files' }) + + vim.keymap.set('n', 'sn', function() + builtin.find_files { cwd = vim.fn.stdpath 'config' } + end, { desc = '[S]earch [N]eovim files' }) + end, + }, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 00000000..117f2fb2 --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,29 @@ +-- Treesitter configuration for syntax highlighting and parsing +return { + { + 'nvim-treesitter/nvim-treesitter', + build = ':TSUpdate', + main = 'nvim-treesitter.configs', + opts = { + ensure_installed = { + 'bash', + 'c', + 'diff', + 'html', + 'lua', + 'luadoc', + 'markdown', + 'markdown_inline', + 'query', + 'vim', + 'vimdoc', + }, + auto_install = true, + highlight = { + enable = true, + additional_vim_regex_highlighting = { 'ruby' }, + }, + indent = { enable = true, disable = { 'ruby' } }, + }, + }, +} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua new file mode 100644 index 00000000..faedb54a --- /dev/null +++ b/lua/plugins/ui.lua @@ -0,0 +1,78 @@ +-- UI and appearance plugins +return { + -- Colorscheme + { + 'rebelot/kanagawa.nvim', + priority = 1000, + config = function() + vim.cmd 'colorscheme kanagawa' + vim.cmd.hi 'Comment gui=none' + end, + }, + + -- Keybinding hints + { + 'folke/which-key.nvim', + event = 'VimEnter', + opts = { + delay = 0, + icons = { + mappings = vim.g.have_nerd_font, + keys = vim.g.have_nerd_font and {} or { + Up = ' ', + Down = ' ', + Left = ' ', + Right = ' ', + C = ' ', + M = ' ', + D = ' ', + S = ' ', + CR = ' ', + Esc = ' ', + ScrollWheelDown = ' ', + ScrollWheelUp = ' ', + NL = ' ', + BS = ' ', + Space = ' ', + Tab = ' ', + F1 = '', + F2 = '', + F3 = '', + F4 = '', + F5 = '', + F6 = '', + F7 = '', + F8 = '', + F9 = '', + F10 = '', + F11 = '', + F12 = '', + }, + }, + spec = { + { 'c', group = '[C]ode' }, + { 'd', group = '[D]ocument' }, + { 'r', group = '[R]ename' }, + { 's', group = '[S]earch' }, + { 't', group = '[T]oggle' }, + { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, + { 'g', group = '[G]it' }, + { 'x', group = 'Trouble/Xcode' }, + { 'f', group = '[F]ind/Format' }, + { 'u', group = '[U]I Toggles' }, + { 'o', group = '[O]pencode' }, + { 'y', group = '[Y]arn (Type Hierarchy)' }, + }, + }, + }, + + -- Icons + { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, + { 'echasnovski/mini.icons', opts = {} }, + + -- Gutter marks + { + 'dimtion/guttermarks.nvim', + event = 'VeryLazy', + }, +}