From b42b49b525411f26238a93353db90848c7007787 Mon Sep 17 00:00:00 2001 From: C4 Patino Date: Wed, 2 Jul 2025 19:38:58 -0500 Subject: [PATCH] feat: updated neovim configuration to match the configuration from nixvim --- .gitignore | 1 - init.lua | 1047 +--------------------------------- lazy-lock.json | 93 +-- lua/autocmds.lua | 11 +- lua/languages/cmp.lua | 113 ++++ lua/languages/conform.lua | 80 +++ lua/languages/dap.lua | 68 +++ lua/languages/init.lua | 4 + lua/languages/lsp.lua | 168 ++++++ lua/languages/lspkind.lua | 12 + lua/languages/lspsaga.lua | 83 +++ lua/languages/luasnip.lua | 4 + lua/languages/treesitter.lua | 14 + lua/navigation/harpoon.lua | 64 +++ lua/navigation/nvim-tree.lua | 80 +++ lua/navigation/telescope.lua | 102 ++++ lua/plugins.lua | 32 ++ lua/ui/alpha.lua | 81 +++ lua/ui/fidget.lua | 89 +++ lua/ui/indent-blankline.lua | 8 + lua/ui/init.lua | 35 ++ lua/ui/lualine.lua | 36 ++ lua/ui/noice.lua | 48 ++ lua/ui/nvim-notify.lua | 45 ++ lua/utils/init.lua | 10 + lua/utils/lazygit.lua | 8 + lua/utils/todo-comments.lua | 7 + lua/utils/toggleterm.lua | 16 + lua/utils/undotree.lua | 11 + lua/utils/vimtex.lua | 7 + lua/utils/zenmode.lua | 13 + 31 files changed, 1296 insertions(+), 1094 deletions(-) create mode 100644 lua/languages/cmp.lua create mode 100644 lua/languages/conform.lua create mode 100644 lua/languages/dap.lua create mode 100644 lua/languages/init.lua create mode 100644 lua/languages/lsp.lua create mode 100644 lua/languages/lspkind.lua create mode 100644 lua/languages/lspsaga.lua create mode 100644 lua/languages/luasnip.lua create mode 100644 lua/languages/treesitter.lua create mode 100644 lua/navigation/harpoon.lua create mode 100644 lua/navigation/nvim-tree.lua create mode 100644 lua/navigation/telescope.lua create mode 100644 lua/plugins.lua create mode 100644 lua/ui/alpha.lua create mode 100644 lua/ui/fidget.lua create mode 100644 lua/ui/indent-blankline.lua create mode 100644 lua/ui/init.lua create mode 100644 lua/ui/lualine.lua create mode 100644 lua/ui/noice.lua create mode 100644 lua/ui/nvim-notify.lua create mode 100644 lua/utils/init.lua create mode 100644 lua/utils/lazygit.lua create mode 100644 lua/utils/todo-comments.lua create mode 100644 lua/utils/toggleterm.lua create mode 100644 lua/utils/undotree.lua create mode 100644 lua/utils/vimtex.lua create mode 100644 lua/utils/zenmode.lua diff --git a/.gitignore b/.gitignore index 012a7b9..7ff9aed 100644 --- a/.gitignore +++ b/.gitignore @@ -70,4 +70,3 @@ tags [._]*.un~ # End of https://www.toptal.com/developers/gitignore/api/direnv,vim,lua - diff --git a/init.lua b/init.lua index ccf3c7b..b78a49f 100755 --- a/init.lua +++ b/init.lua @@ -1,1049 +1,6 @@ -vim.opt.runtimepath:append("/home/c4patino/Programming/personal/neovim") +require("options") require("autocmds") require("mappings") -require("options") ---[[ -===================================================================== -==================== 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 = false - --- [[ 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" }) - --- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier --- for people to discover. Otherwise, you normally need to press , which --- is not what someone will guess without a bit more experience. --- --- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping --- or just use to exit terminal mode -vim.keymap.set("t", "", "", { desc = "Exit terminal mode" }) - --- TIP: Disable arrow keys in normal mode --- vim.keymap.set('n', '', 'echo "Use h to move!!"') --- vim.keymap.set('n', '', 'echo "Use l to move!!"') --- vim.keymap.set('n', '', 'echo "Use k to move!!"') --- vim.keymap.set('n', '', 'echo "Use j to move!!"') - --- Keybinds to make split navigation easier. --- Use CTRL+ to switch between windows --- --- See `:help wincmd` for a list of all window commands -vim.keymap.set("n", "", "", { desc = "Move focus to the left window" }) -vim.keymap.set("n", "", "", { desc = "Move focus to the right window" }) -vim.keymap.set("n", "", "", { desc = "Move focus to the lower window" }) -vim.keymap.set("n", "", "", { desc = "Move focus to the upper window" }) - --- NOTE: Some terminals have colliding keymaps or are not able to send distinct keycodes --- vim.keymap.set("n", "", "H", { desc = "Move window to the left" }) --- vim.keymap.set("n", "", "L", { desc = "Move window to the right" }) --- vim.keymap.set("n", "", "J", { desc = "Move window to the lower" }) --- vim.keymap.set("n", "", "K", { desc = "Move window to the upper" }) - --- [[ 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 -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) - if vim.v.shell_error ~= 0 then - error("Error cloning lazy.nvim:\n" .. out) - end -end - ----@type vim.Option -local rtp = vim.opt.rtp -rtp:prepend(lazypath) - --- [[ Configure and install plugins ]] --- --- To check the current status of your plugins, run --- :Lazy --- --- You can press `?` in this menu for help. Use `:q` to close the window --- --- To update plugins you can run --- :Lazy update --- --- NOTE: Here is where you install your plugins. -require("lazy").setup({ - -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). - "NMAC427/guess-indent.nvim", -- Detect tabstop and shiftwidth automatically - - -- NOTE: Plugins can also be added by using a table, - -- with the first argument being the link and the following - -- keys can be used to configure plugin behavior/loading/etc. - -- - -- Use `opts = {}` to 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" } }, - }, - }, - }, - - -- 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` - - -- 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 servers = { - -- clangd = {}, - -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, - -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs - -- - -- Some languages (like typescript) have entire language plugins that can be useful: - -- https://github.com/pmizio/typescript-tools.nvim - -- - -- But for many setups, the LSP (`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 = { "isort", "black" }, - -- - -- 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 = "default", - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps - }, - - appearance = { - -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- Adjusts spacing to ensure icons are aligned - nerd_font_variant = "mono", - }, - - completion = { - -- By default, you may press `` to show the documentation. - -- Optionally, set `auto_show = true` to show the documentation after a delay. - documentation = { auto_show = false, auto_show_delay_ms = 500 }, - }, - - sources = { - default = { "lsp", "path", "snippets", "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 = { implementation = "lua" }, - - -- 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", - priority = 1000, -- Make sure to load this before all the other start plugins. - config = function() - ---@diagnostic disable-next-line: missing-fields - require("tokyonight").setup({ - styles = { - comments = { italic = false }, -- Disable italics in comments - }, - }) - - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme("tokyonight-night") - end, - }, - - -- 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 - end, - }, - { -- 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 - }, - - -- 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 -}, { - ui = { - -- If you are using a Nerd Font: set icons to an empty table which will use the - -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table - icons = vim.g.have_nerd_font and {} or { - cmd = "⌘", - config = "🛠", - event = "📅", - ft = "📂", - init = "⚙", - keys = "🗝", - plugin = "🔌", - runtime = "💻", - require = "🌙", - source = "📄", - start = "🚀", - task = "📌", - lazy = "💤 ", - }, - }, -}) - --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et +require("plugins") diff --git a/lazy-lock.json b/lazy-lock.json index 1a81c46..89fb66d 100755 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,44 +1,53 @@ { - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, - "NvChad": { "branch": "v2.5", "commit": "4a2cefa5c17e971b45a5089862d031e2f6f0a8fc" }, - "base46": { "branch": "v2.5", "commit": "89cb656606a2f47ae9f814530c961be4cdb6e117" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" }, - "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, - "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a" }, - "gv.vim": { "branch": "master", "commit": "b6bb6664e2c95aa584059f195eb3a9f3cb133994" }, - "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" }, - "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, - "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, - "nvim-lspconfig": { "branch": "master", "commit": "f95d371c1a274f60392edfd8ea5121b42dca736e" }, - "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-numbertoggle": { "branch": "main", "commit": "c5827153f8a955886f1b38eaea6998c067d2992f" }, - "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-tree.lua": { "branch": "master", "commit": "48d0e82f9434691cc50d970898142a8c084a49d6" }, - "nvim-treesitter": { "branch": "master", "commit": "2d5133f67429f82547ea5fad33a0b1e7d4f78a1c" }, - "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, - "nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, - "telescope.nvim": { "branch": "master", "commit": "10b8a82b042caf50b78e619d92caf0910211973d" }, - "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, - "ui": { "branch": "v2.5", "commit": "60a18fbc5e152703f3d8e4cbc3224d7c2ba247c0" }, - "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, - "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, - "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } + "LuaSnip": { "branch": "master", "commit": "eda5be8f0ce9816278671f0b578cdbb8b762c701" }, + "alpha-nvim": { "branch": "main", "commit": "a35468cd72645dbd52c0624ceead5f301c566dff" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, + "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, + "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, + "gitsigns.nvim": { "branch": "main", "commit": "6e3ee68bc9f65b21a21582a3d80e270c7e4f2992" }, + "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, + "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazygit.nvim": { "branch": "main", "commit": "4839ab642962cc76bb1bf278427dc4c59be15072" }, + "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, + "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" }, + "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "73e0143385d8a2185944b42ed44d728b94ee19a3" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-dap": { "branch": "master", "commit": "1c75a797b4017fec6491f509cf196c8c8833f26f" }, + "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" }, + "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, + "nvim-lspconfig": { "branch": "master", "commit": "d8f03bfd5b54b10352276a0ed1f2ffe9c2e0676f" }, + "nvim-notify": { "branch": "master", "commit": "a22f5d7ac511c2df2fd3290a9f04c48d5a822e2e" }, + "nvim-numbertoggle": { "branch": "main", "commit": "4b898b84d6f31f76bd563330d76177d5eb299efa" }, + "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" }, + "nvim-tree.lua": { "branch": "master", "commit": "b0b49552c9462900a882fe772993b01d780445fe" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-web-devicons": { "branch": "master", "commit": "19d6211c78169e78bab372b585b6fb17ad974e82" }, + "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "rustaceanvim": { "branch": "master", "commit": "322224d00a731d75eed6b700d38e460fd30f6e3c" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "typescript-tools.nvim": { "branch": "master", "commit": "3c501d7c7f79457932a8750a2a1476a004c5c1a9" }, + "undotree": { "branch": "master", "commit": "15d91b0afe04ea9ba5cd53e30190d1602af9a925" }, + "vimtex": { "branch": "master", "commit": "7f2633027c8f496a85284de0c11aa32f1e07e049" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, + "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } } diff --git a/lua/autocmds.lua b/lua/autocmds.lua index 67a0024..ca1840a 100644 --- a/lua/autocmds.lua +++ b/lua/autocmds.lua @@ -1,12 +1,12 @@ --- Highlight on yank -vim.api.nvim_create_autocmd("TextYankPost", { +local mkAutocmd = vim.api.nvim_create_autocmd + +mkAutocmd("TextYankPost", { callback = function() vim.highlight.on_yank({ higroup = "IncSearch", timeout = 50 }) end, }) --- Set 2-space tabs for specific filetypes -vim.api.nvim_create_autocmd("FileType", { +mkAutocmd("FileType", { pattern = { "astro", "javascript", "javascriptreact", "nix", "tex", "typescript", "typescriptreact" }, callback = function() vim.opt_local.tabstop = 2 @@ -15,8 +15,7 @@ vim.api.nvim_create_autocmd("FileType", { end, }) --- Enable wrap and ZenMode toggle for LaTeX files -vim.api.nvim_create_autocmd("FileType", { +mkAutocmd("FileType", { pattern = "tex", callback = function() vim.opt_local.wrap = true diff --git a/lua/languages/cmp.lua b/lua/languages/cmp.lua new file mode 100644 index 0000000..dafb3bd --- /dev/null +++ b/lua/languages/cmp.lua @@ -0,0 +1,113 @@ +return { + "hrsh7th/nvim-cmp", + event = { "InsertEnter", "CmdlineEnter" }, + dependencies = { + "L3MON4D3/LuaSnip", + "saadparwaiz1/cmp_luasnip", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-path", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-cmdline", + }, + config = function() + local cmp = require("cmp") + local luasnip = require("luasnip") + local kind_icons = { + Text = "󰊄", + Method = "", + Function = "󰡱", + Constructor = "", + Field = "", + Variable = "󱀍", + Class = "", + Interface = "", + Module = "󰕳", + Property = "", + Unit = "", + Value = "", + Enum = "", + Keyword = "", + Snippet = "", + Color = "", + File = "", + Reference = "", + Folder = "", + EnumMember = "", + Constant = "", + Struct = "", + Event = "", + Operator = "", + TypeParameter = "", + } + + cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.complete(), + }), + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "luasnip" }, + { name = "path" }, + { name = "buffer" }, + }), + performance = { + debounce = 60, + fetching_timeout = 200, + max_view_entries = 30, + }, + window = { + completion = { + border = "rounded", + winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None", + }, + documentation = { + border = "rounded", + }, + }, + formatting = { + fields = { "kind", "abbr", "menu" }, + format = function(_, vim_item) + vim_item.kind = string.format("%s %s", kind_icons[vim_item.kind] or "", vim_item.kind) + return vim_item + end, + }, + }) + + -- `/` and `?` cmdline uses buffer source + cmp.setup.cmdline({ "/", "?" }, { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, + }) + + -- `:` cmdline uses path and cmdline source + cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = "path" }, + }, { + { name = "cmdline" }, + }), + }) + + -- gitcommit filetype config + cmp.setup.filetype("gitcommit", { + sources = cmp.config.sources({ + { name = "cmp_git" }, + }, { + { name = "buffer" }, + }), + }) + end, +} diff --git a/lua/languages/conform.lua b/lua/languages/conform.lua new file mode 100644 index 0000000..c05f420 --- /dev/null +++ b/lua/languages/conform.lua @@ -0,0 +1,80 @@ +return { + "stevearc/conform.nvim", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { + { + "rcarriga/nvim-notify", + config = function() + vim.notify = require("notify") + end, + }, + }, + config = function() + local conform = require("conform") + local notify = require("notify") + + conform.setup({ + notify_on_error = true, + default_format_opts = { + lsp_format = "fallback", + }, + formatters_by_ft = { + astro = { "prettierd", "prettier" }, + cabal = { "ormolu" }, + haskell = { "ormolu" }, + javascript = { "prettierd", "prettier" }, + javascriptreact = { "prettierd", "prettier" }, + typescript = { "prettierd", "prettier" }, + typescriptreact = { "prettierd", "prettier" }, + lua = { "stylua" }, + nix = { "alejandra" }, + racket = { "raco_fmt" }, + }, + formatters = { + raco_fmt = { + command = "raco", + args = { "fmt" }, + }, + }, + format_on_save = function(bufnr) + if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then + return + end + return { lsp_format = "fallback" } + end, + }) + + local function show_notification(message, level) + notify(message, level, { title = "conform.nvim" }) + end + + vim.api.nvim_create_user_command("FormatToggle", function(args) + local is_global = not args.bang + if is_global then + vim.g.disable_autoformat = not vim.g.disable_autoformat + show_notification( + vim.g.disable_autoformat and "Autoformat-on-save disabled globally" + or "Autoformat-on-save enabled globally", + "info" + ) + else + vim.b.disable_autoformat = not vim.b.disable_autoformat + show_notification( + vim.b.disable_autoformat and "Autoformat-on-save disabled for this buffer" + or "Autoformat-on-save enabled for this buffer", + "info" + ) + end + end, { desc = "Toggle autoformat-on-save", bang = true }) + + -- Keybindings + vim.keymap.set("n", "ff", "FormatToggle", { + silent = true, + desc = "Conform Toggle autoformat", + }) + + vim.keymap.set({ "n", "v" }, "f", function() + require("conform").format({ lsp_format = "fallback" }) + end, { silent = true, desc = "Conform Format" }) + end, +} diff --git a/lua/languages/dap.lua b/lua/languages/dap.lua new file mode 100644 index 0000000..ac8272e --- /dev/null +++ b/lua/languages/dap.lua @@ -0,0 +1,68 @@ +return { + { + "mfussenegger/nvim-dap", + config = function() + local dap = require("dap") + + -- Signs + vim.fn.sign_define("DapBreakpoint", { text = "●", texthl = "DapBreakpoint" }) + vim.fn.sign_define("DapBreakpointCondition", { text = "●", texthl = "DapBreakpointCondition" }) + vim.fn.sign_define("DapLogPoint", { text = "◆", texthl = "DapLogPoint" }) + + -- Keymaps + local map = vim.keymap.set + local function with_opts(desc) + return vim.tbl_extend("force", { silent = true }, { desc = desc }) + end + + map("n", "db", ":DapToggleBreakpoint", with_opts("Toggle Breakpoint")) + map("n", "dc", "DapContinue", with_opts("Continue")) + map( + "n", + "da", + "lua require('dap').continue({ before = get_args })", + with_opts("Run with Args") + ) + map("n", "dC", "lua require('dap').run_to_cursor()", with_opts("Run to Cursor")) + map("n", "dg", "lua require('dap').goto_()", with_opts("Go to Line (no execute)")) + map("n", "di", ":DapStepInto", with_opts("Step Into")) + map("n", "dj", "lua require('dap').down()", with_opts("Down")) + map("n", "dk", "lua require('dap').up()", with_opts("Up")) + map("n", "dl", "lua require('dap').run_last()", with_opts("Run Last")) + map("n", "do", ":DapStepOut", with_opts("Step Out")) + map("n", "dO", ":DapStepOver", with_opts("Step Over")) + map("n", "dp", "lua require('dap').pause()", with_opts("Pause")) + map("n", "dr", ":DapToggleRepl", with_opts("Toggle REPL")) + map("n", "ds", "lua require('dap').session()", with_opts("Session")) + map("n", "dt", ":DapTerminate", with_opts("Terminate")) + map("n", "du", "lua require('dapui').toggle()", with_opts("Dap UI")) + map({ "n", "v" }, "de", "lua require('dapui').eval()", with_opts("Eval")) + end, + }, + { + "rcarriga/nvim-dap-ui", + dependencies = { "mfussenegger/nvim-dap" }, + config = function() + require("dapui").setup({ + floating = { + mappings = { + close = { "", "q" }, + }, + }, + }) + end, + }, + { + "theHamsta/nvim-dap-virtual-text", + dependencies = { "mfussenegger/nvim-dap" }, + config = true, + }, + { + "mfussenegger/nvim-dap-python", + ft = "python", + dependencies = { "mfussenegger/nvim-dap" }, + config = function() + require("dap-python").setup("~/.virtualenvs/debugpy/bin/python") + end, + }, +} diff --git a/lua/languages/init.lua b/lua/languages/init.lua new file mode 100644 index 0000000..968d277 --- /dev/null +++ b/lua/languages/init.lua @@ -0,0 +1,4 @@ +return { + { "windwp/nvim-autopairs", event = "InsertEnter", opts = {} }, + { "kylechui/nvim-surround", event = "VeryLazy", opts = {} }, +} diff --git a/lua/languages/lsp.lua b/lua/languages/lsp.lua new file mode 100644 index 0000000..6614982 --- /dev/null +++ b/lua/languages/lsp.lua @@ -0,0 +1,168 @@ +return { + { + "neovim/nvim-lspconfig", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { + { "mason-org/mason.nvim", opts = {} }, + "mason-org/mason-lspconfig.nvim", + "WhoIsSethDaniel/mason-tool-installer.nvim", + }, + config = function() + vim.api.nvim_create_autocmd("LspAttach", { + group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }), + callback = function(event) + -- NOTE: This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10) + local function client_supports_method(client, method, bufnr) + if vim.fn.has("nvim-0.11") == 1 then + return client:supports_method(method, bufnr) + else + return client.supports_method(method, { bufnr = bufnr }) + end + end + + local client = vim.lsp.get_client_by_id(event.data.client_id) + 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 + end, + }) + + 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, + }, + }) + + local border = "rounded" + vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border }) + + vim.lsp.handlers["textDocument/signatureHelp"] = + vim.lsp.with(vim.lsp.handlers.signature_help, { border = border }) + + require("lspconfig.ui.windows").default_options = { + border = border, + } + + local capabilities = require("cmp_nvim_lsp").default_capabilities() + capabilities.offsetEncoding = { "utf-16" } + + local servers = { + lua_ls = { + settings = { + Lua = { + completion = { + callSnippet = "Replace", + }, + }, + }, + }, + pylsp = { + settings = { + configurationSources = { "pycodestyle" }, + plugins = { + pyflakes = { enabled = true }, + mccabe = { enabled = true }, + pycodestyle = { enabled = true }, + pydocstyle = { enabled = true }, + yapf = { enabled = true }, + }, + }, + }, + astro = {}, + clangd = {}, + csharp_ls = {}, + gopls = {}, + hls = { settings = { haskell = { formattingProvider = "ormolu" } } }, + java_language_server = {}, + nixd = {}, + sqls = {}, + zls = {}, + } + + local ensure_installed = vim.tbl_keys(servers or {}) + vim.list_extend(ensure_installed, {}) + 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, + }, + { + "mrcjkb/rustaceanvim", + version = "^6", + ft = { "rust" }, + config = function() + vim.g.rustaceanvim = { + tools = { + autoSetHints = true, + hover_with_actions = true, + }, + } + end, + }, + { + "pmizio/typescript-tools.nvim", + ft = { "typescript", "typescriptreact", "javascript", "javascriptreact" }, + opts = { + separate_diagnostic_server = true, + expose_as_code_action = "all", + }, + }, +} diff --git a/lua/languages/lspkind.lua b/lua/languages/lspkind.lua new file mode 100644 index 0000000..da22aee --- /dev/null +++ b/lua/languages/lspkind.lua @@ -0,0 +1,12 @@ +return { + { + "onsails/lspkind.nvim", + lazy = true, + config = function() + require("lspkind").init({ + maxwidth = 50, + ellipsis_char = "...", + }) + end, + }, +} diff --git a/lua/languages/lspsaga.lua b/lua/languages/lspsaga.lua new file mode 100644 index 0000000..6788cfa --- /dev/null +++ b/lua/languages/lspsaga.lua @@ -0,0 +1,83 @@ +return { + { + "nvimdev/lspsaga.nvim", + event = "LspAttach", + config = function() + require("lspsaga").setup({ + beacon = { enable = true }, + ui = { + border = "rounded", + code_action = "💡", + }, + hover = { + open_cmd = "!floorp", + open_link = "gx", + }, + diagnostic = { + border_follow = true, + diagnostic_only_current = false, + show_code_action = true, + }, + symbol_in_winbar = { + enable = true, + }, + code_action = { + extend_gitsigns = false, + show_server_name = true, + only_in_cursor = true, + num_shortcut = true, + keys = { + exec = "", + quit = { "", "q" }, + }, + }, + lightbulb = { + enable = false, + sign = false, + virtual_text = true, + }, + implement = { + enable = false, + }, + rename = { + auto_save = false, + keys = { + exec = "", + quit = { "", "" }, + select = "x", + }, + }, + outline = { + auto_close = true, + auto_preview = true, + close_after_jump = true, + layout = "normal", + win_position = "right", + keys = { + jump = "e", + quit = "q", + toggle_or_jump = "o", + }, + }, + scroll_preview = { + scroll_down = "", + scroll_up = "", + }, + }) + + local keymap = vim.keymap.set + local function with_opts(desc) + return vim.tbl_extend("force", { silent = true }, { desc = desc }) + end + + keymap("n", "gd", "Lspsaga finder def", with_opts("Goto Definition")) + keymap("n", "gr", "Lspsaga finder ref", with_opts("Goto References")) + keymap("n", "gI", "Lspsaga finder imp", with_opts("Goto Implementation")) + keymap("n", "gT", "Lspsaga peek_type_definition", with_opts("Type Definition")) + keymap("n", "K", "Lspsaga hover_doc", with_opts("Hover")) + keymap("n", "cw", "Lspsaga outline", with_opts("Outline")) + keymap("n", "cr", "Lspsaga rename", with_opts("Rename")) + keymap("n", "ca", "Lspsaga code_action", with_opts("Code Action")) + end, + }, +} diff --git a/lua/languages/luasnip.lua b/lua/languages/luasnip.lua new file mode 100644 index 0000000..9371d7e --- /dev/null +++ b/lua/languages/luasnip.lua @@ -0,0 +1,4 @@ +return { + "L3MON4D3/LuaSnip", + event = "InsertEnter", +} diff --git a/lua/languages/treesitter.lua b/lua/languages/treesitter.lua new file mode 100644 index 0000000..9d9ff5c --- /dev/null +++ b/lua/languages/treesitter.lua @@ -0,0 +1,14 @@ +return { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + require("nvim-treesitter.configs").setup({ + highlight = { + enable = true, + }, + }) + + vim.opt.foldmethod = "expr" + vim.opt.foldexpr = "nvim_treesitter#foldexpr()" + end, +} diff --git a/lua/navigation/harpoon.lua b/lua/navigation/harpoon.lua new file mode 100644 index 0000000..ea5e786 --- /dev/null +++ b/lua/navigation/harpoon.lua @@ -0,0 +1,64 @@ +return { + "ThePrimeagen/harpoon", + branch = "harpoon2", + dependencies = { "nvim-lua/plenary.nvim" }, + lazy = false, + keys = { + { + "a", + function() + require("harpoon"):list():add() + end, + desc = "Harpoon Add File", + }, + { + "", + function() + require("harpoon").ui:toggle_quick_menu(require("harpoon"):list()) + end, + desc = "Harpoon Toggle Quick Menu", + }, + { + "", + function() + require("harpoon"):list():select(1) + end, + desc = "Harpoon to File 1", + }, + { + "", + function() + require("harpoon"):list():select(2) + end, + desc = "Harpoon to File 2", + }, + { + "", + function() + require("harpoon"):list():select(3) + end, + desc = "Harpoon to File 3", + }, + { + "", + function() + require("harpoon"):list():select(4) + end, + desc = "Harpoon to File 4", + }, + }, + + config = function() + local harpoon = require("harpoon") + harpoon:setup({ + settings = { + save_on_toggle = true, + }, + }) + + if require("lazy.core.config").plugins["telescope.nvim"] then + local telescope = require("telescope") + telescope.load_extension("harpoon") + end + end, +} diff --git a/lua/navigation/nvim-tree.lua b/lua/navigation/nvim-tree.lua new file mode 100644 index 0000000..f6062c8 --- /dev/null +++ b/lua/navigation/nvim-tree.lua @@ -0,0 +1,80 @@ +return { + "nvim-tree/nvim-tree.lua", + event = "VeryLazy", + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + keys = { + { "pv", "NvimTreeToggle", desc = "Toggle NvimTree" }, + }, + config = function() + require("nvim-web-devicons").setup({}) + + require("nvim-tree").setup({ + disable_netrw = true, + hijack_netrw = true, + hijack_cursor = true, + hijack_unnamed_buffer_when_opening = true, + sync_root_with_cwd = true, + + update_focused_file = { + enable = true, + }, + + sort_by = "case_sensitive", + + filters = { + custom = { "__pycache__" }, + exclude = {}, + }, + + git = { + enable = true, + ignore = true, + }, + + view = { + side = "right", + width = 60, + number = true, + relativenumber = true, + preserve_window_proportions = true, + }, + + renderer = { + root_folder_label = false, + indent_width = 2, + highlight_git = true, + indent_markers = { + enable = true, + }, + + icons = { + glyphs = { + default = "󰈚", + symlink = "", + folder = { + default = "", + empty = "", + empty_open = "", + open = "", + symlink = "", + symlink_open = "", + arrow_open = "", + arrow_closed = "", + }, + git = { + unstaged = "✗", + staged = "✓", + unmerged = "", + renamed = "➜", + untracked = "★", + deleted = "", + ignored = "◌", + }, + }, + }, + }, + }) + end, +} diff --git a/lua/navigation/telescope.lua b/lua/navigation/telescope.lua new file mode 100644 index 0000000..97e638e --- /dev/null +++ b/lua/navigation/telescope.lua @@ -0,0 +1,102 @@ +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" }, + }, + keys = { + { + "pws", + function() + local word = vim.fn.expand("") + require("telescope.builtin").grep_string({ search = word }) + end, + desc = "Telescope Live grep word under cursor", + }, + { + "pWs", + function() + local word = vim.fn.expand("") + require("telescope.builtin").grep_string({ search = word }) + end, + desc = "Telescope Live grep WORD under cursor", + }, + + { + "pf", + "Telescope find_files", + desc = "Telescope Find project files", + }, + { + "pa", + "Telescope find_files follow=true no_ignore=true hidden=true", + desc = "Telescope Find all files", + }, + { + "pz", + "Telescope current_buffer_fuzzy_find", + desc = "Telescope Find in buffer", + }, + { + "ps", + "Telescope live_grep", + desc = "Telescope Live grep", + }, + { + "ws", + "Telescope lsp_document_symbols ignore_symbols='variable'", + desc = "Telescope LSP Document symbols", + }, + { + "tt", + "Telescope diagnostics", + desc = "Telescope Diagnostics", + }, + { + "tf", + "Telescope diagnostics bufnr=0", + desc = "Telescope Diagnostics in buffer", + }, + { + ":", + "Telescope command_history", + desc = "Telescope Command history", + }, + }, + config = function() + local telescope = require("telescope") + telescope.setup({ + defaults = { + prompt_prefix = "  ", + selection_caret = " ", + entry_prefix = " ", + sorting_strategy = "ascending", + layout_config = { + horizontal = { + prompt_position = "top", + preview_width = 0.65, + }, + width = 0.75, + height = 0.80, + }, + }, + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + }, + }, + }) + + -- Load extensions + pcall(telescope.load_extension("fzf")) + pcall(telescope.load_extension("ui-select")) + end, +} diff --git a/lua/plugins.lua b/lua/plugins.lua new file mode 100644 index 0000000..f432d5c --- /dev/null +++ b/lua/plugins.lua @@ -0,0 +1,32 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + -- import your plugins + { import = "languages" }, + { import = "navigation" }, + { import = "ui" }, + { import = "utils" }, + }, + -- Configure any other settings here. See the documentation for more details. + -- colorscheme that will be used when installing plugins. + install = { colorscheme = { "tokyonight" } }, + -- automatically check for plugin updates + checker = { enabled = true }, +}) diff --git a/lua/ui/alpha.lua b/lua/ui/alpha.lua new file mode 100644 index 0000000..0ab28b2 --- /dev/null +++ b/lua/ui/alpha.lua @@ -0,0 +1,81 @@ +local function mkPadding(val) + return { type = "padding", val = val } +end + +local function mkButton(label, shortcut, command) + return { + type = "button", + val = label, + on_press = function() + local key = vim.api.nvim_replace_termcodes(shortcut, true, false, true) + vim.api.nvim_feedkeys(key, "n", false) + end, + opts = { + keymap = { + "n", + shortcut, + command, + { + noremap = true, + silent = true, + nowait = true, + }, + }, + shortcut = shortcut, + + position = "center", + cursor = 3, + width = 38, + align_shortcut = "right", + hl_shortcut = "Keyword", + }, + } +end + +return { + "goolord/alpha-nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + event = "VimEnter", + config = function() + local layout = { + mkPadding(4), + { + opts = { + hl = "AlphaHeader", + position = "center", + }, + type = "text", + val = { + [[▓██ ██▓ █ ██ ███▄ ▄███▓▓█████ ██▒ █▓ ██▓ ███▄ ▄███▓]], + [[ ▒██ ██▒ ██ ▓██▒▓██▒▀█▀ ██▒▓█ ▀▓██░ █▒▓██▒▓██▒▀█▀ ██▒]], + [[ ▒██ ██░▓██ ▒██░▓██ ▓██░▒███ ▓██ █▒░▒██▒▓██ ▓██░]], + [[ ░ ▐██▓░▓▓█ ░██░▒██ ▒██ ▒▓█ ▄ ▒██ █░░░██░▒██ ▒██ ]], + [[ ░ ██▒▓░▒▒█████▓ ▒██▒ ░██▒░▒████▒ ▒▀█░ ░██░▒██▒ ░██▒]], + [[ ██▒▒▒ ░▒▓▒ ▒ ▒ ░ ▒░ ░ ░░░ ▒░ ░ ░ ▐░ ░▓ ░ ▒░ ░ ░]], + [[ ▓██ ░▒░ ░░▒░ ░ ░ ░ ░ ░ ░ ░ ░ ░ ░░ ▒ ░░ ░ ░]], + [[ ▒ ▒ ░░ ░░░ ░ ░ ░ ░ ░ ░░ ▒ ░░ ░ ]], + [[ ░ ░ ░ ░ ░ ░ ░ ░ ░ ]], + [[ ]], + [[ git@github.com:c4patino ]], + }, + }, + + mkPadding(2), + mkButton(" Find File", "f", ":Telescope find_files"), + mkPadding(1), + mkButton(" New File", "n", ":ene startinsert"), + mkPadding(1), + mkButton("󰈚 Recent Files", "r", ":Telescope oldfiles"), + mkPadding(1), + mkButton("󰈭 Find Word", "g", ":Telescope live_grep"), + mkPadding(1), + mkButton(" Restore Session", "s", ":lua require('persistence').load()"), + mkPadding(1), + mkButton(" Quit Neovim", "q", ":qa"), + } + + require("alpha").setup({ + layout = layout, + }) + end, +} diff --git a/lua/ui/fidget.lua b/lua/ui/fidget.lua new file mode 100644 index 0000000..e8c53ec --- /dev/null +++ b/lua/ui/fidget.lua @@ -0,0 +1,89 @@ +return { + "j-hui/fidget.nvim", + event = "VeryLazy", + config = function() + require("fidget").setup({ + logger = { + level = vim.log.levels.WARN, -- "off", "error", "warn", "info", "debug", "trace" + float_precision = 0.01, + }, + progress = { + poll_rate = 0, + suppress_on_insert = true, + ignore_done_already = false, + ignore_empty_message = false, + clear_on_detach = function(client_id) + local client = vim.lsp.get_client_by_id(client_id) + return client and client.name or nil + end, + notification_group = function(msg) + return msg.lsp_client.name + end, + ignore = {}, + lsp = { + progress_ringbuf_size = 0, + }, + display = { + render_limit = 16, + done_ttl = 3, + done_icon = "✔", + done_style = "Constant", + progress_ttl = math.huge, + progress_icon = { + pattern = "dots", + period = 1, + }, + progress_style = "WarningMsg", + group_style = "Title", + icon_style = "Question", + priority = 30, + skip_history = true, + format_message = require("fidget.progress.display").default_format_message, + format_annote = function(msg) + return msg.title + end, + format_group_name = function(group) + return tostring(group) + end, + overrides = { + rust_analyzer = { + name = "rust-analyzer", + }, + }, + }, + }, + notification = { + poll_rate = 10, + filter = "info", + history_size = 128, + override_vim_notify = true, + redirect = function(msg, level, opts) + if opts and opts.on_open then + return require("fidget.integration.nvim-notify").delegate(msg, level, opts) + end + end, + configs = { + default = require("fidget.notification").default_config, + }, + window = { + normal_hl = "Comment", + winblend = 0, + border = "none", + zindex = 45, + max_width = 0, + max_height = 0, + x_padding = 1, + y_padding = 0, + align = "bottom", + relative = "editor", + }, + view = { + stack_upwards = true, + icon_separator = " ", + group_separator = "---", + group_separator_hl = "Comment", + }, + }, + }) + end, +} diff --git a/lua/ui/indent-blankline.lua b/lua/ui/indent-blankline.lua new file mode 100644 index 0000000..d4704b6 --- /dev/null +++ b/lua/ui/indent-blankline.lua @@ -0,0 +1,8 @@ +return { + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + event = "BufReadPost", + opts = { + scope = { enabled = false }, + }, +} diff --git a/lua/ui/init.lua b/lua/ui/init.lua new file mode 100644 index 0000000..2501351 --- /dev/null +++ b/lua/ui/init.lua @@ -0,0 +1,35 @@ +return { + { + "folke/tokyonight.nvim", + lazy = false, + priority = 1000, + config = function() + vim.cmd([[colorscheme tokyonight-night]]) + end, + }, + { + "stevearc/dressing.nvim", + event = "VeryLazy", + config = function() + require("dressing").setup() + end, + }, + { + "sitiom/nvim-numbertoggle", + event = "BufEnter", + }, + { + "norcalli/nvim-colorizer.lua", + event = "BufReadPost", + config = function() + require("colorizer").setup() + end, + }, + { + "lewis6991/gitsigns.nvim", + event = "BufReadPre", + config = function() + require("gitsigns").setup() + end, + }, +} diff --git a/lua/ui/lualine.lua b/lua/ui/lualine.lua new file mode 100644 index 0000000..110231a --- /dev/null +++ b/lua/ui/lualine.lua @@ -0,0 +1,36 @@ +return { + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + event = "VeryLazy", + config = function() + require("lualine").setup({ + options = { + globalstatus = true, + always_divide_middle = true, + theme = "auto", + ignore_focus = { "nvim-tree" }, + component_separators = { + left = "|", + right = "|", + }, + }, + extensions = { "fzf" }, + sections = { + lualine_a = { "mode" }, + lualine_b = { + { "branch", icon = "", icons_enabled = true }, + { "diff" }, + { "diagnostics" }, + }, + lualine_c = { "filename" }, + lualine_x = { "filetype" }, + lualine_y = { "location" }, + lualine_z = { + function() + return " " .. os.date("%R") + end, + }, + }, + }) + end, +} diff --git a/lua/ui/noice.lua b/lua/ui/noice.lua new file mode 100644 index 0000000..17e97ea --- /dev/null +++ b/lua/ui/noice.lua @@ -0,0 +1,48 @@ +return { + "folke/noice.nvim", + event = "VeryLazy", + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + }, + opts = { + notify = { + enabled = false, + }, + messages = { + enabled = true, + }, + lsp = { + message = { + enabled = true, + }, + progress = { + enabled = false, + view = "mini", + }, + }, + popupmenu = { + enabled = true, + backend = "nui", + }, + format = { + filter = { + pattern = { ":%s*%%s*s:%s*", ":%s*%%s*s!%s*", ":%s*%%s*s/%s*", "%s*s:%s*", ":%s*s!%s*", ":%s*s/%s*" }, + icon = "", + lang = "regex", + }, + replace = { + pattern = { + ":%s*%%s*s:%w*:%s*", + ":%s*%%s*s!%w*!%s*", + ":%s*%%s*s/%w*/%s*", + "%s*s:%w*:%s*", + ":%s*s!%w*!%s*", + ":%s*s/%w*/%s*", + }, + icon = "󱞪", + lang = "regex", + }, + }, + }, +} diff --git a/lua/ui/nvim-notify.lua b/lua/ui/nvim-notify.lua new file mode 100644 index 0000000..c6a6002 --- /dev/null +++ b/lua/ui/nvim-notify.lua @@ -0,0 +1,45 @@ +return { + "rcarriga/nvim-notify", + event = "VeryLazy", + keys = { + { + "un", + function() + require("notify").dismiss({ silent = true, pending = true }) + end, + desc = "Dismiss All Notifications", + }, + }, + config = function() + local notify = require("notify") + + notify.setup({ + background_color = "#000000", + fps = 60, + render = "default", + timeout = 500, + top_down = false, + }) + + -- Filter out noisy or redundant messages + local filtered_message = { "No information available" } + + ---@diagnostic disable-next-line: duplicate-set-field + vim.notify = function(message, level, opts) + for _, msg in ipairs(filtered_message) do + if message == msg then + return + end + end + + local merged_opts = vim.tbl_extend("force", { + on_open = function(win) + local buf = vim.api.nvim_win_get_buf(win) + vim.api.nvim_buf_set_option(buf, "filetype", "markdown") + end, + }, opts or {}) + + return notify(message, level, merged_opts) + end + end, +} diff --git a/lua/utils/init.lua b/lua/utils/init.lua new file mode 100644 index 0000000..50e82a8 --- /dev/null +++ b/lua/utils/init.lua @@ -0,0 +1,10 @@ +return { + { + "folke/persistence.nvim", + lazy = false, + config = function() + require("persistence").setup() + end, + }, + { "folke/which-key.nvim", event = "VeryLazy" }, +} diff --git a/lua/utils/lazygit.lua b/lua/utils/lazygit.lua new file mode 100644 index 0000000..d51bdbf --- /dev/null +++ b/lua/utils/lazygit.lua @@ -0,0 +1,8 @@ +return { + { + "kdheepak/lazygit.nvim", + keys = { + { "gg", "LazyGit", desc = "LazyGit Toggle window" }, + }, + }, +} diff --git a/lua/utils/todo-comments.lua b/lua/utils/todo-comments.lua new file mode 100644 index 0000000..ea598f5 --- /dev/null +++ b/lua/utils/todo-comments.lua @@ -0,0 +1,7 @@ +return { + "folke/todo-comments.nvim", + event = "VeryLazy", + keys = { + { "tc", "TodoTelescope", desc = "Telescope Find todo comments" }, + }, +} diff --git a/lua/utils/toggleterm.lua b/lua/utils/toggleterm.lua new file mode 100644 index 0000000..5155c5b --- /dev/null +++ b/lua/utils/toggleterm.lua @@ -0,0 +1,16 @@ +return { + "akinsho/toggleterm.nvim", + keys = { + { "", "ToggleTerm", desc = "Toggle terminal" }, + }, + opts = { + open_mapping = "", + direction = "float", + float_opts = { + border = "curved", + }, + winbar = { + enabled = true, + }, + }, +} diff --git a/lua/utils/undotree.lua b/lua/utils/undotree.lua new file mode 100644 index 0000000..3a3b50b --- /dev/null +++ b/lua/utils/undotree.lua @@ -0,0 +1,11 @@ +return { + "mbbill/undotree", + keys = { + { "u", "UndotreeToggle", desc = "Undotree Toggle window" }, + }, + config = function() + vim.g.undotree_WindowLayout = 4 + vim.g.undotree_DiffpaneHeight = 15 + vim.g.undotree_SplitWidth = 40 + end, +} diff --git a/lua/utils/vimtex.lua b/lua/utils/vimtex.lua new file mode 100644 index 0000000..92efac5 --- /dev/null +++ b/lua/utils/vimtex.lua @@ -0,0 +1,7 @@ +return { + "lervag/vimtex", + ft = { "tex", "latex" }, + config = function() + vim.g.vimtex_view_method = "zathura" + end, +} diff --git a/lua/utils/zenmode.lua b/lua/utils/zenmode.lua new file mode 100644 index 0000000..742042a --- /dev/null +++ b/lua/utils/zenmode.lua @@ -0,0 +1,13 @@ +return { + "folke/zen-mode.nvim", + keys = { + { "zz", "ZenMode", desc = "Toggle Zen Mode" }, + }, + config = function() + require("zen-mode").setup({ + window = { + width = 150, + }, + }) + end, +}