diff --git a/home.nix b/home.nix index d1e555d..64aafc0 100644 --- a/home.nix +++ b/home.nix @@ -404,7 +404,15 @@ in lsp = { servers = { - "*" = { + pyright.enable = true; + nil_ls.enable = true; + lua_ls.enable = true; + hls.enable = true; + clangd.enable = true; + vtsls.enable = true; + marksman.enable = true; + uiua = { + enable = true; settings = { capabilities = { textDocument = { @@ -466,27 +474,6 @@ in ]; }; }; - pyright.enable = true; - nil_ls.enable = true; - lua_ls.enable = true; - hls.enable = true; - tinymist = { - enable = true; - settings = { - exportPdf = "onType"; - fontPaths = [ - "$dir/" - "./" - "\${workspaceFolder}/fonts" - "\${workspaceFolder}/" - ]; - formatterMode = "typstyle"; - }; - }; - clangd.enable = true; - vtsls.enable = true; - marksman.enable = true; - uiua.enable = true; omnisharp.enable = true; ols.enable = true; rust_analyzer.enable = true; @@ -778,8 +765,9 @@ in typst-vim = { enable = true; settings = { - pdf_viewer = null; + pdf_viewer = "zathura"; conceal_math = 0; + auto_open_quickfix = 0; }; }; @@ -1053,6 +1041,31 @@ in vim.api.nvim_set_hl(0, "@lsp.type.uiua_number.uiua", { fg = "#ffb86c" }) vim.api.nvim_set_hl(0, "@lsp.type.uiua_string.uiua", { fg = "#8be9fd" }) vim.api.nvim_set_hl(0, "@lsp.type.variable.uiua", { fg = "#f8f8f2" }) + + + -- for some reason it didn't work in nixvim.lsp.servers + vim.lsp.config.tinymist = { + cmd = { 'tinymist' }, + filetypes = { 'typst' }, + root_markers = { 'main.typ', '.git' }, + settings = { + exportPdf = "onType", + fontPaths = { + "$dir/", + "./", + "''${workspaceFolder}/fonts", + "''${workspaceFolder}/" + }, + formatterMode = "typstyle" + } + } + + vim.api.nvim_create_autocmd('FileType', { + pattern = 'typst', + callback = function(args) + vim.lsp.enable('tinymist') + end + }) ''; # extraPlugins = [ @@ -1105,11 +1118,11 @@ in python3Packages.pyflakes isort shfmt - tinymist python3Packages.python-lsp-server ols djlint superhtml + tinymist ]; };