convert clojure module

This commit is contained in:
sjcobb 2025-06-03 00:03:28 +01:00
commit 1381962326

View file

@ -13,6 +13,16 @@
inherit (lib.nvim.lua) expToLua; inherit (lib.nvim.lua) expToLua;
cfg = config.vim.languages.clojure; cfg = config.vim.languages.clojure;
defaultServers = ["clojure-lsp"];
servers = {
clojure-lsp = {
enable = true;
cmd = [(getExe pkgs.clojure-lsp)];
filetypes = ["clojure" "edn"];
root_markers = ["project.clj" "deps.edn" "build.boot" "shadow-cljs.edn" ".git" "bb.edn"];
};
};
in { in {
options.vim.languages.clojure = { options.vim.languages.clojure = {
enable = mkEnableOption "Clojure language support"; enable = mkEnableOption "Clojure language support";
@ -24,28 +34,22 @@ in {
lsp = { lsp = {
enable = mkEnableOption "Clojure LSP support" // {default = config.vim.lsp.enable;}; enable = mkEnableOption "Clojure LSP support" // {default = config.vim.lsp.enable;};
package = mkOption { servers = mkOption {
type = either package (listOf str); description = "Clojure LSP server to use";
default = pkgs.clojure-lsp; type = listOf (enum (attrNames servers));
description = "Clojure LSP"; default = defaultServers;
}; };
}; };
}; };
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.lspconfig.enable = true; vim.lsp.servers =
vim.lsp.lspconfig.sources.clojure-lsp = '' mapListToAttrs (n: {
lspconfig.clojure_lsp.setup { name = n;
capabilities = capabilities; value = servers.${n};
on_attach = default_on_attach; })
cmd = ${ cfg.lsp.servers;
if isList cfg.lsp.package
then expToLua cfg.lsp.package
else ''{"${getExe cfg.lsp.package}"}''
};
}
'';
}) })
(mkIf cfg.treesitter.enable { (mkIf cfg.treesitter.enable {