removing jk bind

This commit is contained in:
Jason Stentz 2026-02-16 17:09:31 -05:00
parent efcde1a0e7
commit 14a22f5b34
1 changed files with 657 additions and 648 deletions

443
init.lua
View File

@ -1,9 +1,9 @@
pcall(require, 'local.prehook') pcall(require, "local.prehook")
-- Set <space> as the leader key -- Set <space> as the leader key
-- See `:help mapleader` -- See `:help mapleader`
vim.g.mapleader = ' ' vim.g.mapleader = " "
vim.g.maplocalleader = ' ' vim.g.maplocalleader = " "
-- Set to true if you have a Nerd Font installed and selected in the terminal. -- Set to true if you have a Nerd Font installed and selected in the terminal.
vim.g.have_nerd_font = true vim.g.have_nerd_font = true
@ -15,12 +15,12 @@ vim.o.number = true
vim.o.relativenumber = true vim.o.relativenumber = true
-- Enable mouse mode -- Enable mouse mode
vim.o.mouse = 'a' vim.o.mouse = "a"
-- Don't show the mode, since it's already in the status line. -- Don't show the mode, since it's already in the status line.
vim.o.showmode = false vim.o.showmode = false
require 'clipboard' require("clipboard")
vim.o.breakindent = true vim.o.breakindent = true
@ -29,7 +29,7 @@ vim.o.undofile = true
vim.o.ignorecase = true vim.o.ignorecase = true
vim.o.smartcase = true vim.o.smartcase = true
vim.o.signcolumn = 'yes' vim.o.signcolumn = "yes"
vim.o.updatetime = 250 vim.o.updatetime = 250
-- Decrease mapped sequence wait time -- Decrease mapped sequence wait time
@ -48,10 +48,10 @@ vim.o.splitbelow = true
-- See `:help lua-options` -- See `:help lua-options`
-- and `:help lua-options-guide` -- and `:help lua-options-guide`
vim.o.list = true vim.o.list = true
vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '' } vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "" }
-- Preview substitutions live, as you type! -- Preview substitutions live, as you type!
vim.o.inccommand = 'split' vim.o.inccommand = "split"
-- Show which line your cursor is on -- Show which line your cursor is on
vim.o.cursorline = true vim.o.cursorline = true
@ -65,7 +65,7 @@ vim.o.scrolloff = 10
vim.o.confirm = true vim.o.confirm = true
-- Make all floating windows have a border. -- Make all floating windows have a border.
vim.o.winborder = 'rounded' vim.o.winborder = "rounded"
-- Make the command status bar only appear when necessary. -- Make the command status bar only appear when necessary.
vim.o.cmdheight = 0 vim.o.cmdheight = 0
@ -75,10 +75,10 @@ vim.o.cmdheight = 0
-- Clear highlights on search when pressing <Esc> in normal mode. -- Clear highlights on search when pressing <Esc> in normal mode.
-- See `:help hlsearch` -- See `:help hlsearch`
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>') vim.keymap.set("n", "<Esc>", "<cmd>nohlsearch<CR>")
-- Diagnostic keymaps -- Diagnostic keymaps
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) vim.keymap.set("n", "<leader>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 -- 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 <C-\><C-n>, which -- for people to discover. Otherwise, you normally need to press <C-\><C-n>, which
@ -86,7 +86,7 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagn
-- --
-- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping -- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping
-- or just use <C-\><C-n> to exit terminal mode -- or just use <C-\><C-n> to exit terminal mode
vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' }) vim.keymap.set("t", "<Esc><Esc>", "<C-\\><C-n>", { desc = "Exit terminal mode" })
-- TIP: Disable arrow keys in normal mode -- TIP: Disable arrow keys in normal mode
-- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>') -- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>')
@ -98,20 +98,17 @@ vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' }
-- Use CTRL+<hjkl> to switch between windows -- Use CTRL+<hjkl> to switch between windows
-- --
-- See `:help wincmd` for a list of all window commands -- See `:help wincmd` for a list of all window commands
vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' }) vim.keymap.set("n", "<C-h>", "<C-w><C-h>", { desc = "Move focus to the left window" })
vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' }) vim.keymap.set("n", "<C-l>", "<C-w><C-l>", { desc = "Move focus to the right window" })
vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' }) vim.keymap.set("n", "<C-j>", "<C-w><C-j>", { desc = "Move focus to the lower window" })
vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' }) vim.keymap.set("n", "<C-k>", "<C-w><C-k>", { desc = "Move focus to the upper window" })
-- Exit insert mode easier
vim.keymap.set('i', 'jk', '<Esc>', { desc = 'Exits insert mode' })
-- Keep cursor centered when navigating by half pages. -- Keep cursor centered when navigating by half pages.
vim.keymap.set('n', '<C-d>', '<C-d>zz', { desc = 'Move down by half a page and center the cursor' }) vim.keymap.set("n", "<C-d>", "<C-d>zz", { desc = "Move down by half a page and center the cursor" })
vim.keymap.set('n', '<C-u>', '<C-u>zz', { desc = 'Move down by half a page and center the cursor' }) vim.keymap.set("n", "<C-u>", "<C-u>zz", { desc = "Move down by half a page and center the cursor" })
-- Add the ability to paste over text without clobbering the paste register. -- Add the ability to paste over text without clobbering the paste register.
vim.keymap.set('x', '<leader>p', '"_dP') vim.keymap.set("x", "<leader>p", '"_dP')
-- [[ Basic Autocommands ]] -- [[ Basic Autocommands ]]
-- See `:help lua-guide-autocommands` -- See `:help lua-guide-autocommands`
@ -119,9 +116,9 @@ vim.keymap.set('x', '<leader>p', '"_dP')
-- Highlight when yanking (copying) text -- Highlight when yanking (copying) text
-- Try it with `yap` in normal mode -- Try it with `yap` in normal mode
-- See `:help vim.hl.on_yank()` -- See `:help vim.hl.on_yank()`
vim.api.nvim_create_autocmd('TextYankPost', { vim.api.nvim_create_autocmd("TextYankPost", {
desc = 'Highlight when yanking (copying) text', desc = "Highlight when yanking (copying) text",
group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), group = vim.api.nvim_create_augroup("kickstart-highlight-yank", { clear = true }),
callback = function() callback = function()
vim.hl.on_yank() vim.hl.on_yank()
end, end,
@ -136,12 +133,12 @@ end
-- [[ Install `lazy.nvim` plugin manager ]] -- [[ Install `lazy.nvim` plugin manager ]]
-- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info -- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then if not (vim.uv or vim.loop).fs_stat(lazypath) then
local lazyrepo = 'https://github.com/folke/lazy.nvim.git' local lazyrepo = "https://github.com/folke/lazy.nvim.git"
local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
if vim.v.shell_error ~= 0 then if vim.v.shell_error ~= 0 then
error('Error cloning lazy.nvim:\n' .. out) error("Error cloning lazy.nvim:\n" .. out)
end end
end end
@ -160,12 +157,12 @@ rtp:prepend(lazypath)
-- :Lazy update -- :Lazy update
-- --
-- NOTE: Here is where you install your plugins. -- NOTE: Here is where you install your plugins.
require('lazy').setup({ require("lazy").setup({
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
{ {
'NMAC427/guess-indent.nvim', -- Detect tabstop and shiftwidth automatically, "NMAC427/guess-indent.nvim", -- Detect tabstop and shiftwidth automatically,
config = function() config = function()
require('guess-indent').setup {} require("guess-indent").setup({})
end, end,
}, },
@ -192,14 +189,14 @@ require('lazy').setup({
-- --
-- See `:help gitsigns` to understand what the configuration keys do -- See `:help gitsigns` to understand what the configuration keys do
{ -- Adds git related signs to the gutter, as well as utilities for managing changes { -- Adds git related signs to the gutter, as well as utilities for managing changes
'lewis6991/gitsigns.nvim', "lewis6991/gitsigns.nvim",
opts = { opts = {
signs = { signs = {
add = { text = '+' }, add = { text = "+" },
change = { text = '~' }, change = { text = "~" },
delete = { text = '_' }, delete = { text = "_" },
topdelete = { text = '' }, topdelete = { text = "" },
changedelete = { text = '~' }, changedelete = { text = "~" },
}, },
}, },
}, },
@ -219,8 +216,8 @@ require('lazy').setup({
-- after the plugin has been loaded as `require(MODULE).setup(opts)`. -- after the plugin has been loaded as `require(MODULE).setup(opts)`.
{ -- Useful plugin to show you pending keybinds. { -- Useful plugin to show you pending keybinds.
'folke/which-key.nvim', "folke/which-key.nvim",
event = 'VimEnter', -- Sets the loading event to 'VimEnter' event = "VimEnter", -- Sets the loading event to 'VimEnter'
opts = { opts = {
-- delay between pressing a key and opening which-key (milliseconds) -- delay between pressing a key and opening which-key (milliseconds)
-- this setting is independent of vim.o.timeoutlen -- this setting is independent of vim.o.timeoutlen
@ -231,68 +228,68 @@ require('lazy').setup({
-- If you are using a Nerd Font: set icons.keys to an empty table which will use the -- 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 -- default which-key.nvim defined Nerd Font icons, otherwise define a string table
keys = vim.g.have_nerd_font and {} or { keys = vim.g.have_nerd_font and {} or {
Up = '<Up> ', Up = "<Up> ",
Down = '<Down> ', Down = "<Down> ",
Left = '<Left> ', Left = "<Left> ",
Right = '<Right> ', Right = "<Right> ",
C = '<C-…> ', C = "<C-…> ",
M = '<M-…> ', M = "<M-…> ",
D = '<D-…> ', D = "<D-…> ",
S = '<S-…> ', S = "<S-…> ",
CR = '<CR> ', CR = "<CR> ",
Esc = '<Esc> ', Esc = "<Esc> ",
ScrollWheelDown = '<ScrollWheelDown> ', ScrollWheelDown = "<ScrollWheelDown> ",
ScrollWheelUp = '<ScrollWheelUp> ', ScrollWheelUp = "<ScrollWheelUp> ",
NL = '<NL> ', NL = "<NL> ",
BS = '<BS> ', BS = "<BS> ",
Space = '<Space> ', Space = "<Space> ",
Tab = '<Tab> ', Tab = "<Tab> ",
F1 = '<F1>', F1 = "<F1>",
F2 = '<F2>', F2 = "<F2>",
F3 = '<F3>', F3 = "<F3>",
F4 = '<F4>', F4 = "<F4>",
F5 = '<F5>', F5 = "<F5>",
F6 = '<F6>', F6 = "<F6>",
F7 = '<F7>', F7 = "<F7>",
F8 = '<F8>', F8 = "<F8>",
F9 = '<F9>', F9 = "<F9>",
F10 = '<F10>', F10 = "<F10>",
F11 = '<F11>', F11 = "<F11>",
F12 = '<F12>', F12 = "<F12>",
}, },
}, },
-- Document existing key chains -- Document existing key chains
spec = { spec = {
{ '<leader>s', group = '[S]earch' }, { "<leader>s", group = "[S]earch" },
{ '<leader>t', group = '[T]oggle' }, { "<leader>t", group = "[T]oggle" },
{ '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } }, { "<leader>h", group = "Git [H]unk", mode = { "n", "v" } },
}, },
}, },
}, },
{ -- Fuzzy Finder (files, lsp, etc) { -- Fuzzy Finder (files, lsp, etc)
'nvim-telescope/telescope.nvim', "nvim-telescope/telescope.nvim",
event = 'VimEnter', event = "VimEnter",
dependencies = { dependencies = {
'nvim-lua/plenary.nvim', "nvim-lua/plenary.nvim",
{ -- If encountering errors, see telescope-fzf-native README for installation instructions { -- If encountering errors, see telescope-fzf-native README for installation instructions
'nvim-telescope/telescope-fzf-native.nvim', "nvim-telescope/telescope-fzf-native.nvim",
-- `build` is used to run some command when the plugin is installed/updated. -- `build` is used to run some command when the plugin is installed/updated.
-- This is only run then, not every time Neovim starts up. -- This is only run then, not every time Neovim starts up.
build = 'make', build = "make",
-- `cond` is a condition used to determine whether this plugin should be -- `cond` is a condition used to determine whether this plugin should be
-- installed and loaded. -- installed and loaded.
cond = function() cond = function()
return vim.fn.executable 'make' == 1 return vim.fn.executable("make") == 1
end, end,
}, },
{ 'nvim-telescope/telescope-ui-select.nvim' }, { "nvim-telescope/telescope-ui-select.nvim" },
-- Useful for getting pretty icons, but requires a Nerd Font. -- 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 = vim.g.have_nerd_font },
}, },
config = function() config = function()
-- Telescope is a fuzzy finder that comes with a lot of different things that -- Telescope is a fuzzy finder that comes with a lot of different things that
@ -316,59 +313,59 @@ require('lazy').setup({
-- [[ Configure Telescope ]] -- [[ Configure Telescope ]]
-- See `:help telescope` and `:help telescope.setup()` -- See `:help telescope` and `:help telescope.setup()`
local overrides = opt_require 'local.overrides' or {} local overrides = opt_require("local.overrides") or {}
local opts = { local opts = {
extensions = { extensions = {
['ui-select'] = { ["ui-select"] = {
require('telescope.themes').get_dropdown(), require("telescope.themes").get_dropdown(),
}, },
}, },
} }
opts = vim.tbl_deep_extend('force', {}, opts, (overrides.telescope or {}).opts or {}) opts = vim.tbl_deep_extend("force", {}, opts, (overrides.telescope or {}).opts or {})
require('telescope').setup(opts) require("telescope").setup(opts)
-- Enable Telescope extensions if they are installed -- Enable Telescope extensions if they are installed
pcall(require('telescope').load_extension, 'fzf') pcall(require("telescope").load_extension, "fzf")
pcall(require('telescope').load_extension, 'ui-select') pcall(require("telescope").load_extension, "ui-select")
-- See `:help telescope.builtin` -- See `:help telescope.builtin`
local builtin = require 'telescope.builtin' local builtin = require("telescope.builtin")
vim.keymap.set('n', '<leader>sh', function() vim.keymap.set("n", "<leader>sh", function()
builtin.find_files { hidden = true } builtin.find_files({ hidden = true })
end, { desc = '[S]earch [H]idden Files' }) end, { desc = "[S]earch [H]idden Files" })
vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) vim.keymap.set("n", "<leader>sk", builtin.keymaps, { desc = "[S]earch [K]eymaps" })
vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' }) vim.keymap.set("n", "<leader>sf", builtin.find_files, { desc = "[S]earch [F]iles" })
vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) vim.keymap.set("n", "<leader>ss", builtin.builtin, { desc = "[S]earch [S]elect Telescope" })
vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) vim.keymap.set("n", "<leader>sw", builtin.grep_string, { desc = "[S]earch current [W]ord" })
vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) vim.keymap.set("n", "<leader>sg", builtin.live_grep, { desc = "[S]earch by [G]rep" })
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) vim.keymap.set("n", "<leader>sd", builtin.diagnostics, { desc = "[S]earch [D]iagnostics" })
vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' }) vim.keymap.set("n", "<leader>sr", builtin.resume, { desc = "[S]earch [R]esume" })
vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) vim.keymap.set("n", "<leader>s.", builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' }) vim.keymap.set("n", "<leader><leader>", builtin.buffers, { desc = "[ ] Find existing buffers" })
-- Slightly advanced example of overriding default behavior and theme -- Slightly advanced example of overriding default behavior and theme
vim.keymap.set('n', '<leader>/', function() vim.keymap.set("n", "<leader>/", function()
-- You can pass additional configuration to Telescope to change the theme, layout, etc. -- You can pass additional configuration to Telescope to change the theme, layout, etc.
builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown({
winblend = 10, winblend = 10,
previewer = false, previewer = false,
}) }))
end, { desc = '[/] Fuzzily search in current buffer' }) end, { desc = "[/] Fuzzily search in current buffer" })
-- It's also possible to pass additional configuration options. -- It's also possible to pass additional configuration options.
-- See `:help telescope.builtin.live_grep()` for information about particular keys -- See `:help telescope.builtin.live_grep()` for information about particular keys
vim.keymap.set('n', '<leader>s/', function() vim.keymap.set("n", "<leader>s/", function()
builtin.live_grep { builtin.live_grep({
grep_open_files = true, grep_open_files = true,
prompt_title = 'Live Grep in Open Files', prompt_title = "Live Grep in Open Files",
} })
end, { desc = '[S]earch [/] in Open Files' }) end, { desc = "[S]earch [/] in Open Files" })
-- Shortcut for searching your Neovim configuration files -- Shortcut for searching your Neovim configuration files
vim.keymap.set('n', '<leader>sn', function() vim.keymap.set("n", "<leader>sn", function()
builtin.find_files { cwd = vim.fn.stdpath 'config', hidden = true, no_ignore = true } builtin.find_files({ cwd = vim.fn.stdpath("config"), hidden = true, no_ignore = true })
end, { desc = '[S]earch [N]eovim files' }) end, { desc = "[S]earch [N]eovim files" })
end, end,
}, },
@ -376,74 +373,74 @@ require('lazy').setup({
{ {
-- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
-- used for completion, annotations and signatures of Neovim apis -- used for completion, annotations and signatures of Neovim apis
'folke/lazydev.nvim', "folke/lazydev.nvim",
ft = 'lua', ft = "lua",
opts = { opts = {
library = { library = {
-- Load luvit types when the `vim.uv` word is found -- Load luvit types when the `vim.uv` word is found
{ path = '${3rd}/luv/library', words = { 'vim%.uv' } }, { path = "${3rd}/luv/library", words = { "vim%.uv" } },
}, },
}, },
}, },
{ {
-- Main LSP Configuration -- Main LSP Configuration
'neovim/nvim-lspconfig', "neovim/nvim-lspconfig",
dependencies = { dependencies = {
-- Automatically install LSPs and related tools to stdpath for Neovim -- 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. -- Mason must be loaded before its dependents so we need to set it up here.
{ 'mason-org/mason.nvim', opts = {} }, { "mason-org/mason.nvim", opts = {} },
-- Useful status updates for LSP. -- Useful status updates for LSP.
{ 'j-hui/fidget.nvim', opts = {} }, { "j-hui/fidget.nvim", opts = {} },
-- Allows extra capabilities provided by blink.cmp -- Allows extra capabilities provided by blink.cmp
'saghen/blink.cmp', "saghen/blink.cmp",
}, },
config = function() config = function()
vim.api.nvim_create_autocmd('LspAttach', { vim.api.nvim_create_autocmd("LspAttach", {
group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }),
callback = function(event) callback = function(event)
local map = function(keys, func, desc, mode) local map = function(keys, func, desc, mode)
mode = mode or 'n' mode = mode or "n"
vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = "LSP: " .. desc })
end end
-- Rename the variable under your cursor. -- Rename the variable under your cursor.
-- Most Language Servers support renaming across files, etc. -- Most Language Servers support renaming across files, etc.
map('gn', vim.lsp.buf.rename, '[R]e[n]ame') map("gn", vim.lsp.buf.rename, "[R]e[n]ame")
-- Execute a code action, usually your cursor needs to be on top of an error -- 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. -- or a suggestion from your LSP for this to activate.
map('ga', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) map("ga", vim.lsp.buf.code_action, "[G]oto Code [A]ction", { "n", "x" })
-- Find references for the word under your cursor. -- Find references for the word under your cursor.
map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') map("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
-- Jump to the implementation of the word under your cursor. -- Jump to the implementation of the word under your cursor.
-- Useful when your language has ways of declaring types without an actual implementation. -- Useful when your language has ways of declaring types without an actual implementation.
map('gi', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') map("gi", require("telescope.builtin").lsp_implementations, "[G]oto [I]mplementation")
-- Jump to the definition of the word under your cursor. -- 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. -- This is where a variable was first declared, or where a function is defined, etc.
-- To jump back, press <C-t>. -- To jump back, press <C-t>.
map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') map("gd", require("telescope.builtin").lsp_definitions, "[G]oto [D]efinition")
-- This is not Goto Definition, this is Goto Declaration. -- This is not Goto Definition, this is Goto Declaration.
-- For example, in C this would take you to the header. -- For example, in C this would take you to the header.
map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') map("gD", vim.lsp.buf.declaration, "[G]oto [D]eclaration")
-- Fuzzy find all the symbols in your current document. -- Fuzzy find all the symbols in your current document.
-- Symbols are things like variables, functions, types, etc. -- Symbols are things like variables, functions, types, etc.
map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols') map("gO", require("telescope.builtin").lsp_document_symbols, "Open Document Symbols")
-- Fuzzy find all the symbols in your current workspace. -- Fuzzy find all the symbols in your current workspace.
-- Similar to document symbols, except searches over your entire project. -- Similar to document symbols, except searches over your entire project.
map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols') map("gW", require("telescope.builtin").lsp_dynamic_workspace_symbols, "Open Workspace Symbols")
-- Jump to the type of the word under your cursor. -- 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 -- 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*. -- the definition of its *type*, not where it was *defined*.
map('gt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition') map("gt", 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) -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10)
---@param client vim.lsp.Client ---@param client vim.lsp.Client
@ -451,7 +448,7 @@ require('lazy').setup({
---@param bufnr? integer some lsp support methods only in specific files ---@param bufnr? integer some lsp support methods only in specific files
---@return boolean ---@return boolean
local function client_supports_method(client, method, bufnr) local function client_supports_method(client, method, bufnr)
if vim.fn.has 'nvim-0.11' == 1 then if vim.fn.has("nvim-0.11") == 1 then
return client:supports_method(method, bufnr) return client:supports_method(method, bufnr)
else else
return client.supports_method(method, { bufnr = bufnr }) return client.supports_method(method, { bufnr = bufnr })
@ -464,25 +461,33 @@ require('lazy').setup({
-- --
-- When you move your cursor, the highlights will be cleared (the second autocommand). -- 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) 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 if
local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) client
vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { 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, buffer = event.buf,
group = highlight_augroup, group = highlight_augroup,
callback = vim.lsp.buf.document_highlight, callback = vim.lsp.buf.document_highlight,
}) })
vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { vim.api.nvim_create_autocmd({ "CursorMoved", "CursorMovedI" }, {
buffer = event.buf, buffer = event.buf,
group = highlight_augroup, group = highlight_augroup,
callback = vim.lsp.buf.clear_references, callback = vim.lsp.buf.clear_references,
}) })
vim.api.nvim_create_autocmd('LspDetach', { vim.api.nvim_create_autocmd("LspDetach", {
group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), group = vim.api.nvim_create_augroup("kickstart-lsp-detach", { clear = true }),
callback = function(event2) callback = function(event2)
vim.lsp.buf.clear_references() vim.lsp.buf.clear_references()
vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } vim.api.nvim_clear_autocmds({ group = "kickstart-lsp-highlight", buffer = event2.buf })
end, end,
}) })
end end
@ -491,30 +496,33 @@ require('lazy').setup({
-- code, if the language server you are using supports them -- code, if the language server you are using supports them
-- --
-- This may be unwanted, since they displace some of your code -- 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 if
map('<leader>th', function() client
vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf)
end, '[T]oggle Inlay [H]ints') then
map("<leader>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
end, end,
}) })
-- Diagnostic Config -- Diagnostic Config
-- See :help vim.diagnostic.Opts -- See :help vim.diagnostic.Opts
vim.diagnostic.config { vim.diagnostic.config({
severity_sort = true, severity_sort = true,
float = { border = 'rounded', source = 'if_many' }, float = { border = "rounded", source = "if_many" },
underline = { severity = vim.diagnostic.severity.ERROR }, underline = { severity = vim.diagnostic.severity.ERROR },
signs = vim.g.have_nerd_font and { signs = vim.g.have_nerd_font and {
text = { text = {
[vim.diagnostic.severity.ERROR] = '󰅚 ', [vim.diagnostic.severity.ERROR] = "󰅚 ",
[vim.diagnostic.severity.WARN] = '󰀪 ', [vim.diagnostic.severity.WARN] = "󰀪 ",
[vim.diagnostic.severity.INFO] = '󰋽 ', [vim.diagnostic.severity.INFO] = "󰋽 ",
[vim.diagnostic.severity.HINT] = '󰌶 ', [vim.diagnostic.severity.HINT] = "󰌶 ",
}, },
} or {}, } or {},
virtual_text = { virtual_text = {
source = 'if_many', source = "if_many",
spacing = 2, spacing = 2,
format = function(diagnostic) format = function(diagnostic)
local diagnostic_message = { local diagnostic_message = {
@ -526,37 +534,38 @@ require('lazy').setup({
return diagnostic_message[diagnostic.severity] return diagnostic_message[diagnostic.severity]
end, end,
}, },
} })
-- LSP servers and clients are able to communicate to each other what features they support. -- 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. -- 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. -- 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. -- So, we create new capabilities with blink.cmp, and then broadcast that to the servers.
local capabilities = require('blink.cmp').get_lsp_capabilities() local capabilities = require("blink.cmp").get_lsp_capabilities()
-- Enable the following language servers -- Enable the following language servers
local servers = { local servers = {
pyright = {}, pyright = {},
rust_analyzer = { rust_analyzer = {
cmd = { 'rustup', 'run', 'stable', 'rust-analyzer' }, cmd = { "rustup", "run", "stable", "rust-analyzer" },
}, },
lua_ls = { lua_ls = {
settings = { settings = {
Lua = { Lua = {
completion = { completion = {
callSnippet = 'Replace', callSnippet = "Replace",
}, },
}, },
}, },
}, },
} }
local servers_overrides = (opt_require 'local.overrides' or {}).lsp local servers_overrides = (opt_require("local.overrides") or {}).lsp
servers = vim.tbl_deep_extend('force', {}, servers, servers_overrides or {}) servers = vim.tbl_deep_extend("force", {}, servers, servers_overrides or {})
-- Set up and enable servers. -- Set up and enable servers.
for server_name, server_config in pairs(servers) do for server_name, server_config in pairs(servers) do
server_config.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server_config.capabilities or {}) server_config.capabilities =
vim.tbl_deep_extend("force", {}, capabilities, server_config.capabilities or {})
vim.lsp.config(server_name, server_config) vim.lsp.config(server_name, server_config)
vim.lsp.enable(server_name) vim.lsp.enable(server_name)
end end
@ -564,17 +573,17 @@ require('lazy').setup({
}, },
{ -- Autoformat { -- Autoformat
'stevearc/conform.nvim', "stevearc/conform.nvim",
event = { 'BufWritePre' }, event = { "BufWritePre" },
cmd = { 'ConformInfo' }, cmd = { "ConformInfo" },
keys = { keys = {
{ {
'<leader>f', "<leader>f",
function() function()
require('conform').format { async = true, lsp_format = 'fallback' } require("conform").format({ async = true, lsp_format = "fallback" })
end, end,
mode = '', mode = "",
desc = '[F]ormat buffer', desc = "[F]ormat buffer",
}, },
}, },
opts = { opts = {
@ -589,13 +598,13 @@ require('lazy').setup({
else else
return { return {
timeout_ms = 500, timeout_ms = 500,
lsp_format = 'fallback', lsp_format = "fallback",
} }
end end
end, end,
formatters_by_ft = { formatters_by_ft = {
lua = { 'stylua' }, lua = { "stylua" },
rust = { 'rustfmt' }, rust = { "rustfmt" },
-- Conform can also run multiple formatters sequentially -- Conform can also run multiple formatters sequentially
-- python = { "isort", "black" }, -- python = { "isort", "black" },
-- --
@ -606,22 +615,22 @@ require('lazy').setup({
}, },
{ -- Autocompletion { -- Autocompletion
'saghen/blink.cmp', "saghen/blink.cmp",
event = 'VimEnter', event = "VimEnter",
version = '1.*', version = "1.*",
dependencies = { dependencies = {
-- Snippet Engine -- Snippet Engine
{ {
'L3MON4D3/LuaSnip', "L3MON4D3/LuaSnip",
version = '2.*', version = "2.*",
build = (function() build = (function()
-- Build Step is needed for regex support in snippets. -- Build Step is needed for regex support in snippets.
-- This step is not supported in many windows environments. -- This step is not supported in many windows environments.
-- Remove the below condition to re-enable on windows. -- Remove the below condition to re-enable on windows.
if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then if vim.fn.has("win32") == 1 or vim.fn.executable("make") == 0 then
return return
end end
return 'make install_jsregexp' return "make install_jsregexp"
end)(), end)(),
dependencies = { dependencies = {
-- `friendly-snippets` contains a variety of premade snippets. -- `friendly-snippets` contains a variety of premade snippets.
@ -636,7 +645,7 @@ require('lazy').setup({
}, },
opts = {}, opts = {},
}, },
'folke/lazydev.nvim', "folke/lazydev.nvim",
}, },
--- @module 'blink.cmp' --- @module 'blink.cmp'
--- @type blink.cmp.Config --- @type blink.cmp.Config
@ -663,7 +672,7 @@ require('lazy').setup({
-- <c-k>: Toggle signature help -- <c-k>: Toggle signature help
-- --
-- See :h blink-cmp-config-keymap for defining your own keymap -- See :h blink-cmp-config-keymap for defining your own keymap
preset = 'default', preset = "default",
-- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
-- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
@ -672,7 +681,7 @@ require('lazy').setup({
appearance = { appearance = {
-- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font' -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
-- Adjusts spacing to ensure icons are aligned -- Adjusts spacing to ensure icons are aligned
nerd_font_variant = 'mono', nerd_font_variant = "mono",
}, },
completion = { completion = {
@ -682,13 +691,13 @@ require('lazy').setup({
}, },
sources = { sources = {
default = { 'lsp', 'path', 'snippets', 'lazydev' }, default = { "lsp", "path", "snippets", "lazydev" },
providers = { providers = {
lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, lazydev = { module = "lazydev.integrations.blink", score_offset = 100 },
}, },
}, },
snippets = { preset = 'luasnip' }, snippets = { preset = "luasnip" },
-- Blink.cmp includes an optional, recommended rust fuzzy matcher, -- Blink.cmp includes an optional, recommended rust fuzzy matcher,
-- which automatically downloads a prebuilt binary when enabled. -- which automatically downloads a prebuilt binary when enabled.
@ -697,37 +706,37 @@ require('lazy').setup({
-- the rust implementation via `'prefer_rust_with_warning'` -- the rust implementation via `'prefer_rust_with_warning'`
-- --
-- See :h blink-cmp-config-fuzzy for more information -- See :h blink-cmp-config-fuzzy for more information
fuzzy = { implementation = 'prefer_rust_with_warning' }, fuzzy = { implementation = "prefer_rust_with_warning" },
-- Shows a signature help window while you type arguments for a function -- Shows a signature help window while you type arguments for a function
signature = { enabled = true }, signature = { enabled = true },
}, },
}, },
{ {
'catppuccin/nvim', "catppuccin/nvim",
name = 'catppuccin', name = "catppuccin",
priority = 1000, priority = 1000,
config = function() config = function()
require('catppuccin').setup { require("catppuccin").setup({
float = { float = {
transparent = false, transparent = false,
solid = false, solid = false,
}, },
auto_integrations = true, auto_integrations = true,
} })
vim.cmd.colorscheme 'catppuccin-mocha' vim.cmd.colorscheme("catppuccin-mocha")
end, end,
}, },
-- Highlight todo, notes, etc in comments -- Highlight todo, notes, etc in comments
{ {
'folke/todo-comments.nvim', "folke/todo-comments.nvim",
event = 'VimEnter', event = "VimEnter",
dependencies = { 'nvim-lua/plenary.nvim' }, dependencies = { "nvim-lua/plenary.nvim" },
opts = { signs = false }, opts = { signs = false },
}, },
{ -- Collection of various small independent plugins/modules { -- Collection of various small independent plugins/modules
'echasnovski/mini.nvim', "echasnovski/mini.nvim",
config = function() config = function()
-- Better Around/Inside textobjects -- Better Around/Inside textobjects
-- --
@ -735,28 +744,28 @@ require('lazy').setup({
-- - va) - [V]isually select [A]round [)]paren -- - va) - [V]isually select [A]round [)]paren
-- - yinq - [Y]ank [I]nside [N]ext [Q]uote -- - yinq - [Y]ank [I]nside [N]ext [Q]uote
-- - ci' - [C]hange [I]nside [']quote -- - ci' - [C]hange [I]nside [']quote
require('mini.ai').setup { n_lines = 500 } require("mini.ai").setup({ n_lines = 500 })
-- Add/delete/replace surroundings (brackets, quotes, etc.) -- Add/delete/replace surroundings (brackets, quotes, etc.)
-- --
-- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
-- - sd' - [S]urround [D]elete [']quotes -- - sd' - [S]urround [D]elete [']quotes
-- - sr)' - [S]urround [R]eplace [)] ['] -- - sr)' - [S]urround [R]eplace [)] [']
require('mini.surround').setup() require("mini.surround").setup()
-- Simple and easy statusline. -- Simple and easy statusline.
-- You could remove this setup call if you don't like it, -- You could remove this setup call if you don't like it,
-- and try some other statusline plugin -- and try some other statusline plugin
local statusline = require 'mini.statusline' local statusline = require("mini.statusline")
-- set use_icons to true if you have a Nerd Font -- set use_icons to true if you have a Nerd Font
statusline.setup { use_icons = vim.g.have_nerd_font } statusline.setup({ use_icons = vim.g.have_nerd_font })
-- You can configure sections in the statusline by overriding their -- You can configure sections in the statusline by overriding their
-- default behavior. For example, here we set the section for -- default behavior. For example, here we set the section for
-- cursor location to LINE:COLUMN -- cursor location to LINE:COLUMN
---@diagnostic disable-next-line: duplicate-set-field ---@diagnostic disable-next-line: duplicate-set-field
statusline.section_location = function() statusline.section_location = function()
return '%2l:%-2v' return "%2l:%-2v"
end end
-- ... and there is more! -- ... and there is more!
@ -764,8 +773,8 @@ require('lazy').setup({
end, end,
}, },
{ -- Highlight, edit, and navigate code { -- Highlight, edit, and navigate code
'nvim-treesitter/nvim-treesitter', "nvim-treesitter/nvim-treesitter",
build = ':TSUpdate', build = ":TSUpdate",
lazy = false, lazy = false,
-- There are additional nvim-treesitter modules that you can use to interact -- 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: -- with nvim-treesitter. You should go explore a few and see what interests you:
@ -775,7 +784,7 @@ require('lazy').setup({
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
config = function() config = function()
-- Auto start treesitter if a parser is available. -- Auto start treesitter if a parser is available.
vim.api.nvim_create_autocmd('FileType', { vim.api.nvim_create_autocmd("FileType", {
callback = function(args) callback = function(args)
local ft = vim.bo[args.buf].filetype local ft = vim.bo[args.buf].filetype
-- TODO: add a file type to lang mapper here -- TODO: add a file type to lang mapper here
@ -790,16 +799,16 @@ require('lazy').setup({
end, end,
}, },
require 'kickstart.plugins.neo-tree', require("kickstart.plugins.neo-tree"),
require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps require("kickstart.plugins.gitsigns"), -- adds gitsigns recommend keymaps
require 'kickstart.plugins.autopairs', require("kickstart.plugins.autopairs"),
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` -- 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. -- 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. -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
{ import = 'custom.plugins' }, { import = "custom.plugins" },
{ import = 'local.plugins' }, { import = "local.plugins" },
-- --
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
-- Or use telescope! -- Or use telescope!
@ -810,24 +819,24 @@ require('lazy').setup({
-- If you are using a Nerd Font: set icons to an empty table which will use the -- 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 -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table
icons = vim.g.have_nerd_font and {} or { icons = vim.g.have_nerd_font and {} or {
cmd = '', cmd = "",
config = '🛠', config = "🛠",
event = '📅', event = "📅",
ft = '📂', ft = "📂",
init = '', init = "",
keys = '🗝', keys = "🗝",
plugin = '🔌', plugin = "🔌",
runtime = '💻', runtime = "💻",
require = '🌙', require = "🌙",
source = '📄', source = "📄",
start = '🚀', start = "🚀",
task = '📌', task = "📌",
lazy = '💤 ', lazy = "💤 ",
}, },
}, },
}) })
pcall(require, 'local.posthook') pcall(require, "local.posthook")
-- The line beneath this is called `modeline`. See `:help modeline` -- The line beneath this is called `modeline`. See `:help modeline`
-- vim: ts=2 sts=2 sw=2 et -- vim: ts=2 sts=2 sw=2 et