From 0cbc1810f9647aa7ed733893daff05542b1992cd Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Sat, 5 Apr 2025 23:40:08 +0200 Subject: [PATCH] language/asm: migrate to vim.lsp.servers --- modules/plugins/languages/asm.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/plugins/languages/asm.nix b/modules/plugins/languages/asm.nix index a0e96cef..96c74a49 100644 --- a/modules/plugins/languages/asm.nix +++ b/modules/plugins/languages/asm.nix @@ -5,6 +5,7 @@ ... }: let inherit (lib.options) mkEnableOption mkOption; + inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; inherit (lib.types) package; inherit (lib.nvim.types) mkGrammarOption; @@ -36,14 +37,11 @@ in { }) (mkIf cfg.lsp.enable { - vim.lsp.lspconfig.enable = true; - vim.lsp.lspconfig.sources.asm-lsp = '' - lspconfig.asm_lsp.setup { - capabilities = capabilities, - on_attach = default_on_attach, - cmd = {"${cfg.lsp.package}/bin/asm-lsp"}, - } - ''; + vim.lsp.servers.asm_lsp = { + cmd = [(getExe pkgs.asm-lsp)]; + filetypes = ["asm" "vmasm"]; + root_markers = [".asm-lsp.toml" ".git"]; + }; }) ]); }