NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-05-18 21:17:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

languages/clojure: refactor lsp.servers to use lsp/presets/<name>

Browse source
This commit is contained in:
Snoweuph 2026-04-12 15:48:20 +02:00
commit 58f73dc76a
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/plugins/languages/clojure.nix
View file

@ -4,25 +4,16 @@
lib, lib,
... ...
}: let }: let
inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe; inherit (lib) genAttrs;
inherit (lib.types) enum listOf; inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.clojure; cfg = config.vim.languages.clojure;
defaultServers = ["clojure-lsp"]; defaultServers = ["clojure-lsp"];
servers = { servers = ["clojure-lsp"];
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";
@ -45,7 +36,7 @@ in {
defaultText = literalExpression "config.vim.lsp.enable"; defaultText = literalExpression "config.vim.lsp.enable";
}; };
servers = mkOption { servers = mkOption {
type = listOf (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "Clojure LSP server to use"; description = "Clojure LSP server to use";
}; };
@ -54,12 +45,13 @@ in {
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.servers = vim.lsp = {
mapListToAttrs (n: { presets = genAttrs cfg.lsp.servers (_: {enable = true;});
name = n; servers = genAttrs cfg.lsp.servers (_: {
value = servers.${n}; filetypes = ["clojure" "edn"];
}) root_markers = ["deps.edn" "build.boot" "shadow-cljs.edn" "bb.edn"];
cfg.lsp.servers; });
};
}) })
(mkIf cfg.treesitter.enable { (mkIf cfg.treesitter.enable {