Bunch of stuff

This commit is contained in:
Adam Beck 2025-06-01 14:46:10 -04:00
parent 706c7ed878
commit e84a9283e7
2 changed files with 61 additions and 10 deletions

View File

@ -428,10 +428,10 @@ require('lazy').setup({
local builtin = require 'telescope.builtin' local builtin = require 'telescope.builtin'
vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' })
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)' })
@ -690,7 +690,17 @@ require('lazy').setup({
-- --
-- But for many setups, the LSP (`ts_ls`) will work just fine -- But for many setups, the LSP (`ts_ls`) will work just fine
-- ts_ls = {}, -- ts_ls = {},
-- -- vtsls = {
-- settings = {
-- typescript = {
-- preferences = {
-- includeCompletionsForModuleExports = true,
-- includeCompletionsForImportStatements = true,
-- importModuleSpecifier = 'non-relative',
-- },
-- },
-- },
-- },
lua_ls = { lua_ls = {
-- cmd = { ... }, -- cmd = { ... },
@ -863,11 +873,22 @@ require('lazy').setup({
completion = { completion = {
-- By default, you may press `<c-space>` to show the documentation. -- By default, you may press `<c-space>` to show the documentation.
-- Optionally, set `auto_show = true` to show the documentation after a delay. -- Optionally, set `auto_show = true` to show the documentation after a delay.
documentation = { auto_show = false, auto_show_delay_ms = 500 }, documentation = { auto_show = true, auto_show_delay_ms = 500 },
accept = {
auto_brackets = {
kind_resolution = {
blocked_filetypes = { 'typescriptreact', 'javascriptreact', 'vue', 'astro' },
},
semantic_token_resolution = {
blocked_filetypes = { 'java', 'astro' },
},
},
},
}, },
sources = { sources = {
default = { 'lsp', 'path', 'snippets', 'lazydev' }, default = { 'lsp', 'path', 'snippets', 'lazydev' },
path_only = { 'path ' },
providers = { providers = {
lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
}, },
@ -885,7 +906,7 @@ require('lazy').setup({
fuzzy = { implementation = 'lua' }, fuzzy = { implementation = 'lua' },
-- 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, window = { show_documentation = true } },
}, },
}, },
@ -930,7 +951,20 @@ require('lazy').setup({
-- - 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 {
custom_surroundings = {
T = {
input = { '<(%w+)[^<>]->.-</%1>', '^<()%w+().*</()%w+()>$' },
output = function()
local tag_name = MiniSurround.user_input 'Tag name'
if tag_name == nil then
return nil
end
return { left = tag_name, right = tag_name }
end,
},
},
}
-- 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,
@ -991,9 +1025,9 @@ require('lazy').setup({
-- Uncomment any of the lines below to enable them (you will need to restart nvim). -- Uncomment any of the lines below to enable them (you will need to restart nvim).
-- --
-- require 'kickstart.plugins.debug', -- require 'kickstart.plugins.debug',
-- require 'kickstart.plugins.indent_line', require 'kickstart.plugins.indent_line',
-- require 'kickstart.plugins.lint', -- require 'kickstart.plugins.lint',
-- require 'kickstart.plugins.autopairs', require 'kickstart.plugins.autopairs',
-- 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

View File

@ -7,7 +7,21 @@ vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' })
vim.keymap.set('n', '<leader>cpd', ':Copilot disable<cr>', { silent = true, noremap = true }) -- Disable Copilot vim.keymap.set('n', '<leader>cpd', ':Copilot disable<cr>', { silent = true, noremap = true }) -- Disable Copilot
vim.keymap.set('n', '<leader>cpe', ':Copilot enable<cr>', { silent = true, noremap = true }) -- Enable Copilot vim.keymap.set('n', '<leader>cpe', ':Copilot enable<cr>', { silent = true, noremap = true }) -- Enable Copilot
vim.g.copilot_enabled = false
return { return {
{
'olrtg/nvim-emmet',
config = function()
vim.keymap.set({ 'n', 'v' }, '<leader>xe', require('nvim-emmet').wrap_with_abbreviation)
end,
},
-- {
-- 'nvimdev/indentmini.nvim',
-- config = function()
-- require('indentmini').setup()
-- end,
-- },
{ {
'ibhagwan/fzf-lua', 'ibhagwan/fzf-lua',
dependencies = { 'echasnovski/mini.icons' }, dependencies = { 'echasnovski/mini.icons' },
@ -140,7 +154,10 @@ return {
{ {
'ray-x/lsp_signature.nvim', 'ray-x/lsp_signature.nvim',
event = 'VeryLazy', event = 'VeryLazy',
opts = {}, enabled = false,
opts = {
toggle_key = '<C-k>', -- toggle signature help on and off
},
config = function(_, opts) config = function(_, opts)
require('lsp_signature').setup(opts) require('lsp_signature').setup(opts)
end, end,