Skip to content

Commit 9c13b85

Browse files
committed
refactor(nvim): lspconfig migrate
1 parent 7f9b310 commit 9c13b85

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

AGENTS.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Agent Guidelines for Dotfiles Repository
22

3-
Be extremely concise. Sacrifice grammar for the sake of concision.
3+
Agent guidance for this repository.
4+
5+
> **Communication Style**: Be brief, concise. Maximize information density, minimize tokens. Incomplete sentences acceptable when clear. Remove filler words. Prioritize clarity over grammar.
46
57
## Build/Test Commands
68

nvim/lazy-lock.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2+
"amp.nvim": { "branch": "main", "commit": "3b9ad5ef0328de1b35cc9bfa723a37db5daf9434" },
23
"blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
3-
"conform.nvim": { "branch": "master", "commit": "ffe26e8df8115c9665d24231f8a49fadb2d611ce" },
4+
"conform.nvim": { "branch": "master", "commit": "9b8fa5e0b78168f68bee9bf886dc20f287c61e02" },
45
"flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
56
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
67
"gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
@@ -11,16 +12,16 @@
1112
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
1213
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
1314
"mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" },
14-
"mini.pairs": { "branch": "main", "commit": "472ec50092a3314ec285d2db2baa48602d71fe93" },
15+
"mini.pairs": { "branch": "main", "commit": "d5a29b6254dad07757832db505ea5aeab9aad43a" },
1516
"mini.surround": { "branch": "main", "commit": "88c52297ed3e69ecf9f8652837888ecc727a28ee" },
1617
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
1718
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
18-
"nvim-lspconfig": { "branch": "master", "commit": "d9879110d0422a566fa01d732556f4d5515e1738" },
19+
"nvim-lspconfig": { "branch": "master", "commit": "ef96fce99c72ff4b6e9c44ed6b15f8a52e6a7284" },
1920
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
20-
"nvim-treesitter-context": { "branch": "master", "commit": "660861b1849256398f70450afdf93908d28dc945" },
21+
"nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" },
2122
"nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
2223
"oil.nvim": { "branch": "master", "commit": "cbcb3f997f6f261c577b943ec94e4ef55108dd95" },
23-
"rustaceanvim": { "branch": "master", "commit": "6c3785d6a230bec63f70c98bf8e2842bed924245" },
24+
"rustaceanvim": { "branch": "master", "commit": "823d2adfed6e8ba13e6e0dfd5d2e278868557017" },
2425
"snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
2526
"trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
2627
"ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },

nvim/lua/plugins.lua

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
local icons = require("config").icons
22

33
return {
4+
-- amp.nvim (https://github.com/sourcegraph/amp.nvim)
5+
{
6+
"sourcegraph/amp.nvim",
7+
branch = "main",
8+
lazy = false,
9+
opts = { auto_start = true, log_level = "info" },
10+
},
11+
412
-- blink.cmp (https://github.com/saghen/blink.cmp)
513
{
614
"saghen/blink.cmp",
@@ -718,11 +726,12 @@ return {
718726
},
719727
nil_ls = {},
720728
rust_analyzer = { enabled = false },
729+
volar = { enabled = false },
721730
tailwindcss = {
722731
filetypes_exclude = { "markdown" },
723732
filetypes_include = {},
724733
},
725-
volar = {
734+
vue_ls = {
726735
init_options = {
727736
vue = {
728737
hybridMode = true,
@@ -844,7 +853,10 @@ return {
844853
opts.filetypes = opts.filetypes or {}
845854

846855
-- Add default filetypes
847-
vim.list_extend(opts.filetypes, vim.lsp.config.tailwindcss.filetypes)
856+
local default_config = vim.lsp.config["tailwindcss"]
857+
if default_config and default_config.filetypes then
858+
vim.list_extend(opts.filetypes, default_config.filetypes)
859+
end
848860

849861
-- Remove excluded filetypes
850862
--- @param ft string
@@ -1012,7 +1024,8 @@ return {
10121024
return
10131025
end
10141026
end
1015-
require("lspconfig")[server].setup(server_opts)
1027+
vim.lsp.config(server, server_opts)
1028+
vim.lsp.enable(server)
10161029
end
10171030

10181031
-- get all the servers that are available through mason-lspconfig

0 commit comments

Comments
 (0)