From 33ddc3de885396359319afdf3d3d1a490ae448f8 Mon Sep 17 00:00:00 2001 From: cedricreper Date: Fri, 25 Apr 2025 09:36:09 +0900 Subject: [PATCH 01/11] config changes for my preferences --- init.lua | 150 +++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 95 insertions(+), 55 deletions(-) diff --git a/init.lua b/init.lua index 776c6873ff6..d4b64ceae29 100644 --- a/init.lua +++ b/init.lua @@ -62,7 +62,6 @@ Kickstart Guide: 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. @@ -90,9 +89,6 @@ P.S. You can delete this when you're done too. It's your config now! :) 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.opt` -- NOTE: You can change these options as you wish! @@ -102,7 +98,7 @@ vim.g.have_nerd_font = false vim.opt.number = true -- You can also add relative line numbers, to help with jumping. -- Experiment for yourself to see if you like it! --- vim.opt.relativenumber = true +vim.opt.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a' @@ -110,6 +106,8 @@ vim.opt.mouse = 'a' -- Don't show the mode, since it's already in the status line vim.opt.showmode = false +-- Don't wrap long words +vim.opt.wrap = 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. @@ -161,6 +159,11 @@ vim.opt.scrolloff = 10 -- See `:help 'confirm'` vim.opt.confirm = true +vim.opt.guicursor = { + 'n-v-c:block-Cursor/lCursor-blinkwait1000-blinkon100-blinkoff100', + 'i-ci:ver25-Cursor/lCursor-blinkwait1000-blinkon100-blinkoff100', + 'r:hor50-Cursor/lCursor-blinkwait100-blinkon100-blinkoff100', +} -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` @@ -180,10 +183,10 @@ vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagn 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!!"') +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 @@ -194,11 +197,11 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the right win 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 +-- NOTE: Some trminals 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" }) +-- vim.keymap.sut("n", "", "K", { desc = "Move window to the upper" }) -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` @@ -247,7 +250,48 @@ require('lazy').setup({ -- -- Use `opts = {}` to automatically pass options to a plugin's `setup()` function, forcing the plugin to be loaded. -- - + { + 'christoomey/vim-tmux-navigator', + cmd = { + 'TmuxNavigateLeft', + 'TmuxNavigateDown', + 'TmuxNavigateUp', + 'TmuxNavigateRight', + 'TmuxNavigatePrevious', + 'TmuxNavigatorProcessList', + }, + keys = { + { '', 'TmuxNavigateLeft' }, + { '', 'TmuxNavigateDown' }, + { '', 'TmuxNavigateUp' }, + { '', 'TmuxNavigateRight' }, + { '', 'TmuxNavigatePrevious' }, + }, + }, + { + 'stevearc/oil.nvim', + ---@module 'oil' + ---@type oil.SetupOpts + opts = {}, + -- Optional dependencies + dependencies = { { 'echasnovski/mini.icons', opts = {} } }, + -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons + -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. + lazy = false, + config = function() + require('oil').setup { + vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }), + } + end, + }, + { + 'nvimdev/dashboard-nvim', + event = 'VimEnter', + config = function() + require('dashboard').setup {} + end, + dependencies = { { 'nvim-tree/nvim-web-devicons' } }, + }, -- Alternatively, use `config = function() ... end` for full control over the configuration. -- If you prefer to call `setup` explicitly, use: -- { @@ -298,11 +342,8 @@ require('lazy').setup({ -- this setting is independent of vim.opt.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 { + mappings = false, + keys = { Up = ' ', Down = ' ', Left = ' ', @@ -369,9 +410,7 @@ require('lazy').setup({ 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 }, + { 'nvim-tree/nvim-web-devicons', enabled = false }, }, config = function() -- Telescope is a fuzzy finder that comes with a lot of different things that @@ -405,6 +444,10 @@ require('lazy').setup({ -- }, -- }, -- pickers = {} + defaults = { + layout_strategy = 'vertical', + layout_config = { preview_cutoff = 0, width = { padding = 0 }, height = { padding = 0 } }, + }, extensions = { ['ui-select'] = { require('telescope.themes').get_dropdown(), @@ -434,7 +477,7 @@ require('lazy').setup({ -- 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, + previewer = true, }) end, { desc = '[/] Fuzzily search in current buffer' }) @@ -624,14 +667,7 @@ require('lazy').setup({ 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 {}, + signs = {}, virtual_text = { source = 'if_many', spacing = 2, @@ -665,16 +701,16 @@ require('lazy').setup({ local servers = { -- clangd = {}, -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, + pyright = {}, + zls = {}, + 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 = {}, - -- + ts_ls = {}, lua_ls = { -- cmd = { ... }, @@ -779,12 +815,6 @@ require('lazy').setup({ '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 = { @@ -873,20 +903,15 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', + 'rebelot/kanagawa.nvim', priority = 1000, -- Make sure to load this before all the other start plugins. config = function() ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments - }, + require('kanagawa').setup { + commentStyle = { italic = true }, + theme = 'wave', } - - -- 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' + vim.cmd 'colorscheme kanagawa' end, }, @@ -915,8 +940,8 @@ require('lazy').setup({ -- 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 } + + statusline.setup { use_icons = false } -- You can configure sections in the statusline by overriding their -- default behavior. For example, here we set the section for @@ -936,7 +961,24 @@ require('lazy').setup({ 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' }, + ensure_installed = { + 'zig', + 'python', + 'typescript', + 'rust', + 'htmldjango', + 'bash', + 'c', + 'diff', + 'html', + 'lua', + 'luadoc', + 'markdown', + 'markdown_inline', + 'query', + 'vim', + 'vimdoc', + }, -- Autoinstall languages that are not installed auto_install = true, highlight = { @@ -984,9 +1026,7 @@ require('lazy').setup({ -- you can continue same window with `sr` which resumes last telescope search }, { ui = { - -- If you are using a Nerd Font: set icons to an empty table which will use the - -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table - icons = vim.g.have_nerd_font and {} or { + icons = { cmd = '⌘', config = '🛠', event = '📅', From 72bec883ad9b1bff220b80521a2d68da6c6dc15b Mon Sep 17 00:00:00 2001 From: cedricreper Date: Thu, 8 May 2025 18:38:45 +0900 Subject: [PATCH 02/11] more changes for my preferences --- init.lua | 244 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 177 insertions(+), 67 deletions(-) diff --git a/init.lua b/init.lua index d4b64ceae29..0d85767326c 100644 --- a/init.lua +++ b/init.lua @@ -93,7 +93,9 @@ vim.g.maplocalleader = ' ' -- See `:help vim.opt` -- NOTE: You can change these options as you wish! -- For more options, you can see `:help option-list` - +-- autoindent if possible when entering a new line in a block +vim.opt.autowriteall = false +vim.opt.smartindent = true -- Make line numbers default vim.opt.number = true -- You can also add relative line numbers, to help with jumping. @@ -166,6 +168,9 @@ vim.opt.guicursor = { } -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` +-- recenter to middle after page jump +vim.keymap.set('n', '', 'zz') +vim.keymap.set('n', '', 'zz') -- Clear highlights on search when pressing in normal mode -- See `:help hlsearch` @@ -188,6 +193,21 @@ 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!!"') +vim.keymap.set('i', '', 'echo "Use h to move!!"') +vim.keymap.set('i', '', 'echo "Use l to move!!"') +vim.keymap.set('i', '', 'echo "Use k to move!!"') +vim.keymap.set('i', '', 'echo "Use j to move!!"') + +vim.keymap.set('v', '', 'echo "Use h to move!!"') +vim.keymap.set('v', '', 'echo "Use l to move!!"') +vim.keymap.set('v', '', 'echo "Use k to move!!"') +vim.keymap.set('v', '', 'echo "Use j to move!!"') + +vim.keymap.set('c', '', 'echo "Use h to move!!"') +vim.keymap.set('c', '', 'echo "Use l to move!!"') +vim.keymap.set('c', '', 'echo "Use k to move!!"') +vim.keymap.set('c', '', 'echo "Use j to move!!"') + -- Keybinds to make split navigation easier. -- Use CTRL+ to switch between windows -- @@ -268,30 +288,6 @@ require('lazy').setup({ { '', 'TmuxNavigatePrevious' }, }, }, - { - 'stevearc/oil.nvim', - ---@module 'oil' - ---@type oil.SetupOpts - opts = {}, - -- Optional dependencies - dependencies = { { 'echasnovski/mini.icons', opts = {} } }, - -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons - -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. - lazy = false, - config = function() - require('oil').setup { - vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }), - } - end, - }, - { - 'nvimdev/dashboard-nvim', - event = 'VimEnter', - config = function() - require('dashboard').setup {} - end, - dependencies = { { 'nvim-tree/nvim-web-devicons' } }, - }, -- Alternatively, use `config = function() ... end` for full control over the configuration. -- If you prefer to call `setup` explicitly, use: -- { @@ -496,7 +492,66 @@ require('lazy').setup({ end, { desc = '[S]earch [N]eovim files' }) end, }, + { + 'ThePrimeagen/harpoon', + branch = 'harpoon2', + dependencies = { 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope.nvim' }, + config = function() + local harpoon = require 'harpoon' + harpoon:setup() + vim.keymap.set('n', 'a', function() + harpoon:list():add() + end, { desc = '[A]dd to Harpoon list' }) + vim.keymap.set('n', 'e', function() + harpoon.ui:toggle_quick_menu(harpoon:list()) + end, { desc = 'Toggle Harpoon m[E]nu' }) + + vim.keymap.set('n', '1', function() + harpoon:list():select(1) + end, { desc = 'Harpoon 1' }) + vim.keymap.set('n', '2', function() + harpoon:list():select(2) + end, { desc = 'Harpoon 2' }) + vim.keymap.set('n', '3', function() + harpoon:list():select(3) + end, { desc = 'Harpoon 3' }) + vim.keymap.set('n', '4', function() + harpoon:list():select(4) + end, { desc = 'Harpoon 4' }) + + -- Toggle previous & next buffers stored within Harpoon list + vim.keymap.set('n', 'p', function() + harpoon:list():prev() + end, { desc = '[P]revious Harpoon' }) + vim.keymap.set('n', 'n', function() + harpoon:list():next() + end, { desc = '[N]ext Harpoon' }) + + -- basic telescope configuration + local conf = require('telescope.config').values + local function toggle_telescope(harpoon_files) + local file_paths = {} + for _, item in ipairs(harpoon_files.items) do + table.insert(file_paths, item.value) + end + + require('telescope.pickers') + .new({}, { + prompt_title = 'Harpoon', + finder = require('telescope.finders').new_table { + results = file_paths, + }, + previewer = conf.file_previewer {}, + sorter = conf.generic_sorter {}, + }) + :find() + end + vim.keymap.set('n', '', function() + toggle_telescope(harpoon:list()) + end, { desc = 'Open harpoon window' }) + end, + }, -- LSP Plugins { -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins @@ -797,10 +852,14 @@ require('lazy').setup({ formatters_by_ft = { lua = { 'stylua' }, -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, - -- - -- You can use 'stop_after_first' to run the first available formatter from the list - -- javascript = { "prettierd", "prettier", stop_after_first = true }, + -- python = { 'ruff' }, + javascript = { 'prettier' }, + typescript = { 'prettier' }, + javascriptreact = { 'prettier' }, + typescriptreact = { 'prettier' }, + css = { 'prettier' }, + html = { 'prettier' }, + json = { 'prettier' }, }, }, }, @@ -914,45 +973,13 @@ require('lazy').setup({ vim.cmd 'colorscheme kanagawa' 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', + { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, config = function() - -- Better Around/Inside textobjects - -- - -- Examples: - -- - va) - [V]isually select [A]round [)]paren - -- - yinq - [Y]ank [I]nside [N]ext [Q]uote - -- - ci' - [C]hange [I]nside [']quote - require('mini.ai').setup { n_lines = 500 } - - -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- - -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren - -- - sd' - [S]urround [D]elete [']quotes - -- - sr)' - [S]urround [R]eplace [)] ['] - require('mini.surround').setup() - - -- Simple and easy statusline. - -- You could remove this setup call if you don't like it, - -- and try some other statusline plugin - local statusline = require 'mini.statusline' - - statusline.setup { use_icons = false } - - -- You can configure sections in the statusline by overriding their - -- default behavior. For example, here we set the section for - -- cursor location to LINE:COLUMN - ---@diagnostic disable-next-line: duplicate-set-field - statusline.section_location = function() - return '%2l:%-2v' - end - - -- ... and there is more! - -- Check out: https://github.com/echasnovski/mini.nvim + require('lualine').setup { + theme = 'base16', + } end, }, { -- Highlight, edit, and navigate code @@ -997,7 +1024,90 @@ require('lazy').setup({ -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects }, + { + 'nvim-treesitter/nvim-treesitter-context', + }, + { + 'windwp/nvim-autopairs', + event = 'InsertEnter', + config = true, + -- use opts = {} for passing setup options + -- this is equivalent to setup({}) function + }, + { + 'folke/snacks.nvim', + priority = 1000, + lazy = false, + }, + { + 'mikavilpas/yazi.nvim', + event = 'VeryLazy', + dependencies = { + 'folke/snacks.nvim', + }, + keys = { + -- 👇 in this section, choose your own keymappings! + { + '-', + mode = { 'n', 'v' }, + 'Yazi', + desc = 'Open yazi at the current file', + }, + { + -- Open in the current working directory + 'cw', + 'Yazi cwd', + desc = "Open the file manager in nvim's working directory", + }, + { + '', + 'Yazi toggle', + desc = 'Resume the last yazi session', + }, + }, + opts = { + -- if you want to open yazi instead of netrw, see below for more info + open_for_directories = false, + keymaps = { + show_help = '', + }, + }, + -- 👇 if you use `open_for_directories=true`, this is recommended + init = function() + -- More details: https://github.com/mikavilpas/yazi.nvim/issues/802 + -- vim.g.loaded_netrw = 1 + vim.g.loaded_netrwPlugin = 1 + end, + }, + { + 'goolord/alpha-nvim', + config = function() + local alpha = require 'alpha' + local dashboard = require 'alpha.themes.dashboard' + dashboard.section.header.val = { + ' ', + ' ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ', + ' ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ', + ' ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ', + ' ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ', + ' ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ', + ' ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ', + ' ', + } + -- Set menu + dashboard.section.buttons.val = { + dashboard.button('e', ' > New file', ':ene startinsert '), + dashboard.button('f', ' > Find file', ':cd $HOME/dev | Telescope find_files'), + dashboard.button('r', ' > Recent', ':Telescope oldfiles'), + dashboard.button('s', ' > Settings', ':e $MYVIMRC | :cd %:p:h | split . | wincmd k | pwd'), + dashboard.button('q', ' > Quit NVIM', ':qa'), + } + + -- Send config to alpha + alpha.setup(dashboard.opts) + end, + }, -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the -- init.lua. If you want these files, they are in the repository, so you can just download them and -- place them in the correct locations. From 1c4819a582491ab9b924d83aefcc37c3c821e053 Mon Sep 17 00:00:00 2001 From: cedricreper Date: Sun, 1 Jun 2025 11:15:01 +0900 Subject: [PATCH 03/11] update config --- init.lua | 116 ++++++++----------------------------------------------- 1 file changed, 16 insertions(+), 100 deletions(-) diff --git a/init.lua b/init.lua index 0d85767326c..9530c7867f7 100644 --- a/init.lua +++ b/init.lua @@ -1,105 +1,12 @@ ---[[ - -===================================================================== -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== -======== .-----. ======== -======== .----------------------. | === | ======== -======== |.-""""""""""""""""""-.| |-----| ======== -======== || || | === | ======== -======== || KICKSTART.NVIM || |-----| ======== -======== || || | === | ======== -======== || || |-----| ======== -======== ||:Tutor || |:::::| ======== -======== |'-..................-'| |____o| ======== -======== `"")----------------(""` ___________ ======== -======== /::::::::::| |::::::::::\ \ no mouse \ ======== -======== /:::========| |==hjkl==:::\ \ required \ ======== -======== '""""""""""""' '""""""""""""' '""""""""""' ======== -======== ======== -===================================================================== -===================================================================== - -What is Kickstart? - - Kickstart.nvim is *not* a distribution. - - Kickstart.nvim is a starting point for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. - - Once you've done that, you can start exploring, configuring and tinkering to - make Neovim your own! That might mean leaving Kickstart just the way it is for a while - or immediately breaking it into modular pieces. It's up to you! - - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example which will only take 10-15 minutes: - - https://learnxinyminutes.com/docs/lua/ - - After understanding a bit more about Lua, you can use `:help lua-guide` as a - reference for how Neovim integrates Lua. - - :help lua-guide - - (or HTML version): https://neovim.io/doc/user/lua-guide.html - -Kickstart Guide: - - TODO: The very first thing you should do is to run the command `:Tutor` in Neovim. - - If you don't know what this means, type the following: - - - - : - - Tutor - - - - (If you already know the Neovim basics, you can skip this step.) - - Once you've completed that, you can continue working through **AND READING** the rest - of the kickstart init.lua. - - Next, run AND READ `:help`. - This will open up a help window with some basic information - about reading, navigating and searching the builtin help documentation. - - This should be the first place you go to look when you're stuck or confused - with something. It's one of my favorite Neovim features. - MOST IMPORTANTLY, we provide a keymap "sh" to [s]earch the [h]elp documentation, - which is very useful when you're not exactly sure of what you're looking for. - - I have left several `:help X` comments throughout the init.lua - These are hints about where to find more information about the relevant settings, - plugins or Neovim features used in Kickstart. - - NOTE: Look for lines like this - - Throughout the file. These are for you, the reader, to help you understand what is happening. - Feel free to delete them once you know what you're doing, but they should serve as a guide - for when you are first encountering a few different constructs in your Neovim config. - -If you experience any errors while trying to install kickstart, run `:checkhealth` for more info. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now! :) ---]] - -- Set as the leader key --- See `:help mapleader` --- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' --- [[ Setting options ]] --- See `:help vim.opt` --- NOTE: You can change these options as you wish! --- For more options, you can see `:help option-list` -- autoindent if possible when entering a new line in a block vim.opt.autowriteall = false vim.opt.smartindent = true -- Make line numbers default vim.opt.number = true --- You can also add relative line numbers, to help with jumping. --- Experiment for yourself to see if you like it! vim.opt.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! @@ -111,9 +18,6 @@ vim.opt.showmode = false -- Don't wrap long words vim.opt.wrap = 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.opt.clipboard = 'unnamedplus' end) @@ -572,8 +476,8 @@ require('lazy').setup({ -- 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({})` - { 'williamboman/mason.nvim', opts = {} }, - 'williamboman/mason-lspconfig.nvim', + { 'williamboman/mason.nvim', version = 'v1.*', opts = {} }, + { 'williamboman/mason-lspconfig.nvim', version = 'v1.*' }, 'WhoIsSethDaniel/mason-tool-installer.nvim', -- Useful status updates for LSP. @@ -964,14 +868,26 @@ require('lazy').setup({ -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. 'rebelot/kanagawa.nvim', priority = 1000, -- Make sure to load this before all the other start plugins. + name = 'kanagawa-dragon', config = function() ---@diagnostic disable-next-line: missing-fields require('kanagawa').setup { commentStyle = { italic = true }, - theme = 'wave', + -- statementStyle = { bold = false }, + theme = 'dragon', } - vim.cmd 'colorscheme kanagawa' + vim.cmd 'colorscheme kanagawa-dragon' end, + -- 'vague2k/vague.nvim', + -- priority = 1000, + -- name = 'vague', + -- config = function() + -- -- NOTE: you do not need to call setup if you don't want to. + -- require('vague').setup { + -- -- optional configuration here + -- } + -- vim.cmd 'colorscheme vague' + -- end, }, { 'nvim-lualine/lualine.nvim', From 804b92e481d376be0f0d31ffbcb3b917b46dd712 Mon Sep 17 00:00:00 2001 From: cedricreper Date: Sat, 7 Jun 2025 10:22:20 +0900 Subject: [PATCH 04/11] remove treesitter & dashboard --- init.lua | 71 ++++++++++++++++++-------------------------------------- 1 file changed, 23 insertions(+), 48 deletions(-) diff --git a/init.lua b/init.lua index 9530c7867f7..4cd0836a966 100644 --- a/init.lua +++ b/init.lua @@ -860,24 +860,28 @@ require('lazy').setup({ 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`. - 'rebelot/kanagawa.nvim', - priority = 1000, -- Make sure to load this before all the other start plugins. - name = 'kanagawa-dragon', + { + 'catppuccin/nvim', + name = 'catppuccin', + priority = 1000, config = function() - ---@diagnostic disable-next-line: missing-fields - require('kanagawa').setup { - commentStyle = { italic = true }, - -- statementStyle = { bold = false }, - theme = 'dragon', + require('catppuccin').setup { + flavour = 'mocha', } - vim.cmd 'colorscheme kanagawa-dragon' + vim.cmd 'colorscheme catppuccin' end, + -- 'rebelot/kanagawa.nvim', + -- priority = 1000, -- Make sure to load this before all the other start plugins. + -- name = 'kanagawa-dragon', + -- config = function() + -- ---@diagnostic disable-next-line: missing-fields + -- require('kanagawa').setup { + -- commentStyle = { italic = true }, + -- -- statementStyle = { bold = false }, + -- theme = 'dragon', + -- } + -- vim.cmd 'colorscheme kanagawa-dragon' + -- end, -- 'vague2k/vague.nvim', -- priority = 1000, -- name = 'vague', @@ -940,9 +944,9 @@ require('lazy').setup({ -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects }, - { - 'nvim-treesitter/nvim-treesitter-context', - }, + -- { + -- 'nvim-treesitter/nvim-treesitter-context', + -- }, { 'windwp/nvim-autopairs', event = 'InsertEnter', @@ -985,7 +989,7 @@ require('lazy').setup({ -- if you want to open yazi instead of netrw, see below for more info open_for_directories = false, keymaps = { - show_help = '', + show_help = '~', }, }, -- 👇 if you use `open_for_directories=true`, this is recommended @@ -995,35 +999,6 @@ require('lazy').setup({ vim.g.loaded_netrwPlugin = 1 end, }, - { - 'goolord/alpha-nvim', - config = function() - local alpha = require 'alpha' - local dashboard = require 'alpha.themes.dashboard' - dashboard.section.header.val = { - ' ', - ' ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ ', - ' ████╗ ██║██╔════╝██╔═══██╗██║ ██║██║████╗ ████║ ', - ' ██╔██╗ ██║█████╗ ██║ ██║██║ ██║██║██╔████╔██║ ', - ' ██║╚██╗██║██╔══╝ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║ ', - ' ██║ ╚████║███████╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║ ', - ' ╚═╝ ╚═══╝╚══════╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝ ', - ' ', - } - - -- Set menu - dashboard.section.buttons.val = { - dashboard.button('e', ' > New file', ':ene startinsert '), - dashboard.button('f', ' > Find file', ':cd $HOME/dev | Telescope find_files'), - dashboard.button('r', ' > Recent', ':Telescope oldfiles'), - dashboard.button('s', ' > Settings', ':e $MYVIMRC | :cd %:p:h | split . | wincmd k | pwd'), - dashboard.button('q', ' > Quit NVIM', ':qa'), - } - - -- Send config to alpha - alpha.setup(dashboard.opts) - end, - }, -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the -- init.lua. If you want these files, they are in the repository, so you can just download them and -- place them in the correct locations. From 892eac7d31bd3ed4bb98c2aea06e6bd26d55e206 Mon Sep 17 00:00:00 2001 From: cedricreper Date: Fri, 3 Oct 2025 09:40:04 +0900 Subject: [PATCH 05/11] bak --- init.lua | 149 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 98 insertions(+), 51 deletions(-) diff --git a/init.lua b/init.lua index 4cd0836a966..95f7b879bd2 100644 --- a/init.lua +++ b/init.lua @@ -396,6 +396,20 @@ require('lazy').setup({ end, { desc = '[S]earch [N]eovim files' }) end, }, + { + 'folke/flash.nvim', + event = 'VeryLazy', + ---@type Flash.Config + opts = {}, + -- stylua: ignore + keys = { + { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, + { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, + { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, + { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, + { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, + }, + }, { 'ThePrimeagen/harpoon', branch = 'harpoon2', @@ -729,12 +743,12 @@ require('lazy').setup({ cmd = { 'ConformInfo' }, keys = { { - 'f', + 'm', function() require('conform').format { async = true, lsp_format = 'fallback' } end, mode = '', - desc = '[F]ormat buffer', + desc = 'For[m]at buffer', }, }, opts = { @@ -861,27 +875,44 @@ require('lazy').setup({ }, }, { + -- 'sainnhe/gruvbox-material', + -- lazy = false, + -- priority = 1000, + -- config = function() + -- vim.o.background = 'dark' + -- vim.g.gruvbox_material_enable_italic = true + -- vim.g.gruvbox_material_background = 'hard' + -- vim.cmd.colorscheme 'gruvbox-material' + -- end, 'catppuccin/nvim', name = 'catppuccin', priority = 1000, config = function() require('catppuccin').setup { flavour = 'mocha', + transparent_background = true, } vim.cmd 'colorscheme catppuccin' end, - -- 'rebelot/kanagawa.nvim', - -- priority = 1000, -- Make sure to load this before all the other start plugins. - -- name = 'kanagawa-dragon', - -- config = function() - -- ---@diagnostic disable-next-line: missing-fields - -- require('kanagawa').setup { - -- commentStyle = { italic = true }, - -- -- statementStyle = { bold = false }, - -- theme = 'dragon', - -- } - -- vim.cmd 'colorscheme kanagawa-dragon' - -- end, + -- 'rebelot/kanagawa.nvim', + -- priority = 1000, -- Make sure to load this before all the other start plugins. + -- name = 'kanagawa-dragon', + -- config = function() + -- ---@diagnostic disable-next-line: missing-fields + -- require('kanagawa').setup { + -- commentStyle = { italic = true }, + -- -- statementStyle = { bold = false }, + -- theme = 'dragon', + -- } + -- vim.cmd 'colorscheme kanagawa-dragon' + -- end, + --'zenbones-theme/zenbones.nvim', + --dependencies = 'rktjmp/lush.nvim', + --lazy = false, + --priority = 1000, + --config = function() + -- vim.cmd 'colorscheme zenbones' + --end, -- 'vague2k/vague.nvim', -- priority = 1000, -- name = 'vague', @@ -960,45 +991,61 @@ require('lazy').setup({ lazy = false, }, { - 'mikavilpas/yazi.nvim', - event = 'VeryLazy', - dependencies = { - 'folke/snacks.nvim', - }, - keys = { - -- 👇 in this section, choose your own keymappings! - { - '-', - mode = { 'n', 'v' }, - 'Yazi', - desc = 'Open yazi at the current file', - }, - { - -- Open in the current working directory - 'cw', - 'Yazi cwd', - desc = "Open the file manager in nvim's working directory", - }, - { - '', - 'Yazi toggle', - desc = 'Resume the last yazi session', - }, - }, - opts = { - -- if you want to open yazi instead of netrw, see below for more info - open_for_directories = false, - keymaps = { - show_help = '~', - }, - }, - -- 👇 if you use `open_for_directories=true`, this is recommended - init = function() - -- More details: https://github.com/mikavilpas/yazi.nvim/issues/802 - -- vim.g.loaded_netrw = 1 - vim.g.loaded_netrwPlugin = 1 + 'stevearc/oil.nvim', + ---@module 'oil' + ---@type oil.SetupOpts + opts = {}, + -- Optional dependencies + dependencies = { { 'echasnovski/mini.icons', opts = {} } }, + -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons + -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. + lazy = false, + config = function() + require('oil').setup { + vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }), + } end, }, + --{ + -- 'mikavilpas/yazi.nvim', + -- event = 'VeryLazy', + -- dependencies = { + -- 'folke/snacks.nvim', + -- }, + -- keys = { + -- -- 👇 in this section, choose your own keymappings! + -- { + -- '-', + -- mode = { 'n', 'v' }, + -- 'Yazi', + -- desc = 'Open yazi at the current file', + -- }, + -- { + -- -- Open in the current working directory + -- 'cw', + -- 'Yazi cwd', + -- desc = "Open the file manager in nvim's working directory", + -- }, + -- { + -- '', + -- 'Yazi toggle', + -- desc = 'Resume the last yazi session', + -- }, + -- }, + -- opts = { + -- -- if you want to open yazi instead of netrw, see below for more info + -- open_for_directories = false, + -- keymaps = { + -- show_help = '~', + -- }, + -- }, + -- -- 👇 if you use `open_for_directories=true`, this is recommended + -- init = function() + -- -- More details: https://github.com/mikavilpas/yazi.nvim/issues/802 + -- -- vim.g.loaded_netrw = 1 + -- vim.g.loaded_netrwPlugin = 1 + -- end, + --}, -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the -- init.lua. If you want these files, they are in the repository, so you can just download them and -- place them in the correct locations. From e30c346aa9f36fc09b55d0280e880965c5a0c9ab Mon Sep 17 00:00:00 2001 From: cedricreper Date: Fri, 17 Oct 2025 12:51:24 +0900 Subject: [PATCH 06/11] clean & comment out copilot stuff --- init.lua | 244 +++++++++++++++++++++++-------------------------------- 1 file changed, 101 insertions(+), 143 deletions(-) diff --git a/init.lua b/init.lua index 95f7b879bd2..a631cec8985 100644 --- a/init.lua +++ b/init.lua @@ -91,27 +91,6 @@ vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagn -- 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!!"') - -vim.keymap.set('i', '', 'echo "Use h to move!!"') -vim.keymap.set('i', '', 'echo "Use l to move!!"') -vim.keymap.set('i', '', 'echo "Use k to move!!"') -vim.keymap.set('i', '', 'echo "Use j to move!!"') - -vim.keymap.set('v', '', 'echo "Use h to move!!"') -vim.keymap.set('v', '', 'echo "Use l to move!!"') -vim.keymap.set('v', '', 'echo "Use k to move!!"') -vim.keymap.set('v', '', 'echo "Use j to move!!"') - -vim.keymap.set('c', '', 'echo "Use h to move!!"') -vim.keymap.set('c', '', 'echo "Use l to move!!"') -vim.keymap.set('c', '', 'echo "Use k to move!!"') -vim.keymap.set('c', '', 'echo "Use j to move!!"') - -- Keybinds to make split navigation easier. -- Use CTRL+ to switch between windows -- @@ -130,9 +109,6 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the upper win -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` --- Highlight when yanking (copying) text --- Try it with `yap` in normal mode --- See `:help vim.highlight.on_yank()` vim.api.nvim_create_autocmd('TextYankPost', { desc = 'Highlight when yanking (copying) text', group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), @@ -238,52 +214,37 @@ require('lazy').setup({ 'folke/which-key.nvim', event = 'VimEnter', -- Sets the loading event to 'VimEnter' opts = { + theme = 'helix', -- delay between pressing a key and opening which-key (milliseconds) -- this setting is independent of vim.opt.timeoutlen delay = 0, - icons = { - mappings = false, - keys = { - 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' } }, - }, }, }, - + { + 'greggh/claude-code.nvim', + dependencies = { + 'nvim-lua/plenary.nvim', -- Required for git operations + }, + config = function() + require('claude-code').setup { + window = { + position = 'float', + }, + keymaps = { + toggle = { + normal = 'c', -- Normal mode keymap for toggling Claude Code, false to disable + terminal = 'false', -- Terminal mode keymap for toggling Claude Code, false to disable + -- variants = { + -- continue = "cC", -- Normal mode keymap for Claude Code with continue flag + -- verbose = "cV", -- Normal mode keymap for Claude Code with verbose flag + --}, + }, + window_navigation = true, -- Enable window navigation keymaps () + scrolling = true, -- Enable scrolling keymaps () for page up/down + }, + } + end, + }, -- NOTE: Plugins can specify dependencies. -- -- The dependencies are proper plugin specifications as well - anything @@ -884,16 +845,25 @@ require('lazy').setup({ -- vim.g.gruvbox_material_background = 'hard' -- vim.cmd.colorscheme 'gruvbox-material' -- end, - 'catppuccin/nvim', - name = 'catppuccin', + 'webhooked/kanso.nvim', + lazy = false, priority = 1000, config = function() - require('catppuccin').setup { - flavour = 'mocha', - transparent_background = true, + require('kanso').setup { + transparent = false, } - vim.cmd 'colorscheme catppuccin' + vim.cmd 'colorscheme kanso' end, + -- 'catppuccin/nvim', + -- name = 'catppuccin', + -- priority = 1000, + -- config = function() + -- require('catppuccin').setup { + -- flavour = 'mocha', + -- transparent_background = true, + -- } + -- vim.cmd 'colorscheme catppuccin' + -- end, -- 'rebelot/kanagawa.nvim', -- priority = 1000, -- Make sure to load this before all the other start plugins. -- name = 'kanagawa-dragon', @@ -907,12 +877,12 @@ require('lazy').setup({ -- vim.cmd 'colorscheme kanagawa-dragon' -- end, --'zenbones-theme/zenbones.nvim', - --dependencies = 'rktjmp/lush.nvim', - --lazy = false, - --priority = 1000, - --config = function() - -- vim.cmd 'colorscheme zenbones' - --end, + -- dependencies = 'rktjmp/lush.nvim', + -- lazy = false, + -- priority = 1000, + -- config = function() + -- vim.cmd 'colorscheme zenbones' + -- end, -- 'vague2k/vague.nvim', -- priority = 1000, -- name = 'vague', @@ -1006,72 +976,60 @@ require('lazy').setup({ } end, }, - --{ - -- 'mikavilpas/yazi.nvim', - -- event = 'VeryLazy', - -- dependencies = { - -- 'folke/snacks.nvim', - -- }, - -- keys = { - -- -- 👇 in this section, choose your own keymappings! - -- { - -- '-', - -- mode = { 'n', 'v' }, - -- 'Yazi', - -- desc = 'Open yazi at the current file', - -- }, - -- { - -- -- Open in the current working directory - -- 'cw', - -- 'Yazi cwd', - -- desc = "Open the file manager in nvim's working directory", - -- }, - -- { - -- '', - -- 'Yazi toggle', - -- desc = 'Resume the last yazi session', - -- }, - -- }, - -- opts = { - -- -- if you want to open yazi instead of netrw, see below for more info - -- open_for_directories = false, - -- keymaps = { - -- show_help = '~', - -- }, - -- }, - -- -- 👇 if you use `open_for_directories=true`, this is recommended - -- init = function() - -- -- More details: https://github.com/mikavilpas/yazi.nvim/issues/802 - -- -- vim.g.loaded_netrw = 1 - -- vim.g.loaded_netrwPlugin = 1 - -- end, - --}, - -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the - -- init.lua. If you want these files, they are in the repository, so you can just download them and - -- place them in the correct locations. - - -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart - -- - -- Here are some example plugins that I've included in the Kickstart repository. - -- Uncomment any of the lines below to enable them (you will need to restart nvim). - -- - -- require 'kickstart.plugins.debug', - -- require 'kickstart.plugins.indent_line', - -- require 'kickstart.plugins.lint', - -- require 'kickstart.plugins.autopairs', - -- require 'kickstart.plugins.neo-tree', - -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- This is the easiest way to modularize your config. - -- - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, - -- - -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` - -- Or use telescope! - -- In normal mode type `sh` then write `lazy.nvim-plugin` - -- you can continue same window with `sr` which resumes last telescope search + -- { + -- 'zbirenbaum/copilot.lua', + -- requires = { + -- 'copilotlsp-nvim/copilot-lsp', + -- init = function() + -- vim.g.copilot_nes_debounce = 500 + -- end, + -- }, + -- cmd = 'Copilot', + -- event = 'InsertEnter', + -- config = function() + -- require('copilot').setup { + -- filetypes = { + -- javascript = true, + -- typescript = true, + -- python = true, + -- ['*'] = false, -- disable for all other filetypes and ignore default `filetypes` + -- }, + -- suggestion = { enabled = false }, + -- panel = { enabled = false }, + -- nes = { + -- enabled = true, -- requires copilot-lsp as a dependency + -- auto_trigger = false, + -- keymap = { + -- accept_and_goto = '', + -- accept = false, + -- dismiss = '', + -- }, + -- }, + -- } + -- end, + -- }, + -- { + -- 'copilotlsp-nvim/copilot-lsp', + -- init = function() + -- vim.g.copilot_nes_debounce = 500 + -- vim.lsp.enable 'copilot_ls' + -- vim.keymap.set('n', '', function() + -- local bufnr = vim.api.nvim_get_current_buf() + -- local state = vim.b[bufnr].nes_state + -- if state then + -- -- Try to jump to the start of the suggestion edit. + -- -- If already at the start, then apply the pending suggestion and jump to the end of the edit. + -- local _ = require('copilot-lsp.nes').walk_cursor_start_edit() + -- or (require('copilot-lsp.nes').apply_pending_nes() and require('copilot-lsp.nes').walk_cursor_end_edit()) + -- return nil + -- else + -- -- Resolving the terminal's inability to distinguish between `TAB` and `` in normal mode + -- return '' + -- end + -- end, { desc = 'Accept Copilot NES suggestion', expr = true }) + -- end, + -- }, + -- { 'giuxtaposition/blink-cmp-copilot' }, }, { ui = { icons = { From a9d343de12e581e28f0f1e8c2cb26e081c7fa2c0 Mon Sep 17 00:00:00 2001 From: cedricreper Date: Fri, 17 Oct 2025 12:54:11 +0900 Subject: [PATCH 07/11] remove copilot --- doc/kickstart.txt | 24 --------------------- doc/tags | 3 --- init.lua | 54 ----------------------------------------------- 3 files changed, 81 deletions(-) delete mode 100644 doc/kickstart.txt delete mode 100644 doc/tags diff --git a/doc/kickstart.txt b/doc/kickstart.txt deleted file mode 100644 index cb87ac3f1de..00000000000 --- a/doc/kickstart.txt +++ /dev/null @@ -1,24 +0,0 @@ -================================================================================ -INTRODUCTION *kickstart.nvim* - -Kickstart.nvim is a project to help you get started on your neovim journey. - - *kickstart-is-not* -It is not: -- Complete framework for every plugin under the sun -- Place to add every plugin that could ever be useful - - *kickstart-is* -It is: -- Somewhere that has a good start for the most common "IDE" type features: - - autocompletion - - goto-definition - - find references - - fuzzy finding - - and hinting at what more can be done :) -- A place to _kickstart_ your journey. - - You should fork this project and use/modify it so that it matches your - style and preferences. If you don't want to do that, there are probably - other projects that would fit much better for you (and that's great!)! - - vim:tw=78:ts=8:ft=help:norl: diff --git a/doc/tags b/doc/tags deleted file mode 100644 index 687ae7721d9..00000000000 --- a/doc/tags +++ /dev/null @@ -1,3 +0,0 @@ -kickstart-is kickstart.txt /*kickstart-is* -kickstart-is-not kickstart.txt /*kickstart-is-not* -kickstart.nvim kickstart.txt /*kickstart.nvim* diff --git a/init.lua b/init.lua index a631cec8985..74be94f2011 100644 --- a/init.lua +++ b/init.lua @@ -976,60 +976,6 @@ require('lazy').setup({ } end, }, - -- { - -- 'zbirenbaum/copilot.lua', - -- requires = { - -- 'copilotlsp-nvim/copilot-lsp', - -- init = function() - -- vim.g.copilot_nes_debounce = 500 - -- end, - -- }, - -- cmd = 'Copilot', - -- event = 'InsertEnter', - -- config = function() - -- require('copilot').setup { - -- filetypes = { - -- javascript = true, - -- typescript = true, - -- python = true, - -- ['*'] = false, -- disable for all other filetypes and ignore default `filetypes` - -- }, - -- suggestion = { enabled = false }, - -- panel = { enabled = false }, - -- nes = { - -- enabled = true, -- requires copilot-lsp as a dependency - -- auto_trigger = false, - -- keymap = { - -- accept_and_goto = '', - -- accept = false, - -- dismiss = '', - -- }, - -- }, - -- } - -- end, - -- }, - -- { - -- 'copilotlsp-nvim/copilot-lsp', - -- init = function() - -- vim.g.copilot_nes_debounce = 500 - -- vim.lsp.enable 'copilot_ls' - -- vim.keymap.set('n', '', function() - -- local bufnr = vim.api.nvim_get_current_buf() - -- local state = vim.b[bufnr].nes_state - -- if state then - -- -- Try to jump to the start of the suggestion edit. - -- -- If already at the start, then apply the pending suggestion and jump to the end of the edit. - -- local _ = require('copilot-lsp.nes').walk_cursor_start_edit() - -- or (require('copilot-lsp.nes').apply_pending_nes() and require('copilot-lsp.nes').walk_cursor_end_edit()) - -- return nil - -- else - -- -- Resolving the terminal's inability to distinguish between `TAB` and `` in normal mode - -- return '' - -- end - -- end, { desc = 'Accept Copilot NES suggestion', expr = true }) - -- end, - -- }, - -- { 'giuxtaposition/blink-cmp-copilot' }, }, { ui = { icons = { From ec8084b0817f8dd76f4f841e157bdc3993979dff Mon Sep 17 00:00:00 2001 From: cedricreper Date: Fri, 17 Oct 2025 12:57:24 +0900 Subject: [PATCH 08/11] add claude file --- CLAUDE.md | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 CLAUDE.md diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 00000000000..c694a36acef --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,136 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## Overview + +This is a Neovim configuration based on kickstart.nvim - a single-file starter configuration that prioritizes being small, documented, and understandable. The configuration has been customized with additional plugins and settings. + +## Architecture + +### Single-File Configuration +The entire configuration is contained in `init.lua` (lines 1-1001). This is intentional - kickstart.nvim uses a single-file approach as a teaching tool and reference. While splitting into modules is possible, the current structure keeps everything in one place for clarity. + +### Plugin Management +- **Plugin Manager**: lazy.nvim (installed at init.lua:122-130) +- **Plugin Definitions**: All plugins defined in the `lazy.setup()` call starting at init.lua:143 +- **Custom Plugins**: Additional user plugins can be added in `lua/custom/plugins/init.lua` + +### Key Plugin Categories + +1. **LSP Configuration** (init.lua:435-698) + - Mason for LSP installation (init.lua:454-456) + - Configured servers: `pyright`, `zls`, `rust_analyzer`, `ts_ls`, `lua_ls` + - LSP capabilities enhanced by blink.cmp (init.lua:624) + - Autocommands for LSP attach events setup keymaps and highlighting + +2. **Completion** (init.lua:746-837) + - blink.cmp for autocompletion + - LuaSnip for snippet expansion + - Default keymap preset uses `` to accept + +3. **Telescope** (init.lua:255-359) + - Fuzzy finder with vertical layout + - Extensions: fzf, ui-select + - Leader-based keymaps for searching files, grep, diagnostics, etc. + +4. **Navigation & Movement** + - Harpoon2 for file bookmarking (init.lua:375-432) + - Flash.nvim for rapid cursor movement (init.lua:361-373) + - Oil.nvim for file browsing (init.lua:964-978) + - vim-tmux-navigator for seamless tmux/vim navigation (init.lua:154-170) + +5. **Formatting** (init.lua:701-744) + - conform.nvim handles formatting + - Format on save enabled (except for C/C++) + - Configured formatters: stylua (Lua), prettier (JS/TS/CSS/HTML/JSON) + +## Common Commands + +### Plugin Management +``` +:Lazy " View plugin status +:Lazy update " Update all plugins +:Mason " Manage LSP servers and tools (press g? for help) +``` + +### LSP & Diagnostics +``` +:LspInfo " Show LSP client status +:ConformInfo " Show formatter status +q " Open diagnostic quickfix list +``` + +### File Navigation +``` +sf " Search files +sg " Live grep + " Find buffers +sn " Search Neovim config files +- " Open Oil file browser (parent directory) +``` + +### Harpoon (File Bookmarking) +``` +a " Add file to Harpoon +e " Toggle Harpoon menu +1-4 " Jump to Harpoon mark 1-4 +n/p " Next/Previous Harpoon mark +``` + +### Code Operations +``` +grn " LSP rename +gra " Code action +grr " Find references (Telescope) +grd " Go to definition (Telescope) +gri " Go to implementation (Telescope) +grt " Go to type definition (Telescope) +gO " Document symbols (Telescope) +gW " Workspace symbols (Telescope) +m " Format buffer +``` + +## Configuration Details + +### Settings +- Leader key: `` (init.lua:2) +- Line numbers: relative + absolute (init.lua:9-10) +- No line wrapping (init.lua:19) +- Clipboard: synced with OS (init.lua:21-23) +- Undo history: persisted (init.lua:29) +- Scrolloff: 10 lines (init.lua:61) +- Cursor: blinking block in normal mode, vertical bar in insert (init.lua:68-72) + +### Treesitter Languages +Auto-installed parsers for: zig, python, typescript, rust, htmldjango, bash, c, html, lua, markdown, vim (init.lua:912-929) + +### Color Scheme +Currently using kanso.nvim (init.lua:848-856). Several commented-out alternatives available (gruvbox-material, catppuccin, kanagawa, zenbones, vague). + +### Custom Keymaps +- `/`: Page down/up with recentering (init.lua:76-77) +- ``: Window navigation (init.lua:98-101) +- ``: Clear search highlights (init.lua:81) + +## Development Notes + +### Modifying Configuration +The main configuration is in `init.lua`. When making changes: +1. Restart Neovim or `:source $MYVIMRC` +2. Run `:Lazy sync` if plugins were added/removed +3. Run `:Mason` to install new LSP servers or formatters + +### Adding New LSP Servers +1. Add server to the `servers` table (init.lua:635-663) +2. Add to `ensure_installed` if needed (init.lua:678-681) +3. Restart Neovim - mason-tool-installer will auto-install + +### Adding Formatters +1. Install via Mason or ensure it's in PATH +2. Add to `formatters_by_ft` table (init.lua:731-742) +3. Optionally add to `ensure_installed` (init.lua:679) + +### Plugin Organization +- Custom user plugins: Add to `lua/custom/plugins/init.lua` or create new files in that directory +- Kickstart example plugins: Located in `lua/kickstart/plugins/` (currently commented out/unused) From 2863cec92cf2977d93ad433f6793e379d92d5a70 Mon Sep 17 00:00:00 2001 From: cedricreper Date: Fri, 17 Oct 2025 14:49:36 +0900 Subject: [PATCH 09/11] claude refactor --- CLAUDE.md | 190 +++- init.lua | 972 +----------------- lua/config/autocommands.lua | 10 + lua/config/keymaps.lua | 35 + lua/config/options.lua | 72 ++ lua/custom/plugins/init.lua | 5 - lua/kickstart/health.lua | 52 - lua/kickstart/plugins/autopairs.lua | 8 - lua/kickstart/plugins/indent_line.lua | 9 - lua/kickstart/plugins/neo-tree.lua | 25 - lua/plugins/claude-code.lua | 27 + lua/plugins/colorscheme.lua | 61 ++ lua/plugins/completion.lua | 94 ++ lua/plugins/formatting.lua | 46 + lua/plugins/lsp.lua | 268 +++++ lua/plugins/navigation.lua | 110 ++ lua/plugins/optional/README.md | 33 + .../plugins => plugins/optional}/debug.lua | 7 +- lua/plugins/optional/indent-blankline.lua | 11 + .../plugins => plugins/optional}/lint.lua | 5 +- lua/plugins/telescope.lua | 107 ++ lua/plugins/treesitter.lua | 47 + lua/plugins/ui.lua | 21 + .../gitsigns.lua => plugins/utils.lua} | 32 +- 24 files changed, 1127 insertions(+), 1120 deletions(-) create mode 100644 lua/config/autocommands.lua create mode 100644 lua/config/keymaps.lua create mode 100644 lua/config/options.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/indent_line.lua delete mode 100644 lua/kickstart/plugins/neo-tree.lua create mode 100644 lua/plugins/claude-code.lua create mode 100644 lua/plugins/colorscheme.lua create mode 100644 lua/plugins/completion.lua create mode 100644 lua/plugins/formatting.lua create mode 100644 lua/plugins/lsp.lua create mode 100644 lua/plugins/navigation.lua create mode 100644 lua/plugins/optional/README.md rename lua/{kickstart/plugins => plugins/optional}/debug.lua (95%) create mode 100644 lua/plugins/optional/indent-blankline.lua rename lua/{kickstart/plugins => plugins/optional}/lint.lua (94%) create mode 100644 lua/plugins/telescope.lua create mode 100644 lua/plugins/treesitter.lua create mode 100644 lua/plugins/ui.lua rename lua/{kickstart/plugins/gitsigns.lua => plugins/utils.lua} (69%) diff --git a/CLAUDE.md b/CLAUDE.md index c694a36acef..ba6f084901d 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -4,43 +4,73 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co ## Overview -This is a Neovim configuration based on kickstart.nvim - a single-file starter configuration that prioritizes being small, documented, and understandable. The configuration has been customized with additional plugins and settings. +This is a Neovim configuration based on kickstart.nvim, refactored into a modular structure for better organization and maintainability. The configuration separates core settings, keymaps, and plugins into logical modules. ## Architecture -### Single-File Configuration -The entire configuration is contained in `init.lua` (lines 1-1001). This is intentional - kickstart.nvim uses a single-file approach as a teaching tool and reference. While splitting into modules is possible, the current structure keeps everything in one place for clarity. +### Modular Configuration Structure + +The configuration is organized into three main directories: + +``` +~/.config/nvim/ +├── init.lua # Bootstrap file that loads everything +├── lua/ +│ ├── config/ # Core Neovim configuration +│ │ ├── options.lua # Vim settings (leader, numbering, clipboard, etc.) +│ │ ├── keymaps.lua # Global key mappings +│ │ └── autocommands.lua # Autocommands (highlight on yank, etc.) +│ ├── plugins/ # Plugin specifications (auto-loaded by lazy.nvim) +│ │ ├── colorscheme.lua # Color scheme (kanso.nvim + alternatives) +│ │ ├── treesitter.lua # Syntax highlighting & parsing +│ │ ├── lsp.lua # LSP configuration & Mason +│ │ ├── completion.lua # blink.cmp & LuaSnip +│ │ ├── telescope.lua # Fuzzy finder +│ │ ├── navigation.lua # Harpoon, Flash, Oil, tmux-navigator +│ │ ├── formatting.lua # conform.nvim +│ │ ├── ui.lua # which-key, lualine +│ │ ├── utils.lua # vim-sleuth, gitsigns, autopairs, snacks +│ │ ├── claude-code.lua # Claude Code integration +│ │ └── optional/ # Optional plugins (not loaded by default) +│ │ ├── README.md # Instructions for enabling optional plugins +│ │ ├── debug.lua # DAP debugger for Go +│ │ ├── indent-blankline.lua # Indentation guides +│ │ └── lint.lua # Linting with nvim-lint +│ └── custom/ +│ └── plugins/ +│ └── init.lua # User-added custom plugins +``` ### Plugin Management -- **Plugin Manager**: lazy.nvim (installed at init.lua:122-130) -- **Plugin Definitions**: All plugins defined in the `lazy.setup()` call starting at init.lua:143 -- **Custom Plugins**: Additional user plugins can be added in `lua/custom/plugins/init.lua` +- **Plugin Manager**: lazy.nvim (bootstrapped in init.lua) +- **Auto-Loading**: All files in `lua/plugins/*.lua` are automatically loaded +- **Custom Plugins**: Add your own in `lua/custom/plugins/init.lua` or create new files there ### Key Plugin Categories -1. **LSP Configuration** (init.lua:435-698) - - Mason for LSP installation (init.lua:454-456) +1. **LSP Configuration** (`lua/plugins/lsp.lua`) + - Mason for LSP installation - Configured servers: `pyright`, `zls`, `rust_analyzer`, `ts_ls`, `lua_ls` - - LSP capabilities enhanced by blink.cmp (init.lua:624) + - LSP capabilities enhanced by blink.cmp - Autocommands for LSP attach events setup keymaps and highlighting -2. **Completion** (init.lua:746-837) +2. **Completion** (`lua/plugins/completion.lua`) - blink.cmp for autocompletion - LuaSnip for snippet expansion - Default keymap preset uses `` to accept -3. **Telescope** (init.lua:255-359) +3. **Telescope** (`lua/plugins/telescope.lua`) - Fuzzy finder with vertical layout - Extensions: fzf, ui-select - Leader-based keymaps for searching files, grep, diagnostics, etc. -4. **Navigation & Movement** - - Harpoon2 for file bookmarking (init.lua:375-432) - - Flash.nvim for rapid cursor movement (init.lua:361-373) - - Oil.nvim for file browsing (init.lua:964-978) - - vim-tmux-navigator for seamless tmux/vim navigation (init.lua:154-170) +4. **Navigation & Movement** (`lua/plugins/navigation.lua`) + - Harpoon2 for file bookmarking + - Flash.nvim for rapid cursor movement + - Oil.nvim for file browsing + - vim-tmux-navigator for seamless tmux/vim navigation -5. **Formatting** (init.lua:701-744) +5. **Formatting** (`lua/plugins/formatting.lua`) - conform.nvim handles formatting - Format on save enabled (except for C/C++) - Configured formatters: stylua (Lua), prettier (JS/TS/CSS/HTML/JSON) @@ -91,46 +121,114 @@ gW " Workspace symbols (Telescope) m " Format buffer ``` +### Git Operations (gitsigns) +``` +]c / [c " Next/previous git change +hs " Stage hunk +hr " Reset hunk +hS " Stage buffer +hu " Undo stage hunk +hR " Reset buffer +hp " Preview hunk +hb " Blame line +hd " Diff against index +hD " Diff against last commit +tb " Toggle git blame line +tD " Toggle git show deleted +``` + ## Configuration Details -### Settings -- Leader key: `` (init.lua:2) -- Line numbers: relative + absolute (init.lua:9-10) -- No line wrapping (init.lua:19) -- Clipboard: synced with OS (init.lua:21-23) -- Undo history: persisted (init.lua:29) -- Scrolloff: 10 lines (init.lua:61) -- Cursor: blinking block in normal mode, vertical bar in insert (init.lua:68-72) +### Settings (lua/config/options.lua) +- Leader key: `` +- Line numbers: relative + absolute +- No line wrapping +- Clipboard: synced with OS +- Undo history: persisted +- Scrolloff: 10 lines +- Cursor: blinking block in normal mode, vertical bar in insert -### Treesitter Languages -Auto-installed parsers for: zig, python, typescript, rust, htmldjango, bash, c, html, lua, markdown, vim (init.lua:912-929) +### Treesitter Languages (lua/plugins/treesitter.lua) +Auto-installed parsers for: zig, python, typescript, rust, htmldjango, bash, c, html, lua, markdown, vim -### Color Scheme -Currently using kanso.nvim (init.lua:848-856). Several commented-out alternatives available (gruvbox-material, catppuccin, kanagawa, zenbones, vague). +### Color Scheme (lua/plugins/colorscheme.lua) +Currently using kanso.nvim. Several commented-out alternatives available (gruvbox-material, catppuccin, kanagawa, zenbones, vague). -### Custom Keymaps -- `/`: Page down/up with recentering (init.lua:76-77) -- ``: Window navigation (init.lua:98-101) -- ``: Clear search highlights (init.lua:81) +### Custom Keymaps (lua/config/keymaps.lua) +- `/`: Page down/up with recentering +- ``: Window navigation +- ``: Clear search highlights ## Development Notes ### Modifying Configuration -The main configuration is in `init.lua`. When making changes: -1. Restart Neovim or `:source $MYVIMRC` -2. Run `:Lazy sync` if plugins were added/removed -3. Run `:Mason` to install new LSP servers or formatters + +**Core Settings**: Edit files in `lua/config/` +- `options.lua` - Vim options and settings +- `keymaps.lua` - Global key mappings +- `autocommands.lua` - Autocommands + +**Plugins**: Edit corresponding files in `lua/plugins/` +- Each plugin category has its own file +- Changes take effect after `:source $MYVIMRC` or restarting Neovim +- Run `:Lazy sync` if plugins were added/removed + +### Adding New Plugins + +1. **Create a new file** in `lua/plugins/` (e.g., `my-plugin.lua`) +2. **Return a table** with plugin specs: + ```lua + return { + { + 'author/plugin-name', + config = function() + -- plugin configuration + end, + }, + } + ``` +3. **Restart Neovim** - lazy.nvim will auto-discover and load it ### Adding New LSP Servers -1. Add server to the `servers` table (init.lua:635-663) -2. Add to `ensure_installed` if needed (init.lua:678-681) -3. Restart Neovim - mason-tool-installer will auto-install + +1. Edit `lua/plugins/lsp.lua` +2. Add server to the `servers` table +3. Optionally add to `ensure_installed` +4. Restart Neovim - mason-tool-installer will auto-install ### Adding Formatters -1. Install via Mason or ensure it's in PATH -2. Add to `formatters_by_ft` table (init.lua:731-742) -3. Optionally add to `ensure_installed` (init.lua:679) -### Plugin Organization -- Custom user plugins: Add to `lua/custom/plugins/init.lua` or create new files in that directory -- Kickstart example plugins: Located in `lua/kickstart/plugins/` (currently commented out/unused) +1. Edit `lua/plugins/formatting.lua` +2. Add to `formatters_by_ft` table +3. Install via `:Mason` or ensure it's in PATH +4. Optionally add to `ensure_installed` in `lua/plugins/lsp.lua` + +### Plugin Organization Philosophy + +- **Separation by Function**: Each file in `lua/plugins/` represents a logical category +- **Easy Discovery**: Find all plugins of a type in one file +- **Modular**: Add/remove entire categories by managing single files +- **Custom Additions**: Use `lua/custom/plugins/` for your personal plugins without modifying core structure + +### Optional Plugins + +The `lua/plugins/optional/` directory contains plugins that are not enabled by default but may be useful: + +- **debug.lua** - DAP debugger primarily configured for Go (extensible to other languages) +- **indent-blankline.lua** - Adds indentation guides on blank lines +- **lint.lua** - Linting with nvim-lint (includes markdown example) + +**To enable an optional plugin**, move it from `lua/plugins/optional/` to `lua/plugins/`: +```bash +mv lua/plugins/optional/debug.lua lua/plugins/debug.lua +``` + +Or import it directly in your `init.lua`: +```lua +require('lazy').setup({ + { import = 'plugins' }, + { import = 'plugins.optional.debug' }, -- Enable debug plugin +}) +``` + +See `lua/plugins/optional/README.md` for more details. diff --git a/init.lua b/init.lua index 74be94f2011..a6d2b9e31d1 100644 --- a/init.lua +++ b/init.lua @@ -1,121 +1,8 @@ --- Set as the leader key -vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' - --- autoindent if possible when entering a new line in a block -vim.opt.autowriteall = false -vim.opt.smartindent = true --- Make line numbers default -vim.opt.number = true -vim.opt.relativenumber = true - --- Enable mouse mode, can be useful for resizing splits for example! -vim.opt.mouse = 'a' - --- Don't show the mode, since it's already in the status line -vim.opt.showmode = false - --- Don't wrap long words -vim.opt.wrap = false --- Sync clipboard between OS and Neovim. -vim.schedule(function() - vim.opt.clipboard = 'unnamedplus' -end) - --- Enable break indent -vim.opt.breakindent = true - --- Save undo history -vim.opt.undofile = true - --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term -vim.opt.ignorecase = true -vim.opt.smartcase = true - --- Keep signcolumn on by default -vim.opt.signcolumn = 'yes' - --- Decrease update time -vim.opt.updatetime = 250 - --- Decrease mapped sequence wait time -vim.opt.timeoutlen = 300 - --- Configure how new splits should be opened -vim.opt.splitright = true -vim.opt.splitbelow = true - --- Sets how neovim will display certain whitespace characters in the editor. --- See `:help 'list'` --- and `:help 'listchars'` -vim.opt.list = true -vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } - --- Preview substitutions live, as you type! -vim.opt.inccommand = 'split' - --- Show which line your cursor is on -vim.opt.cursorline = true - --- Minimal number of screen lines to keep above and below the cursor. -vim.opt.scrolloff = 10 - --- 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.opt.confirm = true - -vim.opt.guicursor = { - 'n-v-c:block-Cursor/lCursor-blinkwait1000-blinkon100-blinkoff100', - 'i-ci:ver25-Cursor/lCursor-blinkwait1000-blinkon100-blinkoff100', - 'r:hor50-Cursor/lCursor-blinkwait100-blinkon100-blinkoff100', -} --- [[ Basic Keymaps ]] --- See `:help vim.keymap.set()` --- recenter to middle after page jump -vim.keymap.set('n', '', 'zz') -vim.keymap.set('n', '', 'zz') - --- 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' }) - --- 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 trminals 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.sut("n", "", "K", { desc = "Move window to the upper" }) - --- [[ Basic Autocommands ]] --- See `:help lua-guide-autocommands` - -vim.api.nvim_create_autocmd('TextYankPost', { - desc = 'Highlight when yanking (copying) text', - group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), - callback = function() - vim.highlight.on_yank() - end, -}) +-- Bootstrap configuration +-- Load core vim settings, keymaps, and autocommands +require 'config.options' +require 'config.keymaps' +require 'config.autocommands' -- [[ Install `lazy.nvim` plugin manager ]] -- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info @@ -129,853 +16,10 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then end ---@diagnostic disable-next-line: undefined-field vim.opt.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. +-- Plugins are automatically loaded from lua/plugins/*.lua +-- You can also configure plugins after the setup call as they will be available in your path. require('lazy').setup({ - -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). - 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - - -- NOTE: Plugins can also be added by using a table, - -- with the first argument being the link and the following - -- keys can be used to configure plugin behavior/loading/etc. - -- - -- Use `opts = {}` to automatically pass options to a plugin's `setup()` function, forcing the plugin to be loaded. - -- - { - 'christoomey/vim-tmux-navigator', - cmd = { - 'TmuxNavigateLeft', - 'TmuxNavigateDown', - 'TmuxNavigateUp', - 'TmuxNavigateRight', - 'TmuxNavigatePrevious', - 'TmuxNavigatorProcessList', - }, - keys = { - { '', 'TmuxNavigateLeft' }, - { '', 'TmuxNavigateDown' }, - { '', 'TmuxNavigateUp' }, - { '', 'TmuxNavigateRight' }, - { '', 'TmuxNavigatePrevious' }, - }, - }, - -- 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 = { - theme = 'helix', - -- delay between pressing a key and opening which-key (milliseconds) - -- this setting is independent of vim.opt.timeoutlen - delay = 0, - }, - }, - { - 'greggh/claude-code.nvim', - dependencies = { - 'nvim-lua/plenary.nvim', -- Required for git operations - }, - config = function() - require('claude-code').setup { - window = { - position = 'float', - }, - keymaps = { - toggle = { - normal = 'c', -- Normal mode keymap for toggling Claude Code, false to disable - terminal = 'false', -- Terminal mode keymap for toggling Claude Code, false to disable - -- variants = { - -- continue = "cC", -- Normal mode keymap for Claude Code with continue flag - -- verbose = "cV", -- Normal mode keymap for Claude Code with verbose flag - --}, - }, - window_navigation = true, -- Enable window navigation keymaps () - scrolling = true, -- Enable scrolling keymaps () for page up/down - }, - } - end, - }, - -- NOTE: Plugins can specify dependencies. - -- - -- The dependencies are proper plugin specifications as well - anything - -- you do for a plugin at the top level, you can do for a dependency. - -- - -- Use the `dependencies` key to specify the dependencies of a particular plugin - - { -- Fuzzy Finder (files, lsp, etc) - 'nvim-telescope/telescope.nvim', - event = 'VimEnter', - dependencies = { - 'nvim-lua/plenary.nvim', - { -- If encountering errors, see telescope-fzf-native README for installation instructions - 'nvim-telescope/telescope-fzf-native.nvim', - - -- `build` is used to run some command when the plugin is installed/updated. - -- This is only run then, not every time Neovim starts up. - build = 'make', - - -- `cond` is a condition used to determine whether this plugin should be - -- installed and loaded. - cond = function() - return vim.fn.executable 'make' == 1 - end, - }, - { 'nvim-telescope/telescope-ui-select.nvim' }, - { 'nvim-tree/nvim-web-devicons', enabled = false }, - }, - 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 = {} - defaults = { - layout_strategy = 'vertical', - layout_config = { preview_cutoff = 0, width = { padding = 0 }, height = { padding = 0 } }, - }, - 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 = true, - }) - 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, - }, - { - 'folke/flash.nvim', - event = 'VeryLazy', - ---@type Flash.Config - opts = {}, - -- stylua: ignore - keys = { - { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, - { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, - { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, - { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, - { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, - }, - }, - { - 'ThePrimeagen/harpoon', - branch = 'harpoon2', - dependencies = { 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope.nvim' }, - config = function() - local harpoon = require 'harpoon' - harpoon:setup() - vim.keymap.set('n', 'a', function() - harpoon:list():add() - end, { desc = '[A]dd to Harpoon list' }) - vim.keymap.set('n', 'e', function() - harpoon.ui:toggle_quick_menu(harpoon:list()) - end, { desc = 'Toggle Harpoon m[E]nu' }) - - vim.keymap.set('n', '1', function() - harpoon:list():select(1) - end, { desc = 'Harpoon 1' }) - vim.keymap.set('n', '2', function() - harpoon:list():select(2) - end, { desc = 'Harpoon 2' }) - vim.keymap.set('n', '3', function() - harpoon:list():select(3) - end, { desc = 'Harpoon 3' }) - vim.keymap.set('n', '4', function() - harpoon:list():select(4) - end, { desc = 'Harpoon 4' }) - - -- Toggle previous & next buffers stored within Harpoon list - vim.keymap.set('n', 'p', function() - harpoon:list():prev() - end, { desc = '[P]revious Harpoon' }) - vim.keymap.set('n', 'n', function() - harpoon:list():next() - end, { desc = '[N]ext Harpoon' }) - - -- basic telescope configuration - local conf = require('telescope.config').values - local function toggle_telescope(harpoon_files) - local file_paths = {} - for _, item in ipairs(harpoon_files.items) do - table.insert(file_paths, item.value) - end - - require('telescope.pickers') - .new({}, { - prompt_title = 'Harpoon', - finder = require('telescope.finders').new_table { - results = file_paths, - }, - previewer = conf.file_previewer {}, - sorter = conf.generic_sorter {}, - }) - :find() - end - - vim.keymap.set('n', '', function() - toggle_telescope(harpoon:list()) - end, { desc = 'Open harpoon window' }) - end, - }, - -- 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({})` - { 'williamboman/mason.nvim', version = 'v1.*', opts = {} }, - { 'williamboman/mason-lspconfig.nvim', version = 'v1.*' }, - '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 = {}, - 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 = {}, - zls = {}, - 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 = { - { - 'm', - function() - require('conform').format { async = true, lsp_format = 'fallback' } - end, - mode = '', - desc = 'For[m]at buffer', - }, - }, - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well standardized coding style. You can add additional - -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true } - if disable_filetypes[vim.bo[bufnr].filetype] then - return nil - else - return { - timeout_ms = 500, - lsp_format = 'fallback', - } - end - end, - formatters_by_ft = { - lua = { 'stylua' }, - -- Conform can also run multiple formatters sequentially - -- python = { 'ruff' }, - javascript = { 'prettier' }, - typescript = { 'prettier' }, - javascriptreact = { 'prettier' }, - typescriptreact = { 'prettier' }, - css = { 'prettier' }, - html = { 'prettier' }, - json = { 'prettier' }, - }, - }, - }, - - { -- Autocompletion - 'saghen/blink.cmp', - event = 'VimEnter', - version = '1.*', - dependencies = { - -- Snippet Engine - { - 'L3MON4D3/LuaSnip', - version = '2.*', - build = (function() - return 'make install_jsregexp' - end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, - }, - opts = {}, - }, - 'folke/lazydev.nvim', - }, - --- @module 'blink.cmp' - --- @type blink.cmp.Config - opts = { - keymap = { - -- 'default' (recommended) for mappings similar to built-in completions - -- to accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - -- 'super-tab' for tab to accept - -- 'enter' for enter to accept - -- 'none' for no mappings - -- - -- For an understanding of why the 'default' preset is recommended, - -- you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! - -- - -- All presets have the following mappings: - -- /: move to right/left of your snippet expansion - -- : Open menu or open docs if already open - -- / or /: Select next/previous item - -- : Hide menu - -- : Toggle signature help - -- - -- See :h blink-cmp-config-keymap for defining your own keymap - preset = 'default', - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps - }, - - appearance = { - -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- Adjusts spacing to ensure icons are aligned - nerd_font_variant = 'mono', - }, - - completion = { - -- By default, you may press `` to show the documentation. - -- Optionally, set `auto_show = true` to show the documentation after a delay. - documentation = { auto_show = false, auto_show_delay_ms = 500 }, - }, - - sources = { - default = { 'lsp', 'path', 'snippets', 'lazydev' }, - providers = { - lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, - }, - }, - - snippets = { preset = 'luasnip' }, - - -- Blink.cmp includes an optional, recommended rust fuzzy matcher, - -- which automatically downloads a prebuilt binary when enabled. - -- - -- By default, we use the Lua implementation instead, but you may enable - -- the rust implementation via `'prefer_rust_with_warning'` - -- - -- See :h blink-cmp-config-fuzzy for more information - fuzzy = { implementation = 'lua' }, - - -- Shows a signature help window while you type arguments for a function - signature = { enabled = true }, - }, - }, - { - -- 'sainnhe/gruvbox-material', - -- lazy = false, - -- priority = 1000, - -- config = function() - -- vim.o.background = 'dark' - -- vim.g.gruvbox_material_enable_italic = true - -- vim.g.gruvbox_material_background = 'hard' - -- vim.cmd.colorscheme 'gruvbox-material' - -- end, - 'webhooked/kanso.nvim', - lazy = false, - priority = 1000, - config = function() - require('kanso').setup { - transparent = false, - } - vim.cmd 'colorscheme kanso' - end, - -- 'catppuccin/nvim', - -- name = 'catppuccin', - -- priority = 1000, - -- config = function() - -- require('catppuccin').setup { - -- flavour = 'mocha', - -- transparent_background = true, - -- } - -- vim.cmd 'colorscheme catppuccin' - -- end, - -- 'rebelot/kanagawa.nvim', - -- priority = 1000, -- Make sure to load this before all the other start plugins. - -- name = 'kanagawa-dragon', - -- config = function() - -- ---@diagnostic disable-next-line: missing-fields - -- require('kanagawa').setup { - -- commentStyle = { italic = true }, - -- -- statementStyle = { bold = false }, - -- theme = 'dragon', - -- } - -- vim.cmd 'colorscheme kanagawa-dragon' - -- end, - --'zenbones-theme/zenbones.nvim', - -- dependencies = 'rktjmp/lush.nvim', - -- lazy = false, - -- priority = 1000, - -- config = function() - -- vim.cmd 'colorscheme zenbones' - -- end, - -- 'vague2k/vague.nvim', - -- priority = 1000, - -- name = 'vague', - -- config = function() - -- -- NOTE: you do not need to call setup if you don't want to. - -- require('vague').setup { - -- -- optional configuration here - -- } - -- vim.cmd 'colorscheme vague' - -- end, - }, - { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() - require('lualine').setup { - theme = 'base16', - } - 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 = { - 'zig', - 'python', - 'typescript', - 'rust', - 'htmldjango', - '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 - }, - -- { - -- 'nvim-treesitter/nvim-treesitter-context', - -- }, - { - 'windwp/nvim-autopairs', - event = 'InsertEnter', - config = true, - -- use opts = {} for passing setup options - -- this is equivalent to setup({}) function - }, - { - 'folke/snacks.nvim', - priority = 1000, - lazy = false, - }, - { - 'stevearc/oil.nvim', - ---@module 'oil' - ---@type oil.SetupOpts - opts = {}, - -- Optional dependencies - dependencies = { { 'echasnovski/mini.icons', opts = {} } }, - -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons - -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. - lazy = false, - config = function() - require('oil').setup { - vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }), - } - end, - }, + { import = 'plugins' }, }, { ui = { icons = { diff --git a/lua/config/autocommands.lua b/lua/config/autocommands.lua new file mode 100644 index 00000000000..db114077af5 --- /dev/null +++ b/lua/config/autocommands.lua @@ -0,0 +1,10 @@ +-- [[ Basic Autocommands ]] +-- See `:help lua-guide-autocommands` + +vim.api.nvim_create_autocmd('TextYankPost', { + desc = 'Highlight when yanking (copying) text', + group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), + callback = function() + vim.highlight.on_yank() + end, +}) diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua new file mode 100644 index 00000000000..54bfbde427e --- /dev/null +++ b/lua/config/keymaps.lua @@ -0,0 +1,35 @@ +-- [[ Basic Keymaps ]] +-- See `:help vim.keymap.set()` +-- recenter to middle after page jump +vim.keymap.set('n', '', 'zz') +vim.keymap.set('n', '', 'zz') + +-- 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' }) + +-- 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 trminals 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.sut("n", "", "K", { desc = "Move window to the upper" }) diff --git a/lua/config/options.lua b/lua/config/options.lua new file mode 100644 index 00000000000..5ac27123348 --- /dev/null +++ b/lua/config/options.lua @@ -0,0 +1,72 @@ +-- Set as the leader key +vim.g.mapleader = ' ' +vim.g.maplocalleader = ' ' + +-- autoindent if possible when entering a new line in a block +vim.opt.autowriteall = false +vim.opt.smartindent = true +-- Make line numbers default +vim.opt.number = true +vim.opt.relativenumber = true + +-- Enable mouse mode, can be useful for resizing splits for example! +vim.opt.mouse = 'a' + +-- Don't show the mode, since it's already in the status line +vim.opt.showmode = false + +-- Don't wrap long words +vim.opt.wrap = false +-- Sync clipboard between OS and Neovim. +vim.schedule(function() + vim.opt.clipboard = 'unnamedplus' +end) + +-- Enable break indent +vim.opt.breakindent = true + +-- Save undo history +vim.opt.undofile = true + +-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term +vim.opt.ignorecase = true +vim.opt.smartcase = true + +-- Keep signcolumn on by default +vim.opt.signcolumn = 'yes' + +-- Decrease update time +vim.opt.updatetime = 250 + +-- Decrease mapped sequence wait time +vim.opt.timeoutlen = 300 + +-- Configure how new splits should be opened +vim.opt.splitright = true +vim.opt.splitbelow = true + +-- Sets how neovim will display certain whitespace characters in the editor. +-- See `:help 'list'` +-- and `:help 'listchars'` +vim.opt.list = true +vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } + +-- Preview substitutions live, as you type! +vim.opt.inccommand = 'split' + +-- Show which line your cursor is on +vim.opt.cursorline = true + +-- Minimal number of screen lines to keep above and below the cursor. +vim.opt.scrolloff = 10 + +-- 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.opt.confirm = true + +vim.opt.guicursor = { + 'n-v-c:block-Cursor/lCursor-blinkwait1000-blinkon100-blinkoff100', + 'i-ci:ver25-Cursor/lCursor-blinkwait1000-blinkon100-blinkoff100', + 'r:hor50-Cursor/lCursor-blinkwait100-blinkon100-blinkoff100', +} diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua deleted file mode 100644 index be0eb9d8d7a..00000000000 --- a/lua/custom/plugins/init.lua +++ /dev/null @@ -1,5 +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 {} diff --git a/lua/kickstart/health.lua b/lua/kickstart/health.lua deleted file mode 100644 index b59d08649af..00000000000 --- 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 386d392e7ad..00000000000 --- 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/indent_line.lua b/lua/kickstart/plugins/indent_line.lua deleted file mode 100644 index ed7f269399f..00000000000 --- 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/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua deleted file mode 100644 index bd4422695aa..00000000000 --- a/lua/kickstart/plugins/neo-tree.lua +++ /dev/null @@ -1,25 +0,0 @@ --- Neo-tree is a Neovim plugin to browse the file system --- https://github.com/nvim-neo-tree/neo-tree.nvim - -return { - 'nvim-neo-tree/neo-tree.nvim', - version = '*', - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended - 'MunifTanjim/nui.nvim', - }, - cmd = 'Neotree', - keys = { - { '\\', ':Neotree reveal', desc = 'NeoTree reveal', silent = true }, - }, - opts = { - filesystem = { - window = { - mappings = { - ['\\'] = 'close_window', - }, - }, - }, - }, -} diff --git a/lua/plugins/claude-code.lua b/lua/plugins/claude-code.lua new file mode 100644 index 00000000000..12054fcc714 --- /dev/null +++ b/lua/plugins/claude-code.lua @@ -0,0 +1,27 @@ +return { + { + 'greggh/claude-code.nvim', + dependencies = { + 'nvim-lua/plenary.nvim', -- Required for git operations + }, + config = function() + require('claude-code').setup { + window = { + position = 'float', + }, + keymaps = { + toggle = { + normal = 'c', -- Normal mode keymap for toggling Claude Code, false to disable + terminal = 'false', -- Terminal mode keymap for toggling Claude Code, false to disable + -- variants = { + -- continue = "cC", -- Normal mode keymap for Claude Code with continue flag + -- verbose = "cV", -- Normal mode keymap for Claude Code with verbose flag + --}, + }, + window_navigation = true, -- Enable window navigation keymaps () + scrolling = true, -- Enable scrolling keymaps () for page up/down + }, + } + end, + }, +} diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua new file mode 100644 index 00000000000..b9e936f7847 --- /dev/null +++ b/lua/plugins/colorscheme.lua @@ -0,0 +1,61 @@ +return { + { + -- 'sainnhe/gruvbox-material', + -- lazy = false, + -- priority = 1000, + -- config = function() + -- vim.o.background = 'dark' + -- vim.g.gruvbox_material_enable_italic = true + -- vim.g.gruvbox_material_background = 'hard' + -- vim.cmd.colorscheme 'gruvbox-material' + -- end, + 'webhooked/kanso.nvim', + lazy = false, + priority = 1000, + config = function() + require('kanso').setup { + transparent = false, + } + vim.cmd 'colorscheme kanso' + end, + -- 'catppuccin/nvim', + -- name = 'catppuccin', + -- priority = 1000, + -- config = function() + -- require('catppuccin').setup { + -- flavour = 'mocha', + -- transparent_background = true, + -- } + -- vim.cmd 'colorscheme catppuccin' + -- end, + -- 'rebelot/kanagawa.nvim', + -- priority = 1000, -- Make sure to load this before all the other start plugins. + -- name = 'kanagawa-dragon', + -- config = function() + -- ---@diagnostic disable-next-line: missing-fields + -- require('kanagawa').setup { + -- commentStyle = { italic = true }, + -- -- statementStyle = { bold = false }, + -- theme = 'dragon', + -- } + -- vim.cmd 'colorscheme kanagawa-dragon' + -- end, + --'zenbones-theme/zenbones.nvim', + -- dependencies = 'rktjmp/lush.nvim', + -- lazy = false, + -- priority = 1000, + -- config = function() + -- vim.cmd 'colorscheme zenbones' + -- end, + -- 'vague2k/vague.nvim', + -- priority = 1000, + -- name = 'vague', + -- config = function() + -- -- NOTE: you do not need to call setup if you don't want to. + -- require('vague').setup { + -- -- optional configuration here + -- } + -- vim.cmd 'colorscheme vague' + -- end, + }, +} diff --git a/lua/plugins/completion.lua b/lua/plugins/completion.lua new file mode 100644 index 00000000000..8c064514f90 --- /dev/null +++ b/lua/plugins/completion.lua @@ -0,0 +1,94 @@ +return { + { -- Autocompletion + 'saghen/blink.cmp', + event = 'VimEnter', + version = '1.*', + dependencies = { + -- Snippet Engine + { + 'L3MON4D3/LuaSnip', + version = '2.*', + build = (function() + return 'make install_jsregexp' + end)(), + dependencies = { + -- `friendly-snippets` contains a variety of premade snippets. + -- See the README about individual language/framework/plugin snippets: + -- https://github.com/rafamadriz/friendly-snippets + -- { + -- 'rafamadriz/friendly-snippets', + -- config = function() + -- require('luasnip.loaders.from_vscode').lazy_load() + -- end, + -- }, + }, + opts = {}, + }, + 'folke/lazydev.nvim', + }, + --- @module 'blink.cmp' + --- @type blink.cmp.Config + opts = { + keymap = { + -- 'default' (recommended) for mappings similar to built-in completions + -- to accept ([y]es) the completion. + -- This will auto-import if your LSP supports it. + -- This will expand snippets if the LSP sent a snippet. + -- 'super-tab' for tab to accept + -- 'enter' for enter to accept + -- 'none' for no mappings + -- + -- For an understanding of why the 'default' preset is recommended, + -- you will need to read `:help ins-completion` + -- + -- No, but seriously. Please read `:help ins-completion`, it is really good! + -- + -- All presets have the following mappings: + -- /: move to right/left of your snippet expansion + -- : Open menu or open docs if already open + -- / or /: Select next/previous item + -- : Hide menu + -- : Toggle signature help + -- + -- See :h blink-cmp-config-keymap for defining your own keymap + preset = 'default', + + -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: + -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps + }, + + appearance = { + -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- Adjusts spacing to ensure icons are aligned + nerd_font_variant = 'mono', + }, + + completion = { + -- By default, you may press `` to show the documentation. + -- Optionally, set `auto_show = true` to show the documentation after a delay. + documentation = { auto_show = false, auto_show_delay_ms = 500 }, + }, + + sources = { + default = { 'lsp', 'path', 'snippets', 'lazydev' }, + providers = { + lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, + }, + }, + + snippets = { preset = 'luasnip' }, + + -- Blink.cmp includes an optional, recommended rust fuzzy matcher, + -- which automatically downloads a prebuilt binary when enabled. + -- + -- By default, we use the Lua implementation instead, but you may enable + -- the rust implementation via `'prefer_rust_with_warning'` + -- + -- See :h blink-cmp-config-fuzzy for more information + fuzzy = { implementation = 'lua' }, + + -- Shows a signature help window while you type arguments for a function + signature = { enabled = true }, + }, + }, +} diff --git a/lua/plugins/formatting.lua b/lua/plugins/formatting.lua new file mode 100644 index 00000000000..34920289c27 --- /dev/null +++ b/lua/plugins/formatting.lua @@ -0,0 +1,46 @@ +return { + { -- Autoformat + 'stevearc/conform.nvim', + event = { 'BufWritePre' }, + cmd = { 'ConformInfo' }, + keys = { + { + 'm', + function() + require('conform').format { async = true, lsp_format = 'fallback' } + end, + mode = '', + desc = 'For[m]at buffer', + }, + }, + opts = { + notify_on_error = false, + format_on_save = function(bufnr) + -- Disable "format_on_save lsp_fallback" for languages that don't + -- have a well standardized coding style. You can add additional + -- languages here or re-enable it for the disabled ones. + local disable_filetypes = { c = true, cpp = true } + if disable_filetypes[vim.bo[bufnr].filetype] then + return nil + else + return { + timeout_ms = 500, + lsp_format = 'fallback', + } + end + end, + formatters_by_ft = { + lua = { 'stylua' }, + -- Conform can also run multiple formatters sequentially + -- python = { 'ruff' }, + javascript = { 'prettier' }, + typescript = { 'prettier' }, + javascriptreact = { 'prettier' }, + typescriptreact = { 'prettier' }, + css = { 'prettier' }, + html = { 'prettier' }, + json = { 'prettier' }, + }, + }, + }, +} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua new file mode 100644 index 00000000000..e381e9ddaf3 --- /dev/null +++ b/lua/plugins/lsp.lua @@ -0,0 +1,268 @@ +return { + -- 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({})` + { 'williamboman/mason.nvim', version = 'v1.*', opts = {} }, + { 'williamboman/mason-lspconfig.nvim', version = 'v1.*' }, + '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 = {}, + 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 = {}, + zls = {}, + 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, + }, +} diff --git a/lua/plugins/navigation.lua b/lua/plugins/navigation.lua new file mode 100644 index 00000000000..acae343e60d --- /dev/null +++ b/lua/plugins/navigation.lua @@ -0,0 +1,110 @@ +return { + { + 'christoomey/vim-tmux-navigator', + cmd = { + 'TmuxNavigateLeft', + 'TmuxNavigateDown', + 'TmuxNavigateUp', + 'TmuxNavigateRight', + 'TmuxNavigatePrevious', + 'TmuxNavigatorProcessList', + }, + keys = { + { '', 'TmuxNavigateLeft' }, + { '', 'TmuxNavigateDown' }, + { '', 'TmuxNavigateUp' }, + { '', 'TmuxNavigateRight' }, + { '', 'TmuxNavigatePrevious' }, + }, + }, + { + 'folke/flash.nvim', + event = 'VeryLazy', + ---@type Flash.Config + opts = {}, + -- stylua: ignore + keys = { + { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, + { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, + { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, + { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, + { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, + }, + }, + { + 'ThePrimeagen/harpoon', + branch = 'harpoon2', + dependencies = { 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope.nvim' }, + config = function() + local harpoon = require 'harpoon' + harpoon:setup() + vim.keymap.set('n', 'a', function() + harpoon:list():add() + end, { desc = '[A]dd to Harpoon list' }) + vim.keymap.set('n', 'e', function() + harpoon.ui:toggle_quick_menu(harpoon:list()) + end, { desc = 'Toggle Harpoon m[E]nu' }) + + vim.keymap.set('n', '1', function() + harpoon:list():select(1) + end, { desc = 'Harpoon 1' }) + vim.keymap.set('n', '2', function() + harpoon:list():select(2) + end, { desc = 'Harpoon 2' }) + vim.keymap.set('n', '3', function() + harpoon:list():select(3) + end, { desc = 'Harpoon 3' }) + vim.keymap.set('n', '4', function() + harpoon:list():select(4) + end, { desc = 'Harpoon 4' }) + + -- Toggle previous & next buffers stored within Harpoon list + vim.keymap.set('n', 'p', function() + harpoon:list():prev() + end, { desc = '[P]revious Harpoon' }) + vim.keymap.set('n', 'n', function() + harpoon:list():next() + end, { desc = '[N]ext Harpoon' }) + + -- basic telescope configuration + local conf = require('telescope.config').values + local function toggle_telescope(harpoon_files) + local file_paths = {} + for _, item in ipairs(harpoon_files.items) do + table.insert(file_paths, item.value) + end + + require('telescope.pickers') + .new({}, { + prompt_title = 'Harpoon', + finder = require('telescope.finders').new_table { + results = file_paths, + }, + previewer = conf.file_previewer {}, + sorter = conf.generic_sorter {}, + }) + :find() + end + + vim.keymap.set('n', '', function() + toggle_telescope(harpoon:list()) + end, { desc = 'Open harpoon window' }) + end, + }, + { + 'stevearc/oil.nvim', + ---@module 'oil' + ---@type oil.SetupOpts + opts = {}, + -- Optional dependencies + dependencies = { { 'echasnovski/mini.icons', opts = {} } }, + -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons + -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. + lazy = false, + config = function() + require('oil').setup { + vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }), + } + end, + }, +} diff --git a/lua/plugins/optional/README.md b/lua/plugins/optional/README.md new file mode 100644 index 00000000000..1ed84429ceb --- /dev/null +++ b/lua/plugins/optional/README.md @@ -0,0 +1,33 @@ +# Optional Plugins + +These are optional plugins that are not enabled by default but may be useful for certain workflows. + +## How to Enable + +To enable an optional plugin, simply move it from `lua/plugins/optional/` to `lua/plugins/` and restart Neovim. + +For example: +```bash +mv lua/plugins/optional/debug.lua lua/plugins/debug.lua +``` + +Or create a symlink: +```bash +ln -s optional/debug.lua lua/plugins/debug.lua +``` + +## Available Optional Plugins + +- **indent-blankline.lua** - Adds indentation guides on blank lines +- **debug.lua** - DAP debugger for Go (and extensible to other languages) +- **lint.lua** - Linting with nvim-lint (markdown example included) + +## Alternative Approach + +You can also import these directly by adding to your `init.lua`: +```lua +require('lazy').setup({ + { import = 'plugins' }, + { import = 'plugins.optional.debug' }, -- Enable debug plugin +}) +``` diff --git a/lua/kickstart/plugins/debug.lua b/lua/plugins/optional/debug.lua similarity index 95% rename from lua/kickstart/plugins/debug.lua rename to lua/plugins/optional/debug.lua index 753cb0cedd3..0c175a6fbfd 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/plugins/optional/debug.lua @@ -1,10 +1,11 @@ -- debug.lua -- --- Shows how to use the DAP plugin to debug your code. +-- DAP (Debug Adapter Protocol) plugin for debugging your code. +-- To enable: move this file to lua/plugins/ or import it in init.lua -- -- 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 ;) +-- be extended to other languages as well. +-- See `:help dap` for more information return { -- NOTE: Yes, you can install new plugins here! diff --git a/lua/plugins/optional/indent-blankline.lua b/lua/plugins/optional/indent-blankline.lua new file mode 100644 index 00000000000..5b278ca62e3 --- /dev/null +++ b/lua/plugins/optional/indent-blankline.lua @@ -0,0 +1,11 @@ +-- Adds indentation guides even on blank lines +-- To enable: move this file to lua/plugins/ or import it in init.lua +-- See `:help ibl` + +return { + { + 'lukas-reineke/indent-blankline.nvim', + main = 'ibl', + opts = {}, + }, +} diff --git a/lua/kickstart/plugins/lint.lua b/lua/plugins/optional/lint.lua similarity index 94% rename from lua/kickstart/plugins/lint.lua rename to lua/plugins/optional/lint.lua index 907c6bf3e31..83574f5786b 100644 --- a/lua/kickstart/plugins/lint.lua +++ b/lua/plugins/optional/lint.lua @@ -1,5 +1,8 @@ -return { +-- Linting with nvim-lint +-- To enable: move this file to lua/plugins/ or import it in init.lua +-- See `:help lint` for more information +return { { -- Linting 'mfussenegger/nvim-lint', event = { 'BufReadPre', 'BufNewFile' }, diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua new file mode 100644 index 00000000000..147e3af8e75 --- /dev/null +++ b/lua/plugins/telescope.lua @@ -0,0 +1,107 @@ +return { + { -- 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' }, + { 'nvim-tree/nvim-web-devicons', enabled = false }, + }, + 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 = {} + defaults = { + layout_strategy = 'vertical', + layout_config = { preview_cutoff = 0, width = { padding = 0 }, height = { padding = 0 } }, + }, + 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 = true, + }) + end, { desc = '[/] Fuzzily search in current buffer' }) + + -- It's also possible to pass additional configuration options. + -- See `:help telescope.builtin.live_grep()` for information about particular keys + vim.keymap.set('n', 's/', function() + builtin.live_grep { + grep_open_files = true, + prompt_title = 'Live Grep in Open Files', + } + end, { desc = '[S]earch [/] in Open Files' }) + + -- Shortcut for searching your Neovim configuration files + vim.keymap.set('n', 'sn', function() + builtin.find_files { cwd = vim.fn.stdpath 'config' } + end, { desc = '[S]earch [N]eovim files' }) + end, + }, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua new file mode 100644 index 00000000000..ca84a48a348 --- /dev/null +++ b/lua/plugins/treesitter.lua @@ -0,0 +1,47 @@ +return { + { -- 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 = { + 'zig', + 'python', + 'typescript', + 'rust', + 'htmldjango', + '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 + }, + -- { + -- 'nvim-treesitter/nvim-treesitter-context', + -- }, +} diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua new file mode 100644 index 00000000000..4d5a0a025d8 --- /dev/null +++ b/lua/plugins/ui.lua @@ -0,0 +1,21 @@ +return { + { -- Useful plugin to show you pending keybinds. + 'folke/which-key.nvim', + event = 'VimEnter', -- Sets the loading event to 'VimEnter' + opts = { + theme = 'helix', + -- delay between pressing a key and opening which-key (milliseconds) + -- this setting is independent of vim.opt.timeoutlen + delay = 0, + }, + }, + { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('lualine').setup { + theme = 'base16', + } + end, + }, +} diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/plugins/utils.lua similarity index 69% rename from lua/kickstart/plugins/gitsigns.lua rename to lua/plugins/utils.lua index cbbd22d24fc..b7e3b1d2f6d 100644 --- a/lua/kickstart/plugins/gitsigns.lua +++ b/lua/plugins/utils.lua @@ -1,11 +1,17 @@ --- 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 { - { + -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). + 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically + + { -- 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 = '~' }, + }, on_attach = function(bufnr) local gitsigns = require 'gitsigns' @@ -44,7 +50,7 @@ return { 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', 'hu', gitsigns.undo_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' }) @@ -54,8 +60,20 @@ return { 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' }) + map('n', 'tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) end, }, }, + { + 'windwp/nvim-autopairs', + event = 'InsertEnter', + config = true, + -- use opts = {} for passing setup options + -- this is equivalent to setup({}) function + }, + { + 'folke/snacks.nvim', + priority = 1000, + lazy = false, + }, } From ab58d1a50318a755eac2f697d03720763c2b0268 Mon Sep 17 00:00:00 2001 From: cedricreper Date: Fri, 17 Oct 2025 14:56:54 +0900 Subject: [PATCH 10/11] fix warning for lspconfig --- lua/plugins/lsp.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index e381e9ddaf3..8d8b483355b 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -259,7 +259,9 @@ return { -- 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) + + -- Use the new vim.lsp.config API for Neovim 0.11+ + vim.lsp.config(server_name, server) end, }, } From 631e88bdd2766396ed6f6ee9d1ceb2a7e16d9420 Mon Sep 17 00:00:00 2001 From: cedricreper Date: Fri, 17 Oct 2025 15:04:25 +0900 Subject: [PATCH 11/11] refactor --- CLAUDE.md | 75 +++++----- lua/plugins/autopairs.lua | 9 ++ lua/plugins/flash.lua | 16 +++ lua/plugins/{utils.lua => gitsigns.lua} | 15 -- lua/plugins/{navigation.lua => harpoon.lua} | 48 ------- lua/plugins/lualine.lua | 11 ++ lua/plugins/oil.lua | 18 +++ lua/plugins/optional/README.md | 33 ----- lua/plugins/optional/debug.lua | 149 -------------------- lua/plugins/optional/indent-blankline.lua | 11 -- lua/plugins/optional/lint.lua | 63 --------- lua/plugins/snacks.lua | 7 + lua/plugins/vim-sleuth.lua | 4 + lua/plugins/vim-tmux-navigator.lua | 20 +++ lua/plugins/{ui.lua => which-key.lua} | 9 -- 15 files changed, 122 insertions(+), 366 deletions(-) create mode 100644 lua/plugins/autopairs.lua create mode 100644 lua/plugins/flash.lua rename lua/plugins/{utils.lua => gitsigns.lua} (86%) rename lua/plugins/{navigation.lua => harpoon.lua} (54%) create mode 100644 lua/plugins/lualine.lua create mode 100644 lua/plugins/oil.lua delete mode 100644 lua/plugins/optional/README.md delete mode 100644 lua/plugins/optional/debug.lua delete mode 100644 lua/plugins/optional/indent-blankline.lua delete mode 100644 lua/plugins/optional/lint.lua create mode 100644 lua/plugins/snacks.lua create mode 100644 lua/plugins/vim-sleuth.lua create mode 100644 lua/plugins/vim-tmux-navigator.lua rename lua/plugins/{ui.lua => which-key.lua} (64%) diff --git a/CLAUDE.md b/CLAUDE.md index ba6f084901d..afdfdff2590 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -21,16 +21,23 @@ The configuration is organized into three main directories: │ │ ├── keymaps.lua # Global key mappings │ │ └── autocommands.lua # Autocommands (highlight on yank, etc.) │ ├── plugins/ # Plugin specifications (auto-loaded by lazy.nvim) +│ │ ├── autopairs.lua # Auto-close brackets and quotes +│ │ ├── claude-code.lua # Claude Code integration │ │ ├── colorscheme.lua # Color scheme (kanso.nvim + alternatives) -│ │ ├── treesitter.lua # Syntax highlighting & parsing -│ │ ├── lsp.lua # LSP configuration & Mason │ │ ├── completion.lua # blink.cmp & LuaSnip +│ │ ├── flash.lua # Rapid cursor movement +│ │ ├── formatting.lua # conform.nvim for code formatting +│ │ ├── gitsigns.lua # Git signs and operations +│ │ ├── harpoon.lua # File bookmarking +│ │ ├── lsp.lua # LSP configuration & Mason +│ │ ├── lualine.lua # Status line +│ │ ├── oil.lua # File browser +│ │ ├── snacks.lua # Utility plugin │ │ ├── telescope.lua # Fuzzy finder -│ │ ├── navigation.lua # Harpoon, Flash, Oil, tmux-navigator -│ │ ├── formatting.lua # conform.nvim -│ │ ├── ui.lua # which-key, lualine -│ │ ├── utils.lua # vim-sleuth, gitsigns, autopairs, snacks -│ │ ├── claude-code.lua # Claude Code integration +│ │ ├── treesitter.lua # Syntax highlighting & parsing +│ │ ├── vim-sleuth.lua # Auto-detect indentation +│ │ ├── vim-tmux-navigator.lua # Tmux/Vim navigation +│ │ ├── which-key.lua # Keybinding hints │ │ └── optional/ # Optional plugins (not loaded by default) │ │ ├── README.md # Instructions for enabling optional plugins │ │ ├── debug.lua # DAP debugger for Go @@ -46,34 +53,26 @@ The configuration is organized into three main directories: - **Auto-Loading**: All files in `lua/plugins/*.lua` are automatically loaded - **Custom Plugins**: Add your own in `lua/custom/plugins/init.lua` or create new files there -### Key Plugin Categories - -1. **LSP Configuration** (`lua/plugins/lsp.lua`) - - Mason for LSP installation - - Configured servers: `pyright`, `zls`, `rust_analyzer`, `ts_ls`, `lua_ls` - - LSP capabilities enhanced by blink.cmp - - Autocommands for LSP attach events setup keymaps and highlighting - -2. **Completion** (`lua/plugins/completion.lua`) - - blink.cmp for autocompletion - - LuaSnip for snippet expansion - - Default keymap preset uses `` to accept - -3. **Telescope** (`lua/plugins/telescope.lua`) - - Fuzzy finder with vertical layout - - Extensions: fzf, ui-select - - Leader-based keymaps for searching files, grep, diagnostics, etc. - -4. **Navigation & Movement** (`lua/plugins/navigation.lua`) - - Harpoon2 for file bookmarking - - Flash.nvim for rapid cursor movement - - Oil.nvim for file browsing - - vim-tmux-navigator for seamless tmux/vim navigation - -5. **Formatting** (`lua/plugins/formatting.lua`) - - conform.nvim handles formatting - - Format on save enabled (except for C/C++) - - Configured formatters: stylua (Lua), prettier (JS/TS/CSS/HTML/JSON) +### Key Plugins + +Each plugin is in its own file for easy management: + +- **lsp.lua** - LSP configuration with Mason, servers: `pyright`, `zls`, `rust_analyzer`, `ts_ls`, `lua_ls` +- **completion.lua** - blink.cmp autocompletion with LuaSnip snippets +- **telescope.lua** - Fuzzy finder with vertical layout, fzf and ui-select extensions +- **harpoon.lua** - Quick file bookmarking and navigation +- **flash.lua** - Rapid cursor movement with `s`, `S`, `r`, `R` keys +- **oil.lua** - File browser with `-` key binding +- **vim-tmux-navigator.lua** - Seamless tmux/vim split navigation +- **formatting.lua** - conform.nvim with format-on-save (stylua, prettier) +- **gitsigns.lua** - Git signs in gutter with staging/diffing keymaps +- **which-key.lua** - Keybinding hints popup +- **lualine.lua** - Status line with base16 theme +- **treesitter.lua** - Syntax highlighting for multiple languages +- **autopairs.lua** - Auto-close brackets and quotes +- **vim-sleuth.lua** - Auto-detect indentation +- **snacks.lua** - Utility plugin collection +- **colorscheme.lua** - Multiple color schemes (kanso active) ## Common Commands @@ -205,9 +204,9 @@ Currently using kanso.nvim. Several commented-out alternatives available (gruvbo ### Plugin Organization Philosophy -- **Separation by Function**: Each file in `lua/plugins/` represents a logical category -- **Easy Discovery**: Find all plugins of a type in one file -- **Modular**: Add/remove entire categories by managing single files +- **One Plugin Per File**: Each plugin has its own dedicated file in `lua/plugins/` (except colorscheme.lua which contains theme options) +- **Easy Discovery**: Plugin files are named after the plugin they configure +- **Modular**: Add/remove individual plugins by managing single files - **Custom Additions**: Use `lua/custom/plugins/` for your personal plugins without modifying core structure ### Optional Plugins diff --git a/lua/plugins/autopairs.lua b/lua/plugins/autopairs.lua new file mode 100644 index 00000000000..1f06baeef19 --- /dev/null +++ b/lua/plugins/autopairs.lua @@ -0,0 +1,9 @@ +return { + { + 'windwp/nvim-autopairs', + event = 'InsertEnter', + config = true, + -- use opts = {} for passing setup options + -- this is equivalent to setup({}) function + }, +} diff --git a/lua/plugins/flash.lua b/lua/plugins/flash.lua new file mode 100644 index 00000000000..047f75c2cf2 --- /dev/null +++ b/lua/plugins/flash.lua @@ -0,0 +1,16 @@ +return { + { + 'folke/flash.nvim', + event = 'VeryLazy', + ---@type Flash.Config + opts = {}, + -- stylua: ignore + keys = { + { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, + { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, + { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, + { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, + { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, + }, + }, +} diff --git a/lua/plugins/utils.lua b/lua/plugins/gitsigns.lua similarity index 86% rename from lua/plugins/utils.lua rename to lua/plugins/gitsigns.lua index b7e3b1d2f6d..7f2dee71036 100644 --- a/lua/plugins/utils.lua +++ b/lua/plugins/gitsigns.lua @@ -1,7 +1,4 @@ return { - -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). - 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - { -- Adds git related signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', opts = { @@ -64,16 +61,4 @@ return { end, }, }, - { - 'windwp/nvim-autopairs', - event = 'InsertEnter', - config = true, - -- use opts = {} for passing setup options - -- this is equivalent to setup({}) function - }, - { - 'folke/snacks.nvim', - priority = 1000, - lazy = false, - }, } diff --git a/lua/plugins/navigation.lua b/lua/plugins/harpoon.lua similarity index 54% rename from lua/plugins/navigation.lua rename to lua/plugins/harpoon.lua index acae343e60d..a21ed5ff548 100644 --- a/lua/plugins/navigation.lua +++ b/lua/plugins/harpoon.lua @@ -1,36 +1,4 @@ return { - { - 'christoomey/vim-tmux-navigator', - cmd = { - 'TmuxNavigateLeft', - 'TmuxNavigateDown', - 'TmuxNavigateUp', - 'TmuxNavigateRight', - 'TmuxNavigatePrevious', - 'TmuxNavigatorProcessList', - }, - keys = { - { '', 'TmuxNavigateLeft' }, - { '', 'TmuxNavigateDown' }, - { '', 'TmuxNavigateUp' }, - { '', 'TmuxNavigateRight' }, - { '', 'TmuxNavigatePrevious' }, - }, - }, - { - 'folke/flash.nvim', - event = 'VeryLazy', - ---@type Flash.Config - opts = {}, - -- stylua: ignore - keys = { - { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, - { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, - { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, - { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, - { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, - }, - }, { 'ThePrimeagen/harpoon', branch = 'harpoon2', @@ -91,20 +59,4 @@ return { end, { desc = 'Open harpoon window' }) end, }, - { - 'stevearc/oil.nvim', - ---@module 'oil' - ---@type oil.SetupOpts - opts = {}, - -- Optional dependencies - dependencies = { { 'echasnovski/mini.icons', opts = {} } }, - -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons - -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. - lazy = false, - config = function() - require('oil').setup { - vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }), - } - end, - }, } diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua new file mode 100644 index 00000000000..800aaab832d --- /dev/null +++ b/lua/plugins/lualine.lua @@ -0,0 +1,11 @@ +return { + { + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('lualine').setup { + theme = 'base16', + } + end, + }, +} diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua new file mode 100644 index 00000000000..17ee9009dbf --- /dev/null +++ b/lua/plugins/oil.lua @@ -0,0 +1,18 @@ +return { + { + 'stevearc/oil.nvim', + ---@module 'oil' + ---@type oil.SetupOpts + opts = {}, + -- Optional dependencies + dependencies = { { 'echasnovski/mini.icons', opts = {} } }, + -- dependencies = { "nvim-tree/nvim-web-devicons" }, -- use if you prefer nvim-web-devicons + -- Lazy loading is not recommended because it is very tricky to make it work correctly in all situations. + lazy = false, + config = function() + require('oil').setup { + vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }), + } + end, + }, +} diff --git a/lua/plugins/optional/README.md b/lua/plugins/optional/README.md deleted file mode 100644 index 1ed84429ceb..00000000000 --- a/lua/plugins/optional/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# Optional Plugins - -These are optional plugins that are not enabled by default but may be useful for certain workflows. - -## How to Enable - -To enable an optional plugin, simply move it from `lua/plugins/optional/` to `lua/plugins/` and restart Neovim. - -For example: -```bash -mv lua/plugins/optional/debug.lua lua/plugins/debug.lua -``` - -Or create a symlink: -```bash -ln -s optional/debug.lua lua/plugins/debug.lua -``` - -## Available Optional Plugins - -- **indent-blankline.lua** - Adds indentation guides on blank lines -- **debug.lua** - DAP debugger for Go (and extensible to other languages) -- **lint.lua** - Linting with nvim-lint (markdown example included) - -## Alternative Approach - -You can also import these directly by adding to your `init.lua`: -```lua -require('lazy').setup({ - { import = 'plugins' }, - { import = 'plugins.optional.debug' }, -- Enable debug plugin -}) -``` diff --git a/lua/plugins/optional/debug.lua b/lua/plugins/optional/debug.lua deleted file mode 100644 index 0c175a6fbfd..00000000000 --- a/lua/plugins/optional/debug.lua +++ /dev/null @@ -1,149 +0,0 @@ --- debug.lua --- --- DAP (Debug Adapter Protocol) plugin for debugging your code. --- To enable: move this file to lua/plugins/ or import it in init.lua --- --- Primarily focused on configuring the debugger for Go, but can --- be extended to other languages as well. --- See `:help dap` for more information - -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 - 'williamboman/mason.nvim', - 'jay-babu/mason-nvim-dap.nvim', - - -- Add your own debuggers here - 'leoluz/nvim-dap-go', - }, - 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.', - }, - }, - 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', - }, - } - - -- 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, - }, - } - end, -} diff --git a/lua/plugins/optional/indent-blankline.lua b/lua/plugins/optional/indent-blankline.lua deleted file mode 100644 index 5b278ca62e3..00000000000 --- a/lua/plugins/optional/indent-blankline.lua +++ /dev/null @@ -1,11 +0,0 @@ --- Adds indentation guides even on blank lines --- To enable: move this file to lua/plugins/ or import it in init.lua --- See `:help ibl` - -return { - { - 'lukas-reineke/indent-blankline.nvim', - main = 'ibl', - opts = {}, - }, -} diff --git a/lua/plugins/optional/lint.lua b/lua/plugins/optional/lint.lua deleted file mode 100644 index 83574f5786b..00000000000 --- a/lua/plugins/optional/lint.lua +++ /dev/null @@ -1,63 +0,0 @@ --- Linting with nvim-lint --- To enable: move this file to lua/plugins/ or import it in init.lua --- See `:help lint` for more information - -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.opt_local.modifiable:get() then - lint.try_lint() - end - end, - }) - end, - }, -} diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua new file mode 100644 index 00000000000..99a56f7c18d --- /dev/null +++ b/lua/plugins/snacks.lua @@ -0,0 +1,7 @@ +return { + { + 'folke/snacks.nvim', + priority = 1000, + lazy = false, + }, +} diff --git a/lua/plugins/vim-sleuth.lua b/lua/plugins/vim-sleuth.lua new file mode 100644 index 00000000000..d9a08871b98 --- /dev/null +++ b/lua/plugins/vim-sleuth.lua @@ -0,0 +1,4 @@ +-- Detect tabstop and shiftwidth automatically +return { + 'tpope/vim-sleuth', +} diff --git a/lua/plugins/vim-tmux-navigator.lua b/lua/plugins/vim-tmux-navigator.lua new file mode 100644 index 00000000000..53f0523a66a --- /dev/null +++ b/lua/plugins/vim-tmux-navigator.lua @@ -0,0 +1,20 @@ +return { + { + 'christoomey/vim-tmux-navigator', + cmd = { + 'TmuxNavigateLeft', + 'TmuxNavigateDown', + 'TmuxNavigateUp', + 'TmuxNavigateRight', + 'TmuxNavigatePrevious', + 'TmuxNavigatorProcessList', + }, + keys = { + { '', 'TmuxNavigateLeft' }, + { '', 'TmuxNavigateDown' }, + { '', 'TmuxNavigateUp' }, + { '', 'TmuxNavigateRight' }, + { '', 'TmuxNavigatePrevious' }, + }, + }, +} diff --git a/lua/plugins/ui.lua b/lua/plugins/which-key.lua similarity index 64% rename from lua/plugins/ui.lua rename to lua/plugins/which-key.lua index 4d5a0a025d8..904c4b01046 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/which-key.lua @@ -9,13 +9,4 @@ return { delay = 0, }, }, - { - 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - config = function() - require('lualine').setup { - theme = 'base16', - } - end, - }, }