efmls-configs: Use upstream tool definitions (#692)

nix-community · Nov 6, 2023 · 6b93c8f · 6b93c8f
1 parent 9cf2c34
commit 6b93c8f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 143 deletions.
diff --git a/helpers/default.nix b/helpers/default.nix
@@ -1,5 +1,4 @@
-pkgs: rec {
-  efmls-configs-tools = pkgs.callPackage ./efmls-configs {};
+pkgs: {
   autogenerated-configs = pkgs.callPackage ({stdenv}:
     stdenv.mkDerivation {
       pname = "autogenerated-configs";
@@ -10,7 +9,6 @@ pkgs: rec {
 
       installPhase = ''
         mkdir -p $out
-        cp ${efmls-configs-tools}/share/* $out
       '';
     }) {};
 }
diff --git a/helpers/efmls-configs/default.nix b/helpers/efmls-configs/default.nix
diff --git a/helpers/efmls-configs/extract.py b/helpers/efmls-configs/extract.py
diff --git a/plugins/lsp/language-servers/efmls-configs.nix b/plugins/lsp/language-servers/efmls-configs.nix
@@ -6,13 +6,9 @@
   ...
 }:
 with lib; let
-  tools = trivial.importJSON ./efmls-configs-tools.json;
-  inherit (tools) linters formatters;
+  tools = trivial.importJSON "${pkgs.vimPlugins.efmls-configs-nvim.src}/doc/supported-list.json";
 
-  searchLanguages = tools: (lists.unique (builtins.concatLists (builtins.attrValues tools)));
-  languages =
-    lists.filter
-    (v: v != "misc") (lists.unique ((searchLanguages linters) ++ (searchLanguages formatters)));
+  languages = builtins.attrNames tools;
 in {
   options.plugins.efmls-configs = {
     enable = mkEnableOption "efmls-configs, premade configurations for efm-langserver";
@@ -33,11 +29,15 @@ in {
     }
     */
     setup = let
-      languageTools = lang: tools:
-        builtins.attrNames (attrsets.filterAttrs (_: lists.any (e: e == lang)) tools);
+      languageTools = lang: kind:
+        builtins.map (v: v.name) (
+          if builtins.hasAttr kind tools.${lang}
+          then tools.${lang}.${kind}
+          else []
+        );
 
-      miscLinters = languageTools "misc" linters;
-      miscFormatters = languageTools "misc" formatters;
+      miscLinters = languageTools "misc" "linters";
+      miscFormatters = languageTools "misc" "formatters";
 
       mkChooseOption = lang: kind: possible: let
         toolType = with types; either (enum possible) helpers.rawType;
@@ -58,8 +58,8 @@ in {
               in {
                 name = lang;
                 value = {
-                  linter = mkChooseOption lang "linter" ((langTools linters) ++ miscLinters);
-                  formatter = mkChooseOption lang "formatter" ((langTools formatters) ++ miscFormatters);
+                  linter = mkChooseOption lang "linter" ((langTools "linters") ++ miscLinters);
+                  formatter = mkChooseOption lang "formatter" ((langTools "formatters") ++ miscFormatters);
                 };
               })
               languages))