mirror
/
kickstart.nvim
mirror of https://github.com/nvim-lua/kickstart.nvim.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix bug and add yank paths

This commit is contained in:
lsanto 2024-10-04 01:01:19 -04:00
parent 6d0940d346
commit a788ef0188
5 changed files with 286 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init.lua
View File

@ -325,6 +325,7 @@ require('lazy').setup({
{ '<leader>w', group = '[W]orkspace' }, { '<leader>w', group = '[W]orkspace' },
{ '<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' } },
{ '<leader>y', group = '[Y]ank' },
}, },
triggers = { triggers = {
{ '<leader>', mode = 'nixsotc' }, { '<leader>', mode = 'nixsotc' },

4
lua/custom/plugins/flash.lua
View File

@ -10,9 +10,9 @@ return {
}, },
}, },
} }
vim.keymap.set('n', 'f', '<cmd>lua require("flash").jump()<CR>', { noremap = true, desc = 'flash search' }) vim.keymap.set({'n', 'v', 'o'}, 'f', '<cmd>lua require("flash").jump()<CR>', { noremap = true, desc = 'flash search' })
vim.keymap.set( vim.keymap.set(
'n', {'n', 'v', 'o'},
'F', 'F',
'<cmd>lua require("flash").jump({search = { forward = false, wrap = false, multi_window = false }})<CR>', '<cmd>lua require("flash").jump({search = { forward = false, wrap = false, multi_window = false }})<CR>',
{ noremap = true, desc = 'flash search backwards' } { noremap = true, desc = 'flash search backwards' }

299
lua/custom/plugins/lspconfig.lua
View File

@ -1,135 +1,220 @@
return { return {
"neovim/nvim-lspconfig", -- Main LSP Configuration
event = { "BufReadPre", "BufNewFile" }, 'neovim/nvim-lspconfig',
dependencies = { dependencies = {
"hrsh7th/cmp-nvim-lsp", -- Automatically install LSPs and related tools to stdpath for Neovim
{ "antosha417/nvim-lsp-file-operations", config = true }, { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
'williamboman/mason-lspconfig.nvim',
'WhoIsSethDaniel/mason-tool-installer.nvim',
-- Useful status updates for LSP.
-- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
{ 'j-hui/fidget.nvim', opts = {} },
-- Allows extra capabilities provided by nvim-cmp
'hrsh7th/cmp-nvim-lsp',
}, },
config = function() config = function()
-- import lspconfig plugin -- Brief aside: **What is LSP?**
local lspconfig = require("lspconfig") --
-- 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`
-- import mason_lspconfig plugin -- This function gets run when an LSP attaches to a particular buffer.
local mason_lspconfig = require("mason-lspconfig") -- 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
-- import cmp-nvim-lsp plugin -- Jump to the definition of the word under your cursor.
local cmp_nvim_lsp = require("cmp_nvim_lsp") -- This is where a variable was first declared, or where a function is defined, etc.
-- To jump back, press <C-t>.
map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
local keymap = vim.keymap -- for conciseness -- Find references for the word under your cursor.
map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
vim.api.nvim_create_autocmd("LspAttach", { -- Jump to the implementation of the word under your cursor.
group = vim.api.nvim_create_augroup("UserLspConfig", {}), -- Useful when your language has ways of declaring types without an actual implementation.
callback = function(ev) map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
-- Buffer local mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local opts = { buffer = ev.buf, silent = true }
-- set keybinds -- Jump to the type of the word under your cursor.
opts.desc = "Show LSP references" -- Useful when you're not sure what type a variable is and you want to see
keymap.set("n", "gR", "<cmd>Telescope lsp_references<CR>", opts) -- show definition, references -- the definition of its *type*, not where it was *defined*.
map('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
opts.desc = "Go to declaration" -- Fuzzy find all the symbols in your current document.
keymap.set("n", "gD", vim.lsp.buf.declaration, opts) -- go to declaration -- Symbols are things like variables, functions, types, etc.
map('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
opts.desc = "Show LSP definitions" -- Fuzzy find all the symbols in your current workspace.
keymap.set("n", "gd", "<cmd>Telescope lsp_definitions<CR>", opts) -- show lsp definitions -- Similar to document symbols, except searches over your entire project.
map('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
opts.desc = "Show LSP implementations" -- Rename the variable under your cursor.
keymap.set("n", "gi", "<cmd>Telescope lsp_implementations<CR>", opts) -- show lsp implementations -- Most Language Servers support renaming across files, etc.
map('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
opts.desc = "Show LSP type definitions" -- Execute a code action, usually your cursor needs to be on top of an error
keymap.set("n", "gt", "<cmd>Telescope lsp_type_definitions<CR>", opts) -- show lsp type definitions -- or a suggestion from your LSP for this to activate.
map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' })
opts.desc = "See available code actions" -- WARN: This is not Goto Definition, this is Goto Declaration.
keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection -- For example, in C this would take you to the header.
map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
opts.desc = "Smart rename" -- The following two autocommands are used to highlight references of the
keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts) -- smart rename -- 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(vim.lsp.protocol.Methods.textDocument_documentHighlight) 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,
})
opts.desc = "Show buffer diagnostics" vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
keymap.set("n", "<leader>D", "<cmd>Telescope diagnostics bufnr=0<CR>", opts) -- show diagnostics for file buffer = event.buf,
group = highlight_augroup,
callback = vim.lsp.buf.clear_references,
})
opts.desc = "Show line diagnostics" vim.api.nvim_create_autocmd('LspDetach', {
keymap.set("n", "<leader>d", vim.diagnostic.open_float, opts) -- show diagnostics for line 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
opts.desc = "Go to previous diagnostic" -- The following code creates a keymap to toggle inlay hints in your
keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer -- code, if the language server you are using supports them
--
opts.desc = "Go to next diagnostic" -- This may be unwanted, since they displace some of your code
keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
map('<leader>th', function()
opts.desc = "Show documentation for what is under cursor" vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor end, '[T]oggle Inlay [H]ints')
end
opts.desc = "Restart LSP"
keymap.set("n", "<leader>rs", ":LspRestart<CR>", opts) -- mapping to restart lsp if necessary
end, end,
}) })
-- used to enable autocompletion (assign to every lsp server config) -- LSP servers and clients are able to communicate to each other what features they support.
local capabilities = cmp_nvim_lsp.default_capabilities() -- By default, Neovim doesn't support everything that is in the LSP specification.
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
-- So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
-- Change the Diagnostic symbols in the sign column (gutter) -- Enable the following language servers
-- (not in youtube nvim video) -- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
local signs = { Error = "", Warn = "", Hint = "󰠠 ", Info = "" } --
for type, icon in pairs(signs) do -- Add any additional override configuration in the following tables. Available keys are:
local hl = "DiagnosticSign" .. type -- - cmd (table): Override the default command used to start the server
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) -- - filetypes (table): Override the default list of associated filetypes for the server
end -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
-- - settings (table): Override the default settings passed when initializing the server.
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
local servers = {
-- clangd = {},
-- gopls = {},
-- pyright = {},
-- rust_analyzer = {},
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
--
-- Some languages (like typescript) have entire language plugins that can be useful:
-- https://github.com/pmizio/typescript-tools.nvim
--
-- But for many setups, the LSP (`ts_ls`) will work just fine
ts_ls = {},
--
html = { filetypes = { 'html', 'twig', 'hbs' } },
cssls = {},
tailwindcss = {},
dockerls = {},
sqlls = {},
jsonls = {},
yamlls = {},
mason_lspconfig.setup_handlers({ lua_ls = {
-- default handler for installed servers -- cmd = {...},
function(server_name) -- filetypes = { ...},
lspconfig[server_name].setup({ -- capabilities = {},
capabilities = capabilities, settings = {
}) Lua = {
end, completion = {
["svelte"] = function() callSnippet = 'Replace',
-- configure svelte server
lspconfig["svelte"].setup({
capabilities = capabilities,
on_attach = function(client, bufnr)
vim.api.nvim_create_autocmd("BufWritePost", {
pattern = { "*.js", "*.ts" },
callback = function(ctx)
-- Here use ctx.match instead of ctx.file
client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match })
end,
})
end,
})
end,
["graphql"] = function()
-- configure graphql language server
lspconfig["graphql"].setup({
capabilities = capabilities,
filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" },
})
end,
["emmet_ls"] = function()
-- configure emmet language server
lspconfig["emmet_ls"].setup({
capabilities = capabilities,
filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "svelte" },
})
end,
["lua_ls"] = function()
-- configure lua server (with special settings)
lspconfig["lua_ls"].setup({
capabilities = capabilities,
settings = {
Lua = {
-- make the language server recognize "vim" global
diagnostics = {
globals = { "vim" },
},
completion = {
callSnippet = "Replace",
},
}, },
-- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-- diagnostics = { disable = { 'missing-fields' } },
}, },
}) },
end, },
}
-- 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.
require('mason').setup()
-- 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 {
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, end,
} }

178
lua/custom/plugins/treesitter.lua
View File

@ -1,94 +1,92 @@
return {{ return {
"nvim-treesitter/nvim-treesitter", {
event = { "BufReadPre", "BufNewFile" }, 'nvim-treesitter/nvim-treesitter',
build = ":TSUpdate", event = { 'BufReadPre', 'BufNewFile' },
dependencies = { build = ':TSUpdate',
"windwp/nvim-ts-autotag", dependencies = {
}, 'windwp/nvim-ts-autotag',
config = function() },
-- import nvim-treesitter plugin config = function()
local treesitter = require("nvim-treesitter.configs") -- import nvim-treesitter plugin
local treesitter = require 'nvim-treesitter.configs'
-- configure treesitter -- configure treesitter
treesitter.setup({ -- enable syntax highlighting treesitter.setup { -- enable syntax highlighting
highlight = { modules = {},
enable = true, ignore_install = {},
}, sync_install = false,
-- enable indentation auto_install = true,
indent = { enable = true }, highlight = {
-- enable autotagging (w/ nvim-ts-autotag plugin)
autotag = {
enable = true,
},
-- ensure these language parsers are installed
ensure_installed = {
"json",
"javascript",
"typescript",
"tsx",
"yaml",
"html",
"css",
"prisma",
"markdown",
"markdown_inline",
"graphql",
"bash",
"lua",
"vim",
"dockerfile",
"gitignore",
"query",
"vimdoc",
"c",
},
incremental_selection = {
enable = true,
keymaps = {
init_selection = "<C-space>",
node_incremental = "<C-space>",
scope_incremental = false,
node_decremental = "<bs>",
},
},
})
end,
},
{
"nvim-treesitter/nvim-treesitter-textobjects",
lazy = true,
dependencies = {
"nvim-treesitter/nvim-treesitter",
},
config = function()
require("nvim-treesitter.configs").setup({
textobjects = {
select = {
enable = true, enable = true,
-- Automatically jump forward to textobj, similar to targets.vim
lookahead = true,
keymaps = {
-- You can use the capture groups defined in textobjects.scm
["af"] = "@function.outer",
["if"] = "@function.inner",
["ac"] = "@class.outer",
-- You can optionally set descriptions to the mappings (used in the desc parameter of
-- nvim_buf_set_keymap) which plugins like which-key display
["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" },
-- You can also use captures from other query groups like `locals.scm`
["as"] = { query = "@scope", query_group = "locals", desc = "Select language scope" },
},
selection_modes = {
['@parameter.outer'] = 'v', -- charwise
['@function.outer'] = 'V', -- linewise
['@class.outer'] = '<c-v>', -- blockwise
},
include_surrounding_whitespace = true,
}, },
}, -- enable indentation
}) indent = { enable = true },
end, -- enable autotagging (w/ nvim-ts-autotag plugin)
} autotag = {
enable = true,
},
-- ensure these language parsers are installed
ensure_installed = {
'json',
'javascript',
'typescript',
'tsx',
'yaml',
'html',
'css',
'prisma',
'markdown',
'markdown_inline',
'graphql',
'bash',
'lua',
'vim',
'dockerfile',
'gitignore',
'query',
'vimdoc',
'c',
},
incremental_selection = {
enable = true,
keymaps = {
init_selection = '<C-space>',
node_incremental = '<C-space>',
scope_incremental = false,
node_decremental = '<bs>',
},
},
textobjects = {
select = {
enable = true,
-- Automatically jump forward to textobj, similar to targets.vim
lookahead = true,
keymaps = {
-- You can use the capture groups defined in textobjects.scm
['af'] = '@function.outer',
['if'] = '@function.inner',
['ac'] = '@class.outer',
-- You can optionally set descriptions to the mappings (used in the desc parameter of
-- nvim_buf_set_keymap) which plugins like which-key display
['ic'] = { query = '@class.inner', desc = 'Select inner part of a class region' },
-- You can also use captures from other query groups like `locals.scm`
['as'] = { query = '@scope', query_group = 'locals', desc = 'Select language scope' },
},
selection_modes = {
['@parameter.outer'] = 'v', -- charwise
['@function.outer'] = 'V', -- linewise
['@class.outer'] = '<c-v>', -- blockwise
},
include_surrounding_whitespace = true,
},
},
}
end,
},
{
'nvim-treesitter/nvim-treesitter-textobjects',
build = ':TSUpdate',
},
} }

3
lua/myconfigs.lua
View File

@ -44,6 +44,9 @@ vim.keymap.set('n', '<leader>w', '<cmd>:w<CR>', { noremap = true, desc = 'Save f
vim.keymap.set('i', '<C-k>', vim.lsp.buf.signature_help, { noremap = true, desc = 'Signature Help' }) vim.keymap.set('i', '<C-k>', vim.lsp.buf.signature_help, { noremap = true, desc = 'Signature Help' })
vim.keymap.set('n', '<leader>ff', vim.lsp.buf.format, { noremap = true, desc = 'LSP format' }) vim.keymap.set('n', '<leader>ff', vim.lsp.buf.format, { noremap = true, desc = 'LSP format' })
vim.api.nvim_set_keymap('n', '<leader>yr', ":let @+=expand('%:.%:t')<CR>", { noremap = true, silent = true, desc = 'Copy Relative Path' })
vim.api.nvim_set_keymap('n', '<leader>ya', ":let @+=expand('%:P%:t')<CR>", { noremap = true, silent = true, desc = 'Copy Absolute Path' })
vim.g.diagnostics_active = false vim.g.diagnostics_active = false
function _G.toggle_diagnostics() function _G.toggle_diagnostics()
if vim.g.diagnostics_active then if vim.g.diagnostics_active then