From 6ec8190beb3a2dc80c251671c9e80b5107bc9269 Mon Sep 17 00:00:00 2001 From: zias Date: Thu, 26 Feb 2026 11:54:58 +0100 Subject: [PATCH] refactor: modularize nvim config into lua/config + lua/plugins - Extract all options, keymaps, and autocommands into lua/config/ - Move every plugin spec into its own file under lua/plugins/ - Add custom inline orng colorscheme (dark + light) synced to macOS appearance - Consolidate image.nvim into pdf-viewer.lua (fix duplicate spec) - Fix image.nvim processor: magick -> magick_cli - Remove conflicting nvim-autopairs (kept mini.pairs) - Fix broken keymap (was calling non-existent builtin cmd) - Delete lua/kickstart/ and lua/custom/ folders - Add colors/orng.vim + colors/orng-light.vim stubs for mid-session switching - init.lua reduced from 1078 lines to 49 lines --- colors/orng-light.vim | 2 + colors/orng.vim | 2 + init.lua | 1085 +---------------- lua/config/autocmds.lua | 11 + lua/config/keymaps.lua | 31 + lua/config/options.lua | 49 + lua/custom/keymaps.lua | 14 - lua/custom/plugins/comment.lua | 8 - lua/custom/plugins/fff.lua | 31 - lua/custom/plugins/init.lua | 18 - lua/kickstart/health.lua | 52 - lua/kickstart/plugins/autopairs.lua | 8 - lua/kickstart/plugins/debug.lua | 218 ---- lua/kickstart/plugins/gitsigns.lua | 61 - lua/kickstart/plugins/indent_line.lua | 9 - lua/kickstart/plugins/lint.lua | 60 - lua/plugins/colorscheme.lua | 368 ++++++ lua/plugins/completion.lua | 55 + lua/plugins/conform.lua | 50 + lua/plugins/debug.lua | 75 ++ lua/plugins/extras/comment.lua | 7 + lua/plugins/extras/fff.lua | 17 + .../plugins => plugins/extras}/lazygit.lua | 11 +- lua/plugins/gitsigns.lua | 51 + lua/plugins/guess-indent.lua | 7 + lua/plugins/lint.lua | 25 + lua/plugins/lsp.lua | 135 ++ lua/plugins/mini.lua | 32 + lua/{kickstart => }/plugins/neo-tree.lua | 12 +- lua/{custom => }/plugins/pdf-viewer.lua | 95 +- lua/plugins/telescope.lua | 61 + lua/plugins/todo-comments.lua | 9 + lua/plugins/treesitter.lua | 24 + lua/plugins/which-key.lua | 29 + 34 files changed, 1122 insertions(+), 1600 deletions(-) create mode 100644 colors/orng-light.vim create mode 100644 colors/orng.vim create mode 100644 lua/config/autocmds.lua create mode 100644 lua/config/keymaps.lua create mode 100644 lua/config/options.lua delete mode 100644 lua/custom/keymaps.lua delete mode 100644 lua/custom/plugins/comment.lua delete mode 100644 lua/custom/plugins/fff.lua delete mode 100644 lua/custom/plugins/init.lua delete mode 100644 lua/kickstart/health.lua delete mode 100644 lua/kickstart/plugins/autopairs.lua delete mode 100644 lua/kickstart/plugins/debug.lua delete mode 100644 lua/kickstart/plugins/gitsigns.lua delete mode 100644 lua/kickstart/plugins/indent_line.lua delete mode 100644 lua/kickstart/plugins/lint.lua create mode 100644 lua/plugins/colorscheme.lua create mode 100644 lua/plugins/completion.lua create mode 100644 lua/plugins/conform.lua create mode 100644 lua/plugins/debug.lua create mode 100644 lua/plugins/extras/comment.lua create mode 100644 lua/plugins/extras/fff.lua rename lua/{custom/plugins => plugins/extras}/lazygit.lua (53%) create mode 100644 lua/plugins/gitsigns.lua create mode 100644 lua/plugins/guess-indent.lua create mode 100644 lua/plugins/lint.lua create mode 100644 lua/plugins/lsp.lua create mode 100644 lua/plugins/mini.lua rename lua/{kickstart => }/plugins/neo-tree.lua (52%) rename lua/{custom => }/plugins/pdf-viewer.lua (58%) create mode 100644 lua/plugins/telescope.lua create mode 100644 lua/plugins/todo-comments.lua create mode 100644 lua/plugins/treesitter.lua create mode 100644 lua/plugins/which-key.lua diff --git a/colors/orng-light.vim b/colors/orng-light.vim new file mode 100644 index 0000000..6c2c4e7 --- /dev/null +++ b/colors/orng-light.vim @@ -0,0 +1,2 @@ +" orng-light colorscheme stub +lua require("plugins.colorscheme") diff --git a/colors/orng.vim b/colors/orng.vim new file mode 100644 index 0000000..a15f076 --- /dev/null +++ b/colors/orng.vim @@ -0,0 +1,2 @@ +" orng dark colorscheme stub +lua require("plugins.colorscheme") diff --git a/init.lua b/init.lua index ea74168..1038850 100644 --- a/init.lua +++ b/init.lua @@ -1,1078 +1,49 @@ ---[[ +-- init.lua +-- Minimal bootstrap: leader keys → options → lazy.nvim → plugins +-- All configuration lives in lua/config/ and lua/plugins/ -===================================================================== -==================== 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 = ' ' +-- Leader keys must be set before lazy loads any plugin +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` +-- Core config (options, keymaps, autocommands) +require 'config.options' +require 'config.keymaps' +require 'config.autocmds' --- 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 - --- set tab options --- Source - https://stackoverflow.com/a --- Posted by vadersfather, modified by community. See post 'Timeline' for change history --- Retrieved 2025-11-18, License - CC BY-SA 4.0 -vim.o.expandtab = true -- expand tab input with spaces characters -vim.o.smartindent = true -- syntax aware indentations for newline inserts -vim.o.tabstop = 2 -- num of space characters per tab -vim.o.shiftwidth = 2 -- spaces per indentation level - --- [[ 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 +-- 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 } + local out = vim.fn.system { + 'git', 'clone', '--filter=blob:none', '--branch=stable', + 'https://github.com/folke/lazy.nvim.git', lazypath, + } if vim.v.shell_error ~= 0 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. -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, - }, - - -- Use image.nvim to render pdf's - { - '3rd/image.nvim', - opts = { - backend = 'kitty', - processor = 'magick', - integrations = { - markdown = { - enabled = true, - }, - }, - }, - }, - - -- 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 = { - yamlfmt = { - -- Explicitly tell yamlfmt where to find my global config - prepend_args = { '-conf', vim.fn.expand '~/.config/yamlfmt/.yamlfmt' }, - }, - }, - formatters_by_ft = { - lua = { 'stylua' }, - -- Conform can also run multiple formatters sequentially - python = { 'black' }, - -- - -- You can use 'stop_after_first' to run the first available formatter from the list - javascript = { 'biome', 'prettier', stop_after_first = true }, - typescript = { 'biome', 'prettier', stop_after_first = true }, - javascriptreact = { 'biome', 'prettier', stop_after_first = true }, - typescriptreact = { 'biome', 'prettier', stop_after_first = true }, - json = { 'biome', 'prettier', stop_after_first = true }, - html = { 'prettier' }, - css = { 'prettier' }, - graphql = { 'prettier' }, - yaml = { 'yamlfmt' }, - }, - }, - }, - - { -- 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 = 'super-tab', - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps - }, - - appearance = { - -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- Adjusts spacing to ensure icons are aligned - nerd_font_variant = 'mono', - }, - - completion = { - -- By default, you may press `` to show the documentation. - -- Optionally, set `auto_show = true` to show the documentation after a delay. - documentation = { auto_show = true, 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, - }, - ]] - --[[ { - 'scottmckendry/cyberdream.nvim', - priority = 1000, - config = function() - require('cyberdream').setup { - transparent = true, - } - vim.cmd.colorscheme 'cyberdream' - 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 } - - -- Enable mini.pairs - require('mini.pairs').setup() - - -- Enable mini.completion - -- require('mini.completion').setup() - - -- Enable mini.animate - require('mini.animate').setup() - - -- Enable mini.starter - require('mini.starter').setup() - - -- 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 -}, { +-- Load all plugin specs from lua/plugins/**/*.lua +require('lazy').setup('plugins', { ui = { - -- If you are using a Nerd Font: set icons to an empty table which will use the - -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table icons = vim.g.have_nerd_font and {} or { - cmd = '⌘', - config = '🛠', - event = '📅', - ft = '📂', - init = '⚙', - keys = '🗝', - plugin = '🔌', + cmd = '⌘', + config = '🛠', + event = '📅', + ft = '📂', + init = '⚙', + keys = '🗝', + plugin = '🔌', runtime = '💻', require = '🌙', - source = '📄', - start = '🚀', - task = '📌', - lazy = '💤 ', + source = '📄', + start = '🚀', + task = '📌', + lazy = '💤 ', }, }, }) --- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et - --- Load custom keymaps -require 'custom.keymaps' diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua new file mode 100644 index 0000000..23bfc7b --- /dev/null +++ b/lua/config/autocmds.lua @@ -0,0 +1,11 @@ +-- lua/config/autocmds.lua +-- Global autocommands + +-- Highlight yanked text briefly +vim.api.nvim_create_autocmd('TextYankPost', { + desc = 'Highlight when yanking (copying) text', + group = vim.api.nvim_create_augroup('user-highlight-yank', { clear = true }), + callback = function() + vim.hl.on_yank() + end, +}) diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua new file mode 100644 index 0000000..99782af --- /dev/null +++ b/lua/config/keymaps.lua @@ -0,0 +1,31 @@ +-- lua/config/keymaps.lua +-- Global keymaps (plugin keymaps live in their own plugin files) + +local map = vim.keymap.set + +-- Clear search highlights +map('n', '', 'nohlsearch') + +-- Diagnostics +map('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) + +-- Terminal +map('t', '', '', { desc = 'Exit terminal mode' }) +map('n', '', ':split | terminal', { desc = '[T]erminal (horizontal split)' }) + +-- Window navigation +map('n', '', '', { desc = 'Move focus to the left window' }) +map('n', '', '', { desc = 'Move focus to the right window' }) +map('n', '', '', { desc = 'Move focus to the lower window' }) +map('n', '', '', { desc = 'Move focus to the upper window' }) + +-- File explorer +map('n', '', ':Neotree toggle', { desc = '[E]xplorer (toggle neotree)' }) + +-- LazyGit +map('n', '', 'LazyGit', { desc = 'LazyGit' }) + +-- Telescope live grep (fixed: was using broken builtin... syntax) +map('n', '', function() + require('telescope.builtin').live_grep() +end, { desc = '[F]ind (live grep all files)' }) diff --git a/lua/config/options.lua b/lua/config/options.lua new file mode 100644 index 0000000..7d90daf --- /dev/null +++ b/lua/config/options.lua @@ -0,0 +1,49 @@ +-- lua/config/options.lua +-- All vim options in one place + +local opt = vim.opt +local o = vim.o + +-- Leader keys are set in init.lua before lazy loads + +-- UI +o.number = true +o.relativenumber = false +o.cursorline = true +o.signcolumn = 'yes' +o.showmode = false +o.scrolloff = 10 +o.splitright = true +o.splitbelow = true +o.inccommand = 'split' + +-- Characters +o.list = true +opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } + +-- Mouse +o.mouse = 'a' + +-- Clipboard (deferred to avoid startup lag) +vim.schedule(function() + o.clipboard = 'unnamedplus' +end) + +-- Indentation +o.expandtab = true +o.smartindent = true +o.tabstop = 2 +o.shiftwidth = 2 +o.breakindent = true + +-- Search +o.ignorecase = true +o.smartcase = true + +-- Files +o.undofile = true +o.confirm = true + +-- Performance +o.updatetime = 250 +o.timeoutlen = 300 diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua deleted file mode 100644 index ac288a3..0000000 --- a/lua/custom/keymaps.lua +++ /dev/null @@ -1,14 +0,0 @@ --- Set custom maps -local map = vim.keymap.set - --- Horizontal split for terminal -map('n', '', ':split | terminal', { desc = '[T]erminal (Horizontal Split)' }) - --- Open neo-filetree -map('n', '', ':Neotree toggle', { desc = '[E]xplorer (toggle neotree)' }) - --- Open lazygit in overlay -map('n', '', 'LazyGit', { desc = 'LazyGit' }) - --- Telescope grep all files in working dir -map('n', '', 'builtin.grep_string', { desc = '[F]ind (Telescope ripgrep all files in work_dir)' }) diff --git a/lua/custom/plugins/comment.lua b/lua/custom/plugins/comment.lua deleted file mode 100644 index 4772f43..0000000 --- a/lua/custom/plugins/comment.lua +++ /dev/null @@ -1,8 +0,0 @@ --- Add custom comments package --- https://github.com/numToStr/Comment.nvim -return { - 'numToStr/Comment.nvim', - opts = { - -- add any options here - } -} diff --git a/lua/custom/plugins/fff.lua b/lua/custom/plugins/fff.lua deleted file mode 100644 index eeb29d0..0000000 --- a/lua/custom/plugins/fff.lua +++ /dev/null @@ -1,31 +0,0 @@ --- Open fff.nvim --- https://github.com/dmtrKovalenko/fff.nvim - -return { - 'dmtrKovalenko/fff.nvim', - build = function() - -- this will download prebuild binary or try to use existing rustup toolchain to build from source - -- (if you are using lazy you can use gb for rebuilding a plugin if needed) - require('fff.download').download_or_build_binary() - end, - -- if you are using nixos - -- build = "nix run .#release", - opts = { -- (optional) - debug = { - enabled = false, -- 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', - }, - }, -} diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua deleted file mode 100644 index b419ff1..0000000 --- a/lua/custom/plugins/init.lua +++ /dev/null @@ -1,18 +0,0 @@ --- You can add your own plugins here or in other files in this directory! --- I promise not to create any merge conflicts in this directory :) --- --- See the kickstart.nvim README for more information -return { - -- { - -- 'navarasu/onedark.nvim', - -- priority = 1000, -- make sure to load this before all the other start plugins - -- config = function() - -- require('onedark').setup { - -- style = 'warmer', - -- } - -- require('onedark').load() - -- end, - -- }, - -- { 'catppuccin/nvim', name = 'catppuccin', priority = 1000 }, - -- -} diff --git a/lua/kickstart/health.lua b/lua/kickstart/health.lua deleted file mode 100644 index b59d086..0000000 --- a/lua/kickstart/health.lua +++ /dev/null @@ -1,52 +0,0 @@ ---[[ --- --- This file is not required for your own configuration, --- but helps people determine if their system is setup correctly. --- ---]] - -local check_version = function() - local verstr = tostring(vim.version()) - if not vim.version.ge then - vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) - return - end - - if vim.version.ge(vim.version(), '0.10-dev') then - vim.health.ok(string.format("Neovim version is: '%s'", verstr)) - else - vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) - end -end - -local check_external_reqs = function() - -- Basic utils: `git`, `make`, `unzip` - for _, exe in ipairs { 'git', 'make', 'unzip', 'rg' } do - local is_executable = vim.fn.executable(exe) == 1 - if is_executable then - vim.health.ok(string.format("Found executable: '%s'", exe)) - else - vim.health.warn(string.format("Could not find executable: '%s'", exe)) - end - end - - return true -end - -return { - check = function() - vim.health.start 'kickstart.nvim' - - vim.health.info [[NOTE: Not every warning is a 'must-fix' in `:checkhealth` - - Fix only warnings for plugins and languages you intend to use. - Mason will give warnings for languages that are not installed. - You do not need to install, unless you want to use those languages!]] - - local uv = vim.uv or vim.loop - vim.health.info('System Information: ' .. vim.inspect(uv.os_uname())) - - check_version() - check_external_reqs() - end, -} diff --git a/lua/kickstart/plugins/autopairs.lua b/lua/kickstart/plugins/autopairs.lua deleted file mode 100644 index 386d392..0000000 --- a/lua/kickstart/plugins/autopairs.lua +++ /dev/null @@ -1,8 +0,0 @@ --- autopairs --- https://github.com/windwp/nvim-autopairs - -return { - 'windwp/nvim-autopairs', - event = 'InsertEnter', - opts = {}, -} diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua deleted file mode 100644 index e747831..0000000 --- a/lua/kickstart/plugins/debug.lua +++ /dev/null @@ -1,218 +0,0 @@ --- debug.lua --- --- Shows how to use the DAP plugin to debug your code. --- --- Primarily focused on configuring the debugger for Go, but can --- be extended to other languages as well. That's why it's called --- kickstart.nvim and not kitchen-sink.nvim ;) - -return { - -- NOTE: Yes, you can install new plugins here! - 'mfussenegger/nvim-dap', - -- NOTE: And you can specify dependencies as well - dependencies = { - -- Creates a beautiful debugger UI - 'rcarriga/nvim-dap-ui', - - -- Required dependency for nvim-dap-ui - 'nvim-neotest/nvim-nio', - - -- Installs the debug adapters for you - 'mason-org/mason.nvim', - 'jay-babu/mason-nvim-dap.nvim', - - -- Add your own debuggers here - 'leoluz/nvim-dap-go', - - -- Fuzzy find variables with Telescope - 'nvim-telescope/telescope-dap.nvim', - }, - keys = { - -- Basic debugging keymaps, feel free to change to your liking! - { - '', - function() - require('dap').continue() - end, - desc = 'Debug: Start/Continue', - }, - { - '', - function() - require('dap').step_into() - end, - desc = 'Debug: Step Into', - }, - { - '', - function() - require('dap').step_over() - end, - desc = 'Debug: Step Over', - }, - { - '', - function() - require('dap').step_out() - end, - desc = 'Debug: Step Out', - }, - { - 'b', - function() - require('dap').toggle_breakpoint() - end, - desc = 'Debug: Toggle Breakpoint', - }, - { - 'B', - function() - require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ') - end, - desc = 'Debug: Set Breakpoint', - }, - -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. - { - '', - function() - require('dapui').toggle() - end, - desc = 'Debug: See last session result.', - }, - -- Telescope DAP integration for fuzzy finding - { - 'dv', - function() - require('telescope').extensions.dap.variables() - end, - desc = 'Debug: Find [V]ariables', - }, - { - 'df', - function() - require('telescope').extensions.dap.frames() - end, - desc = 'Debug: Find [F]rames', - }, - { - 'dc', - function() - require('telescope').extensions.dap.commands() - end, - desc = 'Debug: Find [C]ommands', - }, - { - 'db', - function() - require('telescope').extensions.dap.list_breakpoints() - end, - desc = 'Debug: List [B]reakpoints', - }, - }, - config = function() - local dap = require 'dap' - local dapui = require 'dapui' - - require('mason-nvim-dap').setup { - -- Makes a best effort to setup the various debuggers with - -- reasonable debug configurations - automatic_installation = true, - - -- You can provide additional configuration to the handlers, - -- see mason-nvim-dap README for more information - handlers = {}, - - -- You'll need to check that you have the required things installed - -- online, please don't ask me how to install them :) - ensure_installed = { - -- Update this to ensure that you have the debuggers for the langs you want - 'delve', - 'php-debug-adapter', - }, - } - - -- Dap UI setup - -- For more information, see |:help nvim-dap-ui| - dapui.setup { - -- Set icons to characters that are more likely to work in every terminal. - -- Feel free to remove or use ones that you like more! :) - -- Don't feel like these are good choices. - icons = { expanded = '▾', collapsed = '▸', current_frame = '*' }, - controls = { - icons = { - pause = '⏸', - play = '▶', - step_into = '⏎', - step_over = '⏭', - step_out = '⏮', - step_back = 'b', - run_last = '▶▶', - terminate = '⏹', - disconnect = '⏏', - }, - }, - } - - -- Change breakpoint icons - -- vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' }) - -- vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' }) - -- local breakpoint_icons = vim.g.have_nerd_font - -- and { Breakpoint = '', BreakpointCondition = '', BreakpointRejected = '', LogPoint = '', Stopped = '' } - -- or { Breakpoint = '●', BreakpointCondition = '⊜', BreakpointRejected = '⊘', LogPoint = '◆', Stopped = '⭔' } - -- for type, icon in pairs(breakpoint_icons) do - -- local tp = 'Dap' .. type - -- local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak' - -- vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl }) - -- end - - dap.listeners.after.event_initialized['dapui_config'] = dapui.open - dap.listeners.before.event_terminated['dapui_config'] = dapui.close - dap.listeners.before.event_exited['dapui_config'] = dapui.close - - -- Install golang specific config - require('dap-go').setup { - delve = { - -- On Windows delve must be run attached or it crashes. - -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring - detached = vim.fn.has 'win32' == 0, - }, - } - - -- PHP/Xdebug configuration - dap.adapters.php = { - type = 'executable', - command = 'node', - args = { vim.fn.stdpath('data') .. '/mason/packages/php-debug-adapter/extension/out/phpDebug.js' }, - } - - dap.configurations.php = { - { - type = 'php', - request = 'launch', - name = 'Listen for Xdebug', - port = 9003, - }, - { - type = 'php', - request = 'launch', - name = 'Listen for Xdebug (DDEV)', - port = 9003, - pathMappings = { - ['/var/www/html'] = '${workspaceFolder}', - }, - }, - { - type = 'php', - request = 'launch', - name = 'Run current script', - port = 9003, - cwd = '${fileDirname}', - program = '${file}', - runtimeExecutable = 'php', - }, - } - - -- Load telescope-dap extension - require('telescope').load_extension('dap') - end, -} diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/kickstart/plugins/gitsigns.lua deleted file mode 100644 index cbbd22d..0000000 --- a/lua/kickstart/plugins/gitsigns.lua +++ /dev/null @@ -1,61 +0,0 @@ --- Adds git related signs to the gutter, as well as utilities for managing changes --- NOTE: gitsigns is already included in init.lua but contains only the base --- config. This will add also the recommended keymaps. - -return { - { - 'lewis6991/gitsigns.nvim', - opts = { - on_attach = function(bufnr) - local gitsigns = require 'gitsigns' - - local function map(mode, l, r, opts) - opts = opts or {} - opts.buffer = bufnr - vim.keymap.set(mode, l, r, opts) - end - - -- Navigation - map('n', ']c', function() - if vim.wo.diff then - vim.cmd.normal { ']c', bang = true } - else - gitsigns.nav_hunk 'next' - end - end, { desc = 'Jump to next git [c]hange' }) - - map('n', '[c', function() - if vim.wo.diff then - vim.cmd.normal { '[c', bang = true } - else - gitsigns.nav_hunk 'prev' - end - end, { desc = 'Jump to previous git [c]hange' }) - - -- Actions - -- visual mode - map('v', 'hs', function() - gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } - end, { desc = 'git [s]tage hunk' }) - map('v', 'hr', function() - gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } - end, { desc = 'git [r]eset hunk' }) - -- normal mode - map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) - map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) - map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) - map('n', 'hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' }) - map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) - map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) - map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) - map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) - map('n', 'hD', function() - gitsigns.diffthis '@' - end, { desc = 'git [D]iff against last commit' }) - -- Toggles - map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) - map('n', 'tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' }) - end, - }, - }, -} diff --git a/lua/kickstart/plugins/indent_line.lua b/lua/kickstart/plugins/indent_line.lua deleted file mode 100644 index ed7f269..0000000 --- a/lua/kickstart/plugins/indent_line.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { -- Add indentation guides even on blank lines - 'lukas-reineke/indent-blankline.nvim', - -- Enable `lukas-reineke/indent-blankline.nvim` - -- See `:help ibl` - main = 'ibl', - opts = {}, - }, -} diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua deleted file mode 100644 index dec42f0..0000000 --- a/lua/kickstart/plugins/lint.lua +++ /dev/null @@ -1,60 +0,0 @@ -return { - - { -- Linting - 'mfussenegger/nvim-lint', - event = { 'BufReadPre', 'BufNewFile' }, - config = function() - local lint = require 'lint' - lint.linters_by_ft = { - markdown = { 'markdownlint' }, - } - - -- To allow other plugins to add linters to require('lint').linters_by_ft, - -- instead set linters_by_ft like this: - -- lint.linters_by_ft = lint.linters_by_ft or {} - -- lint.linters_by_ft['markdown'] = { 'markdownlint' } - -- - -- However, note that this will enable a set of default linters, - -- which will cause errors unless these tools are available: - -- { - -- clojure = { "clj-kondo" }, - -- dockerfile = { "hadolint" }, - -- inko = { "inko" }, - -- janet = { "janet" }, - -- json = { "jsonlint" }, - -- markdown = { "vale" }, - -- rst = { "vale" }, - -- ruby = { "ruby" }, - -- terraform = { "tflint" }, - -- text = { "vale" } - -- } - -- - -- You can disable the default linters by setting their filetypes to nil: - -- lint.linters_by_ft['clojure'] = nil - -- lint.linters_by_ft['dockerfile'] = nil - -- lint.linters_by_ft['inko'] = nil - -- lint.linters_by_ft['janet'] = nil - -- lint.linters_by_ft['json'] = nil - -- lint.linters_by_ft['markdown'] = nil - -- lint.linters_by_ft['rst'] = nil - -- lint.linters_by_ft['ruby'] = nil - -- lint.linters_by_ft['terraform'] = nil - -- lint.linters_by_ft['text'] = nil - - -- Create autocommand which carries out the actual linting - -- on the specified events. - local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true }) - vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { - group = lint_augroup, - callback = function() - -- Only run the linter in buffers that you can modify in order to - -- avoid superfluous noise, notably within the handy LSP pop-ups that - -- describe the hovered symbol using Markdown. - if vim.bo.modifiable then - lint.try_lint() - end - end, - }) - end, - }, -} diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua new file mode 100644 index 0000000..66fdce2 --- /dev/null +++ b/lua/plugins/colorscheme.lua @@ -0,0 +1,368 @@ +-- lua/plugins/colorscheme.lua +-- Custom "orng" colorscheme — dark and light variants. +-- Palette source: https://gist.github.com/axeldotdev/9b441e22147d2d838624d82357ac4302 +-- +-- Usage: +-- :colorscheme orng → dark (bg #0a0a0a) +-- :colorscheme orng-light → light (bg #ffffff) + +-- ── Shared accent colors ─────────────────────────────────────────────────── +local accent = { + orange = '#EC5B2B', + orange_br = '#EE7948', + cyan = '#56b6c2', + red = '#e06c75', +} + +-- ── Dark palette ─────────────────────────────────────────────────────────── +local dark = { + bg = '#0a0a0a', + fg = '#eeeeee', + orange = accent.orange, + orange_br = accent.orange_br, + yellow = '#e5c07b', + yellow_br = '#FFF7F1', + blue = '#6ba1e6', + cyan = accent.cyan, + red = accent.red, + gray1 = '#1a1a1a', -- panel / float bg + gray2 = '#2a2a2a', -- prompt bg + gray3 = '#3a3a3a', -- borders / separators + gray4 = '#606060', -- comments / inactive + gray5 = '#888888', -- delimiters + sel_bg = accent.orange, + sel_fg = '#0a0a0a', + diff_add = '#0d1f2d', + diff_chg = '#1f1a0d', + diff_del = '#1f0d0d', + diff_txt = '#2a1a0a', + vt_err = '#1f0d0d', + vt_warn = '#1f1a0d', + vt_info = '#0d1020', + vt_hint = '#0d1a1a', +} + +-- ── Light palette ────────────────────────────────────────────────────────── +local light = { + bg = '#ffffff', + fg = '#1a1a1a', + orange = '#D44A1A', -- slightly darker than accent for readability on white + orange_br = accent.orange, + yellow = '#b07800', + yellow_br = '#8a5c00', + blue = '#2d6fc4', + cyan = '#1a7a87', + red = '#c0334a', + gray1 = '#f5f0eb', -- panel / float bg (warm off-white) + gray2 = '#ede8e2', -- prompt bg + gray3 = '#d4cfc8', -- borders / separators + gray4 = '#999999', -- comments / inactive + gray5 = '#777777', -- delimiters + sel_bg = accent.orange, + sel_fg = '#ffffff', + diff_add = '#ddeeff', + diff_chg = '#fff3cc', + diff_del = '#ffd6d6', + diff_txt = '#ffe0b2', + vt_err = '#fde8e8', + vt_warn = '#fef9e0', + vt_info = '#e8f0fd', + vt_hint = '#e0f5f5', +} + +-- ── Highlight helper ─────────────────────────────────────────────────────── +local function hi(group, opts) + vim.api.nvim_set_hl(0, group, opts) +end + +-- ── Apply function — called with either `dark` or `light` palette ────────── +local function apply(c, variant) + local bg_mode = variant == 'light' and 'light' or 'dark' + vim.o.background = bg_mode + vim.cmd.highlight 'clear' + if vim.fn.exists 'syntax_on' == 1 then vim.cmd.syntax 'reset' end + vim.g.colors_name = 'orng' .. (variant == 'light' and '-light' or '') + + -- Editor chrome + hi('Normal', { fg = c.fg, bg = c.bg }) + hi('NormalFloat', { fg = c.fg, bg = c.gray1 }) + hi('NormalNC', { fg = c.fg, bg = c.bg }) + hi('FloatBorder', { fg = c.orange, bg = c.gray1 }) + hi('FloatTitle', { fg = c.orange_br, bg = c.gray1, bold = true }) + hi('ColorColumn', { bg = c.gray1 }) + hi('CursorLine', { bg = c.gray1 }) + hi('CursorLineNr', { fg = c.orange, bold = true }) + hi('LineNr', { fg = c.gray4 }) + hi('SignColumn', { fg = c.gray4, bg = c.bg }) + hi('Folded', { fg = c.gray4, bg = c.gray1 }) + hi('FoldColumn', { fg = c.gray4, bg = c.bg }) + hi('VertSplit', { fg = c.gray3 }) + hi('WinSeparator', { fg = c.gray3 }) + hi('EndOfBuffer', { fg = c.gray3 }) + + -- Cursor & selection + hi('Cursor', { fg = c.bg, bg = c.fg }) + hi('CursorIM', { fg = c.bg, bg = c.fg }) + hi('Visual', { fg = c.sel_fg, bg = c.sel_bg }) + hi('VisualNOS', { fg = c.sel_fg, bg = c.sel_bg }) + + -- Status / tab line + hi('StatusLine', { fg = c.fg, bg = c.gray2 }) + hi('StatusLineNC', { fg = c.gray4, bg = c.gray1 }) + hi('TabLine', { fg = c.gray4, bg = c.gray1 }) + hi('TabLineFill', { bg = c.gray1 }) + hi('TabLineSel', { fg = c.fg, bg = c.gray2, bold = true }) + + -- Pmenu + hi('Pmenu', { fg = c.fg, bg = c.gray1 }) + hi('PmenuSel', { fg = c.sel_fg, bg = c.orange }) + hi('PmenuSbar', { bg = c.gray2 }) + hi('PmenuThumb', { bg = c.orange }) + hi('PmenuBorder', { fg = c.orange }) + + -- Search + hi('Search', { fg = c.bg, bg = c.yellow }) + hi('IncSearch', { fg = c.bg, bg = c.orange }) + hi('CurSearch', { fg = c.bg, bg = c.orange_br }) + hi('Substitute', { fg = c.bg, bg = c.orange }) + + -- Messages + hi('ErrorMsg', { fg = c.red, bold = true }) + hi('WarningMsg', { fg = c.yellow }) + hi('ModeMsg', { fg = c.orange, bold = true }) + hi('MoreMsg', { fg = c.orange }) + hi('Question', { fg = c.blue }) + + -- Diff + hi('DiffAdd', { fg = c.blue, bg = c.diff_add }) + hi('DiffChange', { fg = c.yellow, bg = c.diff_chg }) + hi('DiffDelete', { fg = c.red, bg = c.diff_del }) + hi('DiffText', { fg = c.orange_br, bg = c.diff_txt, bold = true }) + hi('Added', { fg = c.blue }) + hi('Changed', { fg = c.yellow }) + hi('Removed', { fg = c.red }) + + -- Spelling + hi('SpellBad', { undercurl = true, sp = c.red }) + hi('SpellCap', { undercurl = true, sp = c.yellow }) + hi('SpellLocal', { undercurl = true, sp = c.blue }) + hi('SpellRare', { undercurl = true, sp = c.cyan }) + + -- Syntax + hi('Comment', { fg = c.gray4, italic = true }) + hi('Constant', { fg = c.orange_br }) + hi('String', { fg = c.yellow_br }) + hi('Character', { fg = c.yellow_br }) + hi('Number', { fg = c.orange_br }) + hi('Boolean', { fg = c.orange, bold = true }) + hi('Float', { fg = c.orange_br }) + hi('Identifier', { fg = c.fg }) + hi('Function', { fg = c.orange, bold = true }) + hi('Statement', { fg = c.orange }) + hi('Conditional', { fg = c.orange }) + hi('Repeat', { fg = c.orange }) + hi('Label', { fg = c.orange }) + hi('Operator', { fg = c.yellow }) + hi('Keyword', { fg = c.orange, bold = true }) + hi('Exception', { fg = c.red }) + hi('PreProc', { fg = c.blue }) + hi('Include', { fg = c.blue }) + hi('Define', { fg = c.blue }) + hi('Macro', { fg = c.blue }) + hi('PreCondit', { fg = c.blue }) + hi('Type', { fg = c.yellow }) + hi('StorageClass', { fg = c.yellow }) + hi('Structure', { fg = c.yellow }) + hi('Typedef', { fg = c.yellow }) + hi('Special', { fg = c.cyan }) + hi('SpecialChar', { fg = c.cyan }) + hi('Tag', { fg = c.orange }) + hi('Delimiter', { fg = c.gray5 }) + hi('SpecialComment', { fg = c.gray4, italic = true }) + hi('Debug', { fg = c.red }) + hi('Underlined', { underline = true }) + hi('Ignore', { fg = c.gray4 }) + hi('Error', { fg = c.red, bold = true }) + hi('Todo', { fg = c.bg, bg = c.orange, bold = true }) + + -- Treesitter + hi('@variable', { fg = c.fg }) + hi('@variable.builtin', { fg = c.orange_br }) + hi('@variable.parameter', { fg = c.fg }) + hi('@variable.member', { fg = c.fg }) + hi('@constant', { fg = c.orange_br }) + hi('@constant.builtin', { fg = c.orange, bold = true }) + hi('@constant.macro', { fg = c.blue }) + hi('@string', { fg = c.yellow_br }) + hi('@string.escape', { fg = c.cyan }) + hi('@string.special', { fg = c.cyan }) + hi('@character', { fg = c.yellow_br }) + hi('@number', { fg = c.orange_br }) + hi('@boolean', { fg = c.orange, bold = true }) + hi('@float', { fg = c.orange_br }) + hi('@function', { fg = c.orange, bold = true }) + hi('@function.builtin', { fg = c.orange_br }) + hi('@function.call', { fg = c.orange }) + hi('@function.macro', { fg = c.blue }) + hi('@function.method', { fg = c.orange }) + hi('@function.method.call', { fg = c.orange }) + hi('@constructor', { fg = c.yellow }) + hi('@operator', { fg = c.yellow }) + hi('@keyword', { fg = c.orange, bold = true }) + hi('@keyword.function', { fg = c.orange, bold = true }) + hi('@keyword.operator', { fg = c.yellow }) + hi('@keyword.return', { fg = c.orange, bold = true }) + hi('@keyword.import', { fg = c.blue }) + hi('@keyword.conditional', { fg = c.orange }) + hi('@keyword.repeat', { fg = c.orange }) + hi('@keyword.exception', { fg = c.red }) + hi('@type', { fg = c.yellow }) + hi('@type.builtin', { fg = c.yellow, bold = true }) + hi('@type.definition', { fg = c.yellow }) + hi('@attribute', { fg = c.blue }) + hi('@property', { fg = c.fg }) + hi('@punctuation.delimiter', { fg = c.gray5 }) + hi('@punctuation.bracket', { fg = c.gray5 }) + hi('@punctuation.special', { fg = c.cyan }) + hi('@comment', { fg = c.gray4, italic = true }) + hi('@comment.documentation', { fg = c.gray5, italic = true }) + hi('@tag', { fg = c.orange }) + hi('@tag.attribute', { fg = c.yellow }) + hi('@tag.delimiter', { fg = c.gray5 }) + hi('@markup.heading', { fg = c.orange, bold = true }) + hi('@markup.bold', { fg = c.yellow_br, bold = true }) + hi('@markup.italic', { fg = c.fg, italic = true }) + hi('@markup.link', { fg = c.blue, underline = true }) + hi('@markup.link.url', { fg = c.blue, underline = true }) + hi('@markup.raw', { fg = c.cyan }) + hi('@markup.list', { fg = c.orange }) + + -- LSP + hi('LspReferenceText', { bg = c.gray2 }) + hi('LspReferenceRead', { bg = c.gray2 }) + hi('LspReferenceWrite', { bg = c.gray3 }) + hi('LspInlayHint', { fg = c.gray4, italic = true }) + hi('LspCodeLens', { fg = c.gray4, italic = true }) + + -- Diagnostics + hi('DiagnosticError', { fg = c.red }) + hi('DiagnosticWarn', { fg = c.yellow }) + hi('DiagnosticInfo', { fg = c.blue }) + hi('DiagnosticHint', { fg = c.cyan }) + hi('DiagnosticOk', { fg = c.blue }) + hi('DiagnosticVirtualTextError', { fg = c.red, bg = c.vt_err, italic = true }) + hi('DiagnosticVirtualTextWarn', { fg = c.yellow, bg = c.vt_warn, italic = true }) + hi('DiagnosticVirtualTextInfo', { fg = c.blue, bg = c.vt_info, italic = true }) + hi('DiagnosticVirtualTextHint', { fg = c.cyan, bg = c.vt_hint, italic = true }) + hi('DiagnosticUnderlineError', { undercurl = true, sp = c.red }) + hi('DiagnosticUnderlineWarn', { undercurl = true, sp = c.yellow }) + hi('DiagnosticUnderlineInfo', { undercurl = true, sp = c.blue }) + hi('DiagnosticUnderlineHint', { undercurl = true, sp = c.cyan }) + + -- Gitsigns + hi('GitSignsAdd', { fg = c.blue }) + hi('GitSignsChange', { fg = c.yellow }) + hi('GitSignsDelete', { fg = c.red }) + + -- Telescope + hi('TelescopeBorder', { fg = c.orange, bg = c.gray1 }) + hi('TelescopeNormal', { fg = c.fg, bg = c.gray1 }) + hi('TelescopePromptBorder', { fg = c.orange_br, bg = c.gray2 }) + hi('TelescopePromptNormal', { fg = c.fg, bg = c.gray2 }) + hi('TelescopePromptPrefix', { fg = c.orange, bg = c.gray2 }) + hi('TelescopeResultsBorder', { fg = c.orange, bg = c.gray1 }) + hi('TelescopePreviewBorder', { fg = c.gray3, bg = c.gray1 }) + hi('TelescopeSelection', { fg = c.sel_fg, bg = c.orange }) + hi('TelescopeSelectionCaret', { fg = c.sel_fg, bg = c.orange }) + hi('TelescopeMatching', { fg = c.orange_br, bold = true }) + hi('TelescopeTitle', { fg = c.orange_br, bold = true }) + + -- NeoTree + hi('NeoTreeNormal', { fg = c.fg, bg = c.gray1 }) + hi('NeoTreeNormalNC', { fg = c.fg, bg = c.gray1 }) + hi('NeoTreeVertSplit', { fg = c.gray3, bg = c.gray1 }) + hi('NeoTreeWinSeparator', { fg = c.gray3, bg = c.gray1 }) + hi('NeoTreeDirectoryName',{ fg = c.orange }) + hi('NeoTreeDirectoryIcon',{ fg = c.orange }) + hi('NeoTreeFileName', { fg = c.fg }) + hi('NeoTreeGitAdded', { fg = c.blue }) + hi('NeoTreeGitModified', { fg = c.yellow }) + hi('NeoTreeGitDeleted', { fg = c.red }) + hi('NeoTreeIndentMarker', { fg = c.gray3 }) + hi('NeoTreeExpander', { fg = c.orange }) + hi('NeoTreeTitleBar', { fg = c.bg, bg = c.orange, bold = true }) + + -- Which-key + hi('WhichKey', { fg = c.orange }) + hi('WhichKeyGroup', { fg = c.yellow }) + hi('WhichKeyDesc', { fg = c.fg }) + hi('WhichKeySeparator', { fg = c.gray4 }) + hi('WhichKeyFloat', { bg = c.gray1 }) + hi('WhichKeyBorder', { fg = c.orange, bg = c.gray1 }) + + -- Blink.cmp + hi('BlinkCmpMenu', { fg = c.fg, bg = c.gray1 }) + hi('BlinkCmpMenuBorder', { fg = c.orange, bg = c.gray1 }) + hi('BlinkCmpMenuSelection', { fg = c.sel_fg, bg = c.orange }) + hi('BlinkCmpScrollBarThumb', { bg = c.orange }) + hi('BlinkCmpScrollBarGutter', { bg = c.gray2 }) + hi('BlinkCmpLabel', { fg = c.fg }) + hi('BlinkCmpLabelMatch', { fg = c.orange_br, bold = true }) + hi('BlinkCmpKind', { fg = c.yellow }) + hi('BlinkCmpDoc', { fg = c.fg, bg = c.gray1 }) + hi('BlinkCmpDocBorder', { fg = c.gray3, bg = c.gray1 }) + + -- Mini.statusline + hi('MiniStatuslineModeNormal', { fg = c.bg, bg = c.orange, bold = true }) + hi('MiniStatuslineModeInsert', { fg = c.bg, bg = c.blue, bold = true }) + hi('MiniStatuslineModeVisual', { fg = c.bg, bg = c.yellow, bold = true }) + hi('MiniStatuslineModeReplace', { fg = c.bg, bg = c.red, bold = true }) + hi('MiniStatuslineModeCommand', { fg = c.bg, bg = c.orange_br, bold = true }) + hi('MiniStatuslineModeOther', { fg = c.bg, bg = c.gray4, bold = true }) + hi('MiniStatuslineDevinfo', { fg = c.fg, bg = c.gray2 }) + hi('MiniStatuslineFilename', { fg = c.fg, bg = c.gray2 }) + hi('MiniStatuslineFileinfo', { fg = c.fg, bg = c.gray2 }) + hi('MiniStatuslineInactive', { fg = c.gray4, bg = c.gray1 }) + + -- Todo-comments + hi('TodoBgTODO', { fg = c.bg, bg = c.orange, bold = true }) + hi('TodoBgNOTE', { fg = c.bg, bg = c.blue, bold = true }) + hi('TodoBgFIX', { fg = c.bg, bg = c.red, bold = true }) + hi('TodoBgWARN', { fg = c.bg, bg = c.yellow, bold = true }) + hi('TodoBgHACK', { fg = c.bg, bg = c.yellow, bold = true }) + hi('TodoBgPERF', { fg = c.bg, bg = c.cyan, bold = true }) + hi('TodoFgTODO', { fg = c.orange }) + hi('TodoFgNOTE', { fg = c.blue }) + hi('TodoFgFIX', { fg = c.red }) + hi('TodoFgWARN', { fg = c.yellow }) + hi('TodoFgHACK', { fg = c.yellow }) + hi('TodoFgPERF', { fg = c.cyan }) +end + +-- ── Helper: pick palette from macOS system appearance ───────────────────── +local function is_dark_mode() + local out = vim.fn.system 'defaults read -g AppleInterfaceStyle 2>/dev/null' + return out:match 'Dark' ~= nil +end + +-- ── Apply on startup based on system appearance ──────────────────────────── +if is_dark_mode() then + apply(dark, 'dark') +else + apply(light, 'light') +end + +-- ── Re-apply on explicit :colorscheme calls ──────────────────────────────── +-- These autocmds let :colorscheme orng / orng-light work mid-session. +-- Note: they fire only if a colors/orng*.vim stub exists; we create one below. +vim.api.nvim_create_autocmd('ColorScheme', { + pattern = 'orng', + callback = function() apply(dark, 'dark') end, +}) + +vim.api.nvim_create_autocmd('ColorScheme', { + pattern = 'orng-light', + callback = function() apply(light, 'light') end, +}) + +return {} diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua new file mode 100644 index 0000000..081df73 --- /dev/null +++ b/lua/plugins/completion.lua @@ -0,0 +1,55 @@ +-- lua/plugins/completion.lua +-- Autocompletion via blink.cmp + LuaSnip snippets + +return { + 'saghen/blink.cmp', + event = 'VimEnter', + version = '1.*', + dependencies = { + { + 'L3MON4D3/LuaSnip', + version = '2.*', + build = (function() + -- Regex support in snippets requires a build step. + -- Skip on Windows or when make is unavailable. + if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then + return + end + return 'make install_jsregexp' + end)(), + }, + 'folke/lazydev.nvim', + }, + --- @module 'blink.cmp' + --- @type blink.cmp.Config + opts = { + keymap = { + -- super-tab: Tab to accept, C-n/C-p to navigate + preset = 'super-tab', + }, + + appearance = { + nerd_font_variant = 'mono', + }, + + completion = { + documentation = { auto_show = true, auto_show_delay_ms = 300 }, + menu = { + border = 'rounded', + }, + }, + + sources = { + default = { 'lsp', 'path', 'snippets', 'lazydev' }, + providers = { + lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, + }, + }, + + snippets = { preset = 'luasnip' }, + + fuzzy = { implementation = 'lua' }, + + signature = { enabled = true, window = { border = 'rounded' } }, + }, +} diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua new file mode 100644 index 0000000..c7bd136 --- /dev/null +++ b/lua/plugins/conform.lua @@ -0,0 +1,50 @@ +-- lua/plugins/conform.lua +-- Code formatting via conform.nvim + +return { + '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 lsp_fallback for languages without a standardized style. + local disable_filetypes = { c = true, cpp = true } + if disable_filetypes[vim.bo[bufnr].filetype] then + return nil + end + return { timeout_ms = 500, lsp_format = 'fallback' } + end, + + formatters = { + yamlfmt = { + prepend_args = { '-conf', vim.fn.expand '~/.config/yamlfmt/.yamlfmt' }, + }, + }, + + formatters_by_ft = { + lua = { 'stylua' }, + python = { 'black' }, + javascript = { 'biome', 'prettier', stop_after_first = true }, + typescript = { 'biome', 'prettier', stop_after_first = true }, + javascriptreact = { 'biome', 'prettier', stop_after_first = true }, + typescriptreact = { 'biome', 'prettier', stop_after_first = true }, + json = { 'biome', 'prettier', stop_after_first = true }, + html = { 'prettier' }, + css = { 'prettier' }, + graphql = { 'prettier' }, + yaml = { 'yamlfmt' }, + }, + }, +} diff --git a/lua/plugins/debug.lua b/lua/plugins/debug.lua new file mode 100644 index 0000000..b2b0450 --- /dev/null +++ b/lua/plugins/debug.lua @@ -0,0 +1,75 @@ +-- lua/plugins/debug.lua +-- DAP debugging: Go + PHP/Xdebug support + +return { + 'mfussenegger/nvim-dap', + dependencies = { + 'rcarriga/nvim-dap-ui', + 'nvim-neotest/nvim-nio', + 'mason-org/mason.nvim', + 'jay-babu/mason-nvim-dap.nvim', + 'leoluz/nvim-dap-go', + 'nvim-telescope/telescope-dap.nvim', + }, + keys = { + { '', function() require('dap').continue() end, desc = 'Debug: Start/Continue' }, + { '', function() require('dap').step_into() end, desc = 'Debug: Step Into' }, + { '', function() require('dap').step_over() end, desc = 'Debug: Step Over' }, + { '', function() require('dap').step_out() end, desc = 'Debug: Step Out' }, + { '', function() require('dapui').toggle() end, desc = 'Debug: Toggle UI' }, + { 'b', function() require('dap').toggle_breakpoint() end, desc = 'Debug: Toggle Breakpoint' }, + { 'B', function() require('dap').set_breakpoint(vim.fn.input 'Condition: ') end, desc = 'Debug: Set Conditional Breakpoint' }, + { 'dv', function() require('telescope').extensions.dap.variables() end, desc = 'Debug: Find [V]ariables' }, + { 'df', function() require('telescope').extensions.dap.frames() end, desc = 'Debug: Find [F]rames' }, + { 'dc', function() require('telescope').extensions.dap.commands() end, desc = 'Debug: Find [C]ommands' }, + { 'db', function() require('telescope').extensions.dap.list_breakpoints() end, desc = 'Debug: List [B]reakpoints' }, + }, + config = function() + local dap = require 'dap' + local dapui = require 'dapui' + + require('mason-nvim-dap').setup { + automatic_installation = true, + handlers = {}, + ensure_installed = { 'delve', 'php-debug-adapter' }, + } + + dapui.setup { + icons = { expanded = '▾', collapsed = '▸', current_frame = '*' }, + controls = { + icons = { + pause = '⏸', play = '▶', step_into = '⏎', step_over = '⏭', + step_out = '⏮', step_back = 'b', run_last = '▶▶', + terminate = '⏹', disconnect = '⏏', + }, + }, + } + + -- Auto-open/close dapui with debug sessions + dap.listeners.after.event_initialized['dapui_config'] = dapui.open + dap.listeners.before.event_terminated['dapui_config'] = dapui.close + dap.listeners.before.event_exited['dapui_config'] = dapui.close + + -- Go + require('dap-go').setup { + delve = { detached = vim.fn.has 'win32' == 0 }, + } + + -- PHP / Xdebug + dap.adapters.php = { + type = 'executable', + command = 'node', + args = { vim.fn.stdpath 'data' .. '/mason/packages/php-debug-adapter/extension/out/phpDebug.js' }, + } + dap.configurations.php = { + { type = 'php', request = 'launch', name = 'Listen for Xdebug', port = 9003 }, + { type = 'php', request = 'launch', name = 'Listen for Xdebug (DDEV)', port = 9003, + pathMappings = { ['/var/www/html'] = '${workspaceFolder}' } }, + { type = 'php', request = 'launch', name = 'Run current script', port = 9003, + cwd = '${fileDirname}', program = '${file}', runtimeExecutable = 'php' }, + } + + -- Telescope DAP extension + require('telescope').load_extension 'dap' + end, +} diff --git a/lua/plugins/extras/comment.lua b/lua/plugins/extras/comment.lua new file mode 100644 index 0000000..7d927f9 --- /dev/null +++ b/lua/plugins/extras/comment.lua @@ -0,0 +1,7 @@ +-- lua/plugins/extras/comment.lua +-- Smart commenting via gcc / gc + +return { + 'numToStr/Comment.nvim', + opts = {}, +} diff --git a/lua/plugins/extras/fff.lua b/lua/plugins/extras/fff.lua new file mode 100644 index 0000000..05bcea6 --- /dev/null +++ b/lua/plugins/extras/fff.lua @@ -0,0 +1,17 @@ +-- lua/plugins/extras/fff.lua +-- Fast fuzzy file finder with a native Rust binary +-- https://github.com/dmtrKovalenko/fff.nvim + +return { + 'dmtrKovalenko/fff.nvim', + lazy = false, + build = function() + require('fff.download').download_or_build_binary() + end, + opts = { + debug = { enabled = false, show_scores = false }, + }, + keys = { + { 'ff', function() require('fff').find_files() end, desc = 'FFFind files' }, + }, +} diff --git a/lua/custom/plugins/lazygit.lua b/lua/plugins/extras/lazygit.lua similarity index 53% rename from lua/custom/plugins/lazygit.lua rename to lua/plugins/extras/lazygit.lua index a88c258..51fe0a1 100644 --- a/lua/custom/plugins/lazygit.lua +++ b/lua/plugins/extras/lazygit.lua @@ -1,4 +1,5 @@ --- Open lazygit +-- lua/plugins/extras/lazygit.lua +-- LazyGit floating window integration -- https://github.com/kdheepak/lazygit.nvim return { @@ -11,13 +12,9 @@ return { 'LazyGitFilter', 'LazyGitFilterCurrentFile', }, - -- optional for floating window border decoration - dependencies = { - 'nvim-lua/plenary.nvim', - }, - -- setting the keybinding for LazyGit with 'keys' is recommended in - -- order to load the plugin when the command is run for the first time + dependencies = { 'nvim-lua/plenary.nvim' }, keys = { { 'lg', 'LazyGit', desc = 'LazyGit' }, + -- is also mapped in config/keymaps.lua }, } diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua new file mode 100644 index 0000000..1694662 --- /dev/null +++ b/lua/plugins/gitsigns.lua @@ -0,0 +1,51 @@ +-- lua/plugins/gitsigns.lua +-- Git signs in the gutter + hunk actions and navigation keymaps + +return { + 'lewis6991/gitsigns.nvim', + opts = { + signs = { + add = { text = '+' }, + change = { text = '~' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + }, + on_attach = function(bufnr) + local gs = require 'gitsigns' + + local function map(mode, lhs, rhs, opts) + opts = vim.tbl_extend('force', { buffer = bufnr }, opts or {}) + vim.keymap.set(mode, lhs, rhs, opts) + end + + -- Navigation + map('n', ']c', function() + if vim.wo.diff then vim.cmd.normal { ']c', bang = true } + else gs.nav_hunk 'next' end + end, { desc = 'Jump to next git [c]hange' }) + + map('n', '[c', function() + if vim.wo.diff then vim.cmd.normal { '[c', bang = true } + else gs.nav_hunk 'prev' end + end, { desc = 'Jump to previous git [c]hange' }) + + -- Hunk actions (visual + normal) + map('v', 'hs', function() gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [s]tage hunk' }) + map('v', 'hr', function() gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [r]eset hunk' }) + map('n', 'hs', gs.stage_hunk, { desc = 'git [s]tage hunk' }) + map('n', 'hr', gs.reset_hunk, { desc = 'git [r]eset hunk' }) + map('n', 'hS', gs.stage_buffer, { desc = 'git [S]tage buffer' }) + map('n', 'hu', gs.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' }) + map('n', 'hR', gs.reset_buffer, { desc = 'git [R]eset buffer' }) + map('n', 'hp', gs.preview_hunk, { desc = 'git [p]review hunk' }) + map('n', 'hb', gs.blame_line, { desc = 'git [b]lame line' }) + map('n', 'hd', gs.diffthis, { desc = 'git [d]iff against index' }) + map('n', 'hD', function() gs.diffthis '@' end, { desc = 'git [D]iff against last commit' }) + + -- Toggles + map('n', 'tb', gs.toggle_current_line_blame, { desc = '[T]oggle git [b]lame line' }) + map('n', 'tD', gs.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' }) + end, + }, +} diff --git a/lua/plugins/guess-indent.lua b/lua/plugins/guess-indent.lua new file mode 100644 index 0000000..a060413 --- /dev/null +++ b/lua/plugins/guess-indent.lua @@ -0,0 +1,7 @@ +-- lua/plugins/guess-indent.lua +-- Automatically detect tabstop and shiftwidth from the file + +return { + 'NMAC427/guess-indent.nvim', + opts = {}, +} diff --git a/lua/plugins/lint.lua b/lua/plugins/lint.lua new file mode 100644 index 0000000..4984d1e --- /dev/null +++ b/lua/plugins/lint.lua @@ -0,0 +1,25 @@ +-- lua/plugins/lint.lua +-- Async linting via nvim-lint + +return { + 'mfussenegger/nvim-lint', + event = { 'BufReadPre', 'BufNewFile' }, + config = function() + local lint = require 'lint' + + lint.linters_by_ft = { + markdown = { 'markdownlint' }, + } + + local augroup = vim.api.nvim_create_augroup('user-lint', { clear = true }) + vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, { + group = augroup, + callback = function() + -- Only lint modifiable buffers to avoid noise in readonly pop-ups + if vim.bo.modifiable then + lint.try_lint() + end + end, + }) + end, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua new file mode 100644 index 0000000..60678ce --- /dev/null +++ b/lua/plugins/lsp.lua @@ -0,0 +1,135 @@ +-- lua/plugins/lsp.lua +-- Language Server Protocol: mason + nvim-lspconfig + lazydev + fidget + +return { + { + -- Lua LSP annotations for Neovim API + 'folke/lazydev.nvim', + ft = 'lua', + opts = { + library = { + { path = '${3rd}/luv/library', words = { 'vim%.uv' } }, + }, + }, + }, + + { + '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() + -- Keymaps attached per-buffer when an LSP connects + vim.api.nvim_create_autocmd('LspAttach', { + group = vim.api.nvim_create_augroup('user-lsp-attach', { clear = true }), + callback = function(event) + local map = function(keys, func, desc, mode) + vim.keymap.set(mode or 'n', keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) + end + + local tb = require 'telescope.builtin' + 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', tb.lsp_references, '[G]oto [R]eferences') + map('gri', tb.lsp_implementations, '[G]oto [I]mplementation') + map('grd', tb.lsp_definitions, '[G]oto [D]efinition') + map('grD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + map('gO', tb.lsp_document_symbols, 'Open Document Symbols') + map('gW', tb.lsp_dynamic_workspace_symbols, 'Open Workspace Symbols') + map('grt', tb.lsp_type_definitions, '[G]oto [T]ype Definition') + + -- Compat helper for 0.10 vs 0.11 + local function client_supports(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) + + -- Document highlight on CursorHold + if client and client_supports(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then + local hl_group = vim.api.nvim_create_augroup('user-lsp-highlight', { clear = false }) + vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { + buffer = event.buf, group = hl_group, callback = vim.lsp.buf.document_highlight, + }) + vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { + buffer = event.buf, group = hl_group, callback = vim.lsp.buf.clear_references, + }) + vim.api.nvim_create_autocmd('LspDetach', { + group = vim.api.nvim_create_augroup('user-lsp-detach', { clear = true }), + callback = function(ev) + vim.lsp.buf.clear_references() + vim.api.nvim_clear_autocmds { group = 'user-lsp-highlight', buffer = ev.buf } + end, + }) + end + + -- Inlay hints toggle + if client and client_supports(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, + }) + + -- Diagnostics appearance + 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(d) return d.message end, + }, + } + + -- Capabilities enhanced by blink.cmp + local capabilities = require('blink.cmp').get_lsp_capabilities() + + -- Language servers to install and configure + -- Add more servers here as needed; see `:help lspconfig-all` + local servers = { + lua_ls = { + settings = { + Lua = { + completion = { callSnippet = 'Replace' }, + }, + }, + }, + } + + local ensure_installed = vim.tbl_keys(servers) + 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, + }, +} diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua new file mode 100644 index 0000000..a814715 --- /dev/null +++ b/lua/plugins/mini.lua @@ -0,0 +1,32 @@ +-- lua/plugins/mini.lua +-- mini.nvim collection: ai, pairs, animate, starter, surround, statusline + +return { + 'echasnovski/mini.nvim', + config = function() + -- Better text objects: va) yi' ci{ etc. + require('mini.ai').setup { n_lines = 500 } + + -- Auto-pairs for brackets, quotes, etc. + require('mini.pairs').setup() + + -- Smooth scroll / cursor animations + require('mini.animate').setup() + + -- Start screen + require('mini.starter').setup() + + -- Surround: saiw) sd' sr)' + require('mini.surround').setup() + + -- Statusline + local statusline = require 'mini.statusline' + statusline.setup { use_icons = vim.g.have_nerd_font } + + -- Cursor position as LINE:COL + ---@diagnostic disable-next-line: duplicate-set-field + statusline.section_location = function() + return '%2l:%-2v' + end + end, +} diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua similarity index 52% rename from lua/kickstart/plugins/neo-tree.lua rename to lua/plugins/neo-tree.lua index c0b9972..648b231 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -1,22 +1,22 @@ --- Neo-tree is a Neovim plugin to browse the file system --- https://github.com/nvim-neo-tree/neo-tree.nvim +-- lua/plugins/neo-tree.lua +-- File system explorer return { 'nvim-neo-tree/neo-tree.nvim', version = '*', + lazy = false, dependencies = { 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended + 'nvim-tree/nvim-web-devicons', 'MunifTanjim/nui.nvim', }, - lazy = false, keys = { - { '\\', ':Neotree reveal', desc = 'NeoTree reveal', silent = true }, + { '\\', ':Neotree reveal', desc = 'NeoTree: reveal current file', silent = true }, }, opts = { filesystem = { filtered_items = { - visible = true, -- Also show '.' files. + visible = true, -- show dotfiles }, window = { mappings = { diff --git a/lua/custom/plugins/pdf-viewer.lua b/lua/plugins/pdf-viewer.lua similarity index 58% rename from lua/custom/plugins/pdf-viewer.lua rename to lua/plugins/pdf-viewer.lua index c18e32b..174f53f 100644 --- a/lua/custom/plugins/pdf-viewer.lua +++ b/lua/plugins/pdf-viewer.lua @@ -1,68 +1,63 @@ --- Simple PDF viewer using pdftoppm + image.nvim --- Requires: poppler (brew install poppler) +-- lua/plugins/pdf-viewer.lua +-- PDF viewer using pdftoppm + image.nvim (kitty/magick backend) +-- Requires: poppler (brew install poppler), kitty terminal return { '3rd/image.nvim', - config = function() - local image = require('image') - image.setup({}) - + opts = { + backend = 'kitty', + processor = 'magick_cli', + integrations = { + markdown = { enabled = true }, + }, + }, + config = function(_, opts) + local image = require 'image' + image.setup(opts) + local pdf_state = {} - + + -- Open PDF: convert all pages to PNG via pdftoppm, then display page 1 vim.api.nvim_create_autocmd('BufReadPost', { pattern = '*.pdf', callback = function() - local pdf_path = vim.fn.expand('%:p') + local pdf_path = vim.fn.expand '%:p' local temp_dir = vim.fn.tempname() vim.fn.mkdir(temp_dir, 'p') local bufnr = vim.api.nvim_get_current_buf() - - -- Convert all pages upfront - vim.notify('Converting PDF...', vim.log.levels.INFO) - - vim.fn.jobstart({ - 'pdftoppm', '-png', - pdf_path, temp_dir .. '/page' - }, { + + vim.notify('Converting PDF…', vim.log.levels.INFO) + + vim.fn.jobstart({ 'pdftoppm', '-png', pdf_path, temp_dir .. '/page' }, { on_exit = function(_, code) vim.schedule(function() if code ~= 0 then vim.notify('Failed to convert PDF', vim.log.levels.ERROR) return end - - -- Count generated files + + -- Count pages local handle = vim.loop.fs_scandir(temp_dir) local page_count = 0 if handle then while true do local name = vim.loop.fs_scandir_next(handle) if not name then break end - if name:match('^page%-%d+%.png$') then - page_count = page_count + 1 - end + if name:match '^page%-%d+%.png$' then page_count = page_count + 1 end end end - - pdf_state[bufnr] = { - temp_dir = temp_dir, - current_page = 1, - total_pages = page_count, - } - + + pdf_state[bufnr] = { temp_dir = temp_dir, current_page = 1, total_pages = page_count } + local function show_page(page_num) local state = pdf_state[bufnr] if not state then return end - image.clear() - vim.bo[bufnr].modifiable = true - vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, {''}) + vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, { '' }) vim.bo[bufnr].modifiable = false - local page_file = string.format('%s/page-%02d.png', state.temp_dir, page_num) local img = image.from_file(page_file, { buffer = bufnr }) - if img then img:render() vim.notify(string.format('Page %d / %d', page_num, state.total_pages), vim.log.levels.INFO) @@ -70,36 +65,34 @@ return { vim.notify('Failed to load page ' .. page_num, vim.log.levels.ERROR) end end - + local function change_page(delta) local state = pdf_state[bufnr] if not state then return end - local new_page = state.current_page + delta - if new_page < 1 or new_page > state.total_pages then - return - end - + if new_page < 1 or new_page > state.total_pages then return end state.current_page = new_page show_page(new_page) end - - -- Keymaps - vim.keymap.set('n', 'j', function() change_page(1) end, { buffer = bufnr, desc = 'Next page' }) - vim.keymap.set('n', 'k', function() change_page(-1) end, { buffer = bufnr, desc = 'Previous page' }) - vim.keymap.set('n', '', function() change_page(1) end, { buffer = bufnr, desc = 'Next page' }) - vim.keymap.set('n', '', function() change_page(-1) end, { buffer = bufnr, desc = 'Previous page' }) - vim.keymap.set('n', 'q', 'bd!', { buffer = bufnr, silent = true }) - - -- Show first page + + -- Buffer-local navigation keys + local map = function(lhs, fn, desc) + vim.keymap.set('n', lhs, fn, { buffer = bufnr, desc = desc }) + end + map('j', function() change_page(1) end, 'PDF: next page') + map('k', function() change_page(-1) end, 'PDF: previous page') + map('', function() change_page(1) end, 'PDF: next page') + map('', function() change_page(-1) end, 'PDF: previous page') + map('q', 'bd!', 'PDF: close') + show_page(1) end) - end + end, }) end, }) - - -- Cleanup + + -- Cleanup temp files on buffer close vim.api.nvim_create_autocmd('BufDelete', { pattern = '*.pdf', callback = function(args) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 0000000..dbe6ca0 --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,61 @@ +-- lua/plugins/telescope.lua +-- Fuzzy finder for files, LSP, grep, help, and more + +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' + + -- Search keymaps + 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' }) + vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + + -- Fuzzy search inside current buffer + 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' }) + + -- Grep only open files + 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' }) + + -- Search Neovim config 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/todo-comments.lua b/lua/plugins/todo-comments.lua new file mode 100644 index 0000000..38ef4f2 --- /dev/null +++ b/lua/plugins/todo-comments.lua @@ -0,0 +1,9 @@ +-- lua/plugins/todo-comments.lua +-- Highlight and search TODO, NOTE, FIXME, HACK, WARN, PERF comments + +return { + 'folke/todo-comments.nvim', + event = 'VimEnter', + dependencies = { 'nvim-lua/plenary.nvim' }, + opts = { signs = false }, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 0000000..9877149 --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,24 @@ +-- lua/plugins/treesitter.lua +-- Syntax highlighting, indentation, and more via Tree-sitter + +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', + -- web + 'javascript', 'typescript', 'tsx', 'json', 'css', + -- go / php + 'go', 'php', + }, + auto_install = true, + highlight = { + enable = true, + additional_vim_regex_highlighting = { 'ruby' }, + }, + indent = { enable = true, disable = { 'ruby' } }, + }, +} diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua new file mode 100644 index 0000000..7ef5247 --- /dev/null +++ b/lua/plugins/which-key.lua @@ -0,0 +1,29 @@ +-- lua/plugins/which-key.lua +-- Shows pending keybind completions as you type + +return { + '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 = { + { 's', group = '[S]earch' }, + { 't', group = '[T]oggle' }, + { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, + { 'd', group = '[D]ebug' }, + }, + }, +}