From 4c83dd5895af6ae6426a72a7deedc30ccf3f0e41 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Sun, 6 Apr 2025 01:59:33 +0200 Subject: [PATCH] language/cue: migrate to vim.lsp.servers --- modules/plugins/languages/cue.nix | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/modules/plugins/languages/cue.nix b/modules/plugins/languages/cue.nix index bd446cbf..a22ff91c 100644 --- a/modules/plugins/languages/cue.nix +++ b/modules/plugins/languages/cue.nix @@ -4,11 +4,17 @@ lib, ... }: let - inherit (lib.options) mkEnableOption mkOption; + inherit (lib.options) mkEnableOption; + inherit (lib.meta) getExe; inherit (lib.modules) mkIf mkMerge; - inherit (lib.types) package; inherit (lib.nvim.types) mkGrammarOption; + lspOptions = { + cmd = [(getExe pkgs.cue) "lsp"]; + filetypes = ["cue"]; + root_markers = ["cue.mod" ".git"]; + }; + cfg = config.vim.languages.cue; in { options.vim.languages.cue = { @@ -22,12 +28,6 @@ in { lsp = { enable = mkEnableOption "CUE LSP support" // {default = config.vim.lsp.enable;}; - - package = mkOption { - type = package; - default = pkgs.cue; - description = "cue lsp implementation"; - }; }; }; @@ -38,14 +38,7 @@ in { }) (mkIf cfg.lsp.enable { - vim.lsp.lspconfig.enable = true; - vim.lsp.lspconfig.sources.cue-lsp = '' - lspconfig.cue.setup { - capabilities = capabilities, - on_attach = default_on_attach, - cmd = {"${cfg.lsp.package}/bin/cue", "lsp"}, - } - ''; + vim.lsp.servers.cue = lspOptions; }) ]); }