update 24.11 -> 25.05; typst_lsp -> tinymst

This commit is contained in:
Asmir A 2025-05-24 11:11:17 +02:00
parent 8245a48cc7
commit b23265403c
Signed by: asmir
GPG Key ID: 020C42B7A9ABA3E2
2 changed files with 29 additions and 4 deletions

View File

@ -2,7 +2,7 @@
description = "A very basic flake"; description = "A very basic flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
}; };
outputs = { outputs = {
@ -33,7 +33,7 @@
svls svls
texlab texlab
tree-sitter tree-sitter
typst-lsp tinymist
verible verible
yaml-language-server yaml-language-server
zls zls

View File

@ -182,7 +182,7 @@ cmp.setup({
} }
}) })
local servers = { 'pyright', 'rust_analyzer', 'ccls', 'nixd', 'texlab', 'zls', 'gopls', 'yamlls', 'typst_lsp' } local servers = { 'pyright', 'rust_analyzer', 'ccls', 'texlab', 'zls', 'gopls', 'yamlls', 'tinymst' }
local capabilities = require('cmp_nvim_lsp').default_capabilities() local capabilities = require('cmp_nvim_lsp').default_capabilities()
for _, lsp in pairs(servers) do for _, lsp in pairs(servers) do
require('lspconfig')[lsp].setup { require('lspconfig')[lsp].setup {
@ -190,6 +190,31 @@ for _, lsp in pairs(servers) do
} }
end end
require("lspconfig").nixd.setup({
cmd = { "nixd" },
settings = {
nixd = {
nixpkgs = {
expr = 'import "${flake.inputs.nixpkgs}" { }',
},
formatting = {
command = { "nixpkgs-fmt" },
},
options = {
nixos = {
expr =
'(let pkgs = import "${inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${inputs.nixpkgs}/nixos/modules/module-list.nix") ++ [ ({...}: { nixpkgs.hostPlatform = builtins.currentSystem;} ) ] ; })).options',
},
home_manager = {
expr =
'(let pkgs = import "${inputs.nixpkgs}" { }; lib = import "${inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules = (import "${inputs.home-manager}/modules/modules.nix") { inherit lib pkgs; check = false; }; })).options',
},
},
},
},
})
require('lspconfig').lua_ls.setup({ require('lspconfig').lua_ls.setup({
capabilities = capabilities, capabilities = capabilities,
single_file_support = true, single_file_support = true,