From 3a4de0bb2fd19313a9e89c6387cba60e8acf6b90 Mon Sep 17 00:00:00 2001 From: Kareem-Medhat <39652808+Kareem-Medhat@users.noreply.github.com> Date: Sat, 13 Apr 2024 13:36:45 +0200 Subject: [PATCH] plugins/coq-nvim: fix settings not being set when lsp is not enabled (#1408) --- lib/maintainers.nix | 6 ++++++ plugins/completion/coq.nix | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3c2b7271..c846cb81 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -42,4 +42,10 @@ {fingerprint = "20AF 0A65 9F2B 93AD 9184 15D1 A7DA 689C B3B0 78EC";} ]; }; + Kareem-Medhat = { + email = "kareemmedhatnabil@gmail.com"; + github = "Kareem-Medhat"; + githubId = 39652808; + name = "Kareem Medhat"; + }; } diff --git a/plugins/completion/coq.nix b/plugins/completion/coq.nix index be9f694b..56e7d7d8 100644 --- a/plugins/completion/coq.nix +++ b/plugins/completion/coq.nix @@ -11,7 +11,7 @@ with lib; originalName = "coq_nvim"; defaultPackage = pkgs.vimPlugins.coq_nvim; - maintainers = [maintainers.traxys]; + maintainers = [maintainers.traxys helpers.maintainers.Kareem-Medhat]; extraOptions = { installArtifacts = mkEnableOption "and install coq-artifacts"; @@ -67,9 +67,14 @@ with lib; cfg.artifactsPackage ]; + globals = { + coq_settings = cfg.settings; + }; + + extraConfigLua = "require('coq')"; + plugins.lsp = { preConfig = '' - vim.g.coq_settings = ${helpers.toLuaObject cfg.settings} local coq = require 'coq' ''; setupWrappers = [(s: ''coq.lsp_ensure_capabilities(${s})'')];