Wrote plugin to quickly format functions into multi-line params, added orgmode plugin, moved completion plugin into its own file, commented out lspconfig/mason dependencies and utilized nvim 0.12 builtin commands in plugin/lsp.lua to handle lsp. Added treesitter context for text blocks within functions, changed default color to tokyonight, added a few keybinds.

This commit is contained in:
tonybanters 2025-08-30 22:50:53 -07:00
commit ea35497903
11 changed files with 520 additions and 251 deletions

View file

@ -100,4 +100,18 @@ This document provides a simple and organized overview of all the custom keybind
---
Let me know if you want to modify or add descriptions for any specific keybinds!
# LSP servers:
I am migrating my lsp config to /lua/plugins/lsp.lua because nvim v0.11 allows a very minimal debloated way to setup language server protocols.
Below is a running list of what and how to install the lsp's that are going to be configured in this build. I will avoid mason for now because I think its better to have full control over your system, and not outsource it to mason. Just uncommonet `return {` in /plugins/lsp.lua from the original lspconfig if you want to go that route.
1. { lua-language-server }
- refer to distro ( pacman -Ss lua-language-server )
2. { css-language-server --studio, html-language-server }
- npm install -g vscode-langservers-extracted
3. { intelephense }
- npm install -g intelephense
4. { typescript-language-server }
- npm install -g typescript-language-server typescript

View file

@ -1,26 +1,27 @@
-- KEYBINDS
-- KEYBINDS
vim.g.mapleader = " "
vim.keymap.set("n", "<leader>cd", vim.cmd.Ex)
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv") -- Alt Up/Down in vscode
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
vim.keymap.set("n", "J", "mzJ`z") -- Remap joining lines
vim.keymap.set("n", "J", "mzJ`z") -- Remap joining lines
vim.keymap.set("n", "<C-d>", "<C-d>zz") -- Keep cursor in place while moving up/down page
vim.keymap.set("n", "<C-u>", "<C-u>zz")
vim.keymap.set("n", "n", "nzzzv") -- center screen when looping search results
vim.keymap.set("n", "n", "nzzzv") -- center screen when looping search results
vim.keymap.set("n", "N", "Nzzzv")
-- paste and don't replace clipboard over deleted text
vim.keymap.set("x", "<leader>p", [["_dP]])
vim.keymap.set({"n", "v"}, "<leader>d", [["_d]])
vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
-- sometimes in insert mode, control-c doesn't exactly work like escape
vim.keymap.set("i", "<C-c>", "<Esc>")
vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
-- add binds for Control J/K to scroll thru quickfix list
vim.keymap.set("n", "<C-j>", "<cmd>cnext<CR>zz")
vim.keymap.set("n", "<C-k>", "<cmd>cprev<CR>zz")
-- What the heck is Ex mode?
vim.keymap.set("n", "Q", "<nop>")
@ -49,6 +50,13 @@ vim.keymap.set("n", "<leader>rl", "<cmd>source ~/.config/nvim/init.lua<cr>")
vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
-- Quickfix list stuff
vim.keymap.set("n", "<leader>cl", ":cclose<CR>", { silent = true })
vim.keymap.set("n", "<leader>co", ":copen<CR>", { silent = true })
vim.keymap.set("n", "<leader>cn", ":cnext<CR>zz")
vim.keymap.set("n", "<leader>cp", ":cprev<CR>zz")
vim.keymap.set("n", "<leader>li", ":checkhealth vim.lsp<CR>", { desc = "LSP Info" })
-- source file
vim.keymap.set("n", "<leader><leader>", function()
vim.cmd("so")

View file

@ -0,0 +1 @@
return {}

View file

@ -5,23 +5,23 @@ local function enable_transparency()
end
return {
-- {
-- "folke/tokyonight.nvim",
-- config = function()
-- vim.cmd.colorscheme "tokyonight"
-- vim.cmd('hi Directory guibg=NONE')
-- vim.cmd('hi SignColumn guibg=NONE')
-- enable_transparency()
-- end
-- },
{
"Mofiqul/vscode.nvim",
name = 'vscode',
"folke/tokyonight.nvim",
config = function()
vim.cmd.colorscheme "vscode"
vim.cmd.colorscheme "tokyonight"
vim.cmd('hi Directory guibg=NONE')
vim.cmd('hi SignColumn guibg=NONE')
enable_transparency()
end
}
},
-- {
-- "Mofiqul/vscode.nvim",
-- name = 'vscode',
-- config = function()
-- vim.cmd.colorscheme "vscode"
-- vim.cmd('hi Directory guibg=NONE')
-- vim.cmd('hi SignColumn guibg=NONE')
-- enable_transparency()
-- end
-- }
}

View file

@ -0,0 +1,40 @@
return {
{
"hrsh7th/nvim-cmp",
event = "InsertEnter",
dependencies = {
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-path",
"hrsh7th/cmp-buffer",
},
config = function()
local cmp = require("cmp")
cmp.setup({
preselect = cmp.PreselectMode.Item, -- <— preselect first item
completion = { completeopt = "menu,menuone,noinsert" },
window = { documentation = cmp.config.window.bordered() },
mapping = cmp.mapping.preset.insert({
["<CR>"] = cmp.mapping.confirm({ select = false }),
["<C-e>"] = cmp.mapping.abort(),
["<C-Space>"] = cmp.mapping.complete(), -- manual trigger if you want it
["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Select }),
["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Select }),
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-u>"] = cmp.mapping.scroll_docs(-4),
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then cmp.select_next_item() else fallback() end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function()
if cmp.visible() then cmp.select_prev_item() end
end, { "i", "s" }),
}),
sources = {
{ name = "nvim_lsp" },
{ name = "path" },
{ name = "buffer", keyword_length = 3 },
},
})
end,
},
}

View file

@ -1,230 +1,228 @@
return {
'neovim/nvim-lspconfig',
dependencies = {
'williamboman/mason.nvim',
'williamboman/mason-lspconfig.nvim',
-- Autocompletion
'hrsh7th/nvim-cmp',
'hrsh7th/cmp-buffer',
'hrsh7th/cmp-path',
'saadparwaiz1/cmp_luasnip',
'hrsh7th/cmp-nvim-lsp',
'hrsh7th/cmp-nvim-lua',
-- Snippets
'L3MON4D3/LuaSnip',
'rafamadriz/friendly-snippets',
},
config = function()
local autoformat_filetypes = {
"lua",
}
-- Create a keymap for vim.lsp.buf.implementation
vim.api.nvim_create_autocmd('LspAttach', {
callback = function(args)
local client = vim.lsp.get_client_by_id(args.data.client_id)
if not client then return end
if vim.tbl_contains(autoformat_filetypes, vim.bo.filetype) then
vim.api.nvim_create_autocmd("BufWritePre", {
buffer = args.buf,
callback = function()
vim.lsp.buf.format({
formatting_options = { tabSize = 4, insertSpaces = true },
bufnr = args.buf,
id = client.id
})
end
})
end
end
})
-- Add borders to floating windows
vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
vim.lsp.handlers.hover,
{ border = 'rounded' }
)
vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
vim.lsp.handlers.signature_help,
{ border = 'rounded' }
)
-- Configure error/warnings interface
vim.diagnostic.config({
virtual_text = true,
severity_sort = true,
float = {
style = 'minimal',
border = 'rounded',
header = '',
prefix = '',
},
signs = {
text = {
[vim.diagnostic.severity.ERROR] = '✘',
[vim.diagnostic.severity.WARN] = '▲',
[vim.diagnostic.severity.HINT] = '⚑',
[vim.diagnostic.severity.INFO] = '»',
},
},
})
-- Add cmp_nvim_lsp capabilities settings to lspconfig
-- This should be executed before you configure any language server
local lspconfig_defaults = require('lspconfig').util.default_config
lspconfig_defaults.capabilities = vim.tbl_deep_extend(
'force',
lspconfig_defaults.capabilities,
require('cmp_nvim_lsp').default_capabilities()
)
-- This is where you enable features that only work
-- if there is a language server active in the file
vim.api.nvim_create_autocmd('LspAttach', {
callback = function(event)
local opts = { buffer = event.buf }
vim.keymap.set('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', opts)
vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>', opts)
vim.keymap.set('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', opts)
vim.keymap.set('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>', opts)
vim.keymap.set('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<cr>', opts)
vim.keymap.set('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>', opts)
vim.keymap.set('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts)
vim.keymap.set('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<cr>', opts)
vim.keymap.set('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>', opts)
vim.keymap.set({ 'n', 'x' }, '<F3>', '<cmd>lua vim.lsp.buf.format({async = true})<cr>', opts)
vim.keymap.set('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>', opts)
end,
})
require('mason').setup({})
require('mason-lspconfig').setup({
ensure_installed = {
"lua_ls",
"intelephense",
"ts_ls",
"eslint",
},
handlers = {
-- this first function is the "default handler"
-- it applies to every language server without a custom handler
function(server_name)
require('lspconfig')[server_name].setup({})
end,
-- this is the "custom handler" for `lua_ls`
lua_ls = function()
require('lspconfig').lua_ls.setup({
settings = {
Lua = {
runtime = {
version = 'LuaJIT',
},
diagnostics = {
globals = { 'vim' },
},
workspace = {
library = { vim.env.VIMRUNTIME },
},
},
},
})
end,
},
})
local cmp = require('cmp')
require('luasnip.loaders.from_vscode').lazy_load()
vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
cmp.setup({
preselect = 'item',
completion = {
completeopt = 'menu,menuone,noinsert'
},
window = {
documentation = cmp.config.window.bordered(),
},
sources = {
{ name = 'path' },
{ name = 'nvim_lsp' },
{ name = 'buffer', keyword_length = 3 },
{ name = 'luasnip', keyword_length = 2 },
},
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body)
end,
},
formatting = {
fields = { 'abbr', 'menu', 'kind' },
format = function(entry, item)
local n = entry.source.name
if n == 'nvim_lsp' then
item.menu = '[LSP]'
else
item.menu = string.format('[%s]', n)
end
return item
end,
},
mapping = cmp.mapping.preset.insert({
-- confirm completion item
['<CR>'] = cmp.mapping.confirm({ select = false }),
-- scroll documentation window
['<C-f>'] = cmp.mapping.scroll_docs(5),
['<C-u>'] = cmp.mapping.scroll_docs(-5),
-- toggle completion menu
['<C-e>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.abort()
else
cmp.complete()
end
end),
-- tab complete
['<Tab>'] = cmp.mapping(function(fallback)
local col = vim.fn.col('.') - 1
if cmp.visible() then
cmp.select_next_item({ behavior = 'select' })
elseif col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then
fallback()
else
cmp.complete()
end
end, { 'i', 's' }),
-- go to previous item
['<S-Tab>'] = cmp.mapping.select_prev_item({ behavior = 'select' }),
-- navigate to next snippet placeholder
['<C-d>'] = cmp.mapping(function(fallback)
local luasnip = require('luasnip')
if luasnip.jumpable(1) then
luasnip.jump(1)
else
fallback()
end
end, { 'i', 's' }),
-- navigate to the previous snippet placeholder
['<C-b>'] = cmp.mapping(function(fallback)
local luasnip = require('luasnip')
if luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { 'i', 's' }),
}),
})
end
}
return {}
-- return {
-- 'neovim/nvim-lspconfig',
-- dependencies = {
-- 'williamboman/mason.nvim',
-- 'williamboman/mason-lspconfig.nvim',
-- -- Autocompletion
-- 'hrsh7th/nvim-cmp',
-- 'hrsh7th/cmp-buffer',
-- 'hrsh7th/cmp-path',
-- 'saadparwaiz1/cmp_luasnip',
-- 'hrsh7th/cmp-nvim-lsp',
-- 'hrsh7th/cmp-nvim-lua',
-- -- Snippets
-- 'L3MON4D3/LuaSnip',
-- 'rafamadriz/friendly-snippets',
-- },
-- config = function()
-- local autoformat_filetypes = {
-- "lua",
-- }
-- -- Create a keymap for vim.lsp.buf.implementation
-- vim.api.nvim_create_autocmd('LspAttach', {
-- callback = function(args)
-- local client = vim.lsp.get_client_by_id(args.data.client_id)
-- if not client then return end
-- if vim.tbl_contains(autoformat_filetypes, vim.bo.filetype) then
-- vim.api.nvim_create_autocmd("BufWritePre", {
-- buffer = args.buf,
-- callback = function()
-- vim.lsp.buf.format({
-- formatting_options = { tabSize = 4, insertSpaces = true },
-- bufnr = args.buf,
-- id = client.id
-- })
-- end
-- })
-- end
-- end
-- })
--
-- -- Add borders to floating windows
-- vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
-- vim.lsp.handlers.hover,
-- { border = 'rounded' }
-- )
-- vim.lsp.handlers['textDocument/signatureHelp'] = vim.lsp.with(
-- vim.lsp.handlers.signature_help,
-- { border = 'rounded' }
-- )
--
-- -- Configure error/warnings interface
-- vim.diagnostic.config({
-- virtual_text = true,
-- severity_sort = true,
-- float = {
-- style = 'minimal',
-- border = 'rounded',
-- header = '',
-- prefix = '',
-- },
-- signs = {
-- text = {
-- [vim.diagnostic.severity.ERROR] = '✘',
-- [vim.diagnostic.severity.WARN] = '▲',
-- [vim.diagnostic.severity.HINT] = '⚑',
-- [vim.diagnostic.severity.INFO] = '»',
-- },
-- },
-- })
--
-- local lspconfig_defaults = require('lspconfig').util.default_config
-- lspconfig_defaults.capabilities = vim.tbl_deep_extend(
-- 'force',
-- lspconfig_defaults.capabilities,
-- require('cmp_nvim_lsp').default_capabilities()
-- )
--
-- -- This is where you enable features that only work
-- -- if there is a language server active in the file
-- vim.api.nvim_create_autocmd('LspAttach', {
-- callback = function(event)
-- local opts = { buffer = event.buf }
--
-- vim.keymap.set('n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', opts)
-- vim.keymap.set('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<cr>', opts)
-- vim.keymap.set('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', opts)
-- vim.keymap.set('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<cr>', opts)
-- vim.keymap.set('n', 'go', '<cmd>lua vim.lsp.buf.type_definition()<cr>', opts)
-- vim.keymap.set('n', 'gr', '<cmd>lua vim.lsp.buf.references()<cr>', opts)
-- vim.keymap.set('n', 'gs', '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts)
-- vim.keymap.set('n', 'gl', '<cmd>lua vim.diagnostic.open_float()<cr>', opts)
-- vim.keymap.set('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<cr>', opts)
-- vim.keymap.set({ 'n', 'x' }, '<F3>', '<cmd>lua vim.lsp.buf.format({async = true})<cr>', opts)
-- vim.keymap.set('n', '<F4>', '<cmd>lua vim.lsp.buf.code_action()<cr>', opts)
-- end,
-- })
--
-- require('mason').setup({})
-- require('mason-lspconfig').setup({
-- ensure_installed = {
-- "lua_ls",
-- "intelephense",
-- "ts_ls",
-- "eslint",
-- "pyright",
-- },
-- handlers = {
-- function(server_name)
-- if server_name == "luals" then return end -- avoid starting with {}
-- require('lspconfig')[server_name].setup({})
-- end,
--
-- lua_ls = function()
-- require('lspconfig').luals.setup({
-- settings = {
-- Lua = {
-- runtime = {
-- version = 'LuaJIT',
-- },
-- diagnostics = {
-- globals = { 'vim' },
-- },
-- workspace = {
-- library = { vim.env.VIMRUNTIME },
-- },
-- },
-- },
-- })
-- end,
-- },
-- })
--
-- local cmp = require('cmp')
--
-- require('luasnip.loaders.from_vscode').lazy_load()
--
-- vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
--
-- cmp.setup({
-- preselect = 'item',
-- completion = {
-- completeopt = 'menu,menuone,noinsert'
-- },
-- window = {
-- documentation = cmp.config.window.bordered(),
-- },
-- sources = {
-- { name = 'path' },
-- { name = 'nvim_lsp' },
-- { name = 'buffer', keyword_length = 3 },
-- { name = 'luasnip', keyword_length = 2 },
-- },
-- snippet = {
-- expand = function(args)
-- require('luasnip').lsp_expand(args.body)
-- end,
-- },
-- formatting = {
-- fields = { 'abbr', 'menu', 'kind' },
-- format = function(entry, item)
-- local n = entry.source.name
-- if n == 'nvim_lsp' then
-- item.menu = '[LSP]'
-- else
-- item.menu = string.format('[%s]', n)
-- end
-- return item
-- end,
-- },
-- mapping = cmp.mapping.preset.insert({
-- -- confirm completion item
-- ['<CR>'] = cmp.mapping.confirm({ select = false }),
--
-- -- scroll documentation window
-- ['<C-f>'] = cmp.mapping.scroll_docs(5),
-- ['<C-u>'] = cmp.mapping.scroll_docs(-5),
--
-- -- toggle completion menu
-- ['<C-e>'] = cmp.mapping(function(fallback)
-- if cmp.visible() then
-- cmp.abort()
-- else
-- cmp.complete()
-- end
-- end),
--
-- -- tab complete
-- ['<Tab>'] = cmp.mapping(function(fallback)
-- local col = vim.fn.col('.') - 1
--
-- if cmp.visible() then
-- cmp.select_next_item({ behavior = 'select' })
-- elseif col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') then
-- fallback()
-- else
-- cmp.complete()
-- end
-- end, { 'i', 's' }),
--
-- -- go to previous item
-- ['<S-Tab>'] = cmp.mapping.select_prev_item({ behavior = 'select' }),
--
-- -- navigate to next snippet placeholder
-- ['<C-d>'] = cmp.mapping(function(fallback)
-- local luasnip = require('luasnip')
--
-- if luasnip.jumpable(1) then
-- luasnip.jump(1)
-- else
-- fallback()
-- end
-- end, { 'i', 's' }),
--
-- -- navigate to the previous snippet placeholder
-- ['<C-b>'] = cmp.mapping(function(fallback)
-- local luasnip = require('luasnip')
--
-- if luasnip.jumpable(-1) then
-- luasnip.jump(-1)
-- else
-- fallback()
-- end
-- end, { 'i', 's' }),
-- }),
-- })
-- end
-- }

12
lua/plugins/orgmode.lua Normal file
View file

@ -0,0 +1,12 @@
return {
'nvim-orgmode/orgmode',
event = 'VeryLazy',
ft = { 'org' },
config = function()
-- Setup orgmode
require('orgmode').setup({
org_agenda_files = '~/orgfiles/**/*',
org_default_notes_file = '~/orgfiles/refile.org',
})
end,
}

View file

@ -19,7 +19,6 @@ return {
local builtin = require('telescope.builtin')
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
vim.keymap.set('n', '<leader>fg', builtin.git_files, {})
vim.keymap.set('n', '<leader>fo', builtin.oldfiles, {})
vim.keymap.set('n', '<leader>fq', builtin.quickfix, {})
vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })

View file

@ -2,9 +2,23 @@ return {
{
"nvim-treesitter/nvim-treesitter",
build = ":TSUpdate",
dependencies = {
"nvim-treesitter/nvim-treesitter-textobjects",
},
config = function()
local configs = require("nvim-treesitter.configs")
---@diagnostic disable-next-line: missing-fields
configs.setup({
textobjects = {
select = {
enable = true,
lookahead = true,
keymaps = {
["af"] = "@function.outer",
["if"] = "@function.inner",
},
},
},
-- enable syntax highlighting
highlight = {
enable = true,
@ -16,6 +30,7 @@ return {
-- ensure these language parsers are installed
ensure_installed = {
"json",
"python",
"javascript",
"query",
"typescript",

142
plugin/lsp.lua Normal file
View file

@ -0,0 +1,142 @@
vim.lsp.config('*', {
root_markers = { '.git' },
})
vim.diagnostic.config({
virtual_text = true,
severity_sort = true,
float = {
style = 'minimal',
border = 'rounded',
source = 'if_many',
header = '',
prefix = '',
},
signs = {
text = {
[vim.diagnostic.severity.ERROR] = '✘',
[vim.diagnostic.severity.WARN] = '▲',
[vim.diagnostic.severity.HINT] = '⚑',
[vim.diagnostic.severity.INFO] = '»',
},
},
})
-- put early in lsp.lua
local orig = vim.lsp.util.open_floating_preview
---@diagnostic disable-next-line: duplicate-set-field
function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
opts = opts or {}
opts.border = opts.border or 'rounded'
opts.max_width = opts.max_width or 80
opts.max_height = opts.max_height or 24
opts.wrap = opts.wrap ~= false
return orig(contents, syntax, opts, ...)
end
-- 4) Per-buffer behavior on LSP attach (keymaps, auto-format, completion)
-- See :help LspAttach for the recommended pattern
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('my.lsp', {}),
callback = function(args)
local client = assert(vim.lsp.get_client_by_id(args.data.client_id))
local buf = args.buf
local map = function(mode, lhs, rhs) vim.keymap.set(mode, lhs, rhs, { buffer = buf }) end
-- Keymaps (use builtin LSP buffer functions)
map('n', 'K', vim.lsp.buf.hover)
map('n', 'gd', vim.lsp.buf.definition)
map('n', 'gD', vim.lsp.buf.declaration)
map('n', 'gi', vim.lsp.buf.implementation)
map('n', 'go', vim.lsp.buf.type_definition)
map('n', 'gr', vim.lsp.buf.references)
map('n', 'gs', vim.lsp.buf.signature_help)
map('n', 'gl', vim.diagnostic.open_float)
map('n', '<F2>', vim.lsp.buf.rename)
map({ 'n', 'x' }, '<F3>', function() vim.lsp.buf.format({ async = true }) end)
map('n', '<F4>', vim.lsp.buf.code_action)
-- Put near your LSP on_attach
local excluded_filetypes = { php = true }
-- Auto-format on save (only if server can't do WillSaveWaitUntil)
if not client:supports_method('textDocument/willSaveWaitUntil')
and client:supports_method('textDocument/formatting')
and not excluded_filetypes[vim.bo[buf].filetype]
then
vim.api.nvim_create_autocmd('BufWritePre', {
group = vim.api.nvim_create_augroup('my.lsp.format', { clear = false }),
buffer = buf,
callback = function()
vim.lsp.buf.format({ bufnr = buf, id = client.id, timeout_ms = 1000 })
end,
})
end
end,
})
-- 5) Define the Lua language server config (no mason/lspconfig)
-- See :help lsp-new-config and :help vim.lsp.config()
local caps = require("cmp_nvim_lsp").default_capabilities()
vim.lsp.config['luals'] = {
cmd = { 'lua-language-server' },
filetypes = { 'lua' },
root_markers = { { '.luarc.json', '.luarc.jsonc' }, '.git' },
capabilities = caps,
settings = {
Lua = {
runtime = { version = 'LuaJIT' },
diagnostics = { globals = { 'vim' } },
workspace = {
checkThirdParty = false,
library = vim.api.nvim_get_runtime_file('', true),
},
telemetry = { enable = false },
},
},
}
vim.lsp.config['cssls'] = {
cmd = { 'vscode-css-language-server', '--stdio' },
filetypes = { 'css', 'scss', 'less' },
root_markers = { 'package.json', '.git' },
capabilities = caps,
settings = {
css = { validate = true },
scss = { validate = true },
less = { validate = true },
},
}
vim.lsp.config['phpls'] = {
cmd = { 'intelephense', '--stdio' },
filetypes = { 'php' },
root_markers = { 'composer.json', '.git' },
capabilities = caps,
settings = {
intelephense = {
files = {
maxSize = 5000000, -- default 5MB
},
},
},
}
vim.lsp.config['ts_ls'] = {
cmd = { 'typescript-language-server', '--stdio' },
filetypes = {
'javascript', 'javascriptreact', 'javascript.jsx',
'typescript', 'typescriptreact', 'typescript.tsx',
},
root_markers = { 'package.json', 'tsconfig.json', 'jsconfig.json', '.git' },
capabilities = caps,
settings = {
completions = {
completeFunctionCalls = true,
},
},
}
vim.lsp.enable('luals')
vim.lsp.enable('cssls')
vim.lsp.enable('ts_ls')
vim.lsp.enable('phpls')

40
plugin/quickformat.lua Normal file
View file

@ -0,0 +1,40 @@
local function reformat_parenthesized_content()
local bufnr = vim.api.nvim_get_current_buf()
local row = vim.api.nvim_win_get_cursor(0)[1]
local line = vim.api.nvim_buf_get_lines(bufnr, row - 1, row, false)[1]
local inside = line:match("%((.-)%)")
if not inside then
vim.notify(
"No content found inside parentheses",
vim.log.levels.ERROR
)
return
end
local prefix = line:match("^(.-)%(") or ""
local suffix = line:match("%)(.*)$") or ""
local parts = vim.split(inside, ",%s*")
if #parts == 0 then
vim.notify("No comma-separated content found", vim.log.levels.ERROR)
return
end
local new_lines = {}
table.insert(new_lines, prefix .. "(")
for i, part in ipairs(parts) do
if i < #parts then
table.insert(new_lines, " " .. part .. ",")
else
table.insert(new_lines, " " .. part)
end
end
table.insert(new_lines, " )" .. suffix)
vim.api.nvim_buf_set_lines(bufnr, row - 1, row, false, new_lines)
end
vim.keymap.set("n", "<leader>qq", function()
reformat_parenthesized_content()
end)