This commit is contained in:
jmarkin 2025-11-18 01:04:50 +03:00
parent e8022613f0
commit 1d7da56886
6 changed files with 52 additions and 23 deletions

View file

@ -16,8 +16,8 @@
},
"original": {
"owner": "Saghen",
"ref": "574ce24d44526a76e0b76e921a92c6737a6b3954",
"repo": "blink.pairs",
"rev": "574ce24d44526a76e0b76e921a92c6737a6b3954",
"type": "github"
}
},
@ -422,11 +422,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1762977756,
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
"lastModified": 1763283776,
"narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
"rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
"type": "github"
},
"original": {
@ -528,11 +528,11 @@
"smart-splits-nvim": {
"flake": false,
"locked": {
"lastModified": 1763136947,
"narHash": "sha256-eoF2VNAx7KAsvgQ2L+6l9yuNrbmQnR7pzMiua0uJkyk=",
"lastModified": 1763408602,
"narHash": "sha256-NxTRkQlnX8QSGBlumvqkNwH2jl/FDPzeIyCoG2DPIPk=",
"owner": "mrjones2014",
"repo": "smart-splits.nvim",
"rev": "0fddd17d598a8cef2cc821f2df37412b8dd880d2",
"rev": "a0907c99e0bfc99880a27496a4168a7e707f2aaa",
"type": "github"
},
"original": {

View file

@ -16,7 +16,7 @@ let
langs = [ unsorted go lua rust nix sql python http js ];
in
{
packages = builtins.concatMap (x: x.packages) langs;
packages = [ pkgs.lspmux ] ++ builtins.concatMap (x: x.packages) langs;
plugins = with pkgs.vimPlugins; [
{
plugin = nvim-lspconfig;

View file

@ -9,29 +9,26 @@
bun
yarn-berry
typescript-language-server
vtsls
typescript
];
plugins = with pkgs.vimPlugins; [
{
plugin = typescript-tools-nvim;
plugin = nvim-vtsls;
type = "lua";
optional = true;
config = /*lua*/''
lze.load {
"${typescript-tools-nvim.pname}",
event = vim.g.pre_load_events,
after = function()
require("typescript-tools").setup {
tsserver_path = "${pkgs.typescript}/bin/tsserver",
settings = {
tsserver_max_memory = 4096,
tsserver_file_preferences = {
includeCompletionsForModuleExports = true,
},
},
}
end
"${nvim-vtsls.pname}",
ft={
"javascript",
"javascriptreact",
"javascript.jsx",
"typescript",
"typescriptreact",
"typescript.tsx",
}
}
'';
}

View file

@ -7,7 +7,6 @@
graphviz
lldb
ra-multiplex
cargo-nextest
];

33
nvim/lsp/vtsls.lua Normal file
View file

@ -0,0 +1,33 @@
return {
cmd = { "vtsls", "--stdio" },
filetypes = {
"javascript",
"javascriptreact",
"javascript.jsx",
"typescript",
"typescriptreact",
"typescript.tsx",
},
root_markers = { "tsconfig.json", "jsonconfig.json", "package.json", ".git" },
settings = {
typescript = {
updateImportsOnFileMove = "always",
inlayHints = {
parameterNames = { enabled = "literals" },
parameterTypes = { enabled = true },
variableTypes = { enabled = true },
propertyDeclarationTypes = { enabled = true },
functionLikeReturnTypes = { enabled = true },
enumMemberValues = { enabled = true },
},
},
javascript = {
updateImportsOnFileMove = "always",
},
vtsls = {
enableMoveToFileCodeAction = true,
},
},
}